From 49cd4baa0c8e98676916b43e6bca887e554c6558 Mon Sep 17 00:00:00 2001 From: Ufuk Date: Tue, 13 Oct 2020 18:26:00 +0300 Subject: [PATCH 01/93] VPCUUID and ConnectWithPrivateIP have been added to builder/digitalocean --- builder/digitalocean/config.go | 22 +++++++++++++++++++ builder/digitalocean/config.hcl2spec.go | 4 ++++ builder/digitalocean/step_create_droplet.go | 1 + builder/digitalocean/step_droplet_info.go | 5 +++-- .../digitalocean/Config-not-required.mdx | 8 +++++++ 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/builder/digitalocean/config.go b/builder/digitalocean/config.go index 37ff5640c..5a968eab8 100644 --- a/builder/digitalocean/config.go +++ b/builder/digitalocean/config.go @@ -85,6 +85,14 @@ type Config struct { UserDataFile string `mapstructure:"user_data_file" required:"false"` // Tags to apply to the droplet when it is created Tags []string `mapstructure:"tags" required:"false"` + // UUID of the VPC which the droplet will be created in. Before using this, + // private_networking should be enabled. + VPCUUID string `mapstructure:"vpc_uuid" required:"false"` + // Wheter the communicators should use private IP or not (public IP in that case). + // If the droplet is or going to be accessible only from the local network because + // it is at behind a firewall, then communicators should use the private IP + // instead of the public IP. Before using this, private_networking should be enabled. + ConnectWithPrivateIP bool `mapstructure:"connect_with_private_ip" required:"false"` ctx interpolate.Context } @@ -187,6 +195,20 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) { } } + // Check if the PrivateNetworking is enabled by user before use VPC UUID + if c.VPCUUID != "" { + if c.PrivateNetworking != true { + errs = packer.MultiErrorAppend(errs, errors.New("private networking should be enabled to use vpc_uuid")) + } + } + + // Check if the PrivateNetworking is enabled by user before use ConnectWithPrivateIP + if c.ConnectWithPrivateIP == true { + if c.PrivateNetworking != true { + errs = packer.MultiErrorAppend(errs, errors.New("private networking should be enabled to use connect_with_private_ip")) + } + } + if errs != nil && len(errs.Errors) > 0 { return nil, errs } diff --git a/builder/digitalocean/config.hcl2spec.go b/builder/digitalocean/config.hcl2spec.go index 55912d819..1a2f4ec95 100644 --- a/builder/digitalocean/config.hcl2spec.go +++ b/builder/digitalocean/config.hcl2spec.go @@ -79,6 +79,8 @@ type FlatConfig struct { UserData *string `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"` UserDataFile *string `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"` Tags []string `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"` + VPCUUID *string `mapstructure:"vpc_uuid" required:"false" cty:"vpc_uuid" hcl:"vpc_uuid"` + ConnectWithPrivateIP *bool `mapstructure:"connect_with_private_ip" required:"false" cty:"connect_with_private_ip" hcl:"connect_with_private_ip"` } // FlatMapstructure returns a new FlatConfig. @@ -163,6 +165,8 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "user_data": &hcldec.AttrSpec{Name: "user_data", Type: cty.String, Required: false}, "user_data_file": &hcldec.AttrSpec{Name: "user_data_file", Type: cty.String, Required: false}, "tags": &hcldec.AttrSpec{Name: "tags", Type: cty.List(cty.String), Required: false}, + "vpc_uuid": &hcldec.AttrSpec{Name: "vpc_uuid", Type: cty.String, Required: false}, + "connect_with_private_ip": &hcldec.AttrSpec{Name: "connect_with_private_ip", Type: cty.Bool, Required: false}, } return s } diff --git a/builder/digitalocean/step_create_droplet.go b/builder/digitalocean/step_create_droplet.go index e246abf5e..25a29ef4d 100644 --- a/builder/digitalocean/step_create_droplet.go +++ b/builder/digitalocean/step_create_droplet.go @@ -52,6 +52,7 @@ func (s *stepCreateDroplet) Run(ctx context.Context, state multistep.StateBag) m IPv6: c.IPv6, UserData: userData, Tags: c.Tags, + VPCUUID: c.VPCUUID, } log.Printf("[DEBUG] Droplet create paramaters: %s", godo.Stringify(dropletCreateReq)) diff --git a/builder/digitalocean/step_droplet_info.go b/builder/digitalocean/step_droplet_info.go index dc7a9ed8a..75a591f2a 100644 --- a/builder/digitalocean/step_droplet_info.go +++ b/builder/digitalocean/step_droplet_info.go @@ -46,10 +46,11 @@ func (s *stepDropletInfo) Run(ctx context.Context, state multistep.StateBag) mul return multistep.ActionHalt } - // Find a public IPv4 network + // Find the ip address which will be used by communicator foundNetwork := false for _, network := range droplet.Networks.V4 { - if network.Type == "public" { + if (c.ConnectWithPrivateIP && network.Type == "private") || + (!(c.ConnectWithPrivateIP) && network.Type == "public") { state.Put("droplet_ip", network.IPAddress) foundNetwork = true break diff --git a/website/pages/partials/builder/digitalocean/Config-not-required.mdx b/website/pages/partials/builder/digitalocean/Config-not-required.mdx index 3f2cb0abf..4eabeacce 100644 --- a/website/pages/partials/builder/digitalocean/Config-not-required.mdx +++ b/website/pages/partials/builder/digitalocean/Config-not-required.mdx @@ -43,3 +43,11 @@ data when launching the Droplet. - `tags` ([]string) - Tags to apply to the droplet when it is created + +- `vpc_uuid` (string) - UUID of the VPC which the droplet will be created in. Before using this, + private_networking should be enabled. + +- `connect_with_private_ip` (bool) - Wheter the communicators should use private IP or not (public IP in that case). + If the droplet is or going to be accessible only from the local network because + it is at behind a firewall, then communicators should use the private IP + instead of the public IP. Before using this, private_networking should be enabled. From a100fe496b1bac8d5767861d060dd80a5079d004 Mon Sep 17 00:00:00 2001 From: Ufuk Date: Tue, 13 Oct 2020 18:57:57 +0300 Subject: [PATCH 02/93] go fmt --- builder/digitalocean/step_create_droplet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/digitalocean/step_create_droplet.go b/builder/digitalocean/step_create_droplet.go index 25a29ef4d..21bb2b53f 100644 --- a/builder/digitalocean/step_create_droplet.go +++ b/builder/digitalocean/step_create_droplet.go @@ -52,7 +52,7 @@ func (s *stepCreateDroplet) Run(ctx context.Context, state multistep.StateBag) m IPv6: c.IPv6, UserData: userData, Tags: c.Tags, - VPCUUID: c.VPCUUID, + VPCUUID: c.VPCUUID, } log.Printf("[DEBUG] Droplet create paramaters: %s", godo.Stringify(dropletCreateReq)) From 2124d3d6b80b286cd5d5c02076127428a256de36 Mon Sep 17 00:00:00 2001 From: Ufuk Date: Mon, 19 Oct 2020 23:19:11 +0300 Subject: [PATCH 03/93] builder/digitalocean: tests added for new features vpc_uuid and connect_with_private_ip --- builder/digitalocean/builder_test.go | 52 ++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/builder/digitalocean/builder_test.go b/builder/digitalocean/builder_test.go index 5113495cf..a767d52b9 100644 --- a/builder/digitalocean/builder_test.go +++ b/builder/digitalocean/builder_test.go @@ -362,3 +362,55 @@ func TestBuilderPrepare_DropletName(t *testing.T) { } } + +func TestBuilderPrepare_VPCUUID(t *testing.T) { + var b Builder + config := testConfig() + + // Test with the case vpc_uuid is defined but private_networking is not enabled + config["vpc_uuid"] = "554c41b3-425f-5403-8860-7f24fb108098" + _, warnings, err := b.Prepare(config) + if len(warnings) > 0 { + t.Fatalf("bad: %#v", warnings) + } + if err == nil { + t.Fatalf("should have error: 'private networking should be enabled to use vpc_uuid'") + } + + // Test with the case both vpc_uuid and private_networking are defined/enabled + config["private_networking"] = true + b = Builder{} + _, warnings, err = b.Prepare(config) + if len(warnings) > 0 { + t.Fatalf("bad: %#v", warnings) + } + if err != nil { + t.Fatal("should not have error") + } +} + +func TestBuilderPrepare_ConnectWithPrivateIP(t *testing.T) { + var b Builder + config := testConfig() + + // Test with the case connect_with_private_ip is defined but private_networking is not enabled + config["connect_with_private_ip"] = true + _, warnings, err := b.Prepare(config) + if len(warnings) > 0 { + t.Fatalf("bad: %#v", warnings) + } + if err == nil { + t.Fatalf("should have error: 'private networking should be enabled to use connect_with_private_ip'") + } + + // Test with the case both connect_with_private_ip and private_networking are enabled + config["private_networking"] = true + b = Builder{} + _, warnings, err = b.Prepare(config) + if len(warnings) > 0 { + t.Fatalf("bad: %#v", warnings) + } + if err != nil { + t.Fatal("should not have error") + } +} From 288e29b1e07447d58d694045d8a49c3fb424d678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Wed, 28 Oct 2020 17:46:40 +0100 Subject: [PATCH 04/93] scaleway: use the SDK functions to load profile from file and env --- builder/scaleway/config.go | 46 +++++++------------ builder/scaleway/step_create_image.go | 4 +- builder/scaleway/step_create_server.go | 4 +- builder/scaleway/step_pre_validate.go | 4 +- builder/scaleway/step_shutdown.go | 2 +- builder/scaleway/step_snapshot.go | 2 +- .../builder/scaleway/Config-required.mdx | 4 ++ 7 files changed, 28 insertions(+), 38 deletions(-) diff --git a/builder/scaleway/config.go b/builder/scaleway/config.go index c88e4fea5..063a0de84 100644 --- a/builder/scaleway/config.go +++ b/builder/scaleway/config.go @@ -6,8 +6,6 @@ package scaleway import ( "errors" "fmt" - "log" - "os" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/uuid" @@ -116,51 +114,39 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) { c.UserAgent = useragent.String() - // Deprecated variables - if c.Organization == "" { - if os.Getenv("SCALEWAY_ORGANIZATION") != "" { - c.Organization = os.Getenv("SCALEWAY_ORGANIZATION") - } else { - log.Printf("Deprecation warning: Use SCALEWAY_ORGANIZATION environment variable and organization_id argument instead of api_access_key argument and SCALEWAY_API_ACCESS_KEY environment variable.") - c.Organization = os.Getenv("SCALEWAY_API_ACCESS_KEY") - } + configFile, err := scw.LoadConfig() + // If the config file do not exist, don't return an error as we may find config in ENV or flags. + if _, isNotFoundError := err.(*scw.ConfigFileNotFoundError); isNotFoundError { + configFile = &scw.Config{} + } else if err != nil { + return nil, err } - if c.Organization != "" { - warnings = append(warnings, "organization_id is deprecated in favor of project_id") - c.ProjectID = c.Organization + activeProfile, err := configFile.GetActiveProfile() + if err != nil { + return nil, err } - if c.Token == "" { - c.Token = os.Getenv("SCALEWAY_API_TOKEN") - } - if c.Token != "" { - warnings = append(warnings, "token is deprecated in favor of secret_key") - c.SecretKey = c.Token - } - - if c.Region != "" { - warnings = append(warnings, "region is deprecated in favor of zone") - c.Zone = c.Region - } + envProfile := scw.LoadEnvProfile() + profile := scw.MergeProfiles(activeProfile, envProfile) if c.AccessKey == "" { - c.AccessKey = os.Getenv(scw.ScwAccessKeyEnv) + c.AccessKey = *profile.AccessKey } if c.SecretKey == "" { - c.SecretKey = os.Getenv(scw.ScwSecretKeyEnv) + c.SecretKey = *profile.SecretKey } if c.ProjectID == "" { - c.ProjectID = os.Getenv(scw.ScwDefaultProjectIDEnv) + c.ProjectID = *profile.DefaultProjectID } if c.Zone == "" { - c.Zone = os.Getenv(scw.ScwDefaultZoneEnv) + c.Zone = *profile.DefaultZone } if c.APIURL == "" { - c.APIURL = os.Getenv(scw.ScwAPIURLEnv) + c.APIURL = *profile.APIURL } if c.SnapshotName == "" { diff --git a/builder/scaleway/step_create_image.go b/builder/scaleway/step_create_image.go index 98085d3af..b115bea97 100644 --- a/builder/scaleway/step_create_image.go +++ b/builder/scaleway/step_create_image.go @@ -45,7 +45,7 @@ func (s *stepImage) Run(ctx context.Context, state multistep.StateBag) multistep imageResp, err := instanceAPI.GetImage(&instance.GetImageRequest{ ImageID: imageID, - }) + }, scw.WithContext(ctx)) if err != nil { err := fmt.Errorf("Error getting initial image info: %s", err) state.Put("error", err) @@ -62,7 +62,7 @@ func (s *stepImage) Run(ctx context.Context, state multistep.StateBag) multistep DefaultBootscript: bootscriptID, Name: c.ImageName, RootVolume: snapshotID, - }) + }, scw.WithContext(ctx)) if err != nil { err := fmt.Errorf("Error creating image: %s", err) state.Put("error", err) diff --git a/builder/scaleway/step_create_server.go b/builder/scaleway/step_create_server.go index 3342305b1..3f64135e2 100644 --- a/builder/scaleway/step_create_server.go +++ b/builder/scaleway/step_create_server.go @@ -41,7 +41,7 @@ func (s *stepCreateServer) Run(ctx context.Context, state multistep.StateBag) mu Name: c.ServerName, Image: c.Image, Tags: tags, - }) + }, scw.WithContext(ctx)) if err != nil { err := fmt.Errorf("Error creating server: %s", err) state.Put("error", err) @@ -52,7 +52,7 @@ func (s *stepCreateServer) Run(ctx context.Context, state multistep.StateBag) mu _, err = instanceAPI.ServerAction(&instance.ServerActionRequest{ Action: instance.ServerActionPoweron, ServerID: createServerResp.Server.ID, - }) + }, scw.WithContext(ctx)) if err != nil { err := fmt.Errorf("Error starting server: %s", err) state.Put("error", err) diff --git a/builder/scaleway/step_pre_validate.go b/builder/scaleway/step_pre_validate.go index 0e32b2e5d..2e1eedaf0 100644 --- a/builder/scaleway/step_pre_validate.go +++ b/builder/scaleway/step_pre_validate.go @@ -32,7 +32,7 @@ func (s *stepPreValidate) Run(ctx context.Context, state multistep.StateBag) mul instanceAPI := instance.NewAPI(state.Get("client").(*scw.Client)) images, err := instanceAPI.ListImages( &instance.ListImagesRequest{Name: &s.ImageName}, - scw.WithAllPages()) + scw.WithAllPages(), scw.WithContext(ctx)) if err != nil { err := fmt.Errorf("Error: getting image list: %s", err) state.Put("error", err) @@ -54,7 +54,7 @@ func (s *stepPreValidate) Run(ctx context.Context, state multistep.StateBag) mul snapshots, err := instanceAPI.ListSnapshots( &instance.ListSnapshotsRequest{Name: &s.SnapshotName}, - scw.WithAllPages()) + scw.WithAllPages(), scw.WithContext(ctx)) if err != nil { err := fmt.Errorf("Error: getting snapshot list: %s", err) state.Put("error", err) diff --git a/builder/scaleway/step_shutdown.go b/builder/scaleway/step_shutdown.go index 60d76d907..ce8eb71a4 100644 --- a/builder/scaleway/step_shutdown.go +++ b/builder/scaleway/step_shutdown.go @@ -22,7 +22,7 @@ func (s *stepShutdown) Run(ctx context.Context, state multistep.StateBag) multis _, err := instanceAPI.ServerAction(&instance.ServerActionRequest{ Action: instance.ServerActionPoweroff, ServerID: serverID, - }) + }, scw.WithContext(ctx)) if err != nil { err := fmt.Errorf("Error stopping server: %s", err) state.Put("error", err) diff --git a/builder/scaleway/step_snapshot.go b/builder/scaleway/step_snapshot.go index 8b4fab470..72d4c628a 100644 --- a/builder/scaleway/step_snapshot.go +++ b/builder/scaleway/step_snapshot.go @@ -23,7 +23,7 @@ func (s *stepSnapshot) Run(ctx context.Context, state multistep.StateBag) multis createSnapshotResp, err := instanceAPI.CreateSnapshot(&instance.CreateSnapshotRequest{ Name: c.SnapshotName, VolumeID: volumeID, - }) + }, scw.WithContext(ctx)) if err != nil { err := fmt.Errorf("Error creating snapshot: %s", err) state.Put("error", err) diff --git a/website/pages/partials/builder/scaleway/Config-required.mdx b/website/pages/partials/builder/scaleway/Config-required.mdx index 90123c05d..4e63cf752 100644 --- a/website/pages/partials/builder/scaleway/Config-required.mdx +++ b/website/pages/partials/builder/scaleway/Config-required.mdx @@ -1,15 +1,19 @@ - `access_key` (string) - The AccessKey corresponding to the secret key. + Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md). It can also be specified via the environment variable SCW_ACCESS_KEY. - `secret_key` (string) - The SecretKey to authenticate against the Scaleway API. + Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md). It can also be specified via the environment variable SCW_SECRET_KEY. - `project_id` (string) - The Project ID in which the instances, volumes and snapshots will be created. + Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md). It can also be specified via the environment variable SCW_DEFAULT_PROJECT_ID. - `zone` (string) - The Zone in which the instances, volumes and snapshots will be created. + Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md). It can also be specified via the environment variable SCW_DEFAULT_ZONE - `image` (string) - The UUID of the base image to use. This is the image From adb74ba15d36f8e2e45d2fe99253206c22ea0963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Thu, 29 Oct 2020 11:09:04 +0100 Subject: [PATCH 05/93] Fix --- builder/scaleway/config.go | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/builder/scaleway/config.go b/builder/scaleway/config.go index 063a0de84..46bd17927 100644 --- a/builder/scaleway/config.go +++ b/builder/scaleway/config.go @@ -130,23 +130,33 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) { profile := scw.MergeProfiles(activeProfile, envProfile) if c.AccessKey == "" { - c.AccessKey = *profile.AccessKey + if profile.AccessKey != nil { + c.AccessKey = *profile.AccessKey + } } if c.SecretKey == "" { - c.SecretKey = *profile.SecretKey + if profile.SecretKey != nil { + c.SecretKey = *profile.SecretKey + } } if c.ProjectID == "" { - c.ProjectID = *profile.DefaultProjectID + if profile.DefaultProjectID != nil { + c.ProjectID = *profile.DefaultProjectID + } } if c.Zone == "" { - c.Zone = *profile.DefaultZone + if profile.DefaultZone != nil { + c.Zone = *profile.DefaultZone + } } if c.APIURL == "" { - c.APIURL = *profile.APIURL + if profile.APIURL != nil { + c.APIURL = *profile.APIURL + } } if c.SnapshotName == "" { @@ -182,12 +192,12 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) { } if c.ProjectID == "" { errs = packer.MultiErrorAppend( - errs, errors.New("Scaleway Project ID must be specified")) + errs, errors.New("scaleway Project ID must be specified")) } if c.SecretKey == "" { errs = packer.MultiErrorAppend( - errs, errors.New("Scaleway Secret Key must be specified")) + errs, errors.New("scaleway Secret Key must be specified")) } if c.AccessKey == "" { @@ -197,7 +207,7 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) { if c.Zone == "" { errs = packer.MultiErrorAppend( - errs, errors.New("Scaleway Zone is required")) + errs, errors.New("scaleway Zone is required")) } if c.CommercialType == "" { @@ -215,5 +225,6 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) { } packer.LogSecretFilter.Set(c.Token) + packer.LogSecretFilter.Set(c.SecretKey) return warnings, nil } From 3413fc5c4672e12602e7714df7b9b4bf157a9967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Thu, 29 Oct 2020 11:19:18 +0100 Subject: [PATCH 06/93] Fix --- builder/scaleway/config.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/builder/scaleway/config.go b/builder/scaleway/config.go index 46bd17927..5d1b210b4 100644 --- a/builder/scaleway/config.go +++ b/builder/scaleway/config.go @@ -6,6 +6,8 @@ package scaleway import ( "errors" "fmt" + "log" + "os" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/uuid" @@ -129,6 +131,28 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) { envProfile := scw.LoadEnvProfile() profile := scw.MergeProfiles(activeProfile, envProfile) + // Deprecated variables + if c.Organization == "" { + if os.Getenv("SCALEWAY_ORGANIZATION") != "" { + c.Organization = os.Getenv("SCALEWAY_ORGANIZATION") + } else { + log.Printf("Deprecation warning: Use SCALEWAY_ORGANIZATION environment variable and organization_id argument instead of api_access_key argument and SCALEWAY_API_ACCESS_KEY environment variable.") + c.Organization = os.Getenv("SCALEWAY_API_ACCESS_KEY") + } + } + if c.Organization != "" { + warnings = append(warnings, "organization_id is deprecated in favor of project_id") + c.ProjectID = c.Organization + } + + if c.Token == "" { + c.Token = os.Getenv("SCALEWAY_API_TOKEN") + } + if c.Token != "" { + warnings = append(warnings, "token is deprecated in favor of secret_key") + c.SecretKey = c.Token + } + if c.AccessKey == "" { if profile.AccessKey != nil { c.AccessKey = *profile.AccessKey From db96c5c9ae589213269b7bef74b91c92049f0361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Thu, 29 Oct 2020 11:21:31 +0100 Subject: [PATCH 07/93] Fix --- builder/scaleway/config.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/builder/scaleway/config.go b/builder/scaleway/config.go index 5d1b210b4..fa377b414 100644 --- a/builder/scaleway/config.go +++ b/builder/scaleway/config.go @@ -153,6 +153,11 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) { c.SecretKey = c.Token } + if c.Region != "" { + warnings = append(warnings, "region is deprecated in favor of zone") + c.Zone = c.Region + } + if c.AccessKey == "" { if profile.AccessKey != nil { c.AccessKey = *profile.AccessKey From 0cfaf4a6202461d21bc27fdd99bb1f43415346e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Thu, 29 Oct 2020 17:45:03 +0100 Subject: [PATCH 08/93] Fix --- builder/scaleway/config.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/builder/scaleway/config.go b/builder/scaleway/config.go index fa377b414..05cc444b4 100644 --- a/builder/scaleway/config.go +++ b/builder/scaleway/config.go @@ -25,18 +25,23 @@ type Config struct { common.PackerConfig `mapstructure:",squash"` Comm communicator.Config `mapstructure:",squash"` // The AccessKey corresponding to the secret key. + // Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md). // It can also be specified via the environment variable SCW_ACCESS_KEY. AccessKey string `mapstructure:"access_key" required:"true"` // The SecretKey to authenticate against the Scaleway API. + // Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md). // It can also be specified via the environment variable SCW_SECRET_KEY. SecretKey string `mapstructure:"secret_key" required:"true"` // The Project ID in which the instances, volumes and snapshots will be created. + // Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md). // It can also be specified via the environment variable SCW_DEFAULT_PROJECT_ID. ProjectID string `mapstructure:"project_id" required:"true"` // The Zone in which the instances, volumes and snapshots will be created. + // Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md). // It can also be specified via the environment variable SCW_DEFAULT_ZONE Zone string `mapstructure:"zone" required:"true"` // The Scaleway API URL to use + // Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md). // It can also be specified via the environment variable SCW_API_URL APIURL string `mapstructure:"api_url"` From 91d73324714145cefb8148beb55a7047f65266d1 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Fri, 30 Oct 2020 12:26:22 +0100 Subject: [PATCH 09/93] add basic code for variable validation parsing * hcl2template/addrs.ParseRef will parse a reference and tell for example if we are referring to a variable and its name, for now it can only do that and in the future it improved when we need to most of it is from the TF code. This is used to tell wether a variable vas referenced in a variable validation condition; for now. * Added Validations blocks to the hcl2 Variable struct and code to parse/validate that. --- hcl2template/addrs/input_variable.go | 11 ++ hcl2template/addrs/parse_ref.go | 93 ++++++++++ hcl2template/addrs/referenceable.go | 18 ++ hcl2template/types.variables.go | 258 ++++++++++++++++++++++----- hcl2template/types.variables_test.go | 2 +- 5 files changed, 340 insertions(+), 42 deletions(-) create mode 100644 hcl2template/addrs/input_variable.go create mode 100644 hcl2template/addrs/parse_ref.go create mode 100644 hcl2template/addrs/referenceable.go diff --git a/hcl2template/addrs/input_variable.go b/hcl2template/addrs/input_variable.go new file mode 100644 index 000000000..ad4370bb8 --- /dev/null +++ b/hcl2template/addrs/input_variable.go @@ -0,0 +1,11 @@ +package addrs + +// InputVariable is the address of an input variable. +type InputVariable struct { + referenceable + Name string +} + +func (v InputVariable) String() string { + return "var." + v.Name +} diff --git a/hcl2template/addrs/parse_ref.go b/hcl2template/addrs/parse_ref.go new file mode 100644 index 000000000..ee3f238ef --- /dev/null +++ b/hcl2template/addrs/parse_ref.go @@ -0,0 +1,93 @@ +package addrs + +import ( + "fmt" + + "github.com/hashicorp/hcl/v2" +) + +// Reference describes a reference to an address with source location +// information. +type Reference struct { + Subject Referenceable + SourceRange hcl.Range + Remaining hcl.Traversal +} + +// ParseRef attempts to extract a referencable address from the prefix of the +// given traversal, which must be an absolute traversal or this function +// will panic. +// +// If no error diagnostics are returned, the returned reference includes the +// address that was extracted, the source range it was extracted from, and any +// remaining relative traversal that was not consumed as part of the +// reference. +// +// If error diagnostics are returned then the Reference value is invalid and +// must not be used. +func ParseRef(traversal hcl.Traversal) (*Reference, hcl.Diagnostics) { + ref, diags := parseRef(traversal) + + // Normalize a little to make life easier for callers. + if ref != nil { + if len(ref.Remaining) == 0 { + ref.Remaining = nil + } + } + + return ref, diags +} + +func parseRef(traversal hcl.Traversal) (*Reference, hcl.Diagnostics) { + var diags hcl.Diagnostics + + root := traversal.RootName() + rootRange := traversal[0].SourceRange() + + switch root { + + case "var": + name, rng, remain, diags := parseSingleAttrRef(traversal) + return &Reference{ + Subject: InputVariable{Name: name}, + SourceRange: rng, + Remaining: remain, + }, diags + + default: + diags = append(diags, &hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: "Unhandled reference type", + Detail: `Currently parseRef can only parse "var" references.`, + Subject: &rootRange, + }) + } + return nil, diags +} + +func parseSingleAttrRef(traversal hcl.Traversal) (string, hcl.Range, hcl.Traversal, hcl.Diagnostics) { + var diags hcl.Diagnostics + + root := traversal.RootName() + rootRange := traversal[0].SourceRange() + + if len(traversal) < 2 { + diags = append(diags, &hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: "Invalid reference", + Detail: fmt.Sprintf("The %q object cannot be accessed directly. Instead, access one of its attributes.", root), + Subject: &rootRange, + }) + return "", hcl.Range{}, nil, diags + } + if attrTrav, ok := traversal[1].(hcl.TraverseAttr); ok { + return attrTrav.Name, hcl.RangeBetween(rootRange, attrTrav.SrcRange), traversal[2:], diags + } + diags = diags.Append(&hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: "Invalid reference", + Detail: fmt.Sprintf("The %q object does not support this operation.", root), + Subject: traversal[1].SourceRange().Ptr(), + }) + return "", hcl.Range{}, nil, diags +} diff --git a/hcl2template/addrs/referenceable.go b/hcl2template/addrs/referenceable.go new file mode 100644 index 000000000..8c4925c40 --- /dev/null +++ b/hcl2template/addrs/referenceable.go @@ -0,0 +1,18 @@ +package addrs + +// Referenceable is an interface implemented by all address types that can +// appear as references in configuration language expressions. +type Referenceable interface { + referenceableSigil() + + // String produces a string representation of the address that could be + // parsed as a HCL traversal and passed to ParseRef to produce an identical + // result. + String() string +} + +type referenceable struct { +} + +func (r referenceable) referenceableSigil() { +} diff --git a/hcl2template/types.variables.go b/hcl2template/types.variables.go index 2598eacfc..d742f44c6 100644 --- a/hcl2template/types.variables.go +++ b/hcl2template/types.variables.go @@ -3,15 +3,20 @@ package hcl2template import ( "fmt" "strings" + "unicode" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/ext/typeexpr" "github.com/hashicorp/hcl/v2/gohcl" "github.com/hashicorp/hcl/v2/hclsyntax" + "github.com/hashicorp/packer/hcl2template/addrs" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" ) +// A consistent detail message for all "not a valid identifier" diagnostics. +const badIdentifierDetail = "A name must start with a letter or underscore and may contain only letters, digits, underscores, and dashes." + // Local represents a single entry from a "locals" block in a file. // The "locals" block itself is not represented, because it serves only to // provide context for us to interpret its contents. @@ -47,6 +52,8 @@ type Variable struct { // the variable from the output stream. By replacing the text. Sensitive bool + Validations []*VariableValidation + Range hcl.Range } @@ -139,6 +146,28 @@ func (variables *Variables) decodeVariable(key string, attr *hcl.Attribute, ectx return diags } +var variableBlockSchema = &hcl.BodySchema{ + Attributes: []hcl.AttributeSchema{ + { + Name: "description", + }, + { + Name: "default", + }, + { + Name: "type", + }, + { + Name: "sensitive", + }, + }, + Blocks: []hcl.BlockHeaderSchema{ + { + Type: "validation", + }, + }, +} + // decodeVariableBlock decodes a "variables" section the way packer 1 used to func (variables *Variables) decodeVariableBlock(block *hcl.Block, ectx *hcl.EvalContext) hcl.Diagnostics { if (*variables) == nil { @@ -155,51 +184,53 @@ func (variables *Variables) decodeVariableBlock(block *hcl.Block, ectx *hcl.Eval }} } - var b struct { - Description string `hcl:"description,optional"` - Sensitive bool `hcl:"sensitive,optional"` - Rest hcl.Body `hcl:",remain"` - } - diags := gohcl.DecodeBody(block.Body, nil, &b) - - if diags.HasErrors() { - return diags - } - name := block.Labels[0] - res := &Variable{ - Name: name, - Description: b.Description, - Sensitive: b.Sensitive, - Range: block.DefRange, + content, diags := block.Body.Content(variableBlockSchema) + if !hclsyntax.ValidIdentifier(name) { + diags = append(diags, &hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: "Invalid variable name", + Detail: badIdentifierDetail, + Subject: &block.LabelRanges[0], + }) } - attrs, moreDiags := b.Rest.JustAttributes() - diags = append(diags, moreDiags...) + v := &Variable{ + Name: name, + Range: block.DefRange, + } - if t, ok := attrs["type"]; ok { - delete(attrs, "type") + if attr, exists := content.Attributes["description"]; exists { + valDiags := gohcl.DecodeExpression(attr.Expr, nil, &v.Description) + diags = append(diags, valDiags...) + } + + if t, ok := content.Attributes["type"]; ok { tp, moreDiags := typeexpr.Type(t.Expr) diags = append(diags, moreDiags...) if moreDiags.HasErrors() { return diags } - res.Type = tp + v.Type = tp } - if def, ok := attrs["default"]; ok { - delete(attrs, "default") + if attr, exists := content.Attributes["sensitive"]; exists { + valDiags := gohcl.DecodeExpression(attr.Expr, nil, &v.Sensitive) + diags = append(diags, valDiags...) + } + + if def, ok := content.Attributes["default"]; ok { defaultValue, moreDiags := def.Expr.Value(ectx) diags = append(diags, moreDiags...) if moreDiags.HasErrors() { return diags } - if res.Type != cty.NilType { + if v.Type != cty.NilType { var err error - defaultValue, err = convert.Convert(defaultValue, res.Type) + defaultValue, err = convert.Convert(defaultValue, v.Type) if err != nil { diags = append(diags, &hcl.Diagnostic{ Severity: hcl.DiagError, @@ -211,32 +242,177 @@ func (variables *Variables) decodeVariableBlock(block *hcl.Block, ectx *hcl.Eval } } - res.DefaultValue = defaultValue + v.DefaultValue = defaultValue // It's possible no type attribute was assigned so lets make sure we // have a valid type otherwise there could be issues parsing the value. - if res.Type == cty.NilType { - res.Type = res.DefaultValue.Type() + if v.Type == cty.NilType { + v.Type = v.DefaultValue.Type() } } - if len(attrs) > 0 { - keys := []string{} - for k := range attrs { - keys = append(keys, k) - } - diags = append(diags, &hcl.Diagnostic{ - Severity: hcl.DiagWarning, - Summary: "Unknown keys", - Detail: fmt.Sprintf("unknown variable setting(s): %s", keys), - Context: block.DefRange.Ptr(), - }) - } - (*variables)[name] = res + for _, block := range content.Blocks { + switch block.Type { + case "validation": + vv, moreDiags := decodeVariableValidationBlock(v.Name, block) + diags = append(diags, moreDiags...) + v.Validations = append(v.Validations, vv) + } + } + + (*variables)[name] = v return diags } +var variableValidationBlockSchema = &hcl.BodySchema{ + Attributes: []hcl.AttributeSchema{ + { + Name: "condition", + Required: true, + }, + { + Name: "error_message", + Required: true, + }, + }, +} + +// VariableValidation represents a configuration-defined validation rule +// for a particular input variable, given as a "validation" block inside +// a "variable" block. +type VariableValidation struct { + // Condition is an expression that refers to the variable being tested and + // contains no other references. The expression must return true to + // indicate that the value is valid or false to indicate that it is + // invalid. If the expression produces an error, that's considered a bug in + // the block defining the validation rule, not an error in the caller. + Condition hcl.Expression + + // ErrorMessage is one or more full sentences, which would need to be in + // English for consistency with the rest of the error message output but + // can in practice be in any language as long as it ends with a period. + // The message should describe what is required for the condition to return + // true in a way that would make sense to a caller of the module. + ErrorMessage string + + DeclRange hcl.Range +} + +func decodeVariableValidationBlock(varName string, block *hcl.Block) (*VariableValidation, hcl.Diagnostics) { + var diags hcl.Diagnostics + vv := &VariableValidation{ + DeclRange: block.DefRange, + } + + content, moreDiags := block.Body.Content(variableValidationBlockSchema) + diags = append(diags, moreDiags...) + + if attr, exists := content.Attributes["condition"]; exists { + vv.Condition = attr.Expr + + // The validation condition must refer to the variable itself and + // nothing else; to ensure that the variable declaration can't create + // additional edges in the dependency graph. + goodRefs := 0 + for _, traversal := range vv.Condition.Variables() { + + ref, moreDiags := addrs.ParseRef(traversal) + if !moreDiags.HasErrors() { + if addr, ok := ref.Subject.(addrs.InputVariable); ok { + if addr.Name == varName { + goodRefs++ + continue // Reference is valid + } + } + } + + // If we fall out here then the reference is invalid. + diags = diags.Append(&hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: "Invalid reference in variable validation", + Detail: fmt.Sprintf("The condition for variable %q can only refer to the variable itself, using var.%s.", varName, varName), + Subject: traversal.SourceRange().Ptr(), + }) + } + if goodRefs < 1 { + diags = diags.Append(&hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: "Invalid variable validation condition", + Detail: fmt.Sprintf("The condition for variable %q must refer to var.%s in order to test incoming values.", varName, varName), + Subject: attr.Expr.Range().Ptr(), + }) + } + } + + if attr, exists := content.Attributes["error_message"]; exists { + moreDiags := gohcl.DecodeExpression(attr.Expr, nil, &vv.ErrorMessage) + diags = append(diags, moreDiags...) + if !moreDiags.HasErrors() { + const errSummary = "Invalid validation error message" + switch { + case vv.ErrorMessage == "": + diags = diags.Append(&hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: errSummary, + Detail: "An empty string is not a valid nor useful error message.", + Subject: attr.Expr.Range().Ptr(), + }) + case !looksLikeSentences(vv.ErrorMessage): + // Because we're going to include this string verbatim as part + // of a bigger error message written in our usual style in + // English, we'll require the given error message to conform + // to that. We might relax this in future if e.g. we start + // presenting these error messages in a different way, or if + // Terraform starts supporting producing error messages in + // other human languages, etc. + // For pragmatism we also allow sentences ending with + // exclamation points, but we don't mention it explicitly here + // because that's not really consistent with the Terraform UI + // writing style. + diags = diags.Append(&hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: errSummary, + Detail: "Validation error message must be at least one full English sentence starting with an uppercase letter and ending with a period or question mark.", + Subject: attr.Expr.Range().Ptr(), + }) + } + } + } + + return vv, diags +} + +// looksLikeSentence is a simple heuristic that encourages writing error +// messages that will be presentable when included as part of a larger error +// diagnostic whose other text is written in the UI writing style. +// +// This is intentionally not a very strong validation since we're assuming that +// authors want to write good messages and might just need a nudge about +// Packer's specific style, rather than that they are going to try to work +// around these rules to write a lower-quality message. +func looksLikeSentences(s string) bool { + if len(s) < 1 { + return false + } + runes := []rune(s) // HCL guarantees that all strings are valid UTF-8 + first := runes[0] + last := runes[len(runes)-1] + + // If the first rune is a letter then it must be an uppercase letter. + // (This will only see the first rune in a multi-rune combining sequence, + // but the first rune is generally the letter if any are, and if not then + // we'll just ignore it because we're primarily expecting English messages + // right now anyway, for consistency with all of Terraform's other output.) + if unicode.IsLetter(first) && !unicode.IsUpper(first) { + return false + } + + // The string must be at least one full sentence, which implies having + // sentence-ending punctuation. + return last == '.' || last == '?' || last == '!' +} + // Prefix your environment variables with VarEnvPrefix so that Packer can see // them. const VarEnvPrefix = "PKR_VAR_" diff --git a/hcl2template/types.variables_test.go b/hcl2template/types.variables_test.go index b36b6e44f..d1c589d5b 100644 --- a/hcl2template/types.variables_test.go +++ b/hcl2template/types.variables_test.go @@ -131,7 +131,7 @@ func TestParse_variables(t *testing.T) { }, }, }, - true, false, + true, true, []packer.Build{}, false, }, From 4e08ea6a92dc2a0687c3833b44ef07f9a2895a94 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Fri, 30 Oct 2020 12:41:29 +0100 Subject: [PATCH 10/93] add a test --- .../variables/validation/valid.pkr.hcl | 9 ++++++++ hcl2template/types.variables_test.go | 22 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 hcl2template/testdata/variables/validation/valid.pkr.hcl diff --git a/hcl2template/testdata/variables/validation/valid.pkr.hcl b/hcl2template/testdata/variables/validation/valid.pkr.hcl new file mode 100644 index 000000000..a0bbe2cf5 --- /dev/null +++ b/hcl2template/testdata/variables/validation/valid.pkr.hcl @@ -0,0 +1,9 @@ + +variable "image_id" { + type = string + default = "ami-something-something" + validation { + condition = length(var.image_id) > 4 && substr(var.image_id, 0, 4) == "ami-" + error_message = "The image_id value must be a valid AMI id, starting with \"ami-\"." + } +} \ No newline at end of file diff --git a/hcl2template/types.variables_test.go b/hcl2template/types.variables_test.go index d1c589d5b..4a8f697c5 100644 --- a/hcl2template/types.variables_test.go +++ b/hcl2template/types.variables_test.go @@ -357,6 +357,28 @@ func TestParse_variables(t *testing.T) { }, false, }, + + {"valid validation block", + defaultParser, + parseTestArgs{"testdata/variables/validation/valid.pkr.hcl", nil, nil}, + &PackerConfig{ + Basedir: filepath.Join("testdata", "variables", "validation"), + InputVariables: Variables{ + "image_id": &Variable{ + DefaultValue: cty.StringVal("ami-something-something"), + Name: "image_id", + Validations: []*VariableValidation{ + &VariableValidation{ + ErrorMessage: `The image_id value must be a valid AMI id, starting with "ami-".`, + }, + }, + }, + }, + }, + false, false, + []packer.Build{}, + false, + }, } testParse(t, tests) } From 4d386dd806906f546def27fee11a63bcd618ecbb Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Fri, 30 Oct 2020 15:36:23 +0100 Subject: [PATCH 11/93] add length function that can work with more types --- hcl2template/function/length.go | 53 +++++++++++++++++++++++++++++++++ hcl2template/functions.go | 2 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 hcl2template/function/length.go diff --git a/hcl2template/function/length.go b/hcl2template/function/length.go new file mode 100644 index 000000000..176326ac8 --- /dev/null +++ b/hcl2template/function/length.go @@ -0,0 +1,53 @@ +package function + +import ( + "errors" + + "github.com/zclconf/go-cty/cty" + "github.com/zclconf/go-cty/cty/function" + "github.com/zclconf/go-cty/cty/function/stdlib" +) + +var LengthFunc = function.New(&function.Spec{ + Params: []function.Parameter{ + { + Name: "value", + Type: cty.DynamicPseudoType, + AllowDynamicType: true, + AllowUnknown: true, + }, + }, + Type: func(args []cty.Value) (cty.Type, error) { + collTy := args[0].Type() + switch { + case collTy == cty.String || collTy.IsTupleType() || collTy.IsObjectType() || collTy.IsListType() || collTy.IsMapType() || collTy.IsSetType() || collTy == cty.DynamicPseudoType: + return cty.Number, nil + default: + return cty.Number, errors.New("argument must be a string, a collection type, or a structural type") + } + }, + Impl: func(args []cty.Value, retType cty.Type) (cty.Value, error) { + coll := args[0] + collTy := args[0].Type() + switch { + case collTy == cty.DynamicPseudoType: + return cty.UnknownVal(cty.Number), nil + case collTy.IsTupleType(): + l := len(collTy.TupleElementTypes()) + return cty.NumberIntVal(int64(l)), nil + case collTy.IsObjectType(): + l := len(collTy.AttributeTypes()) + return cty.NumberIntVal(int64(l)), nil + case collTy == cty.String: + // We'll delegate to the cty stdlib strlen function here, because + // it deals with all of the complexities of tokenizing unicode + // grapheme clusters. + return stdlib.Strlen(coll) + case collTy.IsListType() || collTy.IsSetType() || collTy.IsMapType(): + return coll.Length(), nil + default: + // Should never happen, because of the checks in our Type func above + return cty.UnknownVal(cty.Number), errors.New("impossible value type for length(...)") + } + }, +}) diff --git a/hcl2template/functions.go b/hcl2template/functions.go index f91abdab7..058a3f8da 100644 --- a/hcl2template/functions.go +++ b/hcl2template/functions.go @@ -68,7 +68,7 @@ func Functions(basedir string) map[string]function.Function { "jsondecode": stdlib.JSONDecodeFunc, "jsonencode": stdlib.JSONEncodeFunc, "keys": stdlib.KeysFunc, - "length": stdlib.LengthFunc, + "length": pkrfunction.LengthFunc, "log": stdlib.LogFunc, "lookup": stdlib.LookupFunc, "lower": stdlib.LowerFunc, From 9932fd1217d612617ca4a92ebc3a69c2d8198124 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Fri, 30 Oct 2020 15:38:29 +0100 Subject: [PATCH 12/93] add Variable.validateValue func --- hcl2template/types.variables.go | 86 +++++++++++++++++++++++++++++---- 1 file changed, 77 insertions(+), 9 deletions(-) diff --git a/hcl2template/types.variables.go b/hcl2template/types.variables.go index d742f44c6..a5de7ca47 100644 --- a/hcl2template/types.variables.go +++ b/hcl2template/types.variables.go @@ -2,6 +2,7 @@ package hcl2template import ( "fmt" + "log" "strings" "unicode" @@ -67,7 +68,76 @@ func (v *Variable) GoString() string { ) } -func (v *Variable) Value() (cty.Value, *hcl.Diagnostic) { +// validateValue ensures that all of the configured custom validations for a +// variable value are passing. +// +func (v *Variable) validateValue(val cty.Value) (diags hcl.Diagnostics) { + if len(v.Validations) == 0 { + log.Printf("[TRACE] validateValue: not active for %s, so skipping", v.Name) + return nil + } + + hclCtx := &hcl.EvalContext{ + Variables: map[string]cty.Value{ + "var": cty.ObjectVal(map[string]cty.Value{ + v.Name: val, + }), + }, + Functions: Functions(""), + } + + for _, validation := range v.Validations { + const errInvalidCondition = "Invalid variable validation result" + const errInvalidValue = "Invalid value for variable" + + result, moreDiags := validation.Condition.Value(hclCtx) + diags = append(diags, moreDiags...) + if moreDiags.HasErrors() { + log.Printf("[TRACE] evalVariableValidations: %s rule %s condition expression failed: %s", v.Name, validation.DeclRange, moreDiags.Error()) + } + if !result.IsKnown() { + log.Printf("[TRACE] evalVariableValidations: %s rule %s condition value is unknown, so skipping validation for now", v.Name, validation.DeclRange) + continue // We'll wait until we've learned more, then. + } + if result.IsNull() { + diags = append(diags, &hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: errInvalidCondition, + Detail: "Validation condition expression must return either true or false, not null.", + Subject: validation.Condition.Range().Ptr(), + Expression: validation.Condition, + EvalContext: hclCtx, + }) + continue + } + var err error + result, err = convert.Convert(result, cty.Bool) + if err != nil { + diags = append(diags, &hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: errInvalidCondition, + Detail: fmt.Sprintf("Invalid validation condition result value: %s.", err), + Subject: validation.Condition.Range().Ptr(), + Expression: validation.Condition, + EvalContext: hclCtx, + }) + continue + } + + if result.False() { + diags = append(diags, &hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: errInvalidValue, + Detail: fmt.Sprintf("%s\n\nThis was checked by the validation rule at %s.", validation.ErrorMessage, validation.DeclRange.String()), + Subject: validation.DeclRange.Ptr(), + }) + } + } + + return diags +} + +func (v *Variable) Value() (cty.Value, hcl.Diagnostics) { for _, value := range []cty.Value{ v.CmdValue, v.VarfileValue, @@ -75,18 +145,18 @@ func (v *Variable) Value() (cty.Value, *hcl.Diagnostic) { v.DefaultValue, } { if value != cty.NilVal { - return value, nil + return value, v.validateValue(value) } } - return cty.UnknownVal(v.Type), &hcl.Diagnostic{ + return cty.UnknownVal(v.Type), hcl.Diagnostics{&hcl.Diagnostic{ Severity: hcl.DiagError, Summary: fmt.Sprintf("Unset variable %q", v.Name), Detail: "A used variable must be set or have a default value; see " + "https://packer.io/docs/configuration/from-1.5/syntax for " + "details.", Context: v.Range.Ptr(), - } + }} } type Variables map[string]*Variable @@ -103,10 +173,8 @@ func (variables Variables) Values() (map[string]cty.Value, hcl.Diagnostics) { res := map[string]cty.Value{} var diags hcl.Diagnostics for k, v := range variables { - value, diag := v.Value() - if diag != nil { - diags = append(diags, diag) - } + value, moreDiags := v.Value() + diags = append(diags, moreDiags...) res[k] = value } return res, diags @@ -486,7 +554,7 @@ func (cfg *PackerConfig) collectInputVariableValues(env []string, files []*hcl.F }) for _, block := range content.Blocks { name := block.Labels[0] - diags = diags.Append(&hcl.Diagnostic{ + diags = append(diags, &hcl.Diagnostic{ Severity: hcl.DiagError, Summary: "Variable declaration in a .pkrvar file", Detail: fmt.Sprintf("A .pkrvar file is used to assign "+ From b892414e84f1f953c7a81571499be1f62b902184 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Fri, 30 Oct 2020 15:40:31 +0100 Subject: [PATCH 13/93] add failing test case --- .../variables/validation/invalid_default.pkr.hcl | 9 +++++++++ hcl2template/testdata/variables/validation/valid.pkr.hcl | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 hcl2template/testdata/variables/validation/invalid_default.pkr.hcl diff --git a/hcl2template/testdata/variables/validation/invalid_default.pkr.hcl b/hcl2template/testdata/variables/validation/invalid_default.pkr.hcl new file mode 100644 index 000000000..4fafe369f --- /dev/null +++ b/hcl2template/testdata/variables/validation/invalid_default.pkr.hcl @@ -0,0 +1,9 @@ + +variable "image_id" { + type = string + default = "potato" + validation { + condition = length(var.image_id) > 4 && substr(var.image_id, 0, 4) == "ami-" + error_message = "The image_id value must be a valid AMI id, starting with \"ami-\"." + } +} diff --git a/hcl2template/testdata/variables/validation/valid.pkr.hcl b/hcl2template/testdata/variables/validation/valid.pkr.hcl index a0bbe2cf5..e17aa7193 100644 --- a/hcl2template/testdata/variables/validation/valid.pkr.hcl +++ b/hcl2template/testdata/variables/validation/valid.pkr.hcl @@ -6,4 +6,4 @@ variable "image_id" { condition = length(var.image_id) > 4 && substr(var.image_id, 0, 4) == "ami-" error_message = "The image_id value must be a valid AMI id, starting with \"ami-\"." } -} \ No newline at end of file +} From 8de2f40a076632f97d3239114dd6ef4b66f8553d Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Fri, 30 Oct 2020 15:42:59 +0100 Subject: [PATCH 14/93] add tests for length --- hcl2template/function/length.go | 6 ++ hcl2template/function/length_test.go | 139 +++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 hcl2template/function/length_test.go diff --git a/hcl2template/function/length.go b/hcl2template/function/length.go index 176326ac8..c1a1e8862 100644 --- a/hcl2template/function/length.go +++ b/hcl2template/function/length.go @@ -51,3 +51,9 @@ var LengthFunc = function.New(&function.Spec{ } }, }) + +// Length returns the number of elements in the given collection or number of +// Unicode characters in the given string. +func Length(collection cty.Value) (cty.Value, error) { + return LengthFunc.Call([]cty.Value{collection}) +} diff --git a/hcl2template/function/length_test.go b/hcl2template/function/length_test.go new file mode 100644 index 000000000..5b217a00a --- /dev/null +++ b/hcl2template/function/length_test.go @@ -0,0 +1,139 @@ +package function + +import ( + "fmt" + "testing" + + "github.com/zclconf/go-cty/cty" +) + +func TestLength(t *testing.T) { + tests := []struct { + Value cty.Value + Want cty.Value + }{ + { + cty.ListValEmpty(cty.Number), + cty.NumberIntVal(0), + }, + { + cty.ListVal([]cty.Value{cty.True}), + cty.NumberIntVal(1), + }, + { + cty.ListVal([]cty.Value{cty.UnknownVal(cty.Bool)}), + cty.NumberIntVal(1), + }, + { + cty.SetValEmpty(cty.Number), + cty.NumberIntVal(0), + }, + { + cty.SetVal([]cty.Value{cty.True}), + cty.NumberIntVal(1), + }, + { + cty.MapValEmpty(cty.Bool), + cty.NumberIntVal(0), + }, + { + cty.MapVal(map[string]cty.Value{"hello": cty.True}), + cty.NumberIntVal(1), + }, + { + cty.EmptyTupleVal, + cty.NumberIntVal(0), + }, + { + cty.UnknownVal(cty.EmptyTuple), + cty.NumberIntVal(0), + }, + { + cty.TupleVal([]cty.Value{cty.True}), + cty.NumberIntVal(1), + }, + { + cty.EmptyObjectVal, + cty.NumberIntVal(0), + }, + { + cty.UnknownVal(cty.EmptyObject), + cty.NumberIntVal(0), + }, + { + cty.ObjectVal(map[string]cty.Value{"true": cty.True}), + cty.NumberIntVal(1), + }, + { + cty.UnknownVal(cty.List(cty.Bool)), + cty.UnknownVal(cty.Number), + }, + { + cty.DynamicVal, + cty.UnknownVal(cty.Number), + }, + { + cty.StringVal("hello"), + cty.NumberIntVal(5), + }, + { + cty.StringVal(""), + cty.NumberIntVal(0), + }, + { + cty.StringVal("1"), + cty.NumberIntVal(1), + }, + { + cty.StringVal("Живой Журнал"), + cty.NumberIntVal(12), + }, + { + // note that the dieresis here is intentionally a combining + // ligature. + cty.StringVal("noël"), + cty.NumberIntVal(4), + }, + { + // The Es in this string has three combining acute accents. + // This tests something that NFC-normalization cannot collapse + // into a single precombined codepoint, since otherwise we might + // be cheating and relying on the single-codepoint forms. + cty.StringVal("wé́́é́́é́́!"), + cty.NumberIntVal(5), + }, + { + // Go's normalization forms don't handle this ligature, so we + // will produce the wrong result but this is now a compatibility + // constraint and so we'll test it. + cty.StringVal("baffle"), + cty.NumberIntVal(4), + }, + { + cty.StringVal("😸😾"), + cty.NumberIntVal(2), + }, + { + cty.UnknownVal(cty.String), + cty.UnknownVal(cty.Number), + }, + { + cty.DynamicVal, + cty.UnknownVal(cty.Number), + }, + } + + for _, test := range tests { + t.Run(fmt.Sprintf("Length(%#v)", test.Value), func(t *testing.T) { + got, err := Length(test.Value) + + if err != nil { + t.Fatalf("unexpected error: %s", err) + } + + if !got.RawEquals(test.Want) { + t.Errorf("wrong result\ngot: %#v\nwant: %#v", got, test.Want) + } + }) + } +} From d561b404d678ac48a8a156aea5464ec3c128bd87 Mon Sep 17 00:00:00 2001 From: Aleksandr Serbin Date: Sun, 1 Nov 2020 15:43:49 +0100 Subject: [PATCH 15/93] amazon-ebs: add tags to launch template --- builder/amazon/chroot/builder.go | 1 + .../common/interpolate_build_info_test.go | 1 + .../amazon/common/step_run_spot_instance.go | 16 +- .../common/step_run_spot_instance_test.go | 190 ++++++++++++++++++ builder/amazon/ebs/builder.go | 1 + builder/amazon/ebssurrogate/builder.go | 1 + builder/amazon/ebsvolume/builder.go | 1 + builder/amazon/instance/builder.go | 1 + 8 files changed, 208 insertions(+), 4 deletions(-) diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index 9fb431583..1af8156c6 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -368,6 +368,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("awsSession", session) state.Put("hook", hook) state.Put("ui", ui) + state.Put("region", *ec2conn.Config.Region) state.Put("wrappedCommand", common.CommandWrapper(wrappedCommand)) generatedData := &builder.GeneratedData{State: state} diff --git a/builder/amazon/common/interpolate_build_info_test.go b/builder/amazon/common/interpolate_build_info_test.go index a29f82dac..7a9da1866 100644 --- a/builder/amazon/common/interpolate_build_info_test.go +++ b/builder/amazon/common/interpolate_build_info_test.go @@ -17,6 +17,7 @@ func testImage() *ec2.Image { Name: aws.String("ami_test_name"), OwnerId: aws.String("ami_test_owner_id"), ImageOwnerAlias: aws.String("ami_test_owner_alias"), + RootDeviceType: aws.String("ebs"), Tags: []*ec2.Tag{ { Key: aws.String("key-1"), diff --git a/builder/amazon/common/step_run_spot_instance.go b/builder/amazon/common/step_run_spot_instance.go index 75ec401e9..1d80b924a 100644 --- a/builder/amazon/common/step_run_spot_instance.go +++ b/builder/amazon/common/step_run_spot_instance.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/hashicorp/packer/builder/amazon/common/awserrors" "github.com/hashicorp/packer/common/random" "github.com/hashicorp/packer/common/retry" @@ -158,8 +159,9 @@ func (s *StepRunSpotInstance) LoadUserData() (string, error) { } func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { - ec2conn := state.Get("ec2").(*ec2.EC2) + ec2conn := state.Get("ec2").(ec2iface.EC2API) ui := state.Get("ui").(packer.Ui) + region := state.Get("region").(string) ui.Say("Launching a spot AWS instance...") @@ -197,7 +199,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag) } // Convert tags from the tag map provided by the user into *ec2.Tag s - ec2Tags, err := TagMap(s.Tags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state) + ec2Tags, err := TagMap(s.Tags).EC2Tags(s.Ctx, region, state) if err != nil { err := fmt.Errorf("Error generating tags for source instance: %s", err) state.Put("error", err) @@ -242,6 +244,12 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag) LaunchTemplateData: templateData, LaunchTemplateName: aws.String(launchTemplateName), VersionDescription: aws.String("template generated by packer for launching spot instances"), + TagSpecifications: []*ec2.TagSpecification{ + { + ResourceType: aws.String("launch-template"), + Tags: ec2Tags, + }, + }, } // Tell EC2 to create the template @@ -361,7 +369,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag) instance := describeOutput.Reservations[0].Instances[0] // Tag the spot instance request (not the eventual spot instance) - spotTags, err := TagMap(s.SpotTags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state) + spotTags, err := TagMap(s.SpotTags).EC2Tags(s.Ctx, region, state) if err != nil { err := fmt.Errorf("Error generating tags for spot request: %s", err) state.Put("error", err) @@ -428,7 +436,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag) if len(volumeIds) > 0 && len(s.VolumeTags) > 0 { ui.Say("Adding tags to source EBS Volumes") - volumeTags, err := TagMap(s.VolumeTags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state) + volumeTags, err := TagMap(s.VolumeTags).EC2Tags(s.Ctx, region, state) if err != nil { err := fmt.Errorf("Error tagging source EBS Volumes on %s: %s", *instance.InstanceId, err) state.Put("error", err) diff --git a/builder/amazon/common/step_run_spot_instance_test.go b/builder/amazon/common/step_run_spot_instance_test.go index 89fa53f01..4a57d0cbd 100644 --- a/builder/amazon/common/step_run_spot_instance_test.go +++ b/builder/amazon/common/step_run_spot_instance_test.go @@ -2,11 +2,13 @@ package common import ( "bytes" + "context" "fmt" "testing" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -134,3 +136,191 @@ func TestCreateTemplateData_NoEphemeral(t *testing.T) { // t.Fatalf("Should have created 26 mappings to keep ephemeral drives from appearing.") // } } + +type runSpotEC2ConnMock struct { + ec2iface.EC2API + + CreateLaunchTemplateParams []*ec2.CreateLaunchTemplateInput + CreateLaunchTemplateFn func(*ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error) + + CreateFleetParams []*ec2.CreateFleetInput + CreateFleetFn func(*ec2.CreateFleetInput) (*ec2.CreateFleetOutput, error) + + CreateTagsParams []*ec2.CreateTagsInput + CreateTagsFn func(*ec2.CreateTagsInput) (*ec2.CreateTagsOutput, error) + + DescribeInstancesParams []*ec2.DescribeInstancesInput + DescribeInstancesFn func(input *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) +} + +func (m *runSpotEC2ConnMock) CreateLaunchTemplate(req *ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error) { + m.CreateLaunchTemplateParams = append(m.CreateLaunchTemplateParams, req) + resp, err := m.CreateLaunchTemplateFn(req) + return resp, err +} + +func (m *runSpotEC2ConnMock) CreateFleet(req *ec2.CreateFleetInput) (*ec2.CreateFleetOutput, error) { + m.CreateFleetParams = append(m.CreateFleetParams, req) + if m.CreateFleetFn != nil { + resp, err := m.CreateFleetFn(req) + return resp, err + } else { + return nil, nil + } +} + +func (m *runSpotEC2ConnMock) DescribeInstances(req *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) { + m.DescribeInstancesParams = append(m.DescribeInstancesParams, req) + if m.DescribeInstancesFn != nil { + resp, err := m.DescribeInstancesFn(req) + return resp, err + } else { + return nil, nil + } +} + +func (m *runSpotEC2ConnMock) CreateTags(req *ec2.CreateTagsInput) (*ec2.CreateTagsOutput, error) { + m.CreateTagsParams = append(m.CreateTagsParams, req) + if m.CreateTagsFn != nil { + resp, err := m.CreateTagsFn(req) + return resp, err + } else { + return nil, nil + } +} + +func TestRun(t *testing.T) { + instanceId := aws.String("test-instance-id") + spotRequestId := aws.String("spot-id") + volumeId := aws.String("volume-id") + instance := &ec2.Instance{ + InstanceId: instanceId, + SpotInstanceRequestId: spotRequestId, + BlockDeviceMappings: []*ec2.InstanceBlockDeviceMapping{ + { + Ebs: &ec2.EbsInstanceBlockDevice{ + VolumeId: volumeId, + }, + }, + }, + } + ec2Mock := &runSpotEC2ConnMock{ + CreateLaunchTemplateFn: func(in *ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error) { + return &ec2.CreateLaunchTemplateOutput{ + LaunchTemplate: nil, + Warning: nil, + }, nil + }, + CreateFleetFn: func(*ec2.CreateFleetInput) (*ec2.CreateFleetOutput, error) { + return &ec2.CreateFleetOutput{ + Errors: nil, + FleetId: nil, + Instances: []*ec2.CreateFleetInstance{ + { + InstanceIds: []*string{instanceId}, + }, + }, + }, nil + }, + DescribeInstancesFn: func(input *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) { + return &ec2.DescribeInstancesOutput{ + NextToken: nil, + Reservations: []*ec2.Reservation{ + { + Instances: []*ec2.Instance{instance}, + }, + }, + }, nil + }, + } + + uiMock := packer.TestUi(t) + + state := tStateSpot() + state.Put("ec2", ec2Mock) + state.Put("ui", uiMock) + state.Put("source_image", testImage()) + state.Put("region", "test-region") + + stepRunSpotInstance := getBasicStep() + stepRunSpotInstance.Tags["Name"] = "Packer Builder" + stepRunSpotInstance.Tags["test-tag"] = "test-value" + stepRunSpotInstance.SpotTags = map[string]string{ + "spot-tag": "spot-tag-value", + } + stepRunSpotInstance.VolumeTags = map[string]string{ + "volume-tag": "volume-tag-value", + } + + ctx := context.TODO() + action := stepRunSpotInstance.Run(ctx, state) + + if err := state.Get("error"); err != nil { + t.Fatalf("should not error, but: %v", err) + } + + if action != multistep.ActionContinue { + t.Fatalf("shoul continue, but: %v", action) + } + + if len(ec2Mock.CreateLaunchTemplateParams) != 1 { + t.Fatalf("createLaunchTemplate should be invoked once, but invoked %v", len(ec2Mock.CreateLaunchTemplateParams)) + } + launchTemplateName := ec2Mock.CreateLaunchTemplateParams[0].LaunchTemplateName + + if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications) != 1 { + t.Fatalf("exactly one launch template tag specification expected") + } + if *ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].ResourceType != "launch-template" { + t.Fatalf("resource type 'launch-template' expected") + } + if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].Tags) != 2 { + t.Fatalf("2 tags expected") + } + + nameTag := ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].Tags[0] + if *nameTag.Key != "Name" || *nameTag.Value != "Packer Builder" { + t.Fatalf("expected name tag") + } + testTag := ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].Tags[1] + if *testTag.Key != "test-tag" || *testTag.Value != "test-value" { + t.Fatalf("expected test tag") + } + + if len(ec2Mock.CreateFleetParams) != 1 { + t.Fatalf("createFleet should be invoked once, but invoked %v", len(ec2Mock.CreateLaunchTemplateParams)) + } + if *ec2Mock.CreateFleetParams[0].TargetCapacitySpecification.DefaultTargetCapacityType != "spot" { + t.Fatalf("capacity type should be spot") + } + if *ec2Mock.CreateFleetParams[0].TargetCapacitySpecification.TotalTargetCapacity != 1 { + t.Fatalf("target capacity should be 1") + } + if len(ec2Mock.CreateFleetParams[0].LaunchTemplateConfigs) != 1 { + t.Fatalf("exactly one launch config template expected") + } + if *ec2Mock.CreateFleetParams[0].LaunchTemplateConfigs[0].LaunchTemplateSpecification.LaunchTemplateName != *launchTemplateName { + t.Fatalf("launchTemplateName should match in createLaunchTemplate and createFleet requests") + } + + if len(ec2Mock.DescribeInstancesParams) != 1 { + t.Fatalf("describeInstancesParams should be invoked once, but invoked %v", len(ec2Mock.DescribeInstancesParams)) + } + if *ec2Mock.DescribeInstancesParams[0].InstanceIds[0] != *instanceId { + t.Fatalf("instanceId should match from createFleet response") + } + + uiMock.Say(fmt.Sprintf("%v", ec2Mock.CreateTagsParams)) + if len(ec2Mock.CreateTagsParams) != 3 { + t.Fatalf("createTags should be invoked 3 times") + } + if len(ec2Mock.CreateTagsParams[0].Resources) != 1 || *ec2Mock.CreateTagsParams[0].Resources[0] != *spotRequestId { + t.Fatalf("should create tags for spot request") + } + if len(ec2Mock.CreateTagsParams[1].Resources) != 1 || *ec2Mock.CreateTagsParams[1].Resources[0] != *instanceId { + t.Fatalf("should create tags for instance") + } + if len(ec2Mock.CreateTagsParams[2].Resources) != 1 || ec2Mock.CreateTagsParams[2].Resources[0] != volumeId { + t.Fatalf("should create tags for volume") + } +} diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 4d4934c43..8c4f00fe2 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -164,6 +164,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("awsSession", session) state.Put("hook", hook) state.Put("ui", ui) + state.Put("region", *ec2conn.Config.Region) generatedData := &builder.GeneratedData{State: state} var instanceStep multistep.Step diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index c70026b3e..6600850f6 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -187,6 +187,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("awsSession", session) state.Put("hook", hook) state.Put("ui", ui) + state.Put("region", *ec2conn.Config.Region) generatedData := &builder.GeneratedData{State: state} var instanceStep multistep.Step diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index d3fb1a03f..f9cb3b819 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/builder/amazon/ebsvolume/builder.go @@ -168,6 +168,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("iam", iam) state.Put("hook", hook) state.Put("ui", ui) + state.Put("region", *ec2conn.Config.Region) generatedData := &builder.GeneratedData{State: state} var instanceStep multistep.Step diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index 7c050b88e..214f16283 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -250,6 +250,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("awsSession", session) state.Put("hook", hook) state.Put("ui", ui) + state.Put("region", ec2conn.Config.Region) generatedData := &builder.GeneratedData{State: state} var instanceStep multistep.Step From 6911495fc486f1bc582eceeffc7c8b80ce775520 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Mon, 2 Nov 2020 11:49:40 +0100 Subject: [PATCH 16/93] add VariableAssignment struct that help describe an input var assignment --- hcl2template/common_test.go | 75 +++--- .../validation/valid_map/definition.pkr.hcl | 17 ++ .../valid_map/invalid_value.auto.pkrvars.hcl | 7 + hcl2template/types.packer_config.go | 10 +- hcl2template/types.packer_config_test.go | 61 +++-- hcl2template/types.variables.go | 124 +++++---- hcl2template/types.variables_test.go | 246 +++++++++++------- 7 files changed, 335 insertions(+), 205 deletions(-) create mode 100644 hcl2template/testdata/variables/validation/valid_map/definition.pkr.hcl create mode 100644 hcl2template/testdata/variables/validation/valid_map/invalid_value.auto.pkrvars.hcl diff --git a/hcl2template/common_test.go b/hcl2template/common_test.go index 48eec28fa..9c77cbd7a 100644 --- a/hcl2template/common_test.go +++ b/hcl2template/common_test.go @@ -69,25 +69,7 @@ func testParse(t *testing.T, tests []parseTest) { if tt.parseWantDiagHasErrors != gotDiags.HasErrors() { t.Fatalf("Parser.parse() unexpected diagnostics HasErrors. %s", gotDiags) } - if diff := cmp.Diff(tt.parseWantCfg, gotCfg, - cmpopts.IgnoreUnexported( - PackerConfig{}, - cty.Value{}, - cty.Type{}, - Variable{}, - SourceBlock{}, - ProvisionerBlock{}, - PostProcessorBlock{}, - ), - cmpopts.IgnoreFields(PackerConfig{}, - "Cwd", // Cwd will change for every computer - ), - cmpopts.IgnoreTypes(HCL2Ref{}), - cmpopts.IgnoreTypes([]*LocalBlock{}), - cmpopts.IgnoreTypes([]hcl.Range{}), - cmpopts.IgnoreTypes(hcl.Range{}), - cmpopts.IgnoreInterfaces(struct{ hcl.Expression }{}), - cmpopts.IgnoreInterfaces(struct{ hcl.Body }{}), + if diff := cmp.Diff(tt.parseWantCfg, gotCfg, cmpOpts..., ); diff != "" { t.Fatalf("Parser.parse() wrong packer config. %s", diff) } @@ -96,11 +78,8 @@ func testParse(t *testing.T, tests []parseTest) { gotInputVar := gotCfg.InputVariables for name, value := range tt.parseWantCfg.InputVariables { if variable, ok := gotInputVar[name]; ok { - if diff := cmp.Diff(variable.DefaultValue.GoString(), value.DefaultValue.GoString()); diff != "" { - t.Fatalf("Parser.parse(): unexpected default value for %s: %s", name, diff) - } - if diff := cmp.Diff(variable.VarfileValue.GoString(), value.VarfileValue.GoString()); diff != "" { - t.Fatalf("Parser.parse(): varfile value differs for %s: %s", name, diff) + if diff := cmp.Diff(variable, value, cmpOpts...); diff != "" { + t.Fatalf("Parser.parse(): unexpected variable values %s: %s", name, diff) } } else { t.Fatalf("Parser.parse() missing input variable. %s", name) @@ -110,8 +89,8 @@ func testParse(t *testing.T, tests []parseTest) { gotLocalVar := gotCfg.LocalVariables for name, value := range tt.parseWantCfg.LocalVariables { if variable, ok := gotLocalVar[name]; ok { - if variable.DefaultValue.GoString() != value.DefaultValue.GoString() { - t.Fatalf("Parser.parse() local variable %s expected '%s' but was '%s'", name, value.DefaultValue.GoString(), variable.DefaultValue.GoString()) + if diff := cmp.Diff(variable, value, cmpOpts...); diff != "" { + t.Fatalf("Parser.parse(): unexpected variable values %s: %s", name, diff) } } else { t.Fatalf("Parser.parse() missing local variable. %s", name) @@ -127,18 +106,7 @@ func testParse(t *testing.T, tests []parseTest) { if tt.getBuildsWantDiags == (gotDiags == nil) { t.Fatalf("Parser.getBuilds() unexpected diagnostics. %s", gotDiags) } - if diff := cmp.Diff(tt.getBuildsWantBuilds, gotBuilds, - cmpopts.IgnoreUnexported( - cty.Value{}, - cty.Type{}, - packer.CoreBuild{}, - packer.CoreBuildProvisioner{}, - packer.CoreBuildPostProcessor{}, - null.Builder{}, - HCL2Provisioner{}, - HCL2PostProcessor{}, - ), - ); diff != "" { + if diff := cmp.Diff(tt.getBuildsWantBuilds, gotBuilds, cmpOpts...); diff != "" { t.Fatalf("Parser.getBuilds() wrong packer builds. %s", diff) } }) @@ -250,3 +218,34 @@ var ( }, } ) + +var cmpOpts = []cmp.Option{ + cmpopts.IgnoreUnexported( + PackerConfig{}, + cty.Value{}, + cty.Type{}, + Variable{}, + SourceBlock{}, + ProvisionerBlock{}, + PostProcessorBlock{}, + packer.CoreBuild{}, + HCL2Provisioner{}, + HCL2PostProcessor{}, + packer.CoreBuildPostProcessor{}, + packer.CoreBuildProvisioner{}, + packer.CoreBuildPostProcessor{}, + null.Builder{}, + ), + cmpopts.IgnoreFields(PackerConfig{}, + "Cwd", // Cwd will change for every os type + ), + cmpopts.IgnoreFields(VariableAssignment{}, + "Expr", // its an interface + ), + cmpopts.IgnoreTypes(HCL2Ref{}), + cmpopts.IgnoreTypes([]*LocalBlock{}), + cmpopts.IgnoreTypes([]hcl.Range{}), + cmpopts.IgnoreTypes(hcl.Range{}), + cmpopts.IgnoreInterfaces(struct{ hcl.Expression }{}), + cmpopts.IgnoreInterfaces(struct{ hcl.Body }{}), +} diff --git a/hcl2template/testdata/variables/validation/valid_map/definition.pkr.hcl b/hcl2template/testdata/variables/validation/valid_map/definition.pkr.hcl new file mode 100644 index 000000000..f095e9062 --- /dev/null +++ b/hcl2template/testdata/variables/validation/valid_map/definition.pkr.hcl @@ -0,0 +1,17 @@ + +variable "image_metadata" { + default = { + key: "value", + something: { + foo: "bar", + } + } + validation { + condition = length(var.image_metadata.key) > 4 + error_message = "The image_metadata.key field must be more than 4 runes." + } + validation { + condition = substr(var.image_metadata.something.foo, 0, 3) == "bar" + error_message = "The image_metadata.something.foo field must start with \"bar\"." + } +} diff --git a/hcl2template/testdata/variables/validation/valid_map/invalid_value.auto.pkrvars.hcl b/hcl2template/testdata/variables/validation/valid_map/invalid_value.auto.pkrvars.hcl new file mode 100644 index 000000000..9734f36f6 --- /dev/null +++ b/hcl2template/testdata/variables/validation/valid_map/invalid_value.auto.pkrvars.hcl @@ -0,0 +1,7 @@ + +image_metadata = { + key: "value", + something: { + foo: "woo", + } +} diff --git a/hcl2template/types.packer_config.go b/hcl2template/types.packer_config.go index c62436725..daf80a209 100644 --- a/hcl2template/types.packer_config.go +++ b/hcl2template/types.packer_config.go @@ -210,9 +210,13 @@ func (c *PackerConfig) evaluateLocalVariable(local *LocalBlock) hcl.Diagnostics return diags } c.LocalVariables[local.Name] = &Variable{ - Name: local.Name, - DefaultValue: value, - Type: value.Type(), + Name: local.Name, + Values: []VariableAssignment{{ + Value: value, + Expr: local.Expr, + From: "default", + }}, + Type: value.Type(), } return diags diff --git a/hcl2template/types.packer_config_test.go b/hcl2template/types.packer_config_test.go index 90498c172..992e6e80b 100644 --- a/hcl2template/types.packer_config_test.go +++ b/hcl2template/types.packer_config_test.go @@ -25,51 +25,58 @@ func TestParser_complete(t *testing.T) { Basedir: "testdata/complete", InputVariables: Variables{ "foo": &Variable{ - Name: "foo", - DefaultValue: cty.StringVal("value"), + Name: "foo", + Values: []VariableAssignment{{From: "default", Value: cty.StringVal("value")}}, }, "image_id": &Variable{ - Name: "image_id", - DefaultValue: cty.StringVal("image-id-default"), + Name: "image_id", + Values: []VariableAssignment{{From: "default", Value: cty.StringVal("image-id-default")}}, }, "port": &Variable{ - Name: "port", - DefaultValue: cty.NumberIntVal(42), + Name: "port", + Values: []VariableAssignment{{From: "default", Value: cty.NumberIntVal(42)}}, }, "availability_zone_names": &Variable{ Name: "availability_zone_names", - DefaultValue: cty.ListVal([]cty.Value{ - cty.StringVal("A"), - cty.StringVal("B"), - cty.StringVal("C"), - }), + Values: []VariableAssignment{{ + From: "default", + Value: cty.ListVal([]cty.Value{ + cty.StringVal("A"), + cty.StringVal("B"), + cty.StringVal("C"), + }), + }}, }, }, LocalVariables: Variables{ "feefoo": &Variable{ - Name: "feefoo", - DefaultValue: cty.StringVal("value_image-id-default"), + Name: "feefoo", + Values: []VariableAssignment{{From: "default", Value: cty.StringVal("value_image-id-default")}}, }, "standard_tags": &Variable{ Name: "standard_tags", - DefaultValue: cty.ObjectVal(map[string]cty.Value{ - "Component": cty.StringVal("user-service"), - "Environment": cty.StringVal("production"), - }), + Values: []VariableAssignment{{From: "default", + Value: cty.ObjectVal(map[string]cty.Value{ + "Component": cty.StringVal("user-service"), + "Environment": cty.StringVal("production"), + }), + }}, }, "abc_map": &Variable{ Name: "abc_map", - DefaultValue: cty.TupleVal([]cty.Value{ - cty.ObjectVal(map[string]cty.Value{ - "id": cty.StringVal("a"), + Values: []VariableAssignment{{From: "default", + Value: cty.TupleVal([]cty.Value{ + cty.ObjectVal(map[string]cty.Value{ + "id": cty.StringVal("a"), + }), + cty.ObjectVal(map[string]cty.Value{ + "id": cty.StringVal("b"), + }), + cty.ObjectVal(map[string]cty.Value{ + "id": cty.StringVal("c"), + }), }), - cty.ObjectVal(map[string]cty.Value{ - "id": cty.StringVal("b"), - }), - cty.ObjectVal(map[string]cty.Value{ - "id": cty.StringVal("c"), - }), - }), + }}, }, }, Sources: map[SourceRef]SourceBlock{ diff --git a/hcl2template/types.variables.go b/hcl2template/types.variables.go index a5de7ca47..5ffe57cdf 100644 --- a/hcl2template/types.variables.go +++ b/hcl2template/types.variables.go @@ -26,15 +26,26 @@ type LocalBlock struct { Expr hcl.Expression } +// VariableAssignment represents a way a variable was set: the expression +// setting it and the value of that expression. It helps pinpoint were +// something was set in diagnostics. +type VariableAssignment struct { + // From tells were it was taken from, command/varfile/env/default + From string + Value cty.Value + Expr hcl.Expression +} + type Variable struct { - // CmdValue, VarfileValue, EnvValue, DefaultValue are possible values of - // the variable; The first value set from these will be the one used. If - // none is set; an error will be returned if a user tries to use the - // Variable. - CmdValue cty.Value - VarfileValue cty.Value - EnvValue cty.Value - DefaultValue cty.Value + // Values contains possible values for the variable; The last value set + // from these will be the one used. If none is set; an error will be + // returned by Value(). + Values []VariableAssignment + + // Validations contains all variables validation rules to be applied to the + // used value. Only the used value - the last value from Values - is + // validated. + Validations []*VariableValidation // Cty Type of the variable. If the default value or a collected value is // not of this type nor can be converted to this type an error diagnostic @@ -53,25 +64,23 @@ type Variable struct { // the variable from the output stream. By replacing the text. Sensitive bool - Validations []*VariableValidation - Range hcl.Range } func (v *Variable) GoString() string { - return fmt.Sprintf("{Type:%s,CmdValue:%s,VarfileValue:%s,EnvValue:%s,DefaultValue:%s}", - v.Type.GoString(), - PrintableCtyValue(v.CmdValue), - PrintableCtyValue(v.VarfileValue), - PrintableCtyValue(v.EnvValue), - PrintableCtyValue(v.DefaultValue), - ) + b := &strings.Builder{} + fmt.Fprintf(b, "{type:%s", v.Type.GoString()) + for _, vv := range v.Values { + fmt.Fprintf(b, ",%s:%s", vv.From, vv.Value) + } + fmt.Fprintf(b, "}") + return b.String() } // validateValue ensures that all of the configured custom validations for a // variable value are passing. // -func (v *Variable) validateValue(val cty.Value) (diags hcl.Diagnostics) { +func (v *Variable) validateValue(val VariableAssignment) (diags hcl.Diagnostics) { if len(v.Validations) == 0 { log.Printf("[TRACE] validateValue: not active for %s, so skipping", v.Name) return nil @@ -80,7 +89,7 @@ func (v *Variable) validateValue(val cty.Value) (diags hcl.Diagnostics) { hclCtx := &hcl.EvalContext{ Variables: map[string]cty.Value{ "var": cty.ObjectVal(map[string]cty.Value{ - v.Name: val, + v.Name: val.Value, }), }, Functions: Functions(""), @@ -88,7 +97,6 @@ func (v *Variable) validateValue(val cty.Value) (diags hcl.Diagnostics) { for _, validation := range v.Validations { const errInvalidCondition = "Invalid variable validation result" - const errInvalidValue = "Invalid value for variable" result, moreDiags := validation.Condition.Value(hclCtx) diags = append(diags, moreDiags...) @@ -125,11 +133,15 @@ func (v *Variable) validateValue(val cty.Value) (diags hcl.Diagnostics) { } if result.False() { + subj := validation.DeclRange.Ptr() + if val.Expr != nil { + subj = val.Expr.Range().Ptr() + } diags = append(diags, &hcl.Diagnostic{ Severity: hcl.DiagError, - Summary: errInvalidValue, + Summary: fmt.Sprintf("Invalid value for %s variable", val.From), Detail: fmt.Sprintf("%s\n\nThis was checked by the validation rule at %s.", validation.ErrorMessage, validation.DeclRange.String()), - Subject: validation.DeclRange.Ptr(), + Subject: subj, }) } } @@ -137,26 +149,20 @@ func (v *Variable) validateValue(val cty.Value) (diags hcl.Diagnostics) { return diags } +// Value returns the last found value from the list of variable settings. func (v *Variable) Value() (cty.Value, hcl.Diagnostics) { - for _, value := range []cty.Value{ - v.CmdValue, - v.VarfileValue, - v.EnvValue, - v.DefaultValue, - } { - if value != cty.NilVal { - return value, v.validateValue(value) - } + if len(v.Values) == 0 { + return cty.UnknownVal(v.Type), hcl.Diagnostics{&hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: fmt.Sprintf("Unset variable %q", v.Name), + Detail: "A used variable must be set or have a default value; see " + + "https://packer.io/docs/configuration/from-1.5/syntax for " + + "details.", + Context: v.Range.Ptr(), + }} } - - return cty.UnknownVal(v.Type), hcl.Diagnostics{&hcl.Diagnostic{ - Severity: hcl.DiagError, - Summary: fmt.Sprintf("Unset variable %q", v.Name), - Detail: "A used variable must be set or have a default value; see " + - "https://packer.io/docs/configuration/from-1.5/syntax for " + - "details.", - Context: v.Range.Ptr(), - }} + val := v.Values[len(v.Values)-1] + return val.Value, v.validateValue(v.Values[len(v.Values)-1]) } type Variables map[string]*Variable @@ -205,10 +211,14 @@ func (variables *Variables) decodeVariable(key string, attr *hcl.Attribute, ectx } (*variables)[key] = &Variable{ - Name: key, - DefaultValue: value, - Type: value.Type(), - Range: attr.Range, + Name: key, + Values: []VariableAssignment{{ + From: "default", + Value: value, + Expr: attr.Expr, + }}, + Type: value.Type(), + Range: attr.Range, } return diags @@ -310,12 +320,16 @@ func (variables *Variables) decodeVariableBlock(block *hcl.Block, ectx *hcl.Eval } } - v.DefaultValue = defaultValue + v.Values = append(v.Values, VariableAssignment{ + From: "default", + Value: defaultValue, + Expr: def.Expr, + }) // It's possible no type attribute was assigned so lets make sure we // have a valid type otherwise there could be issues parsing the value. if v.Type == cty.NilType { - v.Type = v.DefaultValue.Type() + v.Type = defaultValue.Type() } } @@ -532,7 +546,11 @@ func (cfg *PackerConfig) collectInputVariableValues(env []string, files []*hcl.F val = cty.DynamicVal } } - variable.EnvValue = val + variable.Values = append(variable.Values, VariableAssignment{ + From: "env", + Value: val, + Expr: expr, + }) } // files will contain files found in the folder then files passed as @@ -616,7 +634,11 @@ func (cfg *PackerConfig) collectInputVariableValues(env []string, files []*hcl.F } } - variable.VarfileValue = val + variable.Values = append(variable.Values, VariableAssignment{ + From: "varfile", + Value: val, + Expr: attr.Expr, + }) } } @@ -660,7 +682,11 @@ func (cfg *PackerConfig) collectInputVariableValues(env []string, files []*hcl.F } } - variable.CmdValue = val + variable.Values = append(variable.Values, VariableAssignment{ + From: "cmd", + Value: val, + Expr: expr, + }) } return diags diff --git a/hcl2template/types.variables_test.go b/hcl2template/types.variables_test.go index 4a8f697c5..a6a71d99e 100644 --- a/hcl2template/types.variables_test.go +++ b/hcl2template/types.variables_test.go @@ -25,47 +25,59 @@ func TestParse_variables(t *testing.T) { Basedir: filepath.Join("testdata", "variables"), InputVariables: Variables{ "image_name": &Variable{ - Name: "image_name", - DefaultValue: cty.StringVal("foo-image-{{user `my_secret`}}"), + Name: "image_name", + Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo-image-{{user `my_secret`}}")}}, }, "key": &Variable{ - Name: "key", - DefaultValue: cty.StringVal("value"), + Name: "key", + Values: []VariableAssignment{{From: "default", Value: cty.StringVal("value")}}, }, "my_secret": &Variable{ - Name: "my_secret", - DefaultValue: cty.StringVal("foo"), + Name: "my_secret", + Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}}, }, "image_id": &Variable{ - Name: "image_id", - DefaultValue: cty.StringVal("image-id-default"), + Name: "image_id", + Values: []VariableAssignment{{From: "default", Value: cty.StringVal("image-id-default")}}, }, "port": &Variable{ - Name: "port", - DefaultValue: cty.NumberIntVal(42), + Name: "port", + Values: []VariableAssignment{{From: "default", Value: cty.NumberIntVal(42)}}, }, "availability_zone_names": &Variable{ Name: "availability_zone_names", - DefaultValue: cty.ListVal([]cty.Value{ - cty.StringVal("us-west-1a"), - }), + Values: []VariableAssignment{{ + From: "default", + Value: cty.ListVal([]cty.Value{ + cty.StringVal("us-west-1a"), + }), + }}, Description: fmt.Sprintln("Describing is awesome ;D"), }, "super_secret_password": &Variable{ - Name: "super_secret_password", - Sensitive: true, - DefaultValue: cty.NullVal(cty.String), - Description: fmt.Sprintln("Handle with care plz"), + Name: "super_secret_password", + Sensitive: true, + Values: []VariableAssignment{{ + From: "default", + Value: cty.NullVal(cty.String), + }}, + Description: fmt.Sprintln("Handle with care plz"), }, }, LocalVariables: Variables{ "owner": &Variable{ - Name: "owner", - DefaultValue: cty.StringVal("Community Team"), + Name: "owner", + Values: []VariableAssignment{{ + From: "default", + Value: cty.StringVal("Community Team"), + }}, }, "service_name": &Variable{ - Name: "service_name", - DefaultValue: cty.StringVal("forum"), + Name: "service_name", + Values: []VariableAssignment{{ + From: "default", + Value: cty.StringVal("forum"), + }}, }, }, }, @@ -81,6 +93,10 @@ func TestParse_variables(t *testing.T) { InputVariables: Variables{ "boolean_value": &Variable{ Name: "boolean_value", + Values: []VariableAssignment{{ + From: "default", + Value: cty.BoolVal(false), + }}, }, }, }, @@ -96,6 +112,10 @@ func TestParse_variables(t *testing.T) { InputVariables: Variables{ "boolean_value": &Variable{ Name: "boolean_value", + Values: []VariableAssignment{{ + From: "default", + Value: cty.BoolVal(false), + }}, }, }, }, @@ -111,6 +131,10 @@ func TestParse_variables(t *testing.T) { InputVariables: Variables{ "broken_type": &Variable{ Name: "broken_type", + Values: []VariableAssignment{{ + From: "default", + Value: cty.UnknownVal(cty.DynamicPseudoType), + }}, }, }, }, @@ -126,8 +150,8 @@ func TestParse_variables(t *testing.T) { Basedir: filepath.Join("testdata", "variables"), InputVariables: Variables{ "broken_variable": &Variable{ - Name: "broken_variable", - DefaultValue: cty.BoolVal(true), + Name: "broken_variable", + Values: []VariableAssignment{{From: "default", Value: cty.BoolVal(true)}}, }, }, }, @@ -196,34 +220,37 @@ func TestParse_variables(t *testing.T) { Basedir: "testdata/variables/complicated", InputVariables: Variables{ "name_prefix": &Variable{ - Name: "name_prefix", - DefaultValue: cty.StringVal("foo"), + Name: "name_prefix", + Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}}, }, }, LocalVariables: Variables{ "name_prefix": &Variable{ - Name: "name_prefix", - DefaultValue: cty.StringVal("foo"), + Name: "name_prefix", + Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}}, }, "foo": &Variable{ - Name: "foo", - DefaultValue: cty.StringVal("foo"), + Name: "foo", + Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}}, }, "bar": &Variable{ - Name: "bar", - DefaultValue: cty.StringVal("foo"), + Name: "bar", + Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}}, }, "for_var": &Variable{ - Name: "for_var", - DefaultValue: cty.StringVal("foo"), + Name: "for_var", + Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}}, }, "bar_var": &Variable{ Name: "bar_var", - DefaultValue: cty.TupleVal([]cty.Value{ - cty.StringVal("foo"), - cty.StringVal("foo"), - cty.StringVal("foo"), - }), + Values: []VariableAssignment{{ + From: "default", + Value: cty.TupleVal([]cty.Value{ + cty.StringVal("foo"), + cty.StringVal("foo"), + cty.StringVal("foo"), + }), + }}, }, }, }, @@ -250,9 +277,11 @@ func TestParse_variables(t *testing.T) { Basedir: filepath.Join("testdata", "variables"), InputVariables: Variables{ "foo": &Variable{ - DefaultValue: cty.StringVal("bar"), - Name: "foo", - VarfileValue: cty.StringVal("wee"), + Name: "foo", + Values: []VariableAssignment{ + VariableAssignment{"default", cty.StringVal("bar"), nil}, + VariableAssignment{"varfile", cty.StringVal("wee"), nil}, + }, }, }, }, @@ -279,14 +308,14 @@ func TestParse_variables(t *testing.T) { Basedir: filepath.Join("testdata", "variables"), InputVariables: Variables{ "max_retries": &Variable{ - Name: "max_retries", - DefaultValue: cty.StringVal("1"), - Type: cty.String, + Name: "max_retries", + Values: []VariableAssignment{{"default", cty.StringVal("1"), nil}}, + Type: cty.String, }, "max_retries_int": &Variable{ - Name: "max_retries_int", - DefaultValue: cty.NumberIntVal(1), - Type: cty.Number, + Name: "max_retries_int", + Values: []VariableAssignment{{"default", cty.NumberIntVal(1), nil}}, + Type: cty.Number, }, }, Sources: map[SourceRef]SourceBlock{ @@ -365,8 +394,10 @@ func TestParse_variables(t *testing.T) { Basedir: filepath.Join("testdata", "variables", "validation"), InputVariables: Variables{ "image_id": &Variable{ - DefaultValue: cty.StringVal("ami-something-something"), - Name: "image_id", + Values: []VariableAssignment{ + {"default", cty.StringVal("ami-something-something"), nil}, + }, + Name: "image_id", Validations: []*VariableValidation{ &VariableValidation{ ErrorMessage: `The image_id value must be a valid AMI id, starting with "ami-".`, @@ -379,6 +410,28 @@ func TestParse_variables(t *testing.T) { []packer.Build{}, false, }, + + {"valid validation block - invalid default", + defaultParser, + parseTestArgs{"testdata/variables/validation/invalid_default.pkr.hcl", nil, nil}, + &PackerConfig{ + Basedir: filepath.Join("testdata", "variables", "validation"), + InputVariables: Variables{ + "image_id": &Variable{ + Values: []VariableAssignment{{"default", cty.StringVal("ami-something-something"), nil}}, + Name: "image_id", + Validations: []*VariableValidation{ + &VariableValidation{ + ErrorMessage: `The image_id value must be a valid AMI id, starting with "ami-".`, + }, + }, + }, + }, + }, + true, true, + nil, + false, + }, } testParse(t, tests) } @@ -402,8 +455,10 @@ func TestVariables_collectVariableValues(t *testing.T) { {name: "string", variables: Variables{"used_string": &Variable{ - DefaultValue: cty.StringVal("default_value"), - Type: cty.String, + Values: []VariableAssignment{ + {"default", cty.StringVal("default_value"), nil}, + }, + Type: cty.String, }}, args: args{ env: []string{`PKR_VAR_used_string=env_value`}, @@ -420,11 +475,14 @@ func TestVariables_collectVariableValues(t *testing.T) { wantDiags: false, wantVariables: Variables{ "used_string": &Variable{ - Type: cty.String, - CmdValue: cty.StringVal("cmd_value"), - VarfileValue: cty.StringVal("varfile_value"), - EnvValue: cty.StringVal("env_value"), - DefaultValue: cty.StringVal("default_value"), + Type: cty.String, + Values: []VariableAssignment{ + {"default", cty.StringVal(`"default_value"`), nil}, + {"env", cty.StringVal(`"env_value"`), nil}, + {"varfile", cty.StringVal(`"xy"`), nil}, + {"varfile", cty.StringVal(`"varfile_value"`), nil}, + {"cmd", cty.StringVal(`"cmd_value"`), nil}, + }, }, }, wantValues: map[string]cty.Value{ @@ -434,8 +492,10 @@ func TestVariables_collectVariableValues(t *testing.T) { {name: "quoted string", variables: Variables{"quoted_string": &Variable{ - DefaultValue: cty.StringVal(`"default_value"`), - Type: cty.String, + Values: []VariableAssignment{ + {"default", cty.StringVal(`"default_value"`), nil}, + }, + Type: cty.String, }}, args: args{ env: []string{`PKR_VAR_quoted_string="env_value"`}, @@ -452,11 +512,14 @@ func TestVariables_collectVariableValues(t *testing.T) { wantDiags: false, wantVariables: Variables{ "quoted_string": &Variable{ - Type: cty.String, - CmdValue: cty.StringVal(`"cmd_value"`), - VarfileValue: cty.StringVal(`"varfile_value"`), - EnvValue: cty.StringVal(`"env_value"`), - DefaultValue: cty.StringVal(`"default_value"`), + Type: cty.String, + Values: []VariableAssignment{ + {"default", cty.StringVal(`"default_value"`), nil}, + {"env", cty.StringVal(`"env_value"`), nil}, + {"varfile", cty.StringVal(`"xy"`), nil}, + {"varfile", cty.StringVal(`"varfile_value"`), nil}, + {"cmd", cty.StringVal(`"cmd_value"`), nil}, + }, }, }, wantValues: map[string]cty.Value{ @@ -466,8 +529,10 @@ func TestVariables_collectVariableValues(t *testing.T) { {name: "array of strings", variables: Variables{"used_strings": &Variable{ - DefaultValue: stringListVal("default_value_1"), - Type: cty.List(cty.String), + Values: []VariableAssignment{ + {"default", stringListVal("default_value_1"), nil}, + }, + Type: cty.List(cty.String), }}, args: args{ env: []string{`PKR_VAR_used_strings=["env_value_1", "env_value_2"]`}, @@ -484,11 +549,14 @@ func TestVariables_collectVariableValues(t *testing.T) { wantDiags: false, wantVariables: Variables{ "used_strings": &Variable{ - Type: cty.List(cty.String), - CmdValue: stringListVal("cmd_value_1"), - VarfileValue: stringListVal("varfile_value_1"), - EnvValue: stringListVal("env_value_1", "env_value_2"), - DefaultValue: stringListVal("default_value_1"), + Type: cty.List(cty.String), + Values: []VariableAssignment{ + {"default", stringListVal("default_value_1"), nil}, + {"env", stringListVal("env_value_1", "env_value_2"), nil}, + {"varfile", stringListVal("xy"), nil}, + {"varfile", stringListVal("varfile_value_1"), nil}, + {"cmd", stringListVal("cmd_value_1"), nil}, + }, }, }, wantValues: map[string]cty.Value{ @@ -498,8 +566,8 @@ func TestVariables_collectVariableValues(t *testing.T) { {name: "bool", variables: Variables{"enabled": &Variable{ - DefaultValue: cty.False, - Type: cty.Bool, + Values: []VariableAssignment{{"default", cty.False, nil}}, + Type: cty.Bool, }}, args: args{ env: []string{`PKR_VAR_enabled=true`}, @@ -515,11 +583,13 @@ func TestVariables_collectVariableValues(t *testing.T) { wantDiags: false, wantVariables: Variables{ "enabled": &Variable{ - Type: cty.Bool, - CmdValue: cty.True, - VarfileValue: cty.False, - EnvValue: cty.True, - DefaultValue: cty.False, + Type: cty.Bool, + Values: []VariableAssignment{ + {"default", cty.False, nil}, + {"env", cty.True, nil}, + {"varfile", cty.False, nil}, + {"cmd", cty.True, nil}, + }, }, }, wantValues: map[string]cty.Value{ @@ -529,8 +599,8 @@ func TestVariables_collectVariableValues(t *testing.T) { {name: "invalid env var", variables: Variables{"used_string": &Variable{ - DefaultValue: cty.StringVal("default_value"), - Type: cty.String, + Values: []VariableAssignment{{"default", cty.StringVal("default_value"), nil}}, + Type: cty.String, }}, args: args{ env: []string{`PKR_VAR_used_string`}, @@ -540,8 +610,8 @@ func TestVariables_collectVariableValues(t *testing.T) { wantDiags: false, wantVariables: Variables{ "used_string": &Variable{ - Type: cty.String, - DefaultValue: cty.StringVal("default_value"), + Type: cty.String, + Values: []VariableAssignment{{"default", cty.StringVal("default_value"), nil}}, }, }, wantValues: map[string]cty.Value{ @@ -620,8 +690,8 @@ func TestVariables_collectVariableValues(t *testing.T) { wantDiagsHasError: true, wantVariables: Variables{ "used_string": &Variable{ - Type: cty.List(cty.String), - EnvValue: cty.DynamicVal, + Type: cty.List(cty.String), + Values: []VariableAssignment{{"env", cty.DynamicVal, nil}}, }, }, wantValues: map[string]cty.Value{ @@ -644,8 +714,8 @@ func TestVariables_collectVariableValues(t *testing.T) { wantDiagsHasError: true, wantVariables: Variables{ "used_string": &Variable{ - Type: cty.Bool, - VarfileValue: cty.DynamicVal, + Type: cty.Bool, + Values: []VariableAssignment{{"varfile", cty.DynamicVal, nil}}, }, }, wantValues: map[string]cty.Value{ @@ -670,8 +740,8 @@ func TestVariables_collectVariableValues(t *testing.T) { wantDiagsHasError: true, wantVariables: Variables{ "used_string": &Variable{ - Type: cty.Bool, - CmdValue: cty.DynamicVal, + Type: cty.Bool, + Values: []VariableAssignment{{"cmd", cty.DynamicVal, nil}}, }, }, wantValues: map[string]cty.Value{ @@ -714,7 +784,7 @@ func TestVariables_collectVariableValues(t *testing.T) { if tt.wantDiagsHasError != gotDiags.HasErrors() { t.Fatalf("Variables.collectVariableValues() unexpected diagnostics HasErrors. %s", gotDiags) } - if diff := cmp.Diff(fmt.Sprintf("%#v", tt.wantVariables), fmt.Sprintf("%#v", tt.variables)); diff != "" { + if diff := cmp.Diff(tt.wantVariables, tt.variables, cmpOpts...); diff != "" { t.Fatalf("didn't get expected variables: %s", diff) } values := map[string]cty.Value{} From 6dd06fad144ecde83923c7b3fa8a8fc83ab15bd4 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Mon, 2 Nov 2020 15:50:38 +0100 Subject: [PATCH 17/93] add command/ tests --- command/build_test.go | 46 +++++++++++++++++++ .../hcl/validation/map/definition.pkr.hcl | 19 ++++++++ .../validation/map/invalid_value.pkrvars.hcl | 7 +++ .../validation/map/valid_value.pkrvars.hcl | 7 +++ 4 files changed, 79 insertions(+) create mode 100644 command/test-fixtures/hcl/validation/map/definition.pkr.hcl create mode 100644 command/test-fixtures/hcl/validation/map/invalid_value.pkrvars.hcl create mode 100644 command/test-fixtures/hcl/validation/map/valid_value.pkrvars.hcl diff --git a/command/build_test.go b/command/build_test.go index 9e08e6dd8..60660ff09 100644 --- a/command/build_test.go +++ b/command/build_test.go @@ -324,6 +324,52 @@ func TestBuild(t *testing.T) { }, }, }, + + { + name: "hcl - valid validation rule for default value", + args: []string{ + filepath.Join(testFixture("hcl", "validation", "map")), + }, + expectedCode: 0, + }, + + { + name: "hcl - valid setting from varfile", + args: []string{ + "-var-file", filepath.Join(testFixture("hcl", "validation", "map", "valid_value.pkrvars.hcl")), + filepath.Join(testFixture("hcl", "validation", "map")), + }, + expectedCode: 0, + }, + + { + name: "hcl - invalid setting from varfile", + args: []string{ + "-var-file", filepath.Join(testFixture("hcl", "validation", "map", "invalid_value.pkrvars.hcl")), + filepath.Join(testFixture("hcl", "validation", "map")), + }, + expectedCode: 1, + }, + + { + name: "hcl - valid cmd ( invalid varfile bypased )", + args: []string{ + "-var-file", filepath.Join(testFixture("hcl", "validation", "map", "invalid_value.pkrvars.hcl")), + "-var", `image_metadata={key = "new_value", something = { foo = "bar" }}`, + filepath.Join(testFixture("hcl", "validation", "map")), + }, + expectedCode: 0, + }, + + { + name: "hcl - invalid cmd ( valid varfile bypased )", + args: []string{ + "-var-file", filepath.Join(testFixture("hcl", "validation", "map", "valid_value.pkrvars.hcl")), + "-var", `image_metadata={key = "?", something = { foo = "wrong" }}`, + filepath.Join(testFixture("hcl", "validation", "map")), + }, + expectedCode: 1, + }, } for _, tt := range tc { diff --git a/command/test-fixtures/hcl/validation/map/definition.pkr.hcl b/command/test-fixtures/hcl/validation/map/definition.pkr.hcl new file mode 100644 index 000000000..1e60d70bd --- /dev/null +++ b/command/test-fixtures/hcl/validation/map/definition.pkr.hcl @@ -0,0 +1,19 @@ + +variable "image_metadata" { + default = { + key: "value", + something: { + foo: "bar", + } + } + validation { + condition = length(var.image_metadata.key) > 4 + error_message = "The image_metadata.key field must be more than 4 runes." + } + validation { + condition = substr(var.image_metadata.something.foo, 0, 3) == "bar" + error_message = "The image_metadata.something.foo field must start with \"bar\"." + } +} + +build {} diff --git a/command/test-fixtures/hcl/validation/map/invalid_value.pkrvars.hcl b/command/test-fixtures/hcl/validation/map/invalid_value.pkrvars.hcl new file mode 100644 index 000000000..9734f36f6 --- /dev/null +++ b/command/test-fixtures/hcl/validation/map/invalid_value.pkrvars.hcl @@ -0,0 +1,7 @@ + +image_metadata = { + key: "value", + something: { + foo: "woo", + } +} diff --git a/command/test-fixtures/hcl/validation/map/valid_value.pkrvars.hcl b/command/test-fixtures/hcl/validation/map/valid_value.pkrvars.hcl new file mode 100644 index 000000000..250fcfc8f --- /dev/null +++ b/command/test-fixtures/hcl/validation/map/valid_value.pkrvars.hcl @@ -0,0 +1,7 @@ + +image_metadata = { + key: "value", + something: { + foo: "barwoo", + } +} From 88175873e561f1b514b9a4285f285b35643005ee Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Mon, 2 Nov 2020 16:52:21 +0100 Subject: [PATCH 18/93] fix tests to actually check cty values & types --- hcl2template/common_test.go | 18 +++++++++-- hcl2template/types.packer_config_test.go | 20 ++++++++++++ hcl2template/types.variables_test.go | 40 ++++++++++++++++++++---- 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/hcl2template/common_test.go b/hcl2template/common_test.go index 9c77cbd7a..0d15e714b 100644 --- a/hcl2template/common_test.go +++ b/hcl2template/common_test.go @@ -219,11 +219,25 @@ var ( } ) +var ctyValueComparer = cmp.Comparer(func(x, y cty.Value) bool { + return x.RawEquals(y) +}) + +var ctyTypeComparer = cmp.Comparer(func(x, y cty.Type) bool { + if x == cty.NilType && y == cty.NilType { + return true + } + if x == cty.NilType || y == cty.NilType { + return false + } + return x.Equals(y) +}) + var cmpOpts = []cmp.Option{ + ctyValueComparer, + ctyTypeComparer, cmpopts.IgnoreUnexported( PackerConfig{}, - cty.Value{}, - cty.Type{}, Variable{}, SourceBlock{}, ProvisionerBlock{}, diff --git a/hcl2template/types.packer_config_test.go b/hcl2template/types.packer_config_test.go index 992e6e80b..662026da1 100644 --- a/hcl2template/types.packer_config_test.go +++ b/hcl2template/types.packer_config_test.go @@ -27,14 +27,17 @@ func TestParser_complete(t *testing.T) { "foo": &Variable{ Name: "foo", Values: []VariableAssignment{{From: "default", Value: cty.StringVal("value")}}, + Type: cty.String, }, "image_id": &Variable{ Name: "image_id", Values: []VariableAssignment{{From: "default", Value: cty.StringVal("image-id-default")}}, + Type: cty.String, }, "port": &Variable{ Name: "port", Values: []VariableAssignment{{From: "default", Value: cty.NumberIntVal(42)}}, + Type: cty.Number, }, "availability_zone_names": &Variable{ Name: "availability_zone_names", @@ -46,12 +49,14 @@ func TestParser_complete(t *testing.T) { cty.StringVal("C"), }), }}, + Type: cty.List(cty.String), }, }, LocalVariables: Variables{ "feefoo": &Variable{ Name: "feefoo", Values: []VariableAssignment{{From: "default", Value: cty.StringVal("value_image-id-default")}}, + Type: cty.String, }, "standard_tags": &Variable{ Name: "standard_tags", @@ -61,6 +66,10 @@ func TestParser_complete(t *testing.T) { "Environment": cty.StringVal("production"), }), }}, + Type: cty.Object(map[string]cty.Type{ + "Component": cty.String, + "Environment": cty.String, + }), }, "abc_map": &Variable{ Name: "abc_map", @@ -77,6 +86,17 @@ func TestParser_complete(t *testing.T) { }), }), }}, + Type: cty.Tuple([]cty.Type{ + cty.Object(map[string]cty.Type{ + "id": cty.String, + }), + cty.Object(map[string]cty.Type{ + "id": cty.String, + }), + cty.Object(map[string]cty.Type{ + "id": cty.String, + }), + }), }, }, Sources: map[SourceRef]SourceBlock{ diff --git a/hcl2template/types.variables_test.go b/hcl2template/types.variables_test.go index a6a71d99e..105c0b8c9 100644 --- a/hcl2template/types.variables_test.go +++ b/hcl2template/types.variables_test.go @@ -26,22 +26,27 @@ func TestParse_variables(t *testing.T) { InputVariables: Variables{ "image_name": &Variable{ Name: "image_name", + Type: cty.String, Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo-image-{{user `my_secret`}}")}}, }, "key": &Variable{ Name: "key", + Type: cty.String, Values: []VariableAssignment{{From: "default", Value: cty.StringVal("value")}}, }, "my_secret": &Variable{ Name: "my_secret", + Type: cty.String, Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}}, }, "image_id": &Variable{ Name: "image_id", + Type: cty.String, Values: []VariableAssignment{{From: "default", Value: cty.StringVal("image-id-default")}}, }, "port": &Variable{ Name: "port", + Type: cty.Number, Values: []VariableAssignment{{From: "default", Value: cty.NumberIntVal(42)}}, }, "availability_zone_names": &Variable{ @@ -52,6 +57,7 @@ func TestParse_variables(t *testing.T) { cty.StringVal("us-west-1a"), }), }}, + Type: cty.List(cty.String), Description: fmt.Sprintln("Describing is awesome ;D"), }, "super_secret_password": &Variable{ @@ -61,6 +67,7 @@ func TestParse_variables(t *testing.T) { From: "default", Value: cty.NullVal(cty.String), }}, + Type: cty.String, Description: fmt.Sprintln("Handle with care plz"), }, }, @@ -71,6 +78,7 @@ func TestParse_variables(t *testing.T) { From: "default", Value: cty.StringVal("Community Team"), }}, + Type: cty.String, }, "service_name": &Variable{ Name: "service_name", @@ -78,6 +86,7 @@ func TestParse_variables(t *testing.T) { From: "default", Value: cty.StringVal("forum"), }}, + Type: cty.String, }, }, }, @@ -97,6 +106,7 @@ func TestParse_variables(t *testing.T) { From: "default", Value: cty.BoolVal(false), }}, + Type: cty.Bool, }, }, }, @@ -116,6 +126,7 @@ func TestParse_variables(t *testing.T) { From: "default", Value: cty.BoolVal(false), }}, + Type: cty.Bool, }, }, }, @@ -135,6 +146,7 @@ func TestParse_variables(t *testing.T) { From: "default", Value: cty.UnknownVal(cty.DynamicPseudoType), }}, + Type: cty.List(cty.String), }, }, }, @@ -152,6 +164,7 @@ func TestParse_variables(t *testing.T) { "broken_variable": &Variable{ Name: "broken_variable", Values: []VariableAssignment{{From: "default", Value: cty.BoolVal(true)}}, + Type: cty.Bool, }, }, }, @@ -168,6 +181,7 @@ func TestParse_variables(t *testing.T) { InputVariables: Variables{ "foo": &Variable{ Name: "foo", + Type: cty.String, }, }, }, @@ -184,6 +198,7 @@ func TestParse_variables(t *testing.T) { InputVariables: Variables{ "foo": &Variable{ Name: "foo", + Type: cty.String, }, }, Sources: map[SourceRef]SourceBlock{ @@ -222,24 +237,29 @@ func TestParse_variables(t *testing.T) { "name_prefix": &Variable{ Name: "name_prefix", Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}}, + Type: cty.String, }, }, LocalVariables: Variables{ "name_prefix": &Variable{ Name: "name_prefix", Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}}, + Type: cty.String, }, "foo": &Variable{ Name: "foo", Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}}, + Type: cty.String, }, "bar": &Variable{ Name: "bar", Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}}, + Type: cty.String, }, "for_var": &Variable{ Name: "for_var", Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}}, + Type: cty.String, }, "bar_var": &Variable{ Name: "bar_var", @@ -251,6 +271,11 @@ func TestParse_variables(t *testing.T) { cty.StringVal("foo"), }), }}, + Type: cty.Tuple([]cty.Type{ + cty.String, + cty.String, + cty.String, + }), }, }, }, @@ -282,6 +307,7 @@ func TestParse_variables(t *testing.T) { VariableAssignment{"default", cty.StringVal("bar"), nil}, VariableAssignment{"varfile", cty.StringVal("wee"), nil}, }, + Type: cty.String, }, }, }, @@ -398,6 +424,7 @@ func TestParse_variables(t *testing.T) { {"default", cty.StringVal("ami-something-something"), nil}, }, Name: "image_id", + Type: cty.String, Validations: []*VariableValidation{ &VariableValidation{ ErrorMessage: `The image_id value must be a valid AMI id, starting with "ami-".`, @@ -418,8 +445,9 @@ func TestParse_variables(t *testing.T) { Basedir: filepath.Join("testdata", "variables", "validation"), InputVariables: Variables{ "image_id": &Variable{ - Values: []VariableAssignment{{"default", cty.StringVal("ami-something-something"), nil}}, + Values: []VariableAssignment{{"default", cty.StringVal("potato"), nil}}, Name: "image_id", + Type: cty.String, Validations: []*VariableValidation{ &VariableValidation{ ErrorMessage: `The image_id value must be a valid AMI id, starting with "ami-".`, @@ -477,11 +505,11 @@ func TestVariables_collectVariableValues(t *testing.T) { "used_string": &Variable{ Type: cty.String, Values: []VariableAssignment{ - {"default", cty.StringVal(`"default_value"`), nil}, - {"env", cty.StringVal(`"env_value"`), nil}, - {"varfile", cty.StringVal(`"xy"`), nil}, - {"varfile", cty.StringVal(`"varfile_value"`), nil}, - {"cmd", cty.StringVal(`"cmd_value"`), nil}, + {"default", cty.StringVal(`default_value`), nil}, + {"env", cty.StringVal(`env_value`), nil}, + {"varfile", cty.StringVal(`xy`), nil}, + {"varfile", cty.StringVal(`varfile_value`), nil}, + {"cmd", cty.StringVal(`cmd_value`), nil}, }, }, }, From d919fc28ab99b24ab407312598cd8057a3a9affe Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Mon, 2 Nov 2020 17:20:46 +0100 Subject: [PATCH 19/93] add doc --- .../pages/docs/from-1.5/blocks/variable.mdx | 2 + website/pages/docs/from-1.5/variables.mdx | 2 + .../from-1.5/variables/custom-validation.mdx | 43 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 website/pages/partials/from-1.5/variables/custom-validation.mdx diff --git a/website/pages/docs/from-1.5/blocks/variable.mdx b/website/pages/docs/from-1.5/blocks/variable.mdx index e7af7093a..1b423ca6f 100644 --- a/website/pages/docs/from-1.5/blocks/variable.mdx +++ b/website/pages/docs/from-1.5/blocks/variable.mdx @@ -24,6 +24,8 @@ If a default value is set, the variable is optional. Otherwise, the variable `@include 'from-1.5/variables/assignment.mdx'` +`@include 'from-1.5/variables/custom-validation.mdx'` + Example of a variable assignment from a file: `@include 'from-1.5/variables/foo-pkrvar.mdx'` diff --git a/website/pages/docs/from-1.5/variables.mdx b/website/pages/docs/from-1.5/variables.mdx index b22792667..73c5c3746 100644 --- a/website/pages/docs/from-1.5/variables.mdx +++ b/website/pages/docs/from-1.5/variables.mdx @@ -162,6 +162,8 @@ maintainers, use comments. The following sections describe these options in more detail. +`@include 'from-1.5/variables/custom-validation.mdx'` + ### Variables on the Command Line To specify individual variables on the command line, use the `-var` option when diff --git a/website/pages/partials/from-1.5/variables/custom-validation.mdx b/website/pages/partials/from-1.5/variables/custom-validation.mdx new file mode 100644 index 000000000..5a9757a0f --- /dev/null +++ b/website/pages/partials/from-1.5/variables/custom-validation.mdx @@ -0,0 +1,43 @@ +## Custom Validation Rules + +In addition to Type Constraints, you can specify arbitrary custom validation +rules for a particular variable using one or more `validation` block nested +within the corresponding `variable` block: + +```hcl +variable "image_id" { + type = string + description = "The id of the machine image (AMI) to use for the server." + + validation { + condition = length(var.image_id) > 4 && substr(var.image_id, 0, 4) == "ami-" + error_message = "The image_id value must be a valid AMI id, starting with \"ami-\"." + } +} +``` + +The `condition` argument is an expression that must use the value of the +variable to return `true` if the value is valid or `false` if it is invalid. +The expression can refer only to the variable that the condition applies to, +and _must not_ produce errors. + +If the failure of an expression is the basis of the validation decision, use +[the `can` function](./functions/can.html) to detect such errors. For example: + +```hcl +variable "image_id" { + type = string + description = "The id of the machine image (AMI) to use for the server." + + validation { + # regex(...) fails if it cannot find a match + condition = can(regex("^ami-", var.image_id)) + error_message = "The image_id value must be a valid AMI id, starting with \"ami-\"." + } +} +``` + +If `condition` evaluates to `false`, an error message including the sentences +given in `error_message` will be produced. The error message string should be +at least one full sentence explaining the constraint that failed, using a +sentence structure similar to the above examples. \ No newline at end of file From 971254928aa27b716d609c0b0b5fbc1bfbc92c19 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Mon, 2 Nov 2020 17:43:21 +0100 Subject: [PATCH 20/93] various fixes --- hcl2template/common_test.go | 3 +-- hcl2template/types.variables.go | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hcl2template/common_test.go b/hcl2template/common_test.go index 0d15e714b..a5c8b90bd 100644 --- a/hcl2template/common_test.go +++ b/hcl2template/common_test.go @@ -69,8 +69,7 @@ func testParse(t *testing.T, tests []parseTest) { if tt.parseWantDiagHasErrors != gotDiags.HasErrors() { t.Fatalf("Parser.parse() unexpected diagnostics HasErrors. %s", gotDiags) } - if diff := cmp.Diff(tt.parseWantCfg, gotCfg, cmpOpts..., - ); diff != "" { + if diff := cmp.Diff(tt.parseWantCfg, gotCfg, cmpOpts...); diff != "" { t.Fatalf("Parser.parse() wrong packer config. %s", diff) } diff --git a/hcl2template/types.variables.go b/hcl2template/types.variables.go index 5ffe57cdf..2f6303741 100644 --- a/hcl2template/types.variables.go +++ b/hcl2template/types.variables.go @@ -446,11 +446,11 @@ func decodeVariableValidationBlock(varName string, block *hcl.Block) (*VariableV // English, we'll require the given error message to conform // to that. We might relax this in future if e.g. we start // presenting these error messages in a different way, or if - // Terraform starts supporting producing error messages in + // Packer starts supporting producing error messages in // other human languages, etc. // For pragmatism we also allow sentences ending with // exclamation points, but we don't mention it explicitly here - // because that's not really consistent with the Terraform UI + // because that's not really consistent with the Packer UI // writing style. diags = diags.Append(&hcl.Diagnostic{ Severity: hcl.DiagError, @@ -485,7 +485,7 @@ func looksLikeSentences(s string) bool { // (This will only see the first rune in a multi-rune combining sequence, // but the first rune is generally the letter if any are, and if not then // we'll just ignore it because we're primarily expecting English messages - // right now anyway, for consistency with all of Terraform's other output.) + // right now anyway, for consistency with all of Packers's other output.) if unicode.IsLetter(first) && !unicode.IsUpper(first) { return false } From 20b7fd9687a7440c53b81b8c0d805751fbe7e333 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Mon, 2 Nov 2020 17:48:29 +0100 Subject: [PATCH 21/93] add hcl2template/addrs/doc.go --- hcl2template/addrs/doc.go | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hcl2template/addrs/doc.go diff --git a/hcl2template/addrs/doc.go b/hcl2template/addrs/doc.go new file mode 100644 index 000000000..13c300030 --- /dev/null +++ b/hcl2template/addrs/doc.go @@ -0,0 +1,11 @@ +// Package addrs contains types that represent "addresses", which are +// references to specific objects within a Packer configuration. +// +// All addresses have string representations based on HCL traversal syntax +// which should be used in the user-interface, and also in-memory +// representations that can be used internally. +// +// All types within this package should be treated as immutable, even if this +// is not enforced by the Go compiler. It is always an implementation error +// to modify an address object in-place after it is initially constructed. +package addrs From 2987d253355752ccb3c12d9dad1ad13fcb9f4e7c Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Mon, 2 Nov 2020 17:52:19 +0100 Subject: [PATCH 22/93] simplify tests --- hcl2template/common_test.go | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/hcl2template/common_test.go b/hcl2template/common_test.go index a5c8b90bd..08f4ea10b 100644 --- a/hcl2template/common_test.go +++ b/hcl2template/common_test.go @@ -74,26 +74,12 @@ func testParse(t *testing.T, tests []parseTest) { } if gotCfg != nil && !tt.parseWantDiagHasErrors { - gotInputVar := gotCfg.InputVariables - for name, value := range tt.parseWantCfg.InputVariables { - if variable, ok := gotInputVar[name]; ok { - if diff := cmp.Diff(variable, value, cmpOpts...); diff != "" { - t.Fatalf("Parser.parse(): unexpected variable values %s: %s", name, diff) - } - } else { - t.Fatalf("Parser.parse() missing input variable. %s", name) - } + if diff := cmp.Diff(tt.parseWantCfg.InputVariables, gotCfg.InputVariables, cmpOpts...); diff != "" { + t.Fatalf("Parser.parse() unexpected input vars. %s", diff) } - gotLocalVar := gotCfg.LocalVariables - for name, value := range tt.parseWantCfg.LocalVariables { - if variable, ok := gotLocalVar[name]; ok { - if diff := cmp.Diff(variable, value, cmpOpts...); diff != "" { - t.Fatalf("Parser.parse(): unexpected variable values %s: %s", name, diff) - } - } else { - t.Fatalf("Parser.parse() missing local variable. %s", name) - } + if diff := cmp.Diff(tt.parseWantCfg.LocalVariables, gotCfg.LocalVariables, cmpOpts...); diff != "" { + t.Fatalf("Parser.parse() unexpected local vars. %s", diff) } } From 2b69a5f496441df33119e33c516fcddad1b42c6a Mon Sep 17 00:00:00 2001 From: Sumit Kalra Date: Mon, 2 Nov 2020 20:42:55 -0800 Subject: [PATCH 23/93] azure-arm builder: Create keyvaults with SoftDelete enabled --- .../template_factory_test.TestKeyVaultDeployment03.approved.json | 1 + builder/azure/common/template/template.go | 1 + builder/azure/common/template/template_builder.go | 1 + 3 files changed, 3 insertions(+) diff --git a/builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json b/builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json index 44c9e68e4..c4f85c6a8 100644 --- a/builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json +++ b/builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json @@ -38,6 +38,7 @@ "tenantId": "[parameters('tenantId')]" } ], + "enableSoftDelete": "true", "enabledForDeployment": "true", "enabledForTemplateDeployment": "true", "sku": { diff --git a/builder/azure/common/template/template.go b/builder/azure/common/template/template.go index 32fa39917..2366b7a24 100644 --- a/builder/azure/common/template/template.go +++ b/builder/azure/common/template/template.go @@ -85,6 +85,7 @@ type Properties struct { DNSSettings *network.PublicIPAddressDNSSettings `json:"dnsSettings,omitempty"` EnabledForDeployment *string `json:"enabledForDeployment,omitempty"` EnabledForTemplateDeployment *string `json:"enabledForTemplateDeployment,omitempty"` + EnableSoftDelete *string `json:"enableSoftDelete,omitempty"` HardwareProfile *compute.HardwareProfile `json:"hardwareProfile,omitempty"` IPConfigurations *[]network.IPConfiguration `json:"ipConfigurations,omitempty"` NetworkProfile *compute.NetworkProfile `json:"networkProfile,omitempty"` diff --git a/builder/azure/common/template/template_builder.go b/builder/azure/common/template/template_builder.go index d4248d04b..cdb9f92d1 100644 --- a/builder/azure/common/template/template_builder.go +++ b/builder/azure/common/template/template_builder.go @@ -554,6 +554,7 @@ const KeyVault = `{ "properties": { "enabledForDeployment": "true", "enabledForTemplateDeployment": "true", + "enableSoftDelete": "true", "tenantId": "[parameters('tenantId')]", "accessPolicies": [ { From 8dab31b5480d7275a0ab2159b100dcf395d1ea27 Mon Sep 17 00:00:00 2001 From: Aleksandr Serbin Date: Tue, 3 Nov 2020 22:15:44 +0100 Subject: [PATCH 24/93] amazon: use spot tags for launch template tags - use `spot_tags` instead of `run_tags` for launch template - move region to `StepRunSpotInstance` from state --- .../amazon/common/step_run_spot_instance.go | 30 +++++---- .../common/step_run_spot_instance_test.go | 64 +++++++++++++++---- builder/amazon/ebs/builder.go | 2 +- builder/amazon/ebssurrogate/builder.go | 2 +- builder/amazon/ebsvolume/builder.go | 2 +- builder/amazon/instance/builder.go | 2 +- 6 files changed, 70 insertions(+), 32 deletions(-) diff --git a/builder/amazon/common/step_run_spot_instance.go b/builder/amazon/common/step_run_spot_instance.go index 1d80b924a..dc196817a 100644 --- a/builder/amazon/common/step_run_spot_instance.go +++ b/builder/amazon/common/step_run_spot_instance.go @@ -36,6 +36,7 @@ type StepRunSpotInstance struct { ExpectedRootDevice string InstanceInitiatedShutdownBehavior string InstanceType string + Region string SourceAMI string SpotPrice string SpotTags map[string]string @@ -161,7 +162,6 @@ func (s *StepRunSpotInstance) LoadUserData() (string, error) { func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { ec2conn := state.Get("ec2").(ec2iface.EC2API) ui := state.Get("ui").(packer.Ui) - region := state.Get("region").(string) ui.Say("Launching a spot AWS instance...") @@ -199,7 +199,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag) } // Convert tags from the tag map provided by the user into *ec2.Tag s - ec2Tags, err := TagMap(s.Tags).EC2Tags(s.Ctx, region, state) + ec2Tags, err := TagMap(s.Tags).EC2Tags(s.Ctx, s.Region, state) if err != nil { err := fmt.Errorf("Error generating tags for source instance: %s", err) state.Put("error", err) @@ -223,6 +223,14 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag) } marketOptions.SetMarketType(ec2.MarketTypeSpot) + spotTags, err := TagMap(s.SpotTags).EC2Tags(s.Ctx, s.Region, state) + if err != nil { + err := fmt.Errorf("Error generating tags for spot request: %s", err) + state.Put("error", err) + ui.Error(err.Error()) + return multistep.ActionHalt + } + // Create a launch template for the instance ui.Message("Loading User Data File...") @@ -244,12 +252,14 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag) LaunchTemplateData: templateData, LaunchTemplateName: aws.String(launchTemplateName), VersionDescription: aws.String("template generated by packer for launching spot instances"), - TagSpecifications: []*ec2.TagSpecification{ + } + if len(spotTags) > 0 { + launchTemplate.TagSpecifications = []*ec2.TagSpecification{ { ResourceType: aws.String("launch-template"), - Tags: ec2Tags, + Tags: spotTags, }, - }, + } } // Tell EC2 to create the template @@ -369,14 +379,6 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag) instance := describeOutput.Reservations[0].Instances[0] // Tag the spot instance request (not the eventual spot instance) - spotTags, err := TagMap(s.SpotTags).EC2Tags(s.Ctx, region, state) - if err != nil { - err := fmt.Errorf("Error generating tags for spot request: %s", err) - state.Put("error", err) - ui.Error(err.Error()) - return multistep.ActionHalt - } - if len(spotTags) > 0 && len(s.SpotTags) > 0 { spotTags.Report(ui) // Use the instance ID to find out the SIR, so that we can tag the spot @@ -436,7 +438,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag) if len(volumeIds) > 0 && len(s.VolumeTags) > 0 { ui.Say("Adding tags to source EBS Volumes") - volumeTags, err := TagMap(s.VolumeTags).EC2Tags(s.Ctx, region, state) + volumeTags, err := TagMap(s.VolumeTags).EC2Tags(s.Ctx, s.Region, state) if err != nil { err := fmt.Errorf("Error tagging source EBS Volumes on %s: %s", *instance.InstanceId, err) state.Put("error", err) diff --git a/builder/amazon/common/step_run_spot_instance_test.go b/builder/amazon/common/step_run_spot_instance_test.go index 4a57d0cbd..d00bf74dd 100644 --- a/builder/amazon/common/step_run_spot_instance_test.go +++ b/builder/amazon/common/step_run_spot_instance_test.go @@ -45,6 +45,7 @@ func getBasicStep() *StepRunSpotInstance { ExpectedRootDevice: "ebs", InstanceInitiatedShutdownBehavior: "stop", InstanceType: "t2.micro", + Region: "us-east-1", SourceAMI: "", SpotPrice: "auto", SpotTags: nil, @@ -189,10 +190,7 @@ func (m *runSpotEC2ConnMock) CreateTags(req *ec2.CreateTagsInput) (*ec2.CreateTa } } -func TestRun(t *testing.T) { - instanceId := aws.String("test-instance-id") - spotRequestId := aws.String("spot-id") - volumeId := aws.String("volume-id") +func defaultEc2Mock(instanceId, spotRequestId, volumeId *string) *runSpotEC2ConnMock { instance := &ec2.Instance{ InstanceId: instanceId, SpotInstanceRequestId: spotRequestId, @@ -204,7 +202,7 @@ func TestRun(t *testing.T) { }, }, } - ec2Mock := &runSpotEC2ConnMock{ + return &runSpotEC2ConnMock{ CreateLaunchTemplateFn: func(in *ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error) { return &ec2.CreateLaunchTemplateOutput{ LaunchTemplate: nil, @@ -233,6 +231,13 @@ func TestRun(t *testing.T) { }, nil }, } +} + +func TestRun(t *testing.T) { + instanceId := aws.String("test-instance-id") + spotRequestId := aws.String("spot-id") + volumeId := aws.String("volume-id") + ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId) uiMock := packer.TestUi(t) @@ -240,7 +245,6 @@ func TestRun(t *testing.T) { state.Put("ec2", ec2Mock) state.Put("ui", uiMock) state.Put("source_image", testImage()) - state.Put("region", "test-region") stepRunSpotInstance := getBasicStep() stepRunSpotInstance.Tags["Name"] = "Packer Builder" @@ -274,17 +278,13 @@ func TestRun(t *testing.T) { if *ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].ResourceType != "launch-template" { t.Fatalf("resource type 'launch-template' expected") } - if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].Tags) != 2 { - t.Fatalf("2 tags expected") + if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].Tags) != 1 { + t.Fatalf("1 launch template tag expected") } nameTag := ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].Tags[0] - if *nameTag.Key != "Name" || *nameTag.Value != "Packer Builder" { - t.Fatalf("expected name tag") - } - testTag := ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].Tags[1] - if *testTag.Key != "test-tag" || *testTag.Value != "test-value" { - t.Fatalf("expected test tag") + if *nameTag.Key != "spot-tag" || *nameTag.Value != "spot-tag-value" { + t.Fatalf("expected spot-tag: spot-tag-value") } if len(ec2Mock.CreateFleetParams) != 1 { @@ -324,3 +324,39 @@ func TestRun(t *testing.T) { t.Fatalf("should create tags for volume") } } + +func TestRun_NoSpotTags(t *testing.T) { + instanceId := aws.String("test-instance-id") + spotRequestId := aws.String("spot-id") + volumeId := aws.String("volume-id") + ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId) + + uiMock := packer.TestUi(t) + + state := tStateSpot() + state.Put("ec2", ec2Mock) + state.Put("ui", uiMock) + state.Put("source_image", testImage()) + + stepRunSpotInstance := getBasicStep() + stepRunSpotInstance.Tags["Name"] = "Packer Builder" + stepRunSpotInstance.Tags["test-tag"] = "test-value" + stepRunSpotInstance.VolumeTags = map[string]string{ + "volume-tag": "volume-tag-value", + } + + ctx := context.TODO() + action := stepRunSpotInstance.Run(ctx, state) + + if err := state.Get("error"); err != nil { + t.Fatalf("should not error, but: %v", err) + } + + if action != multistep.ActionContinue { + t.Fatalf("shoul continue, but: %v", action) + } + + if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications) != 0 { + t.Fatalf("0 launch template tags expected") + } +} diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 8c4f00fe2..03c8d0c03 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -164,7 +164,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("awsSession", session) state.Put("hook", hook) state.Put("ui", ui) - state.Put("region", *ec2conn.Config.Region) generatedData := &builder.GeneratedData{State: state} var instanceStep multistep.Step @@ -182,6 +181,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ExpectedRootDevice: "ebs", InstanceInitiatedShutdownBehavior: b.config.InstanceInitiatedShutdownBehavior, InstanceType: b.config.InstanceType, + Region: *ec2conn.Config.Region, SourceAMI: b.config.SourceAmi, SpotPrice: b.config.SpotPrice, SpotTags: b.config.SpotTags, diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index 6600850f6..5688193a8 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -187,7 +187,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("awsSession", session) state.Put("hook", hook) state.Put("ui", ui) - state.Put("region", *ec2conn.Config.Region) generatedData := &builder.GeneratedData{State: state} var instanceStep multistep.Step @@ -205,6 +204,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ExpectedRootDevice: "ebs", InstanceInitiatedShutdownBehavior: b.config.InstanceInitiatedShutdownBehavior, InstanceType: b.config.InstanceType, + Region: *ec2conn.Config.Region, SourceAMI: b.config.SourceAmi, SpotPrice: b.config.SpotPrice, SpotInstanceTypes: b.config.SpotInstanceTypes, diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index f9cb3b819..2c7a859a3 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/builder/amazon/ebsvolume/builder.go @@ -168,7 +168,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("iam", iam) state.Put("hook", hook) state.Put("ui", ui) - state.Put("region", *ec2conn.Config.Region) generatedData := &builder.GeneratedData{State: state} var instanceStep multistep.Step @@ -186,6 +185,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ExpectedRootDevice: "ebs", InstanceInitiatedShutdownBehavior: b.config.InstanceInitiatedShutdownBehavior, InstanceType: b.config.InstanceType, + Region: *ec2conn.Config.Region, SourceAMI: b.config.SourceAmi, SpotInstanceTypes: b.config.SpotInstanceTypes, SpotPrice: b.config.SpotPrice, diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index 214f16283..fe755edb1 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -250,7 +250,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("awsSession", session) state.Put("hook", hook) state.Put("ui", ui) - state.Put("region", ec2conn.Config.Region) generatedData := &builder.GeneratedData{State: state} var instanceStep multistep.Step @@ -266,6 +265,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Debug: b.config.PackerDebug, EbsOptimized: b.config.EbsOptimized, InstanceType: b.config.InstanceType, + Region: *ec2conn.Config.Region, SourceAMI: b.config.SourceAmi, SpotPrice: b.config.SpotPrice, SpotInstanceTypes: b.config.SpotInstanceTypes, From 7cb8af14413d9806062a52c16f79f661258b3f9f Mon Sep 17 00:00:00 2001 From: Aleksandr Serbin Date: Tue, 3 Nov 2020 22:28:19 +0100 Subject: [PATCH 25/93] amazon: remove region from state for chroot builder --- builder/amazon/chroot/builder.go | 1 - 1 file changed, 1 deletion(-) diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index 1af8156c6..9fb431583 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -368,7 +368,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("awsSession", session) state.Put("hook", hook) state.Put("ui", ui) - state.Put("region", *ec2conn.Config.Region) state.Put("wrappedCommand", common.CommandWrapper(wrappedCommand)) generatedData := &builder.GeneratedData{State: state} From 8248f52ff740db7f907e4e8cdd23a9941e21d238 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 3 Nov 2020 16:20:34 -0800 Subject: [PATCH 26/93] Return error if ssh-config command fails Update error detection to return an error if the process fails instead of testing for content in stderr. --- builder/vagrant/driver_2_2.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/builder/vagrant/driver_2_2.go b/builder/vagrant/driver_2_2.go index c1df9ea98..cb2243ad5 100644 --- a/builder/vagrant/driver_2_2.go +++ b/builder/vagrant/driver_2_2.go @@ -154,8 +154,10 @@ func (d *Vagrant_2_2_Driver) SSHConfig(id string) (*VagrantSSHConfig, error) { sshConf := &VagrantSSHConfig{} stdout, stderr, err := d.vagrantCmd(args...) - if stderr != "" { - err := fmt.Errorf("ssh-config command returned error: %s", stderr) + if err != nil { + if stderr != "" { + err = fmt.Errorf("ssh-config command returned errors: %s", stderr) + } return sshConf, err } lines := strings.Split(stdout, "\n") From 10eb32d29eaaca118cbf23cad155724b62b623dc Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 4 Nov 2020 13:13:45 +0100 Subject: [PATCH 27/93] require less English --- hcl2template/types.variables.go | 37 +++++++++++++++------------------ 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/hcl2template/types.variables.go b/hcl2template/types.variables.go index 2f6303741..6e09893ef 100644 --- a/hcl2template/types.variables.go +++ b/hcl2template/types.variables.go @@ -371,10 +371,10 @@ type VariableValidation struct { // the block defining the validation rule, not an error in the caller. Condition hcl.Expression - // ErrorMessage is one or more full sentences, which would need to be in - // English for consistency with the rest of the error message output but - // can in practice be in any language as long as it ends with a period. - // The message should describe what is required for the condition to return + // ErrorMessage is one or more full sentences, which _should_ be in English + // for consistency with the rest of the error message output but can in + // practice be in any language as long as it ends with a period. The + // message should describe what is required for the condition to return // true in a way that would make sense to a caller of the module. ErrorMessage string @@ -442,20 +442,19 @@ func decodeVariableValidationBlock(varName string, block *hcl.Block) (*VariableV }) case !looksLikeSentences(vv.ErrorMessage): // Because we're going to include this string verbatim as part - // of a bigger error message written in our usual style in - // English, we'll require the given error message to conform - // to that. We might relax this in future if e.g. we start - // presenting these error messages in a different way, or if - // Packer starts supporting producing error messages in - // other human languages, etc. - // For pragmatism we also allow sentences ending with - // exclamation points, but we don't mention it explicitly here - // because that's not really consistent with the Packer UI - // writing style. + // of a bigger error message written in our usual style, we'll + // require the given error message to conform to that. We might + // relax this in future if e.g. we start presenting these error + // messages in a different way, or if Packer starts supporting + // producing error messages in other human languages, etc. For + // pragmatism we also allow sentences ending with exclamation + // points, but we don't mention it explicitly here because + // that's not really consistent with the Packer UI writing + // style. diags = diags.Append(&hcl.Diagnostic{ Severity: hcl.DiagError, Summary: errSummary, - Detail: "Validation error message must be at least one full English sentence starting with an uppercase letter and ending with a period or question mark.", + Detail: "Validation error message must be at least one full sentence starting with an uppercase letter ( if the alphabet permits it ) and ending with a period or question mark.", Subject: attr.Expr.Range().Ptr(), }) } @@ -481,11 +480,9 @@ func looksLikeSentences(s string) bool { first := runes[0] last := runes[len(runes)-1] - // If the first rune is a letter then it must be an uppercase letter. - // (This will only see the first rune in a multi-rune combining sequence, - // but the first rune is generally the letter if any are, and if not then - // we'll just ignore it because we're primarily expecting English messages - // right now anyway, for consistency with all of Packers's other output.) + // If the first rune is a letter then it must be an uppercase letter. To + // sorts of nudge people into writting sentences. For alphabets that don't + // have the notion of 'upper', this does nothing. if unicode.IsLetter(first) && !unicode.IsUpper(first) { return false } From fd873b8811f7d767c83a3cdce747a4da62ae6923 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 4 Nov 2020 13:20:05 +0100 Subject: [PATCH 28/93] Referenceable: explain a bit more of the whys --- hcl2template/addrs/referenceable.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hcl2template/addrs/referenceable.go b/hcl2template/addrs/referenceable.go index 8c4925c40..8caec1241 100644 --- a/hcl2template/addrs/referenceable.go +++ b/hcl2template/addrs/referenceable.go @@ -3,6 +3,8 @@ package addrs // Referenceable is an interface implemented by all address types that can // appear as references in configuration language expressions. type Referenceable interface { + // referenceableSigil is private to ensure that all Referenceables are + // implentented in this current package. For now this does nothing. referenceableSigil() // String produces a string representation of the address that could be @@ -11,6 +13,8 @@ type Referenceable interface { String() string } +// referenceable is an empty struct that implements Referenceable, add it to +// your Referenceable struct so that it can be recognized as such. type referenceable struct { } From 73caad492cb8c6e89d3355766a46c13b14893a86 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 4 Nov 2020 13:31:45 +0100 Subject: [PATCH 29/93] Update custom-validation.mdx add complex example --- .../from-1.5/variables/custom-validation.mdx | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/website/pages/partials/from-1.5/variables/custom-validation.mdx b/website/pages/partials/from-1.5/variables/custom-validation.mdx index 5a9757a0f..0da062710 100644 --- a/website/pages/partials/from-1.5/variables/custom-validation.mdx +++ b/website/pages/partials/from-1.5/variables/custom-validation.mdx @@ -40,4 +40,29 @@ variable "image_id" { If `condition` evaluates to `false`, an error message including the sentences given in `error_message` will be produced. The error message string should be at least one full sentence explaining the constraint that failed, using a -sentence structure similar to the above examples. \ No newline at end of file +sentence structure similar to the above examples. + +Validation also works with more complex cases: + +```hcl +variable "image_metadata" { + + default = { + key: "value", + something: { + foo: "bar", + } + } + + validation { + condition = length(var.image_metadata.key) > 4 + error_message = "The image_metadata.key field must be more than 4 runes." + } + + validation { + condition = substr(var.image_metadata.something.foo, 0, 3) == "bar" + error_message = "The image_metadata.something.foo field must start with \"bar\"." + } + +} +``` From 8b5e2903b9d0a7a354fd934866b36302dff77508 Mon Sep 17 00:00:00 2001 From: Marin Salinas Date: Wed, 4 Nov 2020 08:13:37 -0600 Subject: [PATCH 30/93] feat: add hk endpoint support for osc builder (#10207) --- builder/osc/common/access_config.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/builder/osc/common/access_config.go b/builder/osc/common/access_config.go index e02d335c7..46530429b 100644 --- a/builder/osc/common/access_config.go +++ b/builder/osc/common/access_config.go @@ -47,6 +47,11 @@ func (c *AccessConfig) NewOSCClient() *osc.APIClient { if c.CustomEndpointOAPI == "" { c.CustomEndpointOAPI = "outscale.com/oapi/latest" + + if c.RawRegion == "cn-southeast-1" { + c.CustomEndpointOAPI = "outscale.hk/oapi/latest" + } + } if c.X509certPath == "" { From d8fec2e9e5a45482aa62726a64b38f6e1a807333 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 4 Nov 2020 06:15:43 -0800 Subject: [PATCH 31/93] move the hyperv-only powershell dependency into the hyperv subdirectory (#10198) --- builder/hyperv/common/config.go | 4 ++-- builder/hyperv/common/driver_ps_4.go | 4 ++-- {common => builder/hyperv/common}/powershell/hyperv/hyperv.go | 4 ++-- .../hyperv/common}/powershell/hyperv/hyperv_test.go | 0 {common => builder/hyperv/common}/powershell/powershell.go | 0 .../hyperv/common}/powershell/powershell_test.go | 0 {common => builder/hyperv/common}/powershell/scriptbuilder.go | 0 builder/hyperv/vmcx/builder.go | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename {common => builder/hyperv/common}/powershell/hyperv/hyperv.go (99%) rename {common => builder/hyperv/common}/powershell/hyperv/hyperv_test.go (100%) rename {common => builder/hyperv/common}/powershell/powershell.go (100%) rename {common => builder/hyperv/common}/powershell/powershell_test.go (100%) rename {common => builder/hyperv/common}/powershell/scriptbuilder.go (100%) diff --git a/builder/hyperv/common/config.go b/builder/hyperv/common/config.go index 5ccd5d453..84473e2dc 100644 --- a/builder/hyperv/common/config.go +++ b/builder/hyperv/common/config.go @@ -8,9 +8,9 @@ import ( "os" "strings" + powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell" + "github.com/hashicorp/packer/builder/hyperv/common/powershell/hyperv" "github.com/hashicorp/packer/common" - powershell "github.com/hashicorp/packer/common/powershell" - "github.com/hashicorp/packer/common/powershell/hyperv" "github.com/hashicorp/packer/template/interpolate" ) diff --git a/builder/hyperv/common/driver_ps_4.go b/builder/hyperv/common/driver_ps_4.go index 13fa4a4d5..e8e8faf29 100644 --- a/builder/hyperv/common/driver_ps_4.go +++ b/builder/hyperv/common/driver_ps_4.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/hashicorp/packer/common/powershell" - "github.com/hashicorp/packer/common/powershell/hyperv" + "github.com/hashicorp/packer/builder/hyperv/common/powershell" + "github.com/hashicorp/packer/builder/hyperv/common/powershell/hyperv" ) type HypervPS4Driver struct { diff --git a/common/powershell/hyperv/hyperv.go b/builder/hyperv/common/powershell/hyperv/hyperv.go similarity index 99% rename from common/powershell/hyperv/hyperv.go rename to builder/hyperv/common/powershell/hyperv/hyperv.go index 75cf4a82f..1c49343b2 100644 --- a/common/powershell/hyperv/hyperv.go +++ b/builder/hyperv/common/powershell/hyperv/hyperv.go @@ -11,7 +11,7 @@ import ( "strings" "text/template" - "github.com/hashicorp/packer/common/powershell" + "github.com/hashicorp/packer/builder/hyperv/common/powershell" ) type scriptOptions struct { @@ -194,7 +194,7 @@ func SetFirstBootDeviceGen1(vmName string, controllerType string) error { script := ` param([string] $vmName, [string] $controllerType) - $vmBootOrder = Hyper-V\Get-VMBios -VMName $vmName | Select-Object -ExpandProperty StartupOrder | Where-Object { $_ -ne $controllerType } + $vmBootOrder = Hyper-V\Get-VMBios -VMName $vmName | Select-Object -ExpandProperty StartupOrder | Where-Object { $_ -ne $controllerType } Hyper-V\Set-VMBios -VMName $vmName -StartupOrder (@($controllerType) + $vmBootOrder) ` diff --git a/common/powershell/hyperv/hyperv_test.go b/builder/hyperv/common/powershell/hyperv/hyperv_test.go similarity index 100% rename from common/powershell/hyperv/hyperv_test.go rename to builder/hyperv/common/powershell/hyperv/hyperv_test.go diff --git a/common/powershell/powershell.go b/builder/hyperv/common/powershell/powershell.go similarity index 100% rename from common/powershell/powershell.go rename to builder/hyperv/common/powershell/powershell.go diff --git a/common/powershell/powershell_test.go b/builder/hyperv/common/powershell/powershell_test.go similarity index 100% rename from common/powershell/powershell_test.go rename to builder/hyperv/common/powershell/powershell_test.go diff --git a/common/powershell/scriptbuilder.go b/builder/hyperv/common/powershell/scriptbuilder.go similarity index 100% rename from common/powershell/scriptbuilder.go rename to builder/hyperv/common/powershell/scriptbuilder.go diff --git a/builder/hyperv/vmcx/builder.go b/builder/hyperv/vmcx/builder.go index 622917ac4..b2968abf6 100644 --- a/builder/hyperv/vmcx/builder.go +++ b/builder/hyperv/vmcx/builder.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" + powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/bootcommand" - powershell "github.com/hashicorp/packer/common/powershell" "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" From addd2da101d13107d01b5071d32317f390ac17b0 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 4 Nov 2020 15:44:21 +0100 Subject: [PATCH 32/93] add can examples --- .../partials/from-1.5/variables/custom-validation.mdx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/website/pages/partials/from-1.5/variables/custom-validation.mdx b/website/pages/partials/from-1.5/variables/custom-validation.mdx index 0da062710..42af7e1d7 100644 --- a/website/pages/partials/from-1.5/variables/custom-validation.mdx +++ b/website/pages/partials/from-1.5/variables/custom-validation.mdx @@ -22,7 +22,7 @@ The expression can refer only to the variable that the condition applies to, and _must not_ produce errors. If the failure of an expression is the basis of the validation decision, use -[the `can` function](./functions/can.html) to detect such errors. For example: +[the `can` function](/docs/from-1.5/functions/conversion/can) to detect such errors. For example: ```hcl variable "image_id" { @@ -59,6 +59,11 @@ variable "image_metadata" { error_message = "The image_metadata.key field must be more than 4 runes." } + validation { + condition = can(var.image_metadata.something.foo) + error_message = "The image_metadata.something.foo field must exist." + } + validation { condition = substr(var.image_metadata.something.foo, 0, 3) == "bar" error_message = "The image_metadata.something.foo field must start with \"bar\"." From 7b57e286007569a4674ad50b17bb43cb6892c1f1 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 4 Nov 2020 11:56:46 -0800 Subject: [PATCH 33/93] move localexec to common/shell-local dir since it is related to shelling out locally --- builder/amazon/common/ssm/session.go | 2 +- builder/docker/exec.go | 2 +- .../shell-local}/localexec/run_and_stream.go | 4 ++++ .../shell-local}/localexec/run_and_stream_test.go | 0 common/step_create_cdrom.go | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) rename {helper/builder => common/shell-local}/localexec/run_and_stream.go (90%) rename {helper/builder => common/shell-local}/localexec/run_and_stream_test.go (100%) diff --git a/builder/amazon/common/ssm/session.go b/builder/amazon/common/ssm/session.go index 2c90233e8..350c01ba4 100644 --- a/builder/amazon/common/ssm/session.go +++ b/builder/amazon/common/ssm/session.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/service/ssm/ssmiface" "github.com/hashicorp/packer/builder/amazon/common/awserrors" "github.com/hashicorp/packer/common/retry" - "github.com/hashicorp/packer/helper/builder/localexec" + "github.com/hashicorp/packer/common/shell-local/localexec" "github.com/hashicorp/packer/packer" ) diff --git a/builder/docker/exec.go b/builder/docker/exec.go index e04461bb6..ee5a01efd 100644 --- a/builder/docker/exec.go +++ b/builder/docker/exec.go @@ -3,7 +3,7 @@ package docker import ( "os/exec" - "github.com/hashicorp/packer/helper/builder/localexec" + "github.com/hashicorp/packer/common/shell-local/localexec" "github.com/hashicorp/packer/packer" ) diff --git a/helper/builder/localexec/run_and_stream.go b/common/shell-local/localexec/run_and_stream.go similarity index 90% rename from helper/builder/localexec/run_and_stream.go rename to common/shell-local/localexec/run_and_stream.go index f40076cdb..9c598e608 100644 --- a/helper/builder/localexec/run_and_stream.go +++ b/common/shell-local/localexec/run_and_stream.go @@ -14,6 +14,10 @@ import ( "github.com/hashicorp/packer/packer" ) +// RunAndStream allows you to run a local command and stream output to the UI. +// This does not require use of a shell-local communicator, so is a nice tool +// for plugins that need to shell out to a local dependency and provide clear +// output to users. func RunAndStream(cmd *exec.Cmd, ui packer.Ui, sensitive []string) error { stdout_r, stdout_w := io.Pipe() stderr_r, stderr_w := io.Pipe() diff --git a/helper/builder/localexec/run_and_stream_test.go b/common/shell-local/localexec/run_and_stream_test.go similarity index 100% rename from helper/builder/localexec/run_and_stream_test.go rename to common/shell-local/localexec/run_and_stream_test.go diff --git a/common/step_create_cdrom.go b/common/step_create_cdrom.go index 3a350cce9..0f1c5664d 100644 --- a/common/step_create_cdrom.go +++ b/common/step_create_cdrom.go @@ -11,7 +11,7 @@ import ( "runtime" "strings" - "github.com/hashicorp/packer/helper/builder/localexec" + "github.com/hashicorp/packer/common/shell-local/localexec" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer/tmp" From 45b5f0c2ee1f77a60754912eadbd2d8eaaa54205 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 4 Nov 2020 14:50:34 -0800 Subject: [PATCH 34/93] move custom http client creation with env proxy args into same package as other network related helpers --- builder/qemu/step_set_iso.go | 4 ++-- {helper/common => common/net}/default_client.go | 2 +- post-processor/vagrant-cloud/client.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename {helper/common => common/net}/default_client.go (93%) diff --git a/builder/qemu/step_set_iso.go b/builder/qemu/step_set_iso.go index c5bfe6e95..338017632 100644 --- a/builder/qemu/step_set_iso.go +++ b/builder/qemu/step_set_iso.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - commonhelper "github.com/hashicorp/packer/helper/common" + "github.com/hashicorp/packer/common/net" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" ) @@ -29,7 +29,7 @@ func (s *stepSetISO) Run(ctx context.Context, state multistep.StateBag) multiste req.Header.Set("User-Agent", "Packer") - httpClient := commonhelper.HttpClientWithEnvironmentProxy() + httpClient := net.HttpClientWithEnvironmentProxy() res, err := httpClient.Do(req) if err == nil && (res.StatusCode >= 200 && res.StatusCode < 300) { diff --git a/helper/common/default_client.go b/common/net/default_client.go similarity index 93% rename from helper/common/default_client.go rename to common/net/default_client.go index a9829568d..ae9b30b29 100644 --- a/helper/common/default_client.go +++ b/common/net/default_client.go @@ -1,4 +1,4 @@ -package common +package net import ( "net/http" diff --git a/post-processor/vagrant-cloud/client.go b/post-processor/vagrant-cloud/client.go index 4fbd37454..b91b6755a 100644 --- a/post-processor/vagrant-cloud/client.go +++ b/post-processor/vagrant-cloud/client.go @@ -11,7 +11,7 @@ import ( "os" "strings" - commonhelper "github.com/hashicorp/packer/helper/common" + "github.com/hashicorp/packer/common/net" ) type VagrantCloudClient struct { @@ -48,7 +48,7 @@ func (v VagrantCloudErrors) FormatErrors() string { func (v VagrantCloudClient) New(baseUrl string, token string, InsecureSkipTLSVerify bool) (*VagrantCloudClient, error) { c := &VagrantCloudClient{ - client: commonhelper.HttpClientWithEnvironmentProxy(), + client: net.HttpClientWithEnvironmentProxy(), BaseURL: baseUrl, AccessToken: token, } From 7a1680df97e028c4a75622effe08f6610d0ee5b4 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Thu, 5 Nov 2020 02:27:07 -0800 Subject: [PATCH 35/93] modify a ton of error messages to make them specifically placable. (#10191) * modify a ton of error messages to make them specifically placable. * remove specific loglines but keep the specialized error messages Co-authored-by: Adrien Delorme --- builder/vsphere/clone/step_clone.go | 2 +- builder/vsphere/driver/datastore.go | 8 ++++---- builder/vsphere/driver/vm.go | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/builder/vsphere/clone/step_clone.go b/builder/vsphere/clone/step_clone.go index 17da84ad1..e0a504b54 100644 --- a/builder/vsphere/clone/step_clone.go +++ b/builder/vsphere/clone/step_clone.go @@ -85,7 +85,7 @@ func (s *StepCloneVM) Run(ctx context.Context, state multistep.StateBag) multist ui.Say("Cloning VM...") template, err := d.FindVM(s.Config.Template) if err != nil { - state.Put("error", err) + state.Put("error", fmt.Errorf("Error finding vm to clone: %s", err)) return multistep.ActionHalt } diff --git a/builder/vsphere/driver/datastore.go b/builder/vsphere/driver/datastore.go index adc13447f..ae371b79f 100644 --- a/builder/vsphere/driver/datastore.go +++ b/builder/vsphere/driver/datastore.go @@ -42,12 +42,12 @@ func (d *VCenterDriver) FindDatastore(name string, host string) (Datastore, erro if name == "" { h, err := d.FindHost(host) if err != nil { - return nil, err + return nil, fmt.Errorf("Error finding host for to get datastore: %s", err) } i, err := h.Info("datastore") if err != nil { - return nil, err + return nil, fmt.Errorf("Error getting datastore info from host: %s", err) } if len(i.Datastore) > 1 { @@ -57,14 +57,14 @@ func (d *VCenterDriver) FindDatastore(name string, host string) (Datastore, erro ds := d.NewDatastore(&i.Datastore[0]) inf, err := ds.Info("name") if err != nil { - return nil, err + return nil, fmt.Errorf("Error getting datastore name: %s", err) } name = inf.Name } ds, err := d.finder.Datastore(d.ctx, name) if err != nil { - return nil, err + return nil, fmt.Errorf("Error finding datastore with name %s: %s", name, err) } return &DatastoreDriver{ diff --git a/builder/vsphere/driver/vm.go b/builder/vsphere/driver/vm.go index f0bbf6f6d..8481f3716 100644 --- a/builder/vsphere/driver/vm.go +++ b/builder/vsphere/driver/vm.go @@ -297,21 +297,21 @@ func (vm *VirtualMachineDriver) FloppyDevices() (object.VirtualDeviceList, error func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig) (VirtualMachine, error) { folder, err := vm.driver.FindFolder(config.Folder) if err != nil { - return nil, err + return nil, fmt.Errorf("Error finding filder: %s", err) } var relocateSpec types.VirtualMachineRelocateSpec pool, err := vm.driver.FindResourcePool(config.Cluster, config.Host, config.ResourcePool) if err != nil { - return nil, err + return nil, fmt.Errorf("Error finding resource pool: %s", err) } poolRef := pool.pool.Reference() relocateSpec.Pool = &poolRef datastore, err := vm.driver.FindDatastore(config.Datastore, config.Host) if err != nil { - return nil, err + return nil, fmt.Errorf("Error finding datastore: %s", err) } datastoreRef := datastore.Reference() relocateSpec.Datastore = &datastoreRef @@ -325,7 +325,7 @@ func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig) tpl, err := vm.Info("snapshot") if err != nil { - return nil, err + return nil, fmt.Errorf("Error getting snapshot info for vm: %s", err) } if tpl.Snapshot == nil { err = errors.New("`linked_clone=true`, but template has no snapshots") @@ -344,21 +344,21 @@ func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig) if config.Network != "" { net, err := vm.driver.FindNetwork(config.Network) if err != nil { - return nil, err + return nil, fmt.Errorf("Error finding network: %s", err) } backing, err := net.network.EthernetCardBackingInfo(ctx) if err != nil { - return nil, err + return nil, fmt.Errorf("Error finding ethernet card backing info: %s", err) } devices, err := vm.vm.Device(ctx) if err != nil { - return nil, err + return nil, fmt.Errorf("Error finding vm devices: %s", err) } adapter, err := findNetworkAdapter(devices) if err != nil { - return nil, err + return nil, fmt.Errorf("Error finding network adapter: %s", err) } current := adapter.GetVirtualEthernetCard() @@ -375,13 +375,13 @@ func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig) vAppConfig, err := vm.updateVAppConfig(ctx, config.VAppProperties) if err != nil { - return nil, err + return nil, fmt.Errorf("Error updating VAppConfig: %s", err) } configSpec.VAppConfig = vAppConfig task, err := vm.vm.Clone(vm.driver.ctx, folder.folder, config.Name, cloneSpec) if err != nil { - return nil, err + return nil, fmt.Errorf("Error calling vm.vm.Clone task: %s", err) } info, err := task.WaitForResult(ctx, nil) @@ -391,7 +391,7 @@ func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig) return nil, err } - return nil, err + return nil, fmt.Errorf("Error waiting for vm Clone to complete: %s", err) } vmRef, ok := info.Result.(types.ManagedObjectReference) From f13f3d4d5f60a1c5281a63845bdc7b224512abb6 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Thu, 5 Nov 2020 16:27:53 -0800 Subject: [PATCH 36/93] fix single tag interpolation to allow golang template engine usage --- builder/amazon/chroot/builder.go | 3 +++ builder/amazon/ebs/builder.go | 5 +++++ builder/amazon/ebssurrogate/builder.go | 5 +++++ builder/amazon/ebsvolume/builder.go | 12 ++++++++++++ 4 files changed, 25 insertions(+) diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index 9fb431583..4e648d1bd 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -201,8 +201,11 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) { Exclude: []string{ "ami_description", "snapshot_tags", + "snapshot_tag", "tags", + "tag", "root_volume_tags", + "root_volume_tag", "command_wrapper", "post_mount_commands", "pre_mount_commands", diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 4d4934c43..176cd5d53 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -92,10 +92,15 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) { Exclude: []string{ "ami_description", "run_tags", + "run_tag", "run_volume_tags", + "run_volume_tag", "spot_tags", + "spot_tag", "snapshot_tags", + "snapshot_tag", "tags", + "tag", }, }, }, raws...) diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index c70026b3e..1a8f6d9c2 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -91,10 +91,15 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) { Exclude: []string{ "ami_description", "run_tags", + "run_tag", "run_volume_tags", + "run_volume_tag", "snapshot_tags", + "snapshot_tag", "spot_tags", + "spot_tag", "tags", + "tag", }, }, }, raws...) diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index d3fb1a03f..da1f46262 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/builder/amazon/ebsvolume/builder.go @@ -103,6 +103,18 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) { PluginType: BuilderId, Interpolate: true, InterpolateContext: &b.config.ctx, + InterpolateFilter: &interpolate.RenderFilter{ + Exclude: []string{ + "run_tags", + "run_tag", + "run_volume_tags", + "run_volume_tag", + "spot_tags", + "spot_tag", + "tags", + "tag", + }, + }, }, raws...) if err != nil { return nil, nil, err From d8222b16569a64465430e236012328aab546d31f Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Thu, 5 Nov 2020 17:01:55 -0800 Subject: [PATCH 37/93] Add support for uploading directly to storage on Vagrant Cloud (#10193) Vagrant Cloud provides support for uploading directly to the backend storage instead of streaming through Vagrant Cloud. This adds support for direct to storage uploads and sets it as the default upload method. A new option has been added to disable this behavior and revert back to streaming upload via Vagrant Cloud (`no_direct_upload`). This default for uploading directly to the backend storage also matches up with changes being added to Vagrant proper for box upload behavior: hashicorp/vagrant#11916 --- post-processor/vagrant-cloud/client.go | 46 +++++ .../vagrant-cloud/post-processor.go | 28 ++- .../vagrant-cloud/post-processor.hcl2spec.go | 2 + .../vagrant-cloud/post-processor_test.go | 187 ++++++++++++++++++ .../vagrant-cloud/step_confirm_upload.go | 43 ++++ .../vagrant-cloud/step_prepare_upload.go | 7 +- post-processor/vagrant-cloud/step_upload.go | 11 +- .../docs/post-processors/vagrant-cloud.mdx | 3 + 8 files changed, 308 insertions(+), 19 deletions(-) create mode 100644 post-processor/vagrant-cloud/step_confirm_upload.go diff --git a/post-processor/vagrant-cloud/client.go b/post-processor/vagrant-cloud/client.go index 4fbd37454..b4198dd70 100644 --- a/post-processor/vagrant-cloud/client.go +++ b/post-processor/vagrant-cloud/client.go @@ -156,6 +156,52 @@ func (v *VagrantCloudClient) Upload(path string, url string) (*http.Response, er return resp, err } +func (v *VagrantCloudClient) DirectUpload(path string, url string) (*http.Response, error) { + file, err := os.Open(path) + + if err != nil { + return nil, fmt.Errorf("Error opening file for upload: %s", err) + } + defer file.Close() + + fi, err := file.Stat() + + if err != nil { + return nil, fmt.Errorf("Error stating file for upload: %s", err) + } + + request, err := http.NewRequest("PUT", url, file) + + if err != nil { + return nil, fmt.Errorf("Error preparing upload request: %s", err) + } + + log.Printf("Post-Processor Vagrant Cloud API Direct Upload: %s %s", path, url) + + request.ContentLength = fi.Size() + resp, err := v.client.Do(request) + + log.Printf("Post-Processor Vagrant Cloud Direct Upload Response: \n\n%+v", resp) + + return resp, err +} + +func (v *VagrantCloudClient) Callback(url string) (*http.Response, error) { + request, err := v.newRequest("PUT", url, nil) + + if err != nil { + return nil, fmt.Errorf("Error preparing callback request: %s", err) + } + + log.Printf("Post-Processor Vagrant Cloud API Direct Upload Callback: %s", url) + + resp, err := v.client.Do(request) + + log.Printf("Post-Processor Vagrant Cloud Direct Upload Callback Response: \n\n%+v", resp) + + return resp, err +} + func (v *VagrantCloudClient) Post(path string, body interface{}) (*http.Response, error) { reqUrl := fmt.Sprintf("%s/%s", v.BaseURL, path) diff --git a/post-processor/vagrant-cloud/post-processor.go b/post-processor/vagrant-cloud/post-processor.go index 8a46b321c..088bcb6d0 100644 --- a/post-processor/vagrant-cloud/post-processor.go +++ b/post-processor/vagrant-cloud/post-processor.go @@ -45,8 +45,8 @@ type Config struct { AccessToken string `mapstructure:"access_token"` VagrantCloudUrl string `mapstructure:"vagrant_cloud_url"` InsecureSkipTLSVerify bool `mapstructure:"insecure_skip_tls_verify"` - - BoxDownloadUrl string `mapstructure:"box_download_url"` + BoxDownloadUrl string `mapstructure:"box_download_url"` + NoDirectUpload bool `mapstructure:"no_direct_upload"` ctx interpolate.Context } @@ -181,24 +181,18 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact state.Put("boxDownloadUrl", boxDownloadUrl) // Build the steps - steps := []multistep.Step{} + steps := []multistep.Step{ + new(stepVerifyBox), + new(stepCreateVersion), + new(stepCreateProvider), + } if p.config.BoxDownloadUrl == "" { - steps = []multistep.Step{ - new(stepVerifyBox), - new(stepCreateVersion), - new(stepCreateProvider), - new(stepPrepareUpload), - new(stepUpload), - new(stepReleaseVersion), - } - } else { - steps = []multistep.Step{ - new(stepVerifyBox), - new(stepCreateVersion), - new(stepCreateProvider), - new(stepReleaseVersion), + steps = append(steps, new(stepPrepareUpload), new(stepUpload)) + if !p.config.NoDirectUpload { + steps = append(steps, new(stepConfirmUpload)) } } + steps = append(steps, new(stepReleaseVersion)) // Run the steps p.runner = common.NewRunner(steps, p.config.PackerConfig, ui) diff --git a/post-processor/vagrant-cloud/post-processor.hcl2spec.go b/post-processor/vagrant-cloud/post-processor.hcl2spec.go index 905e2812f..67f24b8a4 100644 --- a/post-processor/vagrant-cloud/post-processor.hcl2spec.go +++ b/post-processor/vagrant-cloud/post-processor.hcl2spec.go @@ -24,6 +24,7 @@ type FlatConfig struct { VagrantCloudUrl *string `mapstructure:"vagrant_cloud_url" cty:"vagrant_cloud_url" hcl:"vagrant_cloud_url"` InsecureSkipTLSVerify *bool `mapstructure:"insecure_skip_tls_verify" cty:"insecure_skip_tls_verify" hcl:"insecure_skip_tls_verify"` BoxDownloadUrl *string `mapstructure:"box_download_url" cty:"box_download_url" hcl:"box_download_url"` + NoDirectUpload *bool `mapstructure:"no_direct_upload" cty:"no_direct_upload" hcl:"no_direct_upload"` } // FlatMapstructure returns a new FlatConfig. @@ -53,6 +54,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "vagrant_cloud_url": &hcldec.AttrSpec{Name: "vagrant_cloud_url", Type: cty.String, Required: false}, "insecure_skip_tls_verify": &hcldec.AttrSpec{Name: "insecure_skip_tls_verify", Type: cty.Bool, Required: false}, "box_download_url": &hcldec.AttrSpec{Name: "box_download_url", Type: cty.String, Required: false}, + "no_direct_upload": &hcldec.AttrSpec{Name: "no_direct_upload", Type: cty.Bool, Required: false}, } return s } diff --git a/post-processor/vagrant-cloud/post-processor_test.go b/post-processor/vagrant-cloud/post-processor_test.go index d7caaf854..52f68c535 100644 --- a/post-processor/vagrant-cloud/post-processor_test.go +++ b/post-processor/vagrant-cloud/post-processor_test.go @@ -17,6 +17,13 @@ import ( "github.com/stretchr/testify/assert" ) +type stubResponse struct { + Path string + Method string + Response string + StatusCode int +} + type tarFiles []struct { Name, Body string } @@ -46,6 +53,36 @@ func testNoAccessTokenProvidedConfig() map[string]interface{} { } } +func newStackServer(stack []stubResponse) *httptest.Server { + return httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { + if len(stack) < 1 { + rw.Header().Add("Error", fmt.Sprintf("Request stack is empty - Method: %s Path: %s", req.Method, req.URL.Path)) + http.Error(rw, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) + return + } + match := stack[0] + stack = stack[1:] + if match.Method != "" && req.Method != match.Method { + rw.Header().Add("Error", fmt.Sprintf("Request %s != %s", match.Method, req.Method)) + http.Error(rw, fmt.Sprintf("Request %s != %s", match.Method, req.Method), http.StatusInternalServerError) + return + } + if match.Path != "" && match.Path != req.URL.Path { + rw.Header().Add("Error", fmt.Sprintf("Request %s != %s", match.Path, req.URL.Path)) + http.Error(rw, fmt.Sprintf("Request %s != %s", match.Path, req.URL.Path), http.StatusInternalServerError) + return + } + rw.Header().Add("Complete", fmt.Sprintf("Method: %s Path: %s", match.Method, match.Path)) + rw.WriteHeader(match.StatusCode) + if match.Response != "" { + _, err := rw.Write([]byte(match.Response)) + if err != nil { + panic("failed to write response: " + err.Error()) + } + } + })) +} + func newSecureServer(token string, handler http.HandlerFunc) *httptest.Server { token = fmt.Sprintf("Bearer %s", token) return httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { @@ -229,6 +266,156 @@ func TestPostProcessor_PostProcess_checkArtifactFileIsBox(t *testing.T) { } } +func TestPostProcessor_PostProcess_uploadsAndReleases(t *testing.T) { + files := tarFiles{ + {"foo.txt", "This is a foo file"}, + {"bar.txt", "This is a bar file"}, + {"metadata.json", `{"provider": "virtualbox"}`}, + } + boxfile, err := createBox(files) + if err != nil { + t.Fatalf("%s", err) + } + defer os.Remove(boxfile.Name()) + + artifact := &packer.MockArtifact{ + BuilderIdValue: "mitchellh.post-processor.vagrant", + FilesValue: []string{boxfile.Name()}, + } + + s := newStackServer([]stubResponse{stubResponse{StatusCode: 200, Method: "PUT", Path: "/box-upload-path"}}) + defer s.Close() + + stack := []stubResponse{ + stubResponse{StatusCode: 200, Method: "GET", Path: "/authenticate"}, + stubResponse{StatusCode: 200, Method: "GET", Path: "/box/hashicorp/precise64", Response: `{"tag": "hashicorp/precise64"}`}, + stubResponse{StatusCode: 200, Method: "POST", Path: "/box/hashicorp/precise64/versions", Response: `{}`}, + stubResponse{StatusCode: 200, Method: "POST", Path: "/box/hashicorp/precise64/version/0.5/providers", Response: `{}`}, + stubResponse{StatusCode: 200, Method: "GET", Path: "/box/hashicorp/precise64/version/0.5/provider/id/upload", Response: `{"upload_path": "` + s.URL + `/box-upload-path"}`}, + stubResponse{StatusCode: 200, Method: "PUT", Path: "/box/hashicorp/precise64/version/0.5/release"}, + } + + server := newStackServer(stack) + defer server.Close() + config := testGoodConfig() + config["vagrant_cloud_url"] = server.URL + config["no_direct_upload"] = true + + var p PostProcessor + + err = p.Configure(config) + if err != nil { + t.Fatalf("err: %s", err) + } + _, _, _, err = p.PostProcess(context.Background(), testUi(), artifact) + if err != nil { + t.Fatalf("err: %s", err) + } +} + +func TestPostProcessor_PostProcess_uploadsAndNoRelease(t *testing.T) { + files := tarFiles{ + {"foo.txt", "This is a foo file"}, + {"bar.txt", "This is a bar file"}, + {"metadata.json", `{"provider": "virtualbox"}`}, + } + boxfile, err := createBox(files) + if err != nil { + t.Fatalf("%s", err) + } + defer os.Remove(boxfile.Name()) + + artifact := &packer.MockArtifact{ + BuilderIdValue: "mitchellh.post-processor.vagrant", + FilesValue: []string{boxfile.Name()}, + } + + s := newStackServer([]stubResponse{stubResponse{StatusCode: 200, Method: "PUT", Path: "/box-upload-path"}}) + defer s.Close() + + stack := []stubResponse{ + stubResponse{StatusCode: 200, Method: "GET", Path: "/authenticate"}, + stubResponse{StatusCode: 200, Method: "GET", Path: "/box/hashicorp/precise64", Response: `{"tag": "hashicorp/precise64"}`}, + stubResponse{StatusCode: 200, Method: "POST", Path: "/box/hashicorp/precise64/versions", Response: `{}`}, + stubResponse{StatusCode: 200, Method: "POST", Path: "/box/hashicorp/precise64/version/0.5/providers", Response: `{}`}, + stubResponse{StatusCode: 200, Method: "GET", Path: "/box/hashicorp/precise64/version/0.5/provider/id/upload", Response: `{"upload_path": "` + s.URL + `/box-upload-path"}`}, + } + + server := newStackServer(stack) + defer server.Close() + config := testGoodConfig() + config["vagrant_cloud_url"] = server.URL + config["no_direct_upload"] = true + config["no_release"] = true + + var p PostProcessor + + err = p.Configure(config) + if err != nil { + t.Fatalf("err: %s", err) + } + + _, _, _, err = p.PostProcess(context.Background(), testUi(), artifact) + if err != nil { + t.Fatalf("err: %s", err) + } +} + +func TestPostProcessor_PostProcess_uploadsDirectAndReleases(t *testing.T) { + files := tarFiles{ + {"foo.txt", "This is a foo file"}, + {"bar.txt", "This is a bar file"}, + {"metadata.json", `{"provider": "virtualbox"}`}, + } + boxfile, err := createBox(files) + if err != nil { + t.Fatalf("%s", err) + } + defer os.Remove(boxfile.Name()) + + artifact := &packer.MockArtifact{ + BuilderIdValue: "mitchellh.post-processor.vagrant", + FilesValue: []string{boxfile.Name()}, + } + + s := newStackServer( + []stubResponse{ + stubResponse{StatusCode: 200, Method: "PUT", Path: "/box-upload-path"}, + }, + ) + defer s.Close() + + stack := []stubResponse{ + stubResponse{StatusCode: 200, Method: "GET", Path: "/authenticate"}, + stubResponse{StatusCode: 200, Method: "GET", Path: "/box/hashicorp/precise64", Response: `{"tag": "hashicorp/precise64"}`}, + stubResponse{StatusCode: 200, Method: "POST", Path: "/box/hashicorp/precise64/versions", Response: `{}`}, + stubResponse{StatusCode: 200, Method: "POST", Path: "/box/hashicorp/precise64/version/0.5/providers", Response: `{}`}, + stubResponse{StatusCode: 200, Method: "GET", Path: "/box/hashicorp/precise64/version/0.5/provider/id/upload/direct"}, + stubResponse{StatusCode: 200, Method: "PUT", Path: "/box-upload-complete"}, + stubResponse{StatusCode: 200, Method: "PUT", Path: "/box/hashicorp/precise64/version/0.5/release"}, + } + + server := newStackServer(stack) + defer server.Close() + config := testGoodConfig() + config["vagrant_cloud_url"] = server.URL + + // Set response here so we have API server URL available + stack[4].Response = `{"upload_path": "` + s.URL + `/box-upload-path", "callback": "` + server.URL + `/box-upload-complete"}` + + var p PostProcessor + + err = p.Configure(config) + if err != nil { + t.Fatalf("err: %s", err) + } + + _, _, _, err = p.PostProcess(context.Background(), testUi(), artifact) + if err != nil { + t.Fatalf("err: %s", err) + } +} + func testUi() *packer.BasicUi { return &packer.BasicUi{ Reader: new(bytes.Buffer), diff --git a/post-processor/vagrant-cloud/step_confirm_upload.go b/post-processor/vagrant-cloud/step_confirm_upload.go new file mode 100644 index 000000000..6216f5be3 --- /dev/null +++ b/post-processor/vagrant-cloud/step_confirm_upload.go @@ -0,0 +1,43 @@ +package vagrantcloud + +import ( + "context" + "fmt" + + "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer" +) + +type stepConfirmUpload struct { +} + +func (s *stepConfirmUpload) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { + client := state.Get("client").(*VagrantCloudClient) + ui := state.Get("ui").(packer.Ui) + upload := state.Get("upload").(*Upload) + url := upload.CallbackPath + + ui.Say("Confirming direct box upload completion") + + resp, err := client.Callback(url) + + if err != nil || resp.StatusCode != 200 { + if resp == nil || resp.Body == nil { + state.Put("error", "No response from server.") + } else { + cloudErrors := &VagrantCloudErrors{} + err = decodeBody(resp, cloudErrors) + if err != nil { + ui.Error(fmt.Sprintf("error decoding error response: %s", err)) + } + state.Put("error", fmt.Errorf("Error preparing upload: %s", cloudErrors.FormatErrors())) + } + return multistep.ActionHalt + } + + return multistep.ActionContinue +} + +func (s *stepConfirmUpload) Cleanup(state multistep.StateBag) { + // No cleanup +} diff --git a/post-processor/vagrant-cloud/step_prepare_upload.go b/post-processor/vagrant-cloud/step_prepare_upload.go index c76db8d43..fcf8b46eb 100644 --- a/post-processor/vagrant-cloud/step_prepare_upload.go +++ b/post-processor/vagrant-cloud/step_prepare_upload.go @@ -9,7 +9,8 @@ import ( ) type Upload struct { - UploadPath string `json:"upload_path"` + UploadPath string `json:"upload_path"` + CallbackPath string `json:"callback"` } type stepPrepareUpload struct { @@ -17,6 +18,7 @@ type stepPrepareUpload struct { func (s *stepPrepareUpload) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { client := state.Get("client").(*VagrantCloudClient) + config := state.Get("config").(*Config) ui := state.Get("ui").(packer.Ui) box := state.Get("box").(*Box) version := state.Get("version").(*Version) @@ -24,6 +26,9 @@ func (s *stepPrepareUpload) Run(ctx context.Context, state multistep.StateBag) m artifactFilePath := state.Get("artifactFilePath").(string) path := fmt.Sprintf("box/%s/version/%v/provider/%s/upload", box.Tag, version.Version, provider.Name) + if !config.NoDirectUpload { + path = path + "/direct" + } upload := &Upload{} ui.Say(fmt.Sprintf("Preparing upload of box: %s", artifactFilePath)) diff --git a/post-processor/vagrant-cloud/step_upload.go b/post-processor/vagrant-cloud/step_upload.go index 1eb046ded..a0b48d36c 100644 --- a/post-processor/vagrant-cloud/step_upload.go +++ b/post-processor/vagrant-cloud/step_upload.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "log" + "net/http" "time" "github.com/hashicorp/packer/common/retry" @@ -16,6 +17,7 @@ type stepUpload struct { func (s *stepUpload) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { client := state.Get("client").(*VagrantCloudClient) + config := state.Get("config").(*Config) ui := state.Get("ui").(packer.Ui) upload := state.Get("upload").(*Upload) artifactFilePath := state.Get("artifactFilePath").(string) @@ -32,7 +34,14 @@ func (s *stepUpload) Run(ctx context.Context, state multistep.StateBag) multiste }.Run(ctx, func(ctx context.Context) error { ui.Message(fmt.Sprintf("Uploading box")) - resp, err := client.Upload(artifactFilePath, url) + var err error + var resp *http.Response + + if config.NoDirectUpload { + resp, err = client.Upload(artifactFilePath, url) + } else { + resp, err = client.DirectUpload(artifactFilePath, url) + } if err != nil { ui.Message(fmt.Sprintf( "Error uploading box! Will retry in 10 seconds. Error: %s", err)) diff --git a/website/pages/docs/post-processors/vagrant-cloud.mdx b/website/pages/docs/post-processors/vagrant-cloud.mdx index 80d5f25a7..9eaf3dc17 100644 --- a/website/pages/docs/post-processors/vagrant-cloud.mdx +++ b/website/pages/docs/post-processors/vagrant-cloud.mdx @@ -114,6 +114,9 @@ on Vagrant Cloud, as well as authentication and version information. - `Provider`: The Vagrant provider the box is for - `ArtifactId`: The ID of the input artifact. +- `no_direct_upload` (boolean) - When true, upload the box artifact through + Vagrant Cloud instead of directly to the backend storage. + ## Use with the Vagrant Post-Processor An example configuration is shown below. Note the use of the nested array that From 2d90ffe7a402164e6961ffaacf5a939fc2676584 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 4 Nov 2020 15:44:05 -0800 Subject: [PATCH 38/93] move GeneratedData struct and PlaceholderMsg to same package under common --- builder/amazon/chroot/builder.go | 4 ++-- builder/amazon/chroot/step_mount_device.go | 4 ++-- builder/amazon/chroot/step_prepare_device.go | 4 ++-- builder/amazon/common/interpolate_build_info.go | 4 ++-- builder/amazon/common/interpolate_build_info_test.go | 6 +++--- builder/amazon/common/step_modify_ami_attributes.go | 4 ++-- builder/amazon/common/step_set_generated_data.go | 4 ++-- builder/amazon/common/tags.go | 4 ++-- builder/amazon/ebs/builder.go | 4 ++-- builder/amazon/ebssurrogate/builder.go | 4 ++-- builder/amazon/ebsvolume/builder.go | 4 ++-- builder/amazon/instance/builder.go | 4 ++-- builder/docker/builder.go | 4 ++-- builder/docker/step_set_generated_data.go | 4 ++-- builder/docker/step_set_generated_data_test.go | 6 +++--- builder/yandex/builder.go | 4 ++-- builder/yandex/step_create_image.go | 4 ++-- builder/yandex/step_create_instance.go | 4 ++-- {builder => common/packerbuilderdata}/generated_data.go | 7 ++++++- .../packerbuilderdata}/generated_data_test.go | 2 +- helper/common/shared_state.go | 6 ------ packer/build.go | 4 ++-- packer/build_test.go | 4 ++-- packer/provisioner.go | 4 ++-- post-processor/yandex-export/post-processor.go | 4 ++-- template/interpolate/funcs.go | 4 ++-- template/interpolate/funcs_test.go | 8 ++++---- 27 files changed, 59 insertions(+), 60 deletions(-) rename {builder => common/packerbuilderdata}/generated_data.go (68%) rename {builder => common/packerbuilderdata}/generated_data_test.go (97%) delete mode 100644 helper/common/shared_state.go diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index 9fb431583..814bedd84 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -14,10 +14,10 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/builder" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/chroot" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -369,7 +369,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("hook", hook) state.Put("ui", ui) state.Put("wrappedCommand", common.CommandWrapper(wrappedCommand)) - generatedData := &builder.GeneratedData{State: state} + generatedData := &packerbuilderdata.GeneratedData{State: state} // Build the steps steps := []multistep.Step{ diff --git a/builder/amazon/chroot/step_mount_device.go b/builder/amazon/chroot/step_mount_device.go index dffd35854..af796d4b6 100644 --- a/builder/amazon/chroot/step_mount_device.go +++ b/builder/amazon/chroot/step_mount_device.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/builder" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/template/interpolate" @@ -31,7 +31,7 @@ type StepMountDevice struct { MountPartition string mountPath string - GeneratedData *builder.GeneratedData + GeneratedData *packerbuilderdata.GeneratedData } func (s *StepMountDevice) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { diff --git a/builder/amazon/chroot/step_prepare_device.go b/builder/amazon/chroot/step_prepare_device.go index 098d83858..d91ace7c8 100644 --- a/builder/amazon/chroot/step_prepare_device.go +++ b/builder/amazon/chroot/step_prepare_device.go @@ -6,14 +6,14 @@ import ( "log" "os" - "github.com/hashicorp/packer/builder" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" ) // StepPrepareDevice finds an available device and sets it. type StepPrepareDevice struct { - GeneratedData *builder.GeneratedData + GeneratedData *packerbuilderdata.GeneratedData } func (s *StepPrepareDevice) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { diff --git a/builder/amazon/common/interpolate_build_info.go b/builder/amazon/common/interpolate_build_info.go index 21647eaa0..e04400f4b 100644 --- a/builder/amazon/common/interpolate_build_info.go +++ b/builder/amazon/common/interpolate_build_info.go @@ -3,7 +3,7 @@ package common import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/builder" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" ) @@ -17,7 +17,7 @@ type BuildInfoTemplate struct { SourceAMITags map[string]string } -func extractBuildInfo(region string, state multistep.StateBag, generatedData *builder.GeneratedData) *BuildInfoTemplate { +func extractBuildInfo(region string, state multistep.StateBag, generatedData *packerbuilderdata.GeneratedData) *BuildInfoTemplate { rawSourceAMI, hasSourceAMI := state.GetOk("source_image") if !hasSourceAMI { return &BuildInfoTemplate{ diff --git a/builder/amazon/common/interpolate_build_info_test.go b/builder/amazon/common/interpolate_build_info_test.go index a29f82dac..a09490b4f 100644 --- a/builder/amazon/common/interpolate_build_info_test.go +++ b/builder/amazon/common/interpolate_build_info_test.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/builder" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" ) @@ -35,8 +35,8 @@ func testState() multistep.StateBag { return state } -func testGeneratedData(state multistep.StateBag) builder.GeneratedData { - generatedData := builder.GeneratedData{State: state} +func testGeneratedData(state multistep.StateBag) packerbuilderdata.GeneratedData { + generatedData := packerbuilderdata.GeneratedData{State: state} return generatedData } diff --git a/builder/amazon/common/step_modify_ami_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go index 057650a51..e51bcda41 100644 --- a/builder/amazon/common/step_modify_ami_attributes.go +++ b/builder/amazon/common/step_modify_ami_attributes.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/builder" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/template/interpolate" @@ -22,7 +22,7 @@ type StepModifyAMIAttributes struct { Description string Ctx interpolate.Context - GeneratedData *builder.GeneratedData + GeneratedData *packerbuilderdata.GeneratedData } func (s *StepModifyAMIAttributes) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { diff --git a/builder/amazon/common/step_set_generated_data.go b/builder/amazon/common/step_set_generated_data.go index e364390b0..50f0d15fc 100644 --- a/builder/amazon/common/step_set_generated_data.go +++ b/builder/amazon/common/step_set_generated_data.go @@ -4,7 +4,7 @@ import ( "context" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/builder" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" ) @@ -13,7 +13,7 @@ import ( // }, type StepSetGeneratedData struct { - GeneratedData *builder.GeneratedData + GeneratedData *packerbuilderdata.GeneratedData } func (s *StepSetGeneratedData) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { diff --git a/builder/amazon/common/tags.go b/builder/amazon/common/tags.go index 5b0a4d276..f15925134 100644 --- a/builder/amazon/common/tags.go +++ b/builder/amazon/common/tags.go @@ -5,7 +5,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/builder" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/template/interpolate" @@ -23,7 +23,7 @@ func (t EC2Tags) Report(ui packer.Ui) { func (t TagMap) EC2Tags(ictx interpolate.Context, region string, state multistep.StateBag) (EC2Tags, error) { var ec2Tags []*ec2.Tag - generatedData := builder.GeneratedData{State: state} + generatedData := packerbuilderdata.GeneratedData{State: state} ictx.Data = extractBuildInfo(region, state, &generatedData) for key, value := range t { diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 4d4934c43..d5adadacb 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -15,9 +15,9 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/builder" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" @@ -164,7 +164,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("awsSession", session) state.Put("hook", hook) state.Put("ui", ui) - generatedData := &builder.GeneratedData{State: state} + generatedData := &packerbuilderdata.GeneratedData{State: state} var instanceStep multistep.Step diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index c70026b3e..71faccd37 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -13,9 +13,9 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/builder" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" @@ -187,7 +187,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("awsSession", session) state.Put("hook", hook) state.Put("ui", ui) - generatedData := &builder.GeneratedData{State: state} + generatedData := &packerbuilderdata.GeneratedData{State: state} var instanceStep multistep.Step diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index d3fb1a03f..34eb8a564 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/builder/amazon/ebsvolume/builder.go @@ -12,9 +12,9 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/builder" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" @@ -168,7 +168,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("iam", iam) state.Put("hook", hook) state.Put("ui", ui) - generatedData := &builder.GeneratedData{State: state} + generatedData := &packerbuilderdata.GeneratedData{State: state} var instanceStep multistep.Step diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index 7c050b88e..57b42d977 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -15,9 +15,9 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/builder" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -250,7 +250,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("awsSession", session) state.Put("hook", hook) state.Put("ui", ui) - generatedData := &builder.GeneratedData{State: state} + generatedData := &packerbuilderdata.GeneratedData{State: state} var instanceStep multistep.Step diff --git a/builder/docker/builder.go b/builder/docker/builder.go index a3f807da4..3097007f2 100644 --- a/builder/docker/builder.go +++ b/builder/docker/builder.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/builder" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -52,7 +52,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("config", &b.config) state.Put("hook", hook) state.Put("ui", ui) - generatedData := &builder.GeneratedData{State: state} + generatedData := &packerbuilderdata.GeneratedData{State: state} // Setup the driver that will talk to Docker state.Put("driver", driver) diff --git a/builder/docker/step_set_generated_data.go b/builder/docker/step_set_generated_data.go index 5ab9df8b9..ffe58420d 100644 --- a/builder/docker/step_set_generated_data.go +++ b/builder/docker/step_set_generated_data.go @@ -3,12 +3,12 @@ package docker import ( "context" - "github.com/hashicorp/packer/builder" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" ) type StepSetGeneratedData struct { - GeneratedData *builder.GeneratedData + GeneratedData *packerbuilderdata.GeneratedData } func (s *StepSetGeneratedData) Run(_ context.Context, state multistep.StateBag) multistep.StepAction { diff --git a/builder/docker/step_set_generated_data_test.go b/builder/docker/step_set_generated_data_test.go index b1e5e2bea..370626c8e 100644 --- a/builder/docker/step_set_generated_data_test.go +++ b/builder/docker/step_set_generated_data_test.go @@ -4,14 +4,14 @@ import ( "context" "testing" - "github.com/hashicorp/packer/builder" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" ) func TestStepSetGeneratedData_Run(t *testing.T) { state := testState(t) step := new(StepSetGeneratedData) - step.GeneratedData = &builder.GeneratedData{State: state} + step.GeneratedData = &packerbuilderdata.GeneratedData{State: state} driver := state.Get("driver").(*MockDriver) driver.Sha256Result = "80B3BB1B1696E73A9B19DEEF92F664F8979F948DF348088B61F9A3477655AF64" state.Put("image_id", "12345") @@ -33,7 +33,7 @@ func TestStepSetGeneratedData_Run(t *testing.T) { // Image ID not implement state = testState(t) - step.GeneratedData = &builder.GeneratedData{State: state} + step.GeneratedData = &packerbuilderdata.GeneratedData{State: state} driver = state.Get("driver").(*MockDriver) notImplementedMsg := "ERR_IMAGE_SHA256_NOT_FOUND" diff --git a/builder/yandex/builder.go b/builder/yandex/builder.go index 481f7f57f..dec8446a8 100644 --- a/builder/yandex/builder.go +++ b/builder/yandex/builder.go @@ -6,8 +6,8 @@ import ( "github.com/google/uuid" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/builder" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -64,7 +64,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("sdk", driver.SDK()) state.Put("hook", hook) state.Put("ui", ui) - generatedData := &builder.GeneratedData{State: state} + generatedData := &packerbuilderdata.GeneratedData{State: state} // Build the steps steps := []multistep.Step{ diff --git a/builder/yandex/step_create_image.go b/builder/yandex/step_create_image.go index 40a0bf933..13f989b81 100644 --- a/builder/yandex/step_create_image.go +++ b/builder/yandex/step_create_image.go @@ -6,7 +6,7 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/builder" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -15,7 +15,7 @@ import ( ) type stepCreateImage struct { - GeneratedData *builder.GeneratedData + GeneratedData *packerbuilderdata.GeneratedData } func (s *stepCreateImage) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { diff --git a/builder/yandex/step_create_instance.go b/builder/yandex/step_create_instance.go index e89ba5269..df32eead5 100644 --- a/builder/yandex/step_create_instance.go +++ b/builder/yandex/step_create_instance.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "github.com/c2h5oh/datasize" - "github.com/hashicorp/packer/builder" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -23,7 +23,7 @@ type StepCreateInstance struct { Debug bool SerialLogFile string - GeneratedData *builder.GeneratedData + GeneratedData *packerbuilderdata.GeneratedData } func createNetwork(ctx context.Context, c *Config, d Driver) (*vpc.Network, error) { diff --git a/builder/generated_data.go b/common/packerbuilderdata/generated_data.go similarity index 68% rename from builder/generated_data.go rename to common/packerbuilderdata/generated_data.go index 9b84c8d2a..de62677f6 100644 --- a/builder/generated_data.go +++ b/common/packerbuilderdata/generated_data.go @@ -1,7 +1,12 @@ -package builder +package packerbuilderdata import "github.com/hashicorp/packer/helper/multistep" +// This is used in the BasicPlaceholderData() func in the packer/provisioner.go +// To force users to access generated data via the "generated" func. +const PlaceholderMsg = "To set this dynamically in the Packer template, " + + "you must use the `build` function" + // GeneratedData manages variables exported by a builder after // it started. It uses the builder's multistep.StateBag internally, make sure it // is not nil before calling any functions. diff --git a/builder/generated_data_test.go b/common/packerbuilderdata/generated_data_test.go similarity index 97% rename from builder/generated_data_test.go rename to common/packerbuilderdata/generated_data_test.go index 09f673cc1..6cd5761f8 100644 --- a/builder/generated_data_test.go +++ b/common/packerbuilderdata/generated_data_test.go @@ -1,4 +1,4 @@ -package builder +package packerbuilderdata import ( "testing" diff --git a/helper/common/shared_state.go b/helper/common/shared_state.go deleted file mode 100644 index b75d9e091..000000000 --- a/helper/common/shared_state.go +++ /dev/null @@ -1,6 +0,0 @@ -package common - -// This is used in the BasicPlaceholderData() func in the packer/provisioner.go -// To force users to access generated data via the "generated" func. -const PlaceholderMsg = "To set this dynamically in the Packer template, " + - "you must use the `build` function" diff --git a/packer/build.go b/packer/build.go index 201922995..75d978e23 100644 --- a/packer/build.go +++ b/packer/build.go @@ -6,7 +6,7 @@ import ( "log" "sync" - "github.com/hashicorp/packer/helper/common" + "github.com/hashicorp/packer/common/packerbuilderdata" ) const ( @@ -182,7 +182,7 @@ func (b *CoreBuild) Prepare() (warn []string, err error) { if generatedVars != nil { for _, k := range generatedVars { generatedPlaceholderMap[k] = fmt.Sprintf("Build_%s. "+ - common.PlaceholderMsg, k) + packerbuilderdata.PlaceholderMsg, k) } } diff --git a/packer/build_test.go b/packer/build_test.go index dc1d698b6..308c2f03b 100644 --- a/packer/build_test.go +++ b/packer/build_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/helper/common" + "github.com/hashicorp/packer/common/packerbuilderdata" ) func boolPointer(tf bool) *bool { @@ -214,7 +214,7 @@ func TestBuildPrepare_ProvisionerGetsGeneratedMap(t *testing.T) { } generated := BasicPlaceholderData() - generated["PartyVar"] = "Build_PartyVar. " + common.PlaceholderMsg + generated["PartyVar"] = "Build_PartyVar. " + packerbuilderdata.PlaceholderMsg if !reflect.DeepEqual(prov.PrepConfigs, []interface{}{42, packerConfig, generated}) { t.Fatalf("bad: %#v", prov.PrepConfigs) } diff --git a/packer/provisioner.go b/packer/provisioner.go index 834f7433f..9e34ccc1d 100644 --- a/packer/provisioner.go +++ b/packer/provisioner.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/common" + "github.com/hashicorp/packer/common/packerbuilderdata" ) // A provisioner is responsible for installing and configuring software @@ -79,7 +79,7 @@ var BuilderDataCommonKeys = []string{ func BasicPlaceholderData() map[string]string { placeholderData := map[string]string{} for _, key := range BuilderDataCommonKeys { - placeholderData[key] = fmt.Sprintf("Build_%s. "+common.PlaceholderMsg, key) + placeholderData[key] = fmt.Sprintf("Build_%s. "+packerbuilderdata.PlaceholderMsg, key) } // Backwards-compatability: WinRM Password can get through without forcing diff --git a/post-processor/yandex-export/post-processor.go b/post-processor/yandex-export/post-processor.go index 3e995f480..c3d225e42 100644 --- a/post-processor/yandex-export/post-processor.go +++ b/post-processor/yandex-export/post-processor.go @@ -12,9 +12,9 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/builder" "github.com/hashicorp/packer/builder/yandex" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -210,7 +210,7 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact }, &yandex.StepCreateInstance{ Debug: p.config.PackerDebug, - GeneratedData: &builder.GeneratedData{State: state}, + GeneratedData: &packerbuilderdata.GeneratedData{State: state}, }, new(yandex.StepWaitCloudInitScript), new(yandex.StepTeardownInstance), diff --git a/template/interpolate/funcs.go b/template/interpolate/funcs.go index 8ec9b8c1f..d94be75d8 100644 --- a/template/interpolate/funcs.go +++ b/template/interpolate/funcs.go @@ -10,9 +10,9 @@ import ( "text/template" "time" + "github.com/hashicorp/packer/common/packerbuilderdata" commontpl "github.com/hashicorp/packer/common/template" "github.com/hashicorp/packer/common/uuid" - "github.com/hashicorp/packer/helper/common" "github.com/hashicorp/packer/version" strftime "github.com/jehiah/go-strftime" ) @@ -170,7 +170,7 @@ func passthroughOrInterpolate(data map[interface{}]interface{}, s string) (strin // If we're in the first interpolation pass, the goal is to // make sure that we pass the value through. // TODO match against an actual string constant - if strings.Contains(hp, common.PlaceholderMsg) { + if strings.Contains(hp, packerbuilderdata.PlaceholderMsg) { return fmt.Sprintf("{{.%s}}", s), nil } else { return hp, nil diff --git a/template/interpolate/funcs_test.go b/template/interpolate/funcs_test.go index 363ee9672..92bdd6117 100644 --- a/template/interpolate/funcs_test.go +++ b/template/interpolate/funcs_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/packer/helper/common" + "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/version" ) @@ -351,7 +351,7 @@ func TestFuncPackerBuild(t *testing.T) { }, // Data map is a map[string]string and contains value with placeholder. { - DataMap: map[string]string{"PartyVar": "PartyVal" + common.PlaceholderMsg}, + DataMap: map[string]string{"PartyVar": "PartyVal" + packerbuilderdata.PlaceholderMsg}, ErrExpected: false, Template: "{{ build `PartyVar` }}", OutVal: "{{.PartyVar}}", @@ -372,14 +372,14 @@ func TestFuncPackerBuild(t *testing.T) { }, // Data map is a map[interface{}]interface{} and contains value with placeholder. { - DataMap: map[interface{}]interface{}{"PartyVar": "PartyVal" + common.PlaceholderMsg}, + DataMap: map[interface{}]interface{}{"PartyVar": "PartyVal" + packerbuilderdata.PlaceholderMsg}, ErrExpected: false, Template: "{{ build `PartyVar` }}", OutVal: "{{.PartyVar}}", }, // Data map is a map[interface{}]interface{} and doesn't have value. { - DataMap: map[interface{}]interface{}{"BadVar": "PartyVal" + common.PlaceholderMsg}, + DataMap: map[interface{}]interface{}{"BadVar": "PartyVal" + packerbuilderdata.PlaceholderMsg}, ErrExpected: true, Template: "{{ build `MissingVar` }}", OutVal: "", From bb076d8ad78f42c1b8d8d3eb69546d0eb8ed5ba3 Mon Sep 17 00:00:00 2001 From: Jimmy Merritello <7191639+jmfury@users.noreply.github.com> Date: Fri, 6 Nov 2020 13:07:04 -0600 Subject: [PATCH 39/93] Bump HSM version for design tweaks (#10216) --- website/package-lock.json | 6 +++--- website/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/package-lock.json b/website/package-lock.json index 9bee26d7a..d48c503f9 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -1667,9 +1667,9 @@ "integrity": "sha512-lv6XR2plm2m3+qO6VE+RYquTzOODIt3mQ/1fBT1bn7wsR0qxFiuryW4JfsF94oCGk++LkDkRt/8V742HiT+fHw==" }, "@hashicorp/react-hashi-stack-menu": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@hashicorp/react-hashi-stack-menu/-/react-hashi-stack-menu-1.0.7.tgz", - "integrity": "sha512-WcPD9T2WjjuAlUmCNG3ed6zmroKC0T9LDf5ocL/IWTI5TSnqtjmlC63066v1YCPytG1B/QMkarFP9SYZUrIJrQ==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@hashicorp/react-hashi-stack-menu/-/react-hashi-stack-menu-1.0.8.tgz", + "integrity": "sha512-qKNkYguud3rmZQczIaPLYzhuaOahyRulV0KIxKo4TCjfHEzXJfbXaKi8uq1GJw2wAMOl0tV3brMTC0z1S3uTEw==", "requires": { "@hashicorp/react-inline-svg": "^1.0.2", "slugify": "1.3.4" diff --git a/website/package.json b/website/package.json index aa88d9bf4..e0ffb6e64 100644 --- a/website/package.json +++ b/website/package.json @@ -10,7 +10,7 @@ "@hashicorp/react-docs-page": "4.0.0", "@hashicorp/react-docs-sidenav": "3.2.5", "@hashicorp/react-global-styles": "4.4.0", - "@hashicorp/react-hashi-stack-menu": "^1.0.7", + "@hashicorp/react-hashi-stack-menu": "^1.0.8", "@hashicorp/react-head": "1.1.1", "@hashicorp/react-product-downloader": "4.0.2", "@hashicorp/react-search": "^2.1.0", From 65b7d3b604960408f263a2573aa591c0fecd8d18 Mon Sep 17 00:00:00 2001 From: Simon Gottschlag Date: Fri, 6 Nov 2020 20:24:16 +0100 Subject: [PATCH 40/93] Add Azure CLI authentication (#10157) Adds the ability to use an active `az login` session for authenticating the Azure builder --- builder/azure/arm/builder_acc_test.go | 37 +++++++ builder/azure/arm/config.hcl2spec.go | 2 + builder/azure/chroot/builder.hcl2spec.go | 2 + builder/azure/common/client/config.go | 32 ++++++ builder/azure/common/client/config_test.go | 27 +++++ .../azure/common/client/tokenprovider_cli.go | 99 +++++++++++++++++++ builder/azure/dtl/config.hcl2spec.go | 2 + go.mod | 1 + .../azure-dtlartifact/provisioner.hcl2spec.go | 2 + website/pages/docs/builders/azure/index.mdx | 11 +++ .../common/client/Config-not-required.mdx | 7 ++ 11 files changed, 222 insertions(+) create mode 100644 builder/azure/common/client/tokenprovider_cli.go diff --git a/builder/azure/arm/builder_acc_test.go b/builder/azure/arm/builder_acc_test.go index 1837bf5b0..42e518cf4 100644 --- a/builder/azure/arm/builder_acc_test.go +++ b/builder/azure/arm/builder_acc_test.go @@ -90,6 +90,19 @@ func TestBuilderAcc_ManagedDisk_Linux_DeviceLogin(t *testing.T) { }) } +func TestBuilderAcc_ManagedDisk_Linux_AzureCLI(t *testing.T) { + if os.Getenv("AZURE_CLI_AUTH") == "" { + t.Skip("Azure CLI Acceptance tests skipped unless env 'AZURE_CLI_AUTH' is set, and an active `az login` session has been established") + return + } + + builderT.Test(t, builderT.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Builder: &Builder{}, + Template: testBuilderAccManagedDiskLinuxAzureCLI, + }) +} + func TestBuilderAcc_Blob_Windows(t *testing.T) { builderT.Test(t, builderT.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -366,3 +379,27 @@ const testBuilderAccBlobLinux = ` }] } ` +const testBuilderAccManagedDiskLinuxAzureCLI = ` +{ + "builders": [{ + "type": "test", + + "use_azure_cli_auth": true, + + "managed_image_resource_group_name": "packer-acceptance-test", + "managed_image_name": "testBuilderAccManagedDiskLinuxAzureCLI-{{timestamp}}", + + "os_type": "Linux", + "image_publisher": "Canonical", + "image_offer": "UbuntuServer", + "image_sku": "16.04-LTS", + + "location": "South Central US", + "vm_size": "Standard_DS2_v2", + "azure_tags": { + "env": "testing", + "builder": "packer" + } + }] +} +` diff --git a/builder/azure/arm/config.hcl2spec.go b/builder/azure/arm/config.hcl2spec.go index 8c7241f3f..5da288787 100644 --- a/builder/azure/arm/config.hcl2spec.go +++ b/builder/azure/arm/config.hcl2spec.go @@ -25,6 +25,7 @@ type FlatConfig struct { ObjectID *string `mapstructure:"object_id" cty:"object_id" hcl:"object_id"` TenantID *string `mapstructure:"tenant_id" required:"false" cty:"tenant_id" hcl:"tenant_id"` SubscriptionID *string `mapstructure:"subscription_id" cty:"subscription_id" hcl:"subscription_id"` + UseAzureCLIAuth *bool `mapstructure:"use_azure_cli_auth" required:"false" cty:"use_azure_cli_auth" hcl:"use_azure_cli_auth"` UserAssignedManagedIdentities []string `mapstructure:"user_assigned_managed_identities" required:"false" cty:"user_assigned_managed_identities" hcl:"user_assigned_managed_identities"` CaptureNamePrefix *string `mapstructure:"capture_name_prefix" cty:"capture_name_prefix" hcl:"capture_name_prefix"` CaptureContainerName *string `mapstructure:"capture_container_name" cty:"capture_container_name" hcl:"capture_container_name"` @@ -151,6 +152,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "object_id": &hcldec.AttrSpec{Name: "object_id", Type: cty.String, Required: false}, "tenant_id": &hcldec.AttrSpec{Name: "tenant_id", Type: cty.String, Required: false}, "subscription_id": &hcldec.AttrSpec{Name: "subscription_id", Type: cty.String, Required: false}, + "use_azure_cli_auth": &hcldec.AttrSpec{Name: "use_azure_cli_auth", Type: cty.Bool, Required: false}, "user_assigned_managed_identities": &hcldec.AttrSpec{Name: "user_assigned_managed_identities", Type: cty.List(cty.String), Required: false}, "capture_name_prefix": &hcldec.AttrSpec{Name: "capture_name_prefix", Type: cty.String, Required: false}, "capture_container_name": &hcldec.AttrSpec{Name: "capture_container_name", Type: cty.String, Required: false}, diff --git a/builder/azure/chroot/builder.hcl2spec.go b/builder/azure/chroot/builder.hcl2spec.go index 059f4f6b6..03bea01cc 100644 --- a/builder/azure/chroot/builder.hcl2spec.go +++ b/builder/azure/chroot/builder.hcl2spec.go @@ -24,6 +24,7 @@ type FlatConfig struct { ObjectID *string `mapstructure:"object_id" cty:"object_id" hcl:"object_id"` TenantID *string `mapstructure:"tenant_id" required:"false" cty:"tenant_id" hcl:"tenant_id"` SubscriptionID *string `mapstructure:"subscription_id" cty:"subscription_id" hcl:"subscription_id"` + UseAzureCLIAuth *bool `mapstructure:"use_azure_cli_auth" required:"false" cty:"use_azure_cli_auth" hcl:"use_azure_cli_auth"` FromScratch *bool `mapstructure:"from_scratch" cty:"from_scratch" hcl:"from_scratch"` Source *string `mapstructure:"source" required:"true" cty:"source" hcl:"source"` CommandWrapper *string `mapstructure:"command_wrapper" cty:"command_wrapper" hcl:"command_wrapper"` @@ -76,6 +77,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "object_id": &hcldec.AttrSpec{Name: "object_id", Type: cty.String, Required: false}, "tenant_id": &hcldec.AttrSpec{Name: "tenant_id", Type: cty.String, Required: false}, "subscription_id": &hcldec.AttrSpec{Name: "subscription_id", Type: cty.String, Required: false}, + "use_azure_cli_auth": &hcldec.AttrSpec{Name: "use_azure_cli_auth", Type: cty.Bool, Required: false}, "from_scratch": &hcldec.AttrSpec{Name: "from_scratch", Type: cty.Bool, Required: false}, "source": &hcldec.AttrSpec{Name: "source", Type: cty.String, Required: false}, "command_wrapper": &hcldec.AttrSpec{Name: "command_wrapper", Type: cty.String, Required: false}, diff --git a/builder/azure/common/client/config.go b/builder/azure/common/client/config.go index 5eb1d8a38..5ee5e6c31 100644 --- a/builder/azure/common/client/config.go +++ b/builder/azure/common/client/config.go @@ -54,6 +54,14 @@ type Config struct { SubscriptionID string `mapstructure:"subscription_id"` authType string + + // Flag to use Azure CLI authentication. Defaults to false. + // CLI auth will use the information from an active `az login` session to connect to Azure and set the subscription id and tenant id associated to the signed in account. + // If enabled, it will use the authentication provided by the `az` CLI. + // Azure CLI authentication will use the credential marked as `isDefault` and can be verified using `az account show`. + // Works with normal authentication (`az login`) and service principals (`az login --service-principal --username APP_ID --password PASSWORD --tenant TENANT_ID`). + // Ignores all other configurations if enabled. + UseAzureCLIAuth bool `mapstructure:"use_azure_cli_auth" required:"false"` } const ( @@ -62,6 +70,7 @@ const ( authTypeClientSecret = "ClientSecret" authTypeClientCert = "ClientCertificate" authTypeClientBearerJWT = "ClientBearerJWT" + authTypeAzureCLI = "AzureCLI" ) const DefaultCloudEnvironmentName = "Public" @@ -124,6 +133,10 @@ func (c Config) Validate(errs *packer.MultiError) { // readable by the ObjectID of the App. There may be another way to handle // this case, but I am not currently aware of it - send feedback. + if c.UseCLI() { + return + } + if c.UseMSI() { return } @@ -193,6 +206,10 @@ func (c Config) useDeviceLogin() bool { c.ClientCertPath == "" } +func (c Config) UseCLI() bool { + return c.UseAzureCLIAuth == true +} + func (c Config) UseMSI() bool { return c.SubscriptionID == "" && c.ClientID == "" && @@ -230,6 +247,9 @@ func (c Config) GetServicePrincipalToken( case authTypeDeviceLogin: say("Getting tokens using device flow") auth = NewDeviceFlowOAuthTokenProvider(*c.cloudEnvironment, say, c.TenantID) + case authTypeAzureCLI: + say("Getting tokens using Azure CLI") + auth = NewCliOAuthTokenProvider(*c.cloudEnvironment, say, c.TenantID) case authTypeMSI: say("Getting tokens using Managed Identity for Azure") auth = NewMSIOAuthTokenProvider(*c.cloudEnvironment) @@ -268,6 +288,8 @@ func (c *Config) FillParameters() error { if c.authType == "" { if c.useDeviceLogin() { c.authType = authTypeDeviceLogin + } else if c.UseCLI() { + c.authType = authTypeAzureCLI } else if c.UseMSI() { c.authType = authTypeMSI } else if c.ClientSecret != "" { @@ -295,6 +317,16 @@ func (c *Config) FillParameters() error { } } + if c.authType == authTypeAzureCLI { + tenantID, subscriptionID, err := getIDsFromAzureCLI() + if err != nil { + return fmt.Errorf("error fetching tenantID and subscriptionID from Azure CLI (are you logged on using `az login`?): %v", err) + } + + c.TenantID = tenantID + c.SubscriptionID = subscriptionID + } + if c.TenantID == "" { tenantID, err := findTenantID(*c.cloudEnvironment, c.SubscriptionID) if err != nil { diff --git a/builder/azure/common/client/config_test.go b/builder/azure/common/client/config_test.go index a914e25c3..8f399b886 100644 --- a/builder/azure/common/client/config_test.go +++ b/builder/azure/common/client/config_test.go @@ -29,6 +29,13 @@ func Test_ClientConfig_RequiredParametersSet(t *testing.T) { config: Config{}, wantErr: false, }, + { + name: "use_azure_cli_auth will trigger Azure CLI auth", + config: Config{ + UseAzureCLIAuth: true, + }, + wantErr: false, + }, { name: "subscription_id is set will trigger device flow", config: Config{ @@ -158,6 +165,26 @@ func Test_ClientConfig_DeviceLogin(t *testing.T) { } } +func Test_ClientConfig_AzureCli(t *testing.T) { + // Azure CLI tests skipped unless env 'AZURE_CLI_AUTH' is set, and an active `az login` session has been established + getEnvOrSkip(t, "AZURE_CLI_AUTH") + + cfg := Config{ + UseAzureCLIAuth: true, + cloudEnvironment: getCloud(), + } + assertValid(t, cfg) + + err := cfg.FillParameters() + if err != nil { + t.Fatalf("Expected nil err, but got: %v", err) + } + + if cfg.authType != authTypeAzureCLI { + t.Fatalf("Expected authType to be %q, but got: %q", authTypeAzureCLI, cfg.authType) + } +} + func Test_ClientConfig_ClientPassword(t *testing.T) { cfg := Config{ SubscriptionID: getEnvOrSkip(t, "AZURE_SUBSCRIPTION"), diff --git a/builder/azure/common/client/tokenprovider_cli.go b/builder/azure/common/client/tokenprovider_cli.go new file mode 100644 index 000000000..b11182e20 --- /dev/null +++ b/builder/azure/common/client/tokenprovider_cli.go @@ -0,0 +1,99 @@ +package client + +import ( + "context" + "errors" + "fmt" + + "github.com/Azure/go-autorest/autorest/adal" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/go-autorest/autorest/azure/cli" +) + +// for managed identity auth +type cliOAuthTokenProvider struct { + env azure.Environment + say func(string) + tenantID string +} + +func NewCliOAuthTokenProvider(env azure.Environment, say func(string), tenantID string) oAuthTokenProvider { + return &cliOAuthTokenProvider{ + env: env, + say: say, + tenantID: tenantID, + } +} + +func (tp *cliOAuthTokenProvider) getServicePrincipalToken() (*adal.ServicePrincipalToken, error) { + return tp.getServicePrincipalTokenWithResource(tp.env.ResourceManagerEndpoint) +} + +func (tp *cliOAuthTokenProvider) getServicePrincipalTokenWithResource(resource string) (*adal.ServicePrincipalToken, error) { + token, err := cli.GetTokenFromCLI(resource) + if err != nil { + tp.say(fmt.Sprintf("unable to get token from azure cli: %v", err)) + return nil, err + } + + oAuthConfig, err := adal.NewOAuthConfig(resource, tp.tenantID) + if err != nil { + tp.say(fmt.Sprintf("unable to generate OAuth Config: %v", err)) + return nil, err + } + + adalToken, err := token.ToADALToken() + if err != nil { + tp.say(fmt.Sprintf("unable to get ADAL Token from azure cli token: %v", err)) + return nil, err + } + + spt, err := adal.NewServicePrincipalTokenFromManualToken(*oAuthConfig, clientIDs[tp.env.Name], resource, adalToken) + if err != nil { + tp.say(fmt.Sprintf("unable to get service principal token from adal token: %v", err)) + return nil, err + } + + // Custom refresh function to make it possible to use Azure CLI to refresh tokens. + // Inspired by HashiCorps go-azure-helpers: https://github.com/hashicorp/go-azure-helpers/blob/373622ce2effb0cf299051ea019cb657f357a4d8/authentication/auth_method_azure_cli_token.go#L96-L109 + var customRefreshFunc adal.TokenRefresh = func(ctx context.Context, resource string) (*adal.Token, error) { + token, err := cli.GetTokenFromCLI(resource) + if err != nil { + tp.say(fmt.Sprintf("token refresh - unable to get token from azure cli: %v", err)) + return nil, err + } + + adalToken, err := token.ToADALToken() + if err != nil { + tp.say(fmt.Sprintf("token refresh - unable to get ADAL Token from azure cli token: %v", err)) + return nil, err + } + + return &adalToken, nil + } + + spt.SetCustomRefreshFunc(customRefreshFunc) + + return spt, nil +} + +// getIDsFromAzureCLI returns the TenantID and SubscriptionID from an active Azure CLI login session +func getIDsFromAzureCLI() (string, string, error) { + profilePath, err := cli.ProfilePath() + if err != nil { + return "", "", err + } + + profile, err := cli.LoadProfile(profilePath) + if err != nil { + return "", "", err + } + + for _, p := range profile.Subscriptions { + if p.IsDefault { + return p.TenantID, p.ID, nil + } + } + + return "", "", errors.New("Unable to find default subscription") +} diff --git a/builder/azure/dtl/config.hcl2spec.go b/builder/azure/dtl/config.hcl2spec.go index f1c417062..be321e92a 100644 --- a/builder/azure/dtl/config.hcl2spec.go +++ b/builder/azure/dtl/config.hcl2spec.go @@ -51,6 +51,7 @@ type FlatConfig struct { ObjectID *string `mapstructure:"object_id" cty:"object_id" hcl:"object_id"` TenantID *string `mapstructure:"tenant_id" required:"false" cty:"tenant_id" hcl:"tenant_id"` SubscriptionID *string `mapstructure:"subscription_id" cty:"subscription_id" hcl:"subscription_id"` + UseAzureCLIAuth *bool `mapstructure:"use_azure_cli_auth" required:"false" cty:"use_azure_cli_auth" hcl:"use_azure_cli_auth"` CaptureNamePrefix *string `mapstructure:"capture_name_prefix" cty:"capture_name_prefix" hcl:"capture_name_prefix"` CaptureContainerName *string `mapstructure:"capture_container_name" cty:"capture_container_name" hcl:"capture_container_name"` SharedGallery *FlatSharedImageGallery `mapstructure:"shared_image_gallery" cty:"shared_image_gallery" hcl:"shared_image_gallery"` @@ -163,6 +164,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "object_id": &hcldec.AttrSpec{Name: "object_id", Type: cty.String, Required: false}, "tenant_id": &hcldec.AttrSpec{Name: "tenant_id", Type: cty.String, Required: false}, "subscription_id": &hcldec.AttrSpec{Name: "subscription_id", Type: cty.String, Required: false}, + "use_azure_cli_auth": &hcldec.AttrSpec{Name: "use_azure_cli_auth", Type: cty.Bool, Required: false}, "capture_name_prefix": &hcldec.AttrSpec{Name: "capture_name_prefix", Type: cty.String, Required: false}, "capture_container_name": &hcldec.AttrSpec{Name: "capture_container_name", Type: cty.String, Required: false}, "shared_image_gallery": &hcldec.BlockSpec{TypeName: "shared_image_gallery", Nested: hcldec.ObjectSpec((*FlatSharedImageGallery)(nil).HCL2Spec())}, diff --git a/go.mod b/go.mod index c53e9c9d8..a89a5bc24 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/Azure/go-autorest/autorest v0.10.0 github.com/Azure/go-autorest/autorest/adal v0.8.2 github.com/Azure/go-autorest/autorest/azure/auth v0.4.2 + github.com/Azure/go-autorest/autorest/azure/cli v0.3.1 github.com/Azure/go-autorest/autorest/date v0.2.0 github.com/Azure/go-autorest/autorest/to v0.3.0 github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect diff --git a/provisioner/azure-dtlartifact/provisioner.hcl2spec.go b/provisioner/azure-dtlartifact/provisioner.hcl2spec.go index d41dec53e..65a4d885d 100644 --- a/provisioner/azure-dtlartifact/provisioner.hcl2spec.go +++ b/provisioner/azure-dtlartifact/provisioner.hcl2spec.go @@ -51,6 +51,7 @@ type FlatConfig struct { ObjectID *string `mapstructure:"object_id" cty:"object_id" hcl:"object_id"` TenantID *string `mapstructure:"tenant_id" required:"false" cty:"tenant_id" hcl:"tenant_id"` SubscriptionID *string `mapstructure:"subscription_id" cty:"subscription_id" hcl:"subscription_id"` + UseAzureCLIAuth *bool `mapstructure:"use_azure_cli_auth" required:"false" cty:"use_azure_cli_auth" hcl:"use_azure_cli_auth"` DtlArtifacts []FlatDtlArtifact `mapstructure:"dtl_artifacts" cty:"dtl_artifacts" hcl:"dtl_artifacts"` LabName *string `mapstructure:"lab_name" cty:"lab_name" hcl:"lab_name"` ResourceGroupName *string `mapstructure:"lab_resource_group_name" cty:"lab_resource_group_name" hcl:"lab_resource_group_name"` @@ -87,6 +88,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "object_id": &hcldec.AttrSpec{Name: "object_id", Type: cty.String, Required: false}, "tenant_id": &hcldec.AttrSpec{Name: "tenant_id", Type: cty.String, Required: false}, "subscription_id": &hcldec.AttrSpec{Name: "subscription_id", Type: cty.String, Required: false}, + "use_azure_cli_auth": &hcldec.AttrSpec{Name: "use_azure_cli_auth", Type: cty.Bool, Required: false}, "dtl_artifacts": &hcldec.BlockListSpec{TypeName: "dtl_artifacts", Nested: hcldec.ObjectSpec((*FlatDtlArtifact)(nil).HCL2Spec())}, "lab_name": &hcldec.AttrSpec{Name: "lab_name", Type: cty.String, Required: false}, "lab_resource_group_name": &hcldec.AttrSpec{Name: "lab_resource_group_name", Type: cty.String, Required: false}, diff --git a/website/pages/docs/builders/azure/index.mdx b/website/pages/docs/builders/azure/index.mdx index fc76e1b89..50b62be43 100644 --- a/website/pages/docs/builders/azure/index.mdx +++ b/website/pages/docs/builders/azure/index.mdx @@ -40,6 +40,7 @@ following methods are available and are explained below: for the Public and US Gov clouds only. - Azure Managed Identity - Azure Active Directory Service Principal +- Azure CLI -> **Don't know which authentication method to use?** Go with interactive login to try out the builders. If you need packer to run automatically, @@ -103,3 +104,13 @@ way to authenticate the SP to AAD: To create a service principal, you can follow [the Azure documentation on this subject](https://docs.microsoft.com/en-us/cli/azure/create-an-azure-service-principal-azure-cli?view=azure-cli-latest). + +## Azure CLI + +This method will skip all other options provided and only use the credentials that the az cli is authenticated with. +Works with both normal user (`az login`) as well as service principal (`az login --service-principal --username APP_ID --password PASSWORD --tenant TENANT_ID`). + +To enable az cli authentication, use the following: +- `"use_azure_cli_auth": true` + +This mode will use the `tenant_id` and `subscription_id` from the current active az session which can be found by running: `az account show` diff --git a/website/pages/partials/builder/azure/common/client/Config-not-required.mdx b/website/pages/partials/builder/azure/common/client/Config-not-required.mdx index c4c6b20eb..46d553c81 100644 --- a/website/pages/partials/builder/azure/common/client/Config-not-required.mdx +++ b/website/pages/partials/builder/azure/common/client/Config-not-required.mdx @@ -23,3 +23,10 @@ looked up using `subscription_id`. - `subscription_id` (string) - The subscription to use. + +- `use_azure_cli_auth` (bool) - Flag to use Azure CLI authentication. Defaults to false. + CLI auth will use the information from an active `az login` session to connect to Azure and set the subscription id and tenant id associated to the signed in account. + If enabled, it will use the authentication provided by the `az` CLI. + Azure CLI authentication will use the credential marked as `isDefault` and can be verified using `az account show`. + Works with normal authentication (`az login`) and service principals (`az login --service-principal --username APP_ID --password PASSWORD --tenant TENANT_ID`). + Ignores all other configurations if enabled. From b7568f5a4d85cc2725f69e9a58bae5bf91ba08b2 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 6 Nov 2020 14:08:58 -0800 Subject: [PATCH 41/93] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f8dc86e4..85061925a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 1.6.6 (Upcoming) ### FEATURES: +* builder/azure-arm: Create keyvaults with SoftDelete enabled [GH-10210] * builder/outscale: Add x509 certificate support [GH-10161] * post-processor/yandex-export: Verify the access to a specific bucket [GH-10188] From cd74456026fba0ce645ea5ae73a30789faec6650 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 9 Nov 2020 03:16:44 -0800 Subject: [PATCH 42/93] Common provisioner helpers (#10229) * update docstrings to make it clear that plugins are servers and core is client * move provisioner guest helper functions into common dir. --- {provisioner => common/guestexec}/elevated.go | 2 +- {provisioner => common/guestexec}/elevated_test.go | 2 +- .../guestexec}/guest_commands.go | 2 +- .../guestexec}/guest_commands_test.go | 2 +- packer/rpc/client.go | 6 ++++-- packer/rpc/server.go | 4 +++- provisioner/chef-client/provisioner.go | 14 +++++++------- provisioner/chef-solo/provisioner.go | 12 ++++++------ provisioner/powershell/provisioner.go | 4 ++-- provisioner/puppet-masterless/provisioner.go | 14 +++++++------- provisioner/puppet-server/provisioner.go | 14 +++++++------- provisioner/salt-masterless/provisioner.go | 14 +++++++------- 12 files changed, 47 insertions(+), 43 deletions(-) rename {provisioner => common/guestexec}/elevated.go (99%) rename {provisioner => common/guestexec}/elevated_test.go (97%) rename {provisioner => common/guestexec}/guest_commands.go (99%) rename {provisioner => common/guestexec}/guest_commands_test.go (99%) diff --git a/provisioner/elevated.go b/common/guestexec/elevated.go similarity index 99% rename from provisioner/elevated.go rename to common/guestexec/elevated.go index 71addb563..dd46a450f 100644 --- a/provisioner/elevated.go +++ b/common/guestexec/elevated.go @@ -1,4 +1,4 @@ -package provisioner +package guestexec import ( "bytes" diff --git a/provisioner/elevated_test.go b/common/guestexec/elevated_test.go similarity index 97% rename from provisioner/elevated_test.go rename to common/guestexec/elevated_test.go index ac8759ef2..c9d44e817 100644 --- a/provisioner/elevated_test.go +++ b/common/guestexec/elevated_test.go @@ -1,4 +1,4 @@ -package provisioner +package guestexec import ( "regexp" diff --git a/provisioner/guest_commands.go b/common/guestexec/guest_commands.go similarity index 99% rename from provisioner/guest_commands.go rename to common/guestexec/guest_commands.go index ca2b238a4..549ba3ccb 100644 --- a/provisioner/guest_commands.go +++ b/common/guestexec/guest_commands.go @@ -1,4 +1,4 @@ -package provisioner +package guestexec import ( "fmt" diff --git a/provisioner/guest_commands_test.go b/common/guestexec/guest_commands_test.go similarity index 99% rename from provisioner/guest_commands_test.go rename to common/guestexec/guest_commands_test.go index ffbad4bbd..d6300c8e3 100644 --- a/provisioner/guest_commands_test.go +++ b/common/guestexec/guest_commands_test.go @@ -1,4 +1,4 @@ -package provisioner +package guestexec import ( "testing" diff --git a/packer/rpc/client.go b/packer/rpc/client.go index e8eadfbf5..a23437a72 100644 --- a/packer/rpc/client.go +++ b/packer/rpc/client.go @@ -10,8 +10,10 @@ import ( ) // Client is the client end that communicates with a Packer RPC server. -// Establishing a connection is up to the user, the Client can just -// communicate over any ReadWriteCloser. +// Establishing a connection is up to the user. The Client can communicate over +// any ReadWriteCloser. In Packer, each "plugin" (builder, provisioner, +// and post-processor) creates and launches a server. The the packer "core" +// creates and uses the client. type Client struct { mux *muxBroker client *rpc.Client diff --git a/packer/rpc/server.go b/packer/rpc/server.go index b583e2945..acfea8c7c 100644 --- a/packer/rpc/server.go +++ b/packer/rpc/server.go @@ -23,7 +23,9 @@ const ( ) // Server represents an RPC server for Packer. This must be paired on -// the other side with a Client. +// the other side with a Client. In Packer, each "plugin" (builder, provisioner, +// and post-processor) creates and launches a server. The client created and +// used by the packer "core" type Server struct { mux *muxBroker streamId uint32 diff --git a/provisioner/chef-client/provisioner.go b/provisioner/chef-client/provisioner.go index 60f13fa14..3d953aef8 100644 --- a/provisioner/chef-client/provisioner.go +++ b/provisioner/chef-client/provisioner.go @@ -17,10 +17,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/provisioner" "github.com/hashicorp/packer/template/interpolate" ) @@ -32,13 +32,13 @@ type guestOSTypeConfig struct { } var guestOSTypeConfigs = map[string]guestOSTypeConfig{ - provisioner.UnixOSType: { + guestexec.UnixOSType: { executeCommand: "{{if .Sudo}}sudo {{end}}chef-client --no-color -c {{.ConfigPath}} -j {{.JsonPath}}", installCommand: "curl -L https://omnitruck.chef.io/install.sh | {{if .Sudo}}sudo {{end}}bash -s --{{if .Version}} -v {{.Version}}{{end}}", knifeCommand: "{{if .Sudo}}sudo {{end}}knife {{.Args}} {{.Flags}}", stagingDir: "/tmp/packer-chef-client", }, - provisioner.WindowsOSType: { + guestexec.WindowsOSType: { executeCommand: "c:/opscode/chef/bin/chef-client.bat --no-color -c {{.ConfigPath}} -j {{.JsonPath}}", installCommand: "powershell.exe -Command \". { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; Install-Project{{if .Version}} -version {{.Version}}{{end}}\"", knifeCommand: "c:/opscode/chef/bin/knife.bat {{.Args}} {{.Flags}}", @@ -86,7 +86,7 @@ type Provisioner struct { config Config communicator packer.Communicator guestOSTypeConfig guestOSTypeConfig - guestCommands *provisioner.GuestCommands + guestCommands *guestexec.GuestCommands generatedData map[string]interface{} } @@ -142,7 +142,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { } if p.config.GuestOSType == "" { - p.config.GuestOSType = provisioner.DefaultOSType + p.config.GuestOSType = guestexec.DefaultOSType } p.config.GuestOSType = strings.ToLower(p.config.GuestOSType) @@ -152,7 +152,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType) } - p.guestCommands, err = provisioner.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo) + p.guestCommands, err = guestexec.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo) if err != nil { return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType) } @@ -581,7 +581,7 @@ func (p *Provisioner) executeChef(ui packer.Ui, comm packer.Communicator, config } if p.config.ElevatedUser != "" { - command, err = provisioner.GenerateElevatedRunner(command, p) + command, err = guestexec.GenerateElevatedRunner(command, p) if err != nil { return err } diff --git a/provisioner/chef-solo/provisioner.go b/provisioner/chef-solo/provisioner.go index 402ff73b9..cc9178794 100644 --- a/provisioner/chef-solo/provisioner.go +++ b/provisioner/chef-solo/provisioner.go @@ -17,9 +17,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/provisioner" "github.com/hashicorp/packer/template/interpolate" ) @@ -30,12 +30,12 @@ type guestOSTypeConfig struct { } var guestOSTypeConfigs = map[string]guestOSTypeConfig{ - provisioner.UnixOSType: { + guestexec.UnixOSType: { executeCommand: "{{if .Sudo}}sudo {{end}}chef-solo --no-color -c {{.ConfigPath}} -j {{.JsonPath}}", installCommand: "curl -L https://omnitruck.chef.io/install.sh | {{if .Sudo}}sudo {{end}}bash -s --{{if .Version}} -v {{.Version}}{{end}}", stagingDir: "/tmp/packer-chef-solo", }, - provisioner.WindowsOSType: { + guestexec.WindowsOSType: { executeCommand: "c:/opscode/chef/bin/chef-solo.bat --no-color -c {{.ConfigPath}} -j {{.JsonPath}}", installCommand: "powershell.exe -Command \". { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; Install-Project{{if .Version}} -version {{.Version}}{{end}}\"", stagingDir: "C:/Windows/Temp/packer-chef-solo", @@ -70,7 +70,7 @@ type Config struct { type Provisioner struct { config Config guestOSTypeConfig guestOSTypeConfig - guestCommands *provisioner.GuestCommands + guestCommands *guestexec.GuestCommands } type ConfigTemplate struct { @@ -121,7 +121,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { } if p.config.GuestOSType == "" { - p.config.GuestOSType = provisioner.DefaultOSType + p.config.GuestOSType = guestexec.DefaultOSType } p.config.GuestOSType = strings.ToLower(p.config.GuestOSType) @@ -131,7 +131,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType) } - p.guestCommands, err = provisioner.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo) + p.guestCommands, err = guestexec.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo) if err != nil { return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType) } diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go index e7524b79a..fd3f34fda 100644 --- a/provisioner/powershell/provisioner.go +++ b/provisioner/powershell/provisioner.go @@ -18,13 +18,13 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/common/shell" "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/provisioner" "github.com/hashicorp/packer/template/interpolate" ) @@ -522,7 +522,7 @@ func (p *Provisioner) createCommandTextPrivileged() (command string, err error) return "", fmt.Errorf("Error processing command: %s", err) } - command, err = provisioner.GenerateElevatedRunner(command, p) + command, err = guestexec.GenerateElevatedRunner(command, p) if err != nil { return "", fmt.Errorf("Error generating elevated runner: %s", err) } diff --git a/provisioner/puppet-masterless/provisioner.go b/provisioner/puppet-masterless/provisioner.go index 1c1307edd..a398a4204 100644 --- a/provisioner/puppet-masterless/provisioner.go +++ b/provisioner/puppet-masterless/provisioner.go @@ -14,9 +14,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/provisioner" "github.com/hashicorp/packer/template/interpolate" ) @@ -88,7 +88,7 @@ type guestOSTypeConfig struct { // FIXME assumes both Packer host and target are same OS var guestOSTypeConfigs = map[string]guestOSTypeConfig{ - provisioner.UnixOSType: { + guestexec.UnixOSType: { tempDir: "/tmp", stagingDir: "/tmp/packer-puppet-masterless", executeCommand: "cd {{.WorkingDir}} && " + @@ -106,7 +106,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{ facterVarsJoiner: " ", modulePathJoiner: ":", }, - provisioner.WindowsOSType: { + guestexec.WindowsOSType: { tempDir: filepath.ToSlash(os.Getenv("TEMP")), stagingDir: filepath.ToSlash(os.Getenv("SYSTEMROOT")) + "/Temp/packer-puppet-masterless", executeCommand: "cd {{.WorkingDir}} && " + @@ -129,7 +129,7 @@ type Provisioner struct { config Config communicator packer.Communicator guestOSTypeConfig guestOSTypeConfig - guestCommands *provisioner.GuestCommands + guestCommands *guestexec.GuestCommands generatedData map[string]interface{} } @@ -171,7 +171,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { // Set some defaults if p.config.GuestOSType == "" { - p.config.GuestOSType = provisioner.DefaultOSType + p.config.GuestOSType = guestexec.DefaultOSType } p.config.GuestOSType = strings.ToLower(p.config.GuestOSType) @@ -181,7 +181,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType) } - p.guestCommands, err = provisioner.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo) + p.guestCommands, err = guestexec.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo) if err != nil { return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType) } @@ -338,7 +338,7 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C } if p.config.ElevatedUser != "" { - command, err = provisioner.GenerateElevatedRunner(command, p) + command, err = guestexec.GenerateElevatedRunner(command, p) if err != nil { return err } diff --git a/provisioner/puppet-server/provisioner.go b/provisioner/puppet-server/provisioner.go index 6025e7998..c4625f508 100644 --- a/provisioner/puppet-server/provisioner.go +++ b/provisioner/puppet-server/provisioner.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/provisioner" "github.com/hashicorp/packer/template/interpolate" ) @@ -85,7 +85,7 @@ type guestOSTypeConfig struct { // FIXME assumes both Packer host and target are same OS var guestOSTypeConfigs = map[string]guestOSTypeConfig{ - provisioner.UnixOSType: { + guestexec.UnixOSType: { tempDir: "/tmp", stagingDir: "/tmp/packer-puppet-server", executeCommand: "cd {{.WorkingDir}} && " + @@ -102,7 +102,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{ facterVarsFmt: "FACTER_%s='%s'", facterVarsJoiner: " ", }, - provisioner.WindowsOSType: { + guestexec.WindowsOSType: { tempDir: filepath.ToSlash(os.Getenv("TEMP")), stagingDir: filepath.ToSlash(os.Getenv("SYSTEMROOT")) + "/Temp/packer-puppet-server", executeCommand: "cd {{.WorkingDir}} && " + @@ -124,7 +124,7 @@ type Provisioner struct { config Config communicator packer.Communicator guestOSTypeConfig guestOSTypeConfig - guestCommands *provisioner.GuestCommands + guestCommands *guestexec.GuestCommands generatedData map[string]interface{} } @@ -164,7 +164,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { } if p.config.GuestOSType == "" { - p.config.GuestOSType = provisioner.DefaultOSType + p.config.GuestOSType = guestexec.DefaultOSType } p.config.GuestOSType = strings.ToLower(p.config.GuestOSType) @@ -174,7 +174,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType) } - p.guestCommands, err = provisioner.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo) + p.guestCommands, err = guestexec.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo) if err != nil { return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType) } @@ -291,7 +291,7 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C } if p.config.ElevatedUser != "" { - command, err = provisioner.GenerateElevatedRunner(command, p) + command, err = guestexec.GenerateElevatedRunner(command, p) if err != nil { return err } diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go index d343e3ef5..2e12b1af5 100644 --- a/provisioner/salt-masterless/provisioner.go +++ b/provisioner/salt-masterless/provisioner.go @@ -17,9 +17,9 @@ import ( "github.com/hashicorp/go-getter/v2" "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/provisioner" "github.com/hashicorp/packer/template/interpolate" ) @@ -83,7 +83,7 @@ type Config struct { type Provisioner struct { config Config guestOSTypeConfig guestOSTypeConfig - guestCommands *provisioner.GuestCommands + guestCommands *guestexec.GuestCommands } type guestOSTypeConfig struct { @@ -96,7 +96,7 @@ type guestOSTypeConfig struct { } var guestOSTypeConfigs = map[string]guestOSTypeConfig{ - provisioner.UnixOSType: { + guestexec.UnixOSType: { configDir: "/etc/salt", tempDir: "/tmp/salt", stateRoot: "/srv/salt", @@ -104,7 +104,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{ bootstrapFetchCmd: "curl -L https://bootstrap.saltstack.com -o /tmp/install_salt.sh || wget -O /tmp/install_salt.sh https://bootstrap.saltstack.com", bootstrapRunCmd: "sh /tmp/install_salt.sh", }, - provisioner.WindowsOSType: { + guestexec.WindowsOSType: { configDir: "C:/salt/conf", tempDir: "C:/Windows/Temp/salt/", stateRoot: "C:/salt/state", @@ -130,7 +130,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { } if p.config.GuestOSType == "" { - p.config.GuestOSType = provisioner.DefaultOSType + p.config.GuestOSType = guestexec.DefaultOSType } else { p.config.GuestOSType = strings.ToLower(p.config.GuestOSType) } @@ -141,7 +141,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType) } - p.guestCommands, err = provisioner.NewGuestCommands(p.config.GuestOSType, !p.config.DisableSudo) + p.guestCommands, err = guestexec.NewGuestCommands(p.config.GuestOSType, !p.config.DisableSudo) if err != nil { return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType) } @@ -413,7 +413,7 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C // Prepends sudo to supplied command if config says to func (p *Provisioner) sudo(cmd string) string { - if p.config.DisableSudo || (p.config.GuestOSType == provisioner.WindowsOSType) { + if p.config.DisableSudo || (p.config.GuestOSType == guestexec.WindowsOSType) { return cmd } From 88e03280b695e5db097bbccb6dba3d4e92274b13 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 9 Nov 2020 03:17:41 -0800 Subject: [PATCH 43/93] Extract plugin-specific examples to plugin directories (#10228) * move alicloud examples from common example directory to alicloud builder * move amazon examples to amazon builder dir * move examples into ansible provisioner directory * move azure examples to builder dir * move hyperone examples into builder directory * move jdcloud builder examples into builder directory * move tencent cloud examples into the builder directory * move ucloud examples into ucloud builder directory --- .../alicloud/examples}/basic/alicloud.json | 0 .../alicloud/examples}/basic/alicloud_windows.json | 0 .../examples}/basic/alicloud_with_data_disk.json | 0 .../alicloud/examples}/basic/winrm_enable_userdata.ps1 | 0 .../alicloud/examples}/chef/alicloud.json | 0 .../alicloud => builder/alicloud/examples}/chef/chef.sh | 0 .../alicloud/examples}/chef/user_data.sh | 0 .../alicloud/examples}/jenkins/alicloud.json | 0 .../alicloud/examples}/jenkins/jenkins.sh | 0 .../alicloud/examples}/local/centos.json | 0 .../alicloud/examples}/local/http/centos-6.8/ks.cfg | 0 .../amazon/examples}/apache_server/README.Md | 0 .../amazon/examples}/apache_server/apache.json | 9 +++------ .../amazon/examples}/apache_server/packages.sh | 0 .../amazon/examples}/nginx_server/README.Md | 0 .../amazon/examples}/nginx_server/nginx.json | 0 .../amazon/examples}/nginx_server/packages.sh | 0 {examples/azure => builder/azure/examples}/centos.json | 0 .../azure => builder/azure/examples}/debian-chroot.json | 0 {examples/azure => builder/azure/examples}/debian.json | 0 .../azure => builder/azure/examples}/freebsd-chroot.json | 0 {examples/azure => builder/azure/examples}/freebsd.json | 0 .../azure/examples}/linux_custom_image.json | 0 .../azure/examples}/linux_custom_managed_image.json | 0 .../azure/examples}/marketplace_plan_info.json | 0 {examples/azure => builder/azure/examples}/rhel.json | 0 {examples/azure => builder/azure/examples}/suse.json | 0 .../azure => builder/azure/examples}/ubuntu-chroot.json | 0 {examples/azure => builder/azure/examples}/ubuntu.json | 0 .../azure/examples}/ubuntu_managed_image_sig.json | 0 .../azure/examples}/ubuntu_quickstart.json | 0 {examples/azure => builder/azure/examples}/windows.json | 0 .../azure/examples}/windows_custom_image.json | 0 .../azure/examples}/windows_quickstart.json | 0 .../hyperone => builder/hyperone/examples}/basic.json | 0 .../hyperone => builder/hyperone/examples}/chroot.json | 0 .../hyperone/examples}/new-syntax.pkr.hcl | 0 .../jdcloud/examples}/credential-key.json | 0 .../jdcloud/examples}/credential-new-key.json | 0 .../jdcloud/examples}/credential-password.json | 0 .../jdcloud/examples}/use_new_subnet.json | 0 .../tencentcloud/examples}/basic-with-data-disk.json | 0 .../tencentcloud/examples}/basic.json | 0 .../tencentcloud/examples}/centos.json | 0 {examples/ucloud => builder/ucloud/examples}/basic.json | 0 .../ucloud/examples}/local/http/centos-6.10/ks.cfg | 0 .../ucloud => builder/ucloud/examples}/local/local.json | 0 {examples/ucloud => builder/ucloud/examples}/ubuntu.json | 0 .../ansible/examples}/connection-plugin/2.4.x/packer.py | 0 .../ansible/examples}/connection-plugin/2.5.x/packer.py | 0 .../ansible/examples}/connection-plugin/2.6.x/packer.py | 0 51 files changed, 3 insertions(+), 6 deletions(-) rename {examples/alicloud => builder/alicloud/examples}/basic/alicloud.json (100%) rename {examples/alicloud => builder/alicloud/examples}/basic/alicloud_windows.json (100%) rename {examples/alicloud => builder/alicloud/examples}/basic/alicloud_with_data_disk.json (100%) rename {examples/alicloud => builder/alicloud/examples}/basic/winrm_enable_userdata.ps1 (100%) rename {examples/alicloud => builder/alicloud/examples}/chef/alicloud.json (100%) rename {examples/alicloud => builder/alicloud/examples}/chef/chef.sh (100%) rename {examples/alicloud => builder/alicloud/examples}/chef/user_data.sh (100%) rename {examples/alicloud => builder/alicloud/examples}/jenkins/alicloud.json (100%) rename {examples/alicloud => builder/alicloud/examples}/jenkins/jenkins.sh (100%) rename {examples/alicloud => builder/alicloud/examples}/local/centos.json (100%) rename {examples/alicloud => builder/alicloud/examples}/local/http/centos-6.8/ks.cfg (100%) rename {examples/amazon => builder/amazon/examples}/apache_server/README.Md (100%) rename {examples/amazon => builder/amazon/examples}/apache_server/apache.json (95%) rename {examples/amazon => builder/amazon/examples}/apache_server/packages.sh (100%) rename {examples/amazon => builder/amazon/examples}/nginx_server/README.Md (100%) rename {examples/amazon => builder/amazon/examples}/nginx_server/nginx.json (100%) rename {examples/amazon => builder/amazon/examples}/nginx_server/packages.sh (100%) rename {examples/azure => builder/azure/examples}/centos.json (100%) rename {examples/azure => builder/azure/examples}/debian-chroot.json (100%) rename {examples/azure => builder/azure/examples}/debian.json (100%) rename {examples/azure => builder/azure/examples}/freebsd-chroot.json (100%) rename {examples/azure => builder/azure/examples}/freebsd.json (100%) rename {examples/azure => builder/azure/examples}/linux_custom_image.json (100%) rename {examples/azure => builder/azure/examples}/linux_custom_managed_image.json (100%) rename {examples/azure => builder/azure/examples}/marketplace_plan_info.json (100%) rename {examples/azure => builder/azure/examples}/rhel.json (100%) rename {examples/azure => builder/azure/examples}/suse.json (100%) rename {examples/azure => builder/azure/examples}/ubuntu-chroot.json (100%) rename {examples/azure => builder/azure/examples}/ubuntu.json (100%) rename {examples/azure => builder/azure/examples}/ubuntu_managed_image_sig.json (100%) rename {examples/azure => builder/azure/examples}/ubuntu_quickstart.json (100%) rename {examples/azure => builder/azure/examples}/windows.json (100%) rename {examples/azure => builder/azure/examples}/windows_custom_image.json (100%) rename {examples/azure => builder/azure/examples}/windows_quickstart.json (100%) rename {examples/hyperone => builder/hyperone/examples}/basic.json (100%) rename {examples/hyperone => builder/hyperone/examples}/chroot.json (100%) rename {examples/hyperone => builder/hyperone/examples}/new-syntax.pkr.hcl (100%) rename {examples/jdcloud => builder/jdcloud/examples}/credential-key.json (100%) rename {examples/jdcloud => builder/jdcloud/examples}/credential-new-key.json (100%) rename {examples/jdcloud => builder/jdcloud/examples}/credential-password.json (100%) rename {examples/jdcloud => builder/jdcloud/examples}/use_new_subnet.json (100%) rename {examples/tencentcloud => builder/tencentcloud/examples}/basic-with-data-disk.json (100%) rename {examples/tencentcloud => builder/tencentcloud/examples}/basic.json (100%) rename {examples/tencentcloud => builder/tencentcloud/examples}/centos.json (100%) rename {examples/ucloud => builder/ucloud/examples}/basic.json (100%) rename {examples/ucloud => builder/ucloud/examples}/local/http/centos-6.10/ks.cfg (100%) rename {examples/ucloud => builder/ucloud/examples}/local/local.json (100%) rename {examples/ucloud => builder/ucloud/examples}/ubuntu.json (100%) rename {examples/ansible => provisioner/ansible/examples}/connection-plugin/2.4.x/packer.py (100%) rename {examples/ansible => provisioner/ansible/examples}/connection-plugin/2.5.x/packer.py (100%) rename {examples/ansible => provisioner/ansible/examples}/connection-plugin/2.6.x/packer.py (100%) diff --git a/examples/alicloud/basic/alicloud.json b/builder/alicloud/examples/basic/alicloud.json similarity index 100% rename from examples/alicloud/basic/alicloud.json rename to builder/alicloud/examples/basic/alicloud.json diff --git a/examples/alicloud/basic/alicloud_windows.json b/builder/alicloud/examples/basic/alicloud_windows.json similarity index 100% rename from examples/alicloud/basic/alicloud_windows.json rename to builder/alicloud/examples/basic/alicloud_windows.json diff --git a/examples/alicloud/basic/alicloud_with_data_disk.json b/builder/alicloud/examples/basic/alicloud_with_data_disk.json similarity index 100% rename from examples/alicloud/basic/alicloud_with_data_disk.json rename to builder/alicloud/examples/basic/alicloud_with_data_disk.json diff --git a/examples/alicloud/basic/winrm_enable_userdata.ps1 b/builder/alicloud/examples/basic/winrm_enable_userdata.ps1 similarity index 100% rename from examples/alicloud/basic/winrm_enable_userdata.ps1 rename to builder/alicloud/examples/basic/winrm_enable_userdata.ps1 diff --git a/examples/alicloud/chef/alicloud.json b/builder/alicloud/examples/chef/alicloud.json similarity index 100% rename from examples/alicloud/chef/alicloud.json rename to builder/alicloud/examples/chef/alicloud.json diff --git a/examples/alicloud/chef/chef.sh b/builder/alicloud/examples/chef/chef.sh similarity index 100% rename from examples/alicloud/chef/chef.sh rename to builder/alicloud/examples/chef/chef.sh diff --git a/examples/alicloud/chef/user_data.sh b/builder/alicloud/examples/chef/user_data.sh similarity index 100% rename from examples/alicloud/chef/user_data.sh rename to builder/alicloud/examples/chef/user_data.sh diff --git a/examples/alicloud/jenkins/alicloud.json b/builder/alicloud/examples/jenkins/alicloud.json similarity index 100% rename from examples/alicloud/jenkins/alicloud.json rename to builder/alicloud/examples/jenkins/alicloud.json diff --git a/examples/alicloud/jenkins/jenkins.sh b/builder/alicloud/examples/jenkins/jenkins.sh similarity index 100% rename from examples/alicloud/jenkins/jenkins.sh rename to builder/alicloud/examples/jenkins/jenkins.sh diff --git a/examples/alicloud/local/centos.json b/builder/alicloud/examples/local/centos.json similarity index 100% rename from examples/alicloud/local/centos.json rename to builder/alicloud/examples/local/centos.json diff --git a/examples/alicloud/local/http/centos-6.8/ks.cfg b/builder/alicloud/examples/local/http/centos-6.8/ks.cfg similarity index 100% rename from examples/alicloud/local/http/centos-6.8/ks.cfg rename to builder/alicloud/examples/local/http/centos-6.8/ks.cfg diff --git a/examples/amazon/apache_server/README.Md b/builder/amazon/examples/apache_server/README.Md similarity index 100% rename from examples/amazon/apache_server/README.Md rename to builder/amazon/examples/apache_server/README.Md diff --git a/examples/amazon/apache_server/apache.json b/builder/amazon/examples/apache_server/apache.json similarity index 95% rename from examples/amazon/apache_server/apache.json rename to builder/amazon/examples/apache_server/apache.json index 331f21138..ddba2e18e 100644 --- a/examples/amazon/apache_server/apache.json +++ b/builder/amazon/examples/apache_server/apache.json @@ -1,7 +1,4 @@ - - - -{ +{ "variables": { "accesskey": "", @@ -22,13 +19,13 @@ "OS_Version": "Ubuntu", "Release": "Latest" } - } + } ], "provisioners":[ { "type": "shell", "script": "{{user `shellpath`}}" - } + } ] } diff --git a/examples/amazon/apache_server/packages.sh b/builder/amazon/examples/apache_server/packages.sh similarity index 100% rename from examples/amazon/apache_server/packages.sh rename to builder/amazon/examples/apache_server/packages.sh diff --git a/examples/amazon/nginx_server/README.Md b/builder/amazon/examples/nginx_server/README.Md similarity index 100% rename from examples/amazon/nginx_server/README.Md rename to builder/amazon/examples/nginx_server/README.Md diff --git a/examples/amazon/nginx_server/nginx.json b/builder/amazon/examples/nginx_server/nginx.json similarity index 100% rename from examples/amazon/nginx_server/nginx.json rename to builder/amazon/examples/nginx_server/nginx.json diff --git a/examples/amazon/nginx_server/packages.sh b/builder/amazon/examples/nginx_server/packages.sh similarity index 100% rename from examples/amazon/nginx_server/packages.sh rename to builder/amazon/examples/nginx_server/packages.sh diff --git a/examples/azure/centos.json b/builder/azure/examples/centos.json similarity index 100% rename from examples/azure/centos.json rename to builder/azure/examples/centos.json diff --git a/examples/azure/debian-chroot.json b/builder/azure/examples/debian-chroot.json similarity index 100% rename from examples/azure/debian-chroot.json rename to builder/azure/examples/debian-chroot.json diff --git a/examples/azure/debian.json b/builder/azure/examples/debian.json similarity index 100% rename from examples/azure/debian.json rename to builder/azure/examples/debian.json diff --git a/examples/azure/freebsd-chroot.json b/builder/azure/examples/freebsd-chroot.json similarity index 100% rename from examples/azure/freebsd-chroot.json rename to builder/azure/examples/freebsd-chroot.json diff --git a/examples/azure/freebsd.json b/builder/azure/examples/freebsd.json similarity index 100% rename from examples/azure/freebsd.json rename to builder/azure/examples/freebsd.json diff --git a/examples/azure/linux_custom_image.json b/builder/azure/examples/linux_custom_image.json similarity index 100% rename from examples/azure/linux_custom_image.json rename to builder/azure/examples/linux_custom_image.json diff --git a/examples/azure/linux_custom_managed_image.json b/builder/azure/examples/linux_custom_managed_image.json similarity index 100% rename from examples/azure/linux_custom_managed_image.json rename to builder/azure/examples/linux_custom_managed_image.json diff --git a/examples/azure/marketplace_plan_info.json b/builder/azure/examples/marketplace_plan_info.json similarity index 100% rename from examples/azure/marketplace_plan_info.json rename to builder/azure/examples/marketplace_plan_info.json diff --git a/examples/azure/rhel.json b/builder/azure/examples/rhel.json similarity index 100% rename from examples/azure/rhel.json rename to builder/azure/examples/rhel.json diff --git a/examples/azure/suse.json b/builder/azure/examples/suse.json similarity index 100% rename from examples/azure/suse.json rename to builder/azure/examples/suse.json diff --git a/examples/azure/ubuntu-chroot.json b/builder/azure/examples/ubuntu-chroot.json similarity index 100% rename from examples/azure/ubuntu-chroot.json rename to builder/azure/examples/ubuntu-chroot.json diff --git a/examples/azure/ubuntu.json b/builder/azure/examples/ubuntu.json similarity index 100% rename from examples/azure/ubuntu.json rename to builder/azure/examples/ubuntu.json diff --git a/examples/azure/ubuntu_managed_image_sig.json b/builder/azure/examples/ubuntu_managed_image_sig.json similarity index 100% rename from examples/azure/ubuntu_managed_image_sig.json rename to builder/azure/examples/ubuntu_managed_image_sig.json diff --git a/examples/azure/ubuntu_quickstart.json b/builder/azure/examples/ubuntu_quickstart.json similarity index 100% rename from examples/azure/ubuntu_quickstart.json rename to builder/azure/examples/ubuntu_quickstart.json diff --git a/examples/azure/windows.json b/builder/azure/examples/windows.json similarity index 100% rename from examples/azure/windows.json rename to builder/azure/examples/windows.json diff --git a/examples/azure/windows_custom_image.json b/builder/azure/examples/windows_custom_image.json similarity index 100% rename from examples/azure/windows_custom_image.json rename to builder/azure/examples/windows_custom_image.json diff --git a/examples/azure/windows_quickstart.json b/builder/azure/examples/windows_quickstart.json similarity index 100% rename from examples/azure/windows_quickstart.json rename to builder/azure/examples/windows_quickstart.json diff --git a/examples/hyperone/basic.json b/builder/hyperone/examples/basic.json similarity index 100% rename from examples/hyperone/basic.json rename to builder/hyperone/examples/basic.json diff --git a/examples/hyperone/chroot.json b/builder/hyperone/examples/chroot.json similarity index 100% rename from examples/hyperone/chroot.json rename to builder/hyperone/examples/chroot.json diff --git a/examples/hyperone/new-syntax.pkr.hcl b/builder/hyperone/examples/new-syntax.pkr.hcl similarity index 100% rename from examples/hyperone/new-syntax.pkr.hcl rename to builder/hyperone/examples/new-syntax.pkr.hcl diff --git a/examples/jdcloud/credential-key.json b/builder/jdcloud/examples/credential-key.json similarity index 100% rename from examples/jdcloud/credential-key.json rename to builder/jdcloud/examples/credential-key.json diff --git a/examples/jdcloud/credential-new-key.json b/builder/jdcloud/examples/credential-new-key.json similarity index 100% rename from examples/jdcloud/credential-new-key.json rename to builder/jdcloud/examples/credential-new-key.json diff --git a/examples/jdcloud/credential-password.json b/builder/jdcloud/examples/credential-password.json similarity index 100% rename from examples/jdcloud/credential-password.json rename to builder/jdcloud/examples/credential-password.json diff --git a/examples/jdcloud/use_new_subnet.json b/builder/jdcloud/examples/use_new_subnet.json similarity index 100% rename from examples/jdcloud/use_new_subnet.json rename to builder/jdcloud/examples/use_new_subnet.json diff --git a/examples/tencentcloud/basic-with-data-disk.json b/builder/tencentcloud/examples/basic-with-data-disk.json similarity index 100% rename from examples/tencentcloud/basic-with-data-disk.json rename to builder/tencentcloud/examples/basic-with-data-disk.json diff --git a/examples/tencentcloud/basic.json b/builder/tencentcloud/examples/basic.json similarity index 100% rename from examples/tencentcloud/basic.json rename to builder/tencentcloud/examples/basic.json diff --git a/examples/tencentcloud/centos.json b/builder/tencentcloud/examples/centos.json similarity index 100% rename from examples/tencentcloud/centos.json rename to builder/tencentcloud/examples/centos.json diff --git a/examples/ucloud/basic.json b/builder/ucloud/examples/basic.json similarity index 100% rename from examples/ucloud/basic.json rename to builder/ucloud/examples/basic.json diff --git a/examples/ucloud/local/http/centos-6.10/ks.cfg b/builder/ucloud/examples/local/http/centos-6.10/ks.cfg similarity index 100% rename from examples/ucloud/local/http/centos-6.10/ks.cfg rename to builder/ucloud/examples/local/http/centos-6.10/ks.cfg diff --git a/examples/ucloud/local/local.json b/builder/ucloud/examples/local/local.json similarity index 100% rename from examples/ucloud/local/local.json rename to builder/ucloud/examples/local/local.json diff --git a/examples/ucloud/ubuntu.json b/builder/ucloud/examples/ubuntu.json similarity index 100% rename from examples/ucloud/ubuntu.json rename to builder/ucloud/examples/ubuntu.json diff --git a/examples/ansible/connection-plugin/2.4.x/packer.py b/provisioner/ansible/examples/connection-plugin/2.4.x/packer.py similarity index 100% rename from examples/ansible/connection-plugin/2.4.x/packer.py rename to provisioner/ansible/examples/connection-plugin/2.4.x/packer.py diff --git a/examples/ansible/connection-plugin/2.5.x/packer.py b/provisioner/ansible/examples/connection-plugin/2.5.x/packer.py similarity index 100% rename from examples/ansible/connection-plugin/2.5.x/packer.py rename to provisioner/ansible/examples/connection-plugin/2.5.x/packer.py diff --git a/examples/ansible/connection-plugin/2.6.x/packer.py b/provisioner/ansible/examples/connection-plugin/2.6.x/packer.py similarity index 100% rename from examples/ansible/connection-plugin/2.6.x/packer.py rename to provisioner/ansible/examples/connection-plugin/2.6.x/packer.py From 23a7f677788e72cec5786f523ec2e7080b817efd Mon Sep 17 00:00:00 2001 From: Daniel Underwood Date: Mon, 9 Nov 2020 09:33:07 -0500 Subject: [PATCH 44/93] Fix proxmox page links (#10230) --- website/pages/docs/builders/proxmox/index.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/pages/docs/builders/proxmox/index.mdx b/website/pages/docs/builders/proxmox/index.mdx index c5d1731ac..3c907b1f9 100644 --- a/website/pages/docs/builders/proxmox/index.mdx +++ b/website/pages/docs/builders/proxmox/index.mdx @@ -16,13 +16,13 @@ machines and store them as new Proxmox Virutal Machine images. Packer is able to target both ISO and existing Cloud-Init images: -- [proxmox-clone](/docs/builders/proxmox-clone) - The proxmox image +- [proxmox-clone](/docs/builders/proxmox/clone) - The proxmox image Packer builder is able to create new images for use with Proxmox VE. The builder takes a cloud-init enabled virtual machine template name, runs any provisioning necessary on the image after launching it, then creates a virtual machine template. -- [proxmox-iso](/docs/builders/proxmox-iso) - The proxmox Packer +- [proxmox-iso](/docs/builders/proxmox/iso) - The proxmox Packer builder is able to create new images for use with Proxmox VE. The builder takes an ISO source, runs any provisioning necessary on the image after launching it, then creates a virtual machine From bc85854a53b48b44c5e612b79fb212356acd3cb4 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 9 Nov 2020 12:29:53 -0800 Subject: [PATCH 45/93] refactor packer version out of hcltemplate code. --- command/build.go | 11 +++++++---- common/packer_config.go | 1 + hcl2template/parser.go | 22 ++++++++++++++-------- hcl2template/types.packer_config.go | 7 +++++-- hcl2template/version_required.go | 8 ++++---- packer/build.go | 7 +++++++ 6 files changed, 38 insertions(+), 18 deletions(-) diff --git a/command/build.go b/command/build.go index 38901701e..ce1421315 100644 --- a/command/build.go +++ b/command/build.go @@ -16,6 +16,7 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/version" "golang.org/x/sync/semaphore" "github.com/hako/durafmt" @@ -62,10 +63,12 @@ func (c *BuildCommand) ParseArgs(args []string) (*BuildArgs, int) { func (m *Meta) GetConfigFromHCL(cla *MetaArgs) (*hcl2template.PackerConfig, int) { parser := &hcl2template.Parser{ - Parser: hclparse.NewParser(), - BuilderSchemas: m.CoreConfig.Components.BuilderStore, - ProvisionersSchemas: m.CoreConfig.Components.ProvisionerStore, - PostProcessorsSchemas: m.CoreConfig.Components.PostProcessorStore, + CorePackerVersion: version.SemVer, + CorePackerVersionString: version.FormattedVersion(), + Parser: hclparse.NewParser(), + BuilderSchemas: m.CoreConfig.Components.BuilderStore, + ProvisionersSchemas: m.CoreConfig.Components.ProvisionerStore, + PostProcessorsSchemas: m.CoreConfig.Components.PostProcessorStore, } cfg, diags := parser.Parse(cla.Path, cla.VarFiles, cla.Vars) return cfg, writeDiags(m.Ui, parser.Files(), diags) diff --git a/common/packer_config.go b/common/packer_config.go index dcf77f9fb..3e2c87225 100644 --- a/common/packer_config.go +++ b/common/packer_config.go @@ -6,6 +6,7 @@ package common type PackerConfig struct { PackerBuildName string `mapstructure:"packer_build_name"` PackerBuilderType string `mapstructure:"packer_builder_type"` + PackerCoreVersion bool `mapstructure:"packer_core_version"` PackerDebug bool `mapstructure:"packer_debug"` PackerForce bool `mapstructure:"packer_force"` PackerOnError string `mapstructure:"packer_on_error"` diff --git a/hcl2template/parser.go b/hcl2template/parser.go index 409157f02..2a856a16f 100644 --- a/hcl2template/parser.go +++ b/hcl2template/parser.go @@ -5,6 +5,7 @@ import ( "os" "path/filepath" + "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/ext/dynblock" "github.com/hashicorp/hcl/v2/hclparse" @@ -47,6 +48,10 @@ var packerBlockSchema = &hcl.BodySchema{ // the parsed HCL and then return a []packer.Build. Packer will use that list // of Builds to run everything in order. type Parser struct { + CorePackerVersion *version.Version + + CorePackerVersionString string + *hclparse.Parser BuilderSchemas packer.BuilderStore @@ -115,13 +120,14 @@ func (p *Parser) Parse(filename string, varFiles []string, argVars map[string]st }) } cfg := &PackerConfig{ - Basedir: basedir, - Cwd: wd, - builderSchemas: p.BuilderSchemas, - provisionersSchemas: p.ProvisionersSchemas, - postProcessorsSchemas: p.PostProcessorsSchemas, - parser: p, - files: files, + Basedir: basedir, + Cwd: wd, + CorePackerVersionString: p.CorePackerVersionString, + builderSchemas: p.BuilderSchemas, + provisionersSchemas: p.ProvisionersSchemas, + postProcessorsSchemas: p.PostProcessorsSchemas, + parser: p, + files: files, } for _, file := range files { @@ -133,7 +139,7 @@ func (p *Parser) Parse(filename string, varFiles []string, argVars map[string]st // Before we go further, we'll check to make sure this version can read // that file, so we can produce a version-related error message rather than // potentially-confusing downstream errors. - versionDiags := cfg.CheckCoreVersionRequirements() + versionDiags := cfg.CheckCoreVersionRequirements(p.CorePackerVersion) diags = append(diags, versionDiags...) if versionDiags.HasErrors() { return cfg, diags diff --git a/hcl2template/types.packer_config.go b/hcl2template/types.packer_config.go index daf80a209..58938faf6 100644 --- a/hcl2template/types.packer_config.go +++ b/hcl2template/types.packer_config.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/version" "github.com/zclconf/go-cty/cty" ) @@ -21,6 +20,10 @@ type PackerConfig struct { } // Directory where the config files are defined Basedir string + + // Core Packer version, for reference by plugins and template functions. + CorePackerVersionString string + // directory Packer was called from Cwd string @@ -84,7 +87,7 @@ func (cfg *PackerConfig) EvalContext(variables map[string]cty.Value) *hcl.EvalCo }), buildAccessor: cty.UnknownVal(cty.EmptyObject), packerAccessor: cty.ObjectVal(map[string]cty.Value{ - "version": cty.StringVal(version.FormattedVersion()), + "version": cty.StringVal(cfg.CorePackerVersionString), }), pathVariablesAccessor: cty.ObjectVal(map[string]cty.Value{ "cwd": cty.StringVal(strings.ReplaceAll(cfg.Cwd, `\`, `/`)), diff --git a/hcl2template/version_required.go b/hcl2template/version_required.go index 516d84823..10d50bb82 100644 --- a/hcl2template/version_required.go +++ b/hcl2template/version_required.go @@ -3,8 +3,8 @@ package hcl2template import ( "fmt" + "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2" - pkrversion "github.com/hashicorp/packer/version" ) // CheckCoreVersionRequirements visits each of the block in the given @@ -14,7 +14,7 @@ import ( // The returned diagnostics will contain errors if any constraints do not match. // The returned diagnostics might also return warnings, which should be // displayed to the user. -func (cfg *PackerConfig) CheckCoreVersionRequirements() hcl.Diagnostics { +func (cfg *PackerConfig) CheckCoreVersionRequirements(coreVersion *version.Version) hcl.Diagnostics { if cfg == nil { return nil } @@ -22,13 +22,13 @@ func (cfg *PackerConfig) CheckCoreVersionRequirements() hcl.Diagnostics { var diags hcl.Diagnostics for _, constraint := range cfg.Packer.VersionConstraints { - if !constraint.Required.Check(pkrversion.SemVer) { + if !constraint.Required.Check(coreVersion) { diags = diags.Append(&hcl.Diagnostic{ Severity: hcl.DiagError, Summary: "Unsupported Packer Core version", Detail: fmt.Sprintf( "This configuration does not support Packer version %s. To proceed, either choose another supported Packer version or update this version constraint. Version constraints are normally set for good reason, so updating the constraint may lead to other errors or unexpected behavior.", - pkrversion.String(), + coreVersion.String(), ), Subject: constraint.DeclRange.Ptr(), }) diff --git a/packer/build.go b/packer/build.go index 75d978e23..e054d2b55 100644 --- a/packer/build.go +++ b/packer/build.go @@ -7,6 +7,7 @@ import ( "sync" "github.com/hashicorp/packer/common/packerbuilderdata" + "github.com/hashicorp/packer/version" ) const ( @@ -19,6 +20,11 @@ const ( // such who want to make use of this. BuilderTypeConfigKey = "packer_builder_type" + // this is the key in the configuration that is set to the version of the + // Packer Core. This can be used by plugins to set user agents, etc, without + // having to import the Core to find out the Packer version. + CoreVersionConfigKey = "packer_core_version" + // This is the key in configurations that is set to "true" when Packer // debugging is enabled. DebugConfigKey = "packer_debug" @@ -160,6 +166,7 @@ func (b *CoreBuild) Prepare() (warn []string, err error) { packerConfig := map[string]interface{}{ BuildNameConfigKey: b.Type, BuilderTypeConfigKey: b.BuilderType, + CoreVersionConfigKey: version.Version, DebugConfigKey: b.debug, ForceConfigKey: b.force, OnErrorConfigKey: b.onError, From cd59d938b2f441fc27c9f5c8724325cfca97b231 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 9 Nov 2020 13:20:36 -0800 Subject: [PATCH 46/93] refactor core version pkg imports out of json interpolation/decode pathway. --- common/packer_config.go | 2 +- helper/config/decode.go | 23 +++++++++++++---------- packer/build.go | 2 +- template/interpolate/funcs.go | 9 ++++++--- template/interpolate/i.go | 7 ++++--- 5 files changed, 25 insertions(+), 18 deletions(-) diff --git a/common/packer_config.go b/common/packer_config.go index 3e2c87225..028e58f17 100644 --- a/common/packer_config.go +++ b/common/packer_config.go @@ -6,7 +6,7 @@ package common type PackerConfig struct { PackerBuildName string `mapstructure:"packer_build_name"` PackerBuilderType string `mapstructure:"packer_builder_type"` - PackerCoreVersion bool `mapstructure:"packer_core_version"` + PackerCoreVersion string `mapstructure:"packer_core_version"` PackerDebug bool `mapstructure:"packer_debug"` PackerForce bool `mapstructure:"packer_force"` PackerOnError string `mapstructure:"packer_on_error"` diff --git a/helper/config/decode.go b/helper/config/decode.go index e351d20d0..0bd1b0950 100644 --- a/helper/config/decode.go +++ b/helper/config/decode.go @@ -113,6 +113,7 @@ func Decode(target interface{}, config *DecodeOpts, raws ...interface{}) error { } else { config.InterpolateContext.BuildName = ctx.BuildName config.InterpolateContext.BuildType = ctx.BuildType + config.InterpolateContext.CorePackerVersionString = ctx.CorePackerVersionString config.InterpolateContext.TemplatePath = ctx.TemplatePath config.InterpolateContext.UserVariables = ctx.UserVariables if config.InterpolateContext.Data == nil { @@ -259,11 +260,12 @@ func DetectContextData(raws ...interface{}) (map[interface{}]interface{}, []inte // detecting things like user variables from the raw configuration params. func DetectContext(raws ...interface{}) (*interpolate.Context, error) { var s struct { - BuildName string `mapstructure:"packer_build_name"` - BuildType string `mapstructure:"packer_builder_type"` - TemplatePath string `mapstructure:"packer_template_path"` - Vars map[string]string `mapstructure:"packer_user_variables"` - SensitiveVars []string `mapstructure:"packer_sensitive_variables"` + BuildName string `mapstructure:"packer_build_name"` + BuildType string `mapstructure:"packer_builder_type"` + CorePackerVersionString string `mapstructure:"packer_core_version"` + TemplatePath string `mapstructure:"packer_template_path"` + Vars map[string]string `mapstructure:"packer_user_variables"` + SensitiveVars []string `mapstructure:"packer_sensitive_variables"` } for _, r := range raws { @@ -274,11 +276,12 @@ func DetectContext(raws ...interface{}) (*interpolate.Context, error) { } return &interpolate.Context{ - BuildName: s.BuildName, - BuildType: s.BuildType, - TemplatePath: s.TemplatePath, - UserVariables: s.Vars, - SensitiveVariables: s.SensitiveVars, + BuildName: s.BuildName, + BuildType: s.BuildType, + CorePackerVersionString: s.CorePackerVersionString, + TemplatePath: s.TemplatePath, + UserVariables: s.Vars, + SensitiveVariables: s.SensitiveVars, }, nil } diff --git a/packer/build.go b/packer/build.go index e054d2b55..f495aa5e1 100644 --- a/packer/build.go +++ b/packer/build.go @@ -166,7 +166,7 @@ func (b *CoreBuild) Prepare() (warn []string, err error) { packerConfig := map[string]interface{}{ BuildNameConfigKey: b.Type, BuilderTypeConfigKey: b.BuilderType, - CoreVersionConfigKey: version.Version, + CoreVersionConfigKey: version.FormattedVersion(), DebugConfigKey: b.debug, ForceConfigKey: b.force, OnErrorConfigKey: b.onError, diff --git a/template/interpolate/funcs.go b/template/interpolate/funcs.go index d94be75d8..471343151 100644 --- a/template/interpolate/funcs.go +++ b/template/interpolate/funcs.go @@ -13,7 +13,6 @@ import ( "github.com/hashicorp/packer/common/packerbuilderdata" commontpl "github.com/hashicorp/packer/common/template" "github.com/hashicorp/packer/common/uuid" - "github.com/hashicorp/packer/version" strftime "github.com/jehiah/go-strftime" ) @@ -242,8 +241,12 @@ func funcGenUuid(ctx *Context) interface{} { } func funcGenPackerVersion(ctx *Context) interface{} { - return func() string { - return version.FormattedVersion() + return func() (string, error) { + if ctx == nil || ctx.CorePackerVersionString == "" { + return "", errors.New("packer_version not available") + } + + return ctx.CorePackerVersionString, nil } } diff --git a/template/interpolate/i.go b/template/interpolate/i.go index 852f7f116..8ad4e50df 100644 --- a/template/interpolate/i.go +++ b/template/interpolate/i.go @@ -35,9 +35,10 @@ type Context struct { // // TemplatePath is the path to the template that this is being // rendered within. - BuildName string - BuildType string - TemplatePath string + BuildName string + BuildType string + CorePackerVersionString string + TemplatePath string } // NewContext returns an initialized empty context. From 1ecd715221f94a05f542dc36cf6587a17f46f488 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 9 Nov 2020 17:09:32 -0800 Subject: [PATCH 47/93] refactor code so that packer/version is not a dependency of sdk code or plugin code --- builder/alicloud/ecs/access_config.go | 4 +- builder/alicloud/version/version.go | 11 ++++ builder/azure/arm/azure_client.go | 35 +++++++------ .../azure/common/client/azure_client_set.go | 9 +++- builder/azure/common/client/devicelogin.go | 3 +- builder/azure/dtl/azure_client.go | 15 +++--- builder/azure/version/version.go | 11 ++++ builder/googlecompute/driver_gce.go | 3 +- builder/googlecompute/version/version.go | 11 ++++ builder/linode/linode.go | 4 +- builder/linode/version/version.go | 11 ++++ builder/scaleway/config.go | 3 +- builder/scaleway/version/version.go | 11 ++++ builder/ucloud/common/access_config.go | 4 +- builder/ucloud/version/version.go | 11 ++++ builder/yandex/driver_yc.go | 3 +- builder/yandex/version/version.go | 11 ++++ helper/useragent/useragent.go | 13 +---- helper/useragent/useragent_test.go | 3 +- helper/version/version.go | 52 +++++++++++++++++++ packer/build_test.go | 2 + .../exoscale-import/post-processor.go | 4 +- .../exoscale-import/version/version.go | 11 ++++ template/interpolate/funcs_test.go | 9 ++-- version/version.go | 26 +++------- 25 files changed, 207 insertions(+), 73 deletions(-) create mode 100644 builder/alicloud/version/version.go create mode 100644 builder/azure/version/version.go create mode 100644 builder/googlecompute/version/version.go create mode 100644 builder/linode/version/version.go create mode 100644 builder/scaleway/version/version.go create mode 100644 builder/ucloud/version/version.go create mode 100644 builder/yandex/version/version.go create mode 100644 helper/version/version.go create mode 100644 post-processor/exoscale-import/version/version.go diff --git a/builder/alicloud/ecs/access_config.go b/builder/alicloud/ecs/access_config.go index 516b521ff..3def01411 100644 --- a/builder/alicloud/ecs/access_config.go +++ b/builder/alicloud/ecs/access_config.go @@ -11,8 +11,8 @@ import ( "time" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" + "github.com/hashicorp/packer/builder/alicloud/version" "github.com/hashicorp/packer/template/interpolate" - "github.com/hashicorp/packer/version" "github.com/mitchellh/go-homedir" ) @@ -78,7 +78,7 @@ func (c *AlicloudAccessConfig) Client() (*ClientWrapper, error) { return nil, err } - client.AppendUserAgent(Packer, version.FormattedVersion()) + client.AppendUserAgent(Packer, version.AlicloudPluginVersion.FormattedVersion()) client.SetReadTimeout(DefaultRequestReadTimeout) c.client = &ClientWrapper{client} diff --git a/builder/alicloud/version/version.go b/builder/alicloud/version/version.go new file mode 100644 index 000000000..45ac500ca --- /dev/null +++ b/builder/alicloud/version/version.go @@ -0,0 +1,11 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var AlicloudPluginVersion = version.PluginVersion{ + Version: packerVersion.Version, + VersionPrerelease: packerVersion.VersionPrerelease, +} diff --git a/builder/azure/arm/azure_client.go b/builder/azure/arm/azure_client.go index 22e61f11e..f48f80621 100644 --- a/builder/azure/arm/azure_client.go +++ b/builder/azure/arm/azure_client.go @@ -22,6 +22,7 @@ import ( "github.com/Azure/go-autorest/autorest/adal" "github.com/Azure/go-autorest/autorest/azure" "github.com/hashicorp/packer/builder/azure/common" + "github.com/hashicorp/packer/builder/azure/version" "github.com/hashicorp/packer/helper/useragent" ) @@ -140,97 +141,97 @@ func NewAzureClient(subscriptionID, sigSubscriptionID, resourceGroupName, storag azureClient.DeploymentsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.DeploymentsClient.RequestInspector = withInspection(maxlen) azureClient.DeploymentsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.DeploymentsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DeploymentsClient.UserAgent) + azureClient.DeploymentsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DeploymentsClient.UserAgent) azureClient.DeploymentsClient.Client.PollingDuration = pollingDuration azureClient.DeploymentOperationsClient = resources.NewDeploymentOperationsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.DeploymentOperationsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.DeploymentOperationsClient.RequestInspector = withInspection(maxlen) azureClient.DeploymentOperationsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.DeploymentOperationsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DeploymentOperationsClient.UserAgent) + azureClient.DeploymentOperationsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DeploymentOperationsClient.UserAgent) azureClient.DeploymentOperationsClient.Client.PollingDuration = pollingDuration azureClient.DisksClient = compute.NewDisksClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.DisksClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.DisksClient.RequestInspector = withInspection(maxlen) azureClient.DisksClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.DisksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DisksClient.UserAgent) + azureClient.DisksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DisksClient.UserAgent) azureClient.DisksClient.Client.PollingDuration = pollingDuration azureClient.GroupsClient = resources.NewGroupsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.GroupsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.GroupsClient.RequestInspector = withInspection(maxlen) azureClient.GroupsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.GroupsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.GroupsClient.UserAgent) + azureClient.GroupsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.GroupsClient.UserAgent) azureClient.GroupsClient.Client.PollingDuration = pollingDuration azureClient.ImagesClient = compute.NewImagesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.ImagesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.ImagesClient.RequestInspector = withInspection(maxlen) azureClient.ImagesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.ImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.ImagesClient.UserAgent) + azureClient.ImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.ImagesClient.UserAgent) azureClient.ImagesClient.Client.PollingDuration = pollingDuration azureClient.InterfacesClient = network.NewInterfacesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.InterfacesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.InterfacesClient.RequestInspector = withInspection(maxlen) azureClient.InterfacesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.InterfacesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.InterfacesClient.UserAgent) + azureClient.InterfacesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.InterfacesClient.UserAgent) azureClient.InterfacesClient.Client.PollingDuration = pollingDuration azureClient.SubnetsClient = network.NewSubnetsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.SubnetsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.SubnetsClient.RequestInspector = withInspection(maxlen) azureClient.SubnetsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.SubnetsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.SubnetsClient.UserAgent) + azureClient.SubnetsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.SubnetsClient.UserAgent) azureClient.SubnetsClient.Client.PollingDuration = pollingDuration azureClient.VirtualNetworksClient = network.NewVirtualNetworksClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.VirtualNetworksClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.VirtualNetworksClient.RequestInspector = withInspection(maxlen) azureClient.VirtualNetworksClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.VirtualNetworksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.VirtualNetworksClient.UserAgent) + azureClient.VirtualNetworksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.VirtualNetworksClient.UserAgent) azureClient.VirtualNetworksClient.Client.PollingDuration = pollingDuration azureClient.SecurityGroupsClient = network.NewSecurityGroupsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.SecurityGroupsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.SecurityGroupsClient.RequestInspector = withInspection(maxlen) azureClient.SecurityGroupsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.SecurityGroupsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.SecurityGroupsClient.UserAgent) + azureClient.SecurityGroupsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.SecurityGroupsClient.UserAgent) azureClient.PublicIPAddressesClient = network.NewPublicIPAddressesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.PublicIPAddressesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.PublicIPAddressesClient.RequestInspector = withInspection(maxlen) azureClient.PublicIPAddressesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.PublicIPAddressesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.PublicIPAddressesClient.UserAgent) + azureClient.PublicIPAddressesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.PublicIPAddressesClient.UserAgent) azureClient.PublicIPAddressesClient.Client.PollingDuration = pollingDuration azureClient.VirtualMachinesClient = compute.NewVirtualMachinesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.VirtualMachinesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.VirtualMachinesClient.RequestInspector = withInspection(maxlen) azureClient.VirtualMachinesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient), errorCapture(azureClient)) - azureClient.VirtualMachinesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.VirtualMachinesClient.UserAgent) + azureClient.VirtualMachinesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.VirtualMachinesClient.UserAgent) azureClient.VirtualMachinesClient.Client.PollingDuration = pollingDuration azureClient.SnapshotsClient = compute.NewSnapshotsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.SnapshotsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.SnapshotsClient.RequestInspector = withInspection(maxlen) azureClient.SnapshotsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.SnapshotsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.SnapshotsClient.UserAgent) + azureClient.SnapshotsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.SnapshotsClient.UserAgent) azureClient.SnapshotsClient.Client.PollingDuration = pollingDuration azureClient.AccountsClient = armStorage.NewAccountsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.AccountsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.AccountsClient.RequestInspector = withInspection(maxlen) azureClient.AccountsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.AccountsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.AccountsClient.UserAgent) + azureClient.AccountsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.AccountsClient.UserAgent) azureClient.AccountsClient.Client.PollingDuration = pollingDuration azureClient.GalleryImageVersionsClient = newCompute.NewGalleryImageVersionsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.GalleryImageVersionsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.GalleryImageVersionsClient.RequestInspector = withInspection(maxlen) azureClient.GalleryImageVersionsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.GalleryImageVersionsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.GalleryImageVersionsClient.UserAgent) + azureClient.GalleryImageVersionsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.GalleryImageVersionsClient.UserAgent) azureClient.GalleryImageVersionsClient.Client.PollingDuration = sharedGalleryTimeout azureClient.GalleryImageVersionsClient.SubscriptionID = sigSubscriptionID @@ -238,7 +239,7 @@ func NewAzureClient(subscriptionID, sigSubscriptionID, resourceGroupName, storag azureClient.GalleryImagesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.GalleryImagesClient.RequestInspector = withInspection(maxlen) azureClient.GalleryImagesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.GalleryImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.GalleryImagesClient.UserAgent) + azureClient.GalleryImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.GalleryImagesClient.UserAgent) azureClient.GalleryImagesClient.Client.PollingDuration = pollingDuration azureClient.GalleryImagesClient.SubscriptionID = sigSubscriptionID @@ -251,7 +252,7 @@ func NewAzureClient(subscriptionID, sigSubscriptionID, resourceGroupName, storag azureClient.VaultClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalTokenVault) azureClient.VaultClient.RequestInspector = withInspection(maxlen) azureClient.VaultClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.VaultClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.VaultClient.UserAgent) + azureClient.VaultClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.VaultClient.UserAgent) azureClient.VaultClient.Client.PollingDuration = pollingDuration // This client is different than the above because it manages the vault @@ -260,7 +261,7 @@ func NewAzureClient(subscriptionID, sigSubscriptionID, resourceGroupName, storag azureClient.VaultClientDelete.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.VaultClientDelete.RequestInspector = withInspection(maxlen) azureClient.VaultClientDelete.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.VaultClientDelete.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.VaultClientDelete.UserAgent) + azureClient.VaultClientDelete.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.VaultClientDelete.UserAgent) azureClient.VaultClientDelete.Client.PollingDuration = pollingDuration // If this is a managed disk build, this should be ignored. diff --git a/builder/azure/common/client/azure_client_set.go b/builder/azure/common/client/azure_client_set.go index 04fb6a473..3d7b1a272 100644 --- a/builder/azure/common/client/azure_client_set.go +++ b/builder/azure/common/client/azure_client_set.go @@ -1,6 +1,7 @@ package client import ( + "log" "net/http" "regexp" "time" @@ -10,6 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute/computeapi" "github.com/Azure/go-autorest/autorest" + version "github.com/hashicorp/packer/builder/azure/version" ) type AzureClientSet interface { @@ -64,7 +66,10 @@ func (s azureClientSet) SubscriptionID() string { } func (s azureClientSet) configureAutorestClient(c *autorest.Client) { - c.AddToUserAgent(useragent.String()) + err := c.AddToUserAgent(useragent.String(version.AzurePluginVersion.FormattedVersion())) + if err != nil { + log.Printf("Error appending Packer plugin version to user agent.") + } c.Authorizer = s.authorizer c.Sender = s.sender } @@ -72,7 +77,7 @@ func (s azureClientSet) configureAutorestClient(c *autorest.Client) { func (s azureClientSet) MetadataClient() MetadataClientAPI { return metadataClient{ s.sender, - useragent.String(), + useragent.String(version.AzurePluginVersion.FormattedVersion()), } } diff --git a/builder/azure/common/client/devicelogin.go b/builder/azure/common/client/devicelogin.go index 888e851bf..69f6027b6 100644 --- a/builder/azure/common/client/devicelogin.go +++ b/builder/azure/common/client/devicelogin.go @@ -15,6 +15,7 @@ import ( "github.com/Azure/go-autorest/autorest/adal" "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" + version "github.com/hashicorp/packer/builder/azure/version" "github.com/hashicorp/packer/helper/useragent" ) @@ -123,7 +124,7 @@ func tokenFromFile(say func(string), oauthCfg adal.OAuthConfig, tokenPath, clien // endpoint is polled until user gives consent, denies or the flow times out. // Returned token must be saved. func tokenFromDeviceFlow(say func(string), oauthCfg adal.OAuthConfig, clientID, resource string) (*adal.ServicePrincipalToken, error) { - cl := autorest.NewClientWithUserAgent(useragent.String()) + cl := autorest.NewClientWithUserAgent(useragent.String(version.AzurePluginVersion.FormattedVersion())) deviceCode, err := adal.InitiateDeviceAuth(&cl, oauthCfg, clientID, resource) if err != nil { return nil, fmt.Errorf("Failed to start device auth: %v", err) diff --git a/builder/azure/dtl/azure_client.go b/builder/azure/dtl/azure_client.go index eefc89d45..1c1531969 100644 --- a/builder/azure/dtl/azure_client.go +++ b/builder/azure/dtl/azure_client.go @@ -20,6 +20,7 @@ import ( "github.com/Azure/go-autorest/autorest/adal" "github.com/Azure/go-autorest/autorest/azure" "github.com/hashicorp/packer/builder/azure/common" + "github.com/hashicorp/packer/builder/azure/version" "github.com/hashicorp/packer/helper/useragent" ) @@ -142,28 +143,28 @@ func NewAzureClient(subscriptionID, resourceGroupName string, azureClient.DtlVirtualMachineClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.DtlVirtualMachineClient.RequestInspector = withInspection(maxlen) azureClient.DtlVirtualMachineClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient), errorCapture(azureClient)) - azureClient.DtlVirtualMachineClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DtlVirtualMachineClient.UserAgent) + azureClient.DtlVirtualMachineClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DtlVirtualMachineClient.UserAgent) azureClient.DtlVirtualMachineClient.Client.PollingDuration = PollingDuration azureClient.DtlEnvironmentsClient = dtl.NewEnvironmentsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.DtlEnvironmentsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.DtlEnvironmentsClient.RequestInspector = withInspection(maxlen) azureClient.DtlEnvironmentsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient), errorCapture(azureClient)) - azureClient.DtlEnvironmentsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DtlEnvironmentsClient.UserAgent) + azureClient.DtlEnvironmentsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DtlEnvironmentsClient.UserAgent) azureClient.DtlEnvironmentsClient.Client.PollingDuration = PollingDuration azureClient.DtlLabsClient = dtl.NewLabsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.DtlLabsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.DtlLabsClient.RequestInspector = withInspection(maxlen) azureClient.DtlLabsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient), errorCapture(azureClient)) - azureClient.DtlLabsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DtlLabsClient.UserAgent) + azureClient.DtlLabsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DtlLabsClient.UserAgent) azureClient.DtlLabsClient.Client.PollingDuration = PollingDuration azureClient.DtlCustomImageClient = dtl.NewCustomImagesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.DtlCustomImageClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.DtlCustomImageClient.RequestInspector = withInspection(maxlen) azureClient.DtlCustomImageClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient), errorCapture(azureClient)) - azureClient.DtlCustomImageClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DtlCustomImageClient.UserAgent) + azureClient.DtlCustomImageClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DtlCustomImageClient.UserAgent) azureClient.DtlCustomImageClient.PollingDuration = autorest.DefaultPollingDuration azureClient.DtlCustomImageClient.Client.PollingDuration = PollingDuration @@ -171,14 +172,14 @@ func NewAzureClient(subscriptionID, resourceGroupName string, azureClient.DtlVirtualNetworksClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.DtlVirtualNetworksClient.RequestInspector = withInspection(maxlen) azureClient.DtlVirtualNetworksClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient), errorCapture(azureClient)) - azureClient.DtlVirtualNetworksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DtlVirtualNetworksClient.UserAgent) + azureClient.DtlVirtualNetworksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DtlVirtualNetworksClient.UserAgent) azureClient.DtlVirtualNetworksClient.Client.PollingDuration = PollingDuration azureClient.GalleryImageVersionsClient = newCompute.NewGalleryImageVersionsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.GalleryImageVersionsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.GalleryImageVersionsClient.RequestInspector = withInspection(maxlen) azureClient.GalleryImageVersionsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.GalleryImageVersionsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.GalleryImageVersionsClient.UserAgent) + azureClient.GalleryImageVersionsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.GalleryImageVersionsClient.UserAgent) azureClient.GalleryImageVersionsClient.Client.PollingDuration = SharedGalleryTimeout azureClient.GalleryImageVersionsClient.Client.PollingDuration = PollingDuration @@ -186,7 +187,7 @@ func NewAzureClient(subscriptionID, resourceGroupName string, azureClient.GalleryImagesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken) azureClient.GalleryImagesClient.RequestInspector = withInspection(maxlen) azureClient.GalleryImagesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient)) - azureClient.GalleryImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.GalleryImagesClient.UserAgent) + azureClient.GalleryImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.GalleryImagesClient.UserAgent) azureClient.GalleryImagesClient.Client.PollingDuration = PollingDuration return azureClient, nil diff --git a/builder/azure/version/version.go b/builder/azure/version/version.go new file mode 100644 index 000000000..9120955a8 --- /dev/null +++ b/builder/azure/version/version.go @@ -0,0 +1,11 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var AzurePluginVersion = version.PluginVersion{ + Version: packerVersion.Version, + VersionPrerelease: packerVersion.VersionPrerelease, +} diff --git a/builder/googlecompute/driver_gce.go b/builder/googlecompute/driver_gce.go index e1a558713..518408bcf 100644 --- a/builder/googlecompute/driver_gce.go +++ b/builder/googlecompute/driver_gce.go @@ -17,6 +17,7 @@ import ( "google.golang.org/api/option" oslogin "google.golang.org/api/oslogin/v1" + "github.com/hashicorp/packer/builder/googlecompute/version" "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/helper/useragent" "github.com/hashicorp/packer/packer" @@ -146,7 +147,7 @@ func NewDriverGCE(config GCEDriverConfig) (Driver, error) { } // Set UserAgent - service.UserAgent = useragent.String() + service.UserAgent = useragent.String(version.GCEPluginVersion.FormattedVersion()) return &driverGCE{ projectId: config.ProjectId, diff --git a/builder/googlecompute/version/version.go b/builder/googlecompute/version/version.go new file mode 100644 index 000000000..644d55712 --- /dev/null +++ b/builder/googlecompute/version/version.go @@ -0,0 +1,11 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var GCEPluginVersion = version.PluginVersion{ + Version: packerVersion.Version, + VersionPrerelease: packerVersion.VersionPrerelease, +} diff --git a/builder/linode/linode.go b/builder/linode/linode.go index 726a9b468..c274960a9 100644 --- a/builder/linode/linode.go +++ b/builder/linode/linode.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/hashicorp/packer/version" + "github.com/hashicorp/packer/builder/linode/version" "github.com/linode/linodego" "golang.org/x/oauth2" ) @@ -23,7 +23,7 @@ func newLinodeClient(pat string) linodego.Client { projectURL := "https://www.packer.io" userAgent := fmt.Sprintf("Packer/%s (+%s) linodego/%s", - version.FormattedVersion(), projectURL, linodego.Version) + version.LinodePluginVersion.FormattedVersion(), projectURL, linodego.Version) client.SetUserAgent(userAgent) return client diff --git a/builder/linode/version/version.go b/builder/linode/version/version.go new file mode 100644 index 000000000..bf10c2e83 --- /dev/null +++ b/builder/linode/version/version.go @@ -0,0 +1,11 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var LinodePluginVersion = version.PluginVersion{ + Version: packerVersion.Version, + VersionPrerelease: packerVersion.VersionPrerelease, +} diff --git a/builder/scaleway/config.go b/builder/scaleway/config.go index c88e4fea5..d5ffba5fc 100644 --- a/builder/scaleway/config.go +++ b/builder/scaleway/config.go @@ -9,6 +9,7 @@ import ( "log" "os" + "github.com/hashicorp/packer/builder/scaleway/version" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/communicator" @@ -114,7 +115,7 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) { var warnings []string - c.UserAgent = useragent.String() + c.UserAgent = useragent.String(version.ScalewayPluginVersion.FormattedVersion()) // Deprecated variables if c.Organization == "" { diff --git a/builder/scaleway/version/version.go b/builder/scaleway/version/version.go new file mode 100644 index 000000000..8aee52974 --- /dev/null +++ b/builder/scaleway/version/version.go @@ -0,0 +1,11 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ScalewayPluginVersion = version.PluginVersion{ + Version: packerVersion.Version, + VersionPrerelease: packerVersion.VersionPrerelease, +} diff --git a/builder/ucloud/common/access_config.go b/builder/ucloud/common/access_config.go index f29a0f107..3e0c060e6 100644 --- a/builder/ucloud/common/access_config.go +++ b/builder/ucloud/common/access_config.go @@ -10,8 +10,8 @@ import ( "path/filepath" "runtime" + "github.com/hashicorp/packer/builder/ucloud/version" "github.com/hashicorp/packer/template/interpolate" - "github.com/hashicorp/packer/version" "github.com/ucloud/ucloud-sdk-go/external" "github.com/ucloud/ucloud-sdk-go/private/protocol/http" "github.com/ucloud/ucloud-sdk-go/services/uaccount" @@ -68,7 +68,7 @@ func (c *AccessConfig) Client() (*UCloudClient, error) { cfg.BaseUrl = c.BaseUrl } cfg.LogLevel = log.PanicLevel - cfg.UserAgent = fmt.Sprintf("Packer-UCloud/%s", version.FormattedVersion()) + cfg.UserAgent = fmt.Sprintf("Packer-UCloud/%s", version.UcloudPluginVersion.FormattedVersion()) // set default max retry count cfg.MaxRetries = 3 diff --git a/builder/ucloud/version/version.go b/builder/ucloud/version/version.go new file mode 100644 index 000000000..1aae958f1 --- /dev/null +++ b/builder/ucloud/version/version.go @@ -0,0 +1,11 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var UcloudPluginVersion = version.PluginVersion{ + Version: packerVersion.Version, + VersionPrerelease: packerVersion.VersionPrerelease, +} diff --git a/builder/yandex/driver_yc.go b/builder/yandex/driver_yc.go index 437233dd4..ff1913279 100644 --- a/builder/yandex/driver_yc.go +++ b/builder/yandex/driver_yc.go @@ -14,6 +14,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" + "github.com/hashicorp/packer/builder/yandex/version" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" "github.com/yandex-cloud/go-genproto/yandex/cloud/endpoint" "github.com/yandex-cloud/go-genproto/yandex/cloud/vpc/v1" @@ -83,7 +84,7 @@ func NewDriverYC(ui packer.Ui, ac *AccessConfig) (Driver, error) { // Now we will have new request id for every retry attempt. interceptorChain := grpc_middleware.ChainUnaryClient(retryInterceptor, requestIDInterceptor) - userAgentMD := metadata.Pairs("user-agent", useragent.String()) + userAgentMD := metadata.Pairs("user-agent", useragent.String(version.YandexPluginVersion.FormattedVersion())) sdk, err := ycsdk.Build(context.Background(), sdkConfig, grpc.WithDefaultCallOptions(grpc.Header(&userAgentMD)), diff --git a/builder/yandex/version/version.go b/builder/yandex/version/version.go new file mode 100644 index 000000000..5f9969b63 --- /dev/null +++ b/builder/yandex/version/version.go @@ -0,0 +1,11 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var YandexPluginVersion = version.PluginVersion{ + Version: packerVersion.Version, + VersionPrerelease: packerVersion.VersionPrerelease, +} diff --git a/helper/useragent/useragent.go b/helper/useragent/useragent.go index 575d77aba..12f9facd5 100644 --- a/helper/useragent/useragent.go +++ b/helper/useragent/useragent.go @@ -3,8 +3,6 @@ package useragent import ( "fmt" "runtime" - - "github.com/hashicorp/packer/version" ) var ( @@ -19,17 +17,10 @@ var ( // goarch is the architecture - variable for tests. goarch = runtime.GOARCH - - // versionFunc is the func that returns the current version. This is a - // function to take into account the different build processes and distinguish - // between enterprise and oss builds. - versionFunc = func() string { - return version.FormattedVersion() - } ) // String returns the consistent user-agent string for Packer. -func String() string { +func String(packerVersion string) string { return fmt.Sprintf("Packer/%s (+%s; %s; %s/%s)", - versionFunc(), projectURL, rt, goos, goarch) + packerVersion, projectURL, rt, goos, goarch) } diff --git a/helper/useragent/useragent_test.go b/helper/useragent/useragent_test.go index b792753c6..639e1b4fb 100644 --- a/helper/useragent/useragent_test.go +++ b/helper/useragent/useragent_test.go @@ -9,9 +9,8 @@ func TestUserAgent(t *testing.T) { rt = "go5.0" goos = "linux" goarch = "amd64" - versionFunc = func() string { return "1.2.3" } - act := String() + act := String("1.2.3") exp := "Packer/1.2.3 (+https://packer-test.com; go5.0; linux/amd64)" if exp != act { diff --git a/helper/version/version.go b/helper/version/version.go new file mode 100644 index 000000000..f40ea536d --- /dev/null +++ b/helper/version/version.go @@ -0,0 +1,52 @@ +// Version helps plugin creators set and track the plugin version using the same +// convenience functions used by the Packer core. +package version + +import ( + "bytes" + "fmt" + + "github.com/hashicorp/go-version" +) + +// The git commit that was compiled. This will be filled in by the compiler. +var GitCommit string + +type PluginVersion struct { + // The main version number that is being run at the moment. + Version string + // A pre-release marker for the version. If this is "" (empty string) + // then it means that it is a final release. Otherwise, this is a pre-release + // such as "dev" (in development), "beta", "rc1", etc. + VersionPrerelease string +} + +func (p *PluginVersion) FormattedVersion() string { + var versionString bytes.Buffer + fmt.Fprintf(&versionString, "%s", p.Version) + if p.VersionPrerelease != "" { + fmt.Fprintf(&versionString, "-%s", p.VersionPrerelease) + + if GitCommit != "" { + fmt.Fprintf(&versionString, " (%s)", GitCommit) + } + } + + return versionString.String() +} + +func (p *PluginVersion) Semver() *version.Version { + // SemVer is an instance of version.Version. This has the secondary + // benefit of verifying during tests and init time that our version is a + // proper semantic version, which should always be the case. + SemVer := version.Must(version.NewVersion(p.Version)) + return SemVer +} + +// String returns the complete version string, including prerelease +func (p *PluginVersion) String() string { + if p.VersionPrerelease != "" { + return fmt.Sprintf("%s-%s", p.Version, p.VersionPrerelease) + } + return p.Version +} diff --git a/packer/build_test.go b/packer/build_test.go index 308c2f03b..5d0805361 100644 --- a/packer/build_test.go +++ b/packer/build_test.go @@ -6,6 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/common/packerbuilderdata" + "github.com/hashicorp/packer/version" ) func boolPointer(tf bool) *bool { @@ -41,6 +42,7 @@ func testDefaultPackerConfig() map[string]interface{} { return map[string]interface{}{ BuildNameConfigKey: "test", BuilderTypeConfigKey: "foo", + CoreVersionConfigKey: version.FormattedVersion(), DebugConfigKey: false, ForceConfigKey: false, OnErrorConfigKey: "cleanup", diff --git a/post-processor/exoscale-import/post-processor.go b/post-processor/exoscale-import/post-processor.go index ac190191e..08e60cee6 100644 --- a/post-processor/exoscale-import/post-processor.go +++ b/post-processor/exoscale-import/post-processor.go @@ -24,7 +24,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/post-processor/artifice" - "github.com/hashicorp/packer/version" + "github.com/hashicorp/packer/post-processor/exoscale-import/version" ) var ( @@ -51,7 +51,7 @@ type Config struct { } func init() { - egoscale.UserAgent = "Packer-Exoscale/" + version.FormattedVersion() + " " + egoscale.UserAgent + egoscale.UserAgent = "Packer-Exoscale/" + version.ExoscaleImportPluginVersion.FormattedVersion() + " " + egoscale.UserAgent } type PostProcessor struct { diff --git a/post-processor/exoscale-import/version/version.go b/post-processor/exoscale-import/version/version.go new file mode 100644 index 000000000..c6e587827 --- /dev/null +++ b/post-processor/exoscale-import/version/version.go @@ -0,0 +1,11 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ExoscaleImportPluginVersion = version.PluginVersion{ + Version: packerVersion.Version, + VersionPrerelease: packerVersion.VersionPrerelease, +} diff --git a/template/interpolate/funcs_test.go b/template/interpolate/funcs_test.go index 92bdd6117..4a11be88b 100644 --- a/template/interpolate/funcs_test.go +++ b/template/interpolate/funcs_test.go @@ -10,7 +10,6 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/packer/common/packerbuilderdata" - "github.com/hashicorp/packer/version" ) func TestFuncBuildName(t *testing.T) { @@ -413,7 +412,9 @@ func TestFuncPackerBuild(t *testing.T) { func TestFuncPackerVersion(t *testing.T) { template := `{{packer_version}}` - ctx := &Context{} + ctx := &Context{ + CorePackerVersionString: "1.4.3-dev [DEADC0DE]", + } i := &I{Value: template} result, err := i.Render(ctx) @@ -422,9 +423,9 @@ func TestFuncPackerVersion(t *testing.T) { } // Only match the X.Y.Z portion of the whole version string. - if !strings.HasPrefix(result, version.Version) { + if !strings.HasPrefix(result, "1.4.3-dev [DEADC0DE]") { t.Fatalf("Expected input to include: %s\n\nGot: %s", - version.Version, result) + "1.4.3-dev [DEADC0DE]", result) } } diff --git a/version/version.go b/version/version.go index b0f5dcafc..3c89bd0ef 100644 --- a/version/version.go +++ b/version/version.go @@ -1,10 +1,8 @@ package version import ( - "bytes" - "fmt" - "github.com/hashicorp/go-version" + pluginVersion "github.com/hashicorp/packer/helper/version" ) // The git commit that was compiled. This will be filled in by the compiler. @@ -18,18 +16,13 @@ const Version = "1.6.6" // such as "dev" (in development), "beta", "rc1", etc. const VersionPrerelease = "dev" +var PackerVersion = pluginVersion.PluginVersion{ + Version: Version, + VersionPrerelease: VersionPrerelease, +} + func FormattedVersion() string { - var versionString bytes.Buffer - fmt.Fprintf(&versionString, "%s", Version) - if VersionPrerelease != "" { - fmt.Fprintf(&versionString, "-%s", VersionPrerelease) - - if GitCommit != "" { - fmt.Fprintf(&versionString, " (%s)", GitCommit) - } - } - - return versionString.String() + return PackerVersion.FormattedVersion() } // SemVer is an instance of version.Version. This has the secondary @@ -43,8 +36,5 @@ func init() { // String returns the complete version string, including prerelease func String() string { - if VersionPrerelease != "" { - return fmt.Sprintf("%s-%s", Version, VersionPrerelease) - } - return Version + return PackerVersion.String() } From 17ec88246fc33c50702480182d6423ff05038c56 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Tue, 10 Nov 2020 10:46:20 +0100 Subject: [PATCH 48/93] hcl2_upgrade update (#10221) * handle template_dir, pwd funcs, handle min_packer_version * gotpl packer_version becomes hcl2 packer.version * uuid becomes hcl2 uuidv4 * test code with emojis * handle all cases were we cannot guess what the argument was * handle clean_resource_name cases * up docs --- command/hcl2_upgrade.go | 106 +++++++++++++++++- .../hcl2_upgrade_basic/expected.pkr.hcl | 70 +++++++++++- .../hcl2_upgrade_basic/input.json | 50 ++++++++- 3 files changed, 214 insertions(+), 12 deletions(-) diff --git a/command/hcl2_upgrade.go b/command/hcl2_upgrade.go index 9da3dc645..13148c430 100644 --- a/command/hcl2_upgrade.go +++ b/command/hcl2_upgrade.go @@ -64,10 +64,19 @@ const ( # once they also need to be in the same folder. 'packer inspect folder/' # will describe to you what is in that folder. +# Avoid mixing go templating calls ( for example ` + "```{{ upper(`string`) }}```" + ` ) +# and HCL2 calls (for example '${ var.string_value_example }' ). They won't be +# executed together and the outcome will be unknown. +` + inputVarHeader = ` # All generated input variables will be of 'string' type as this is how Packer JSON # views them; you can change their type later on. Read the variables type # constraints documentation # https://www.packer.io/docs/from-1.5/variables#type-constraints for more info. +` + + packerBlockHeader = ` +# See https://www.packer.io/docs/from-1.5/blocks/packer for more info ` sourcesHeader = ` @@ -112,10 +121,22 @@ func (c *HCL2UpgradeCommand) RunContext(buildCtx context.Context, cla *HCL2Upgra core := hdl.(*CoreWrapper).Core if err := core.Initialize(); err != nil { - c.Ui.Error(fmt.Sprintf("Initialization error, continuing: %v", err)) + c.Ui.Error(fmt.Sprintf("Ignoring following initialization error: %v", err)) } tpl := core.Template + // Packer section + if tpl.MinVersion != "" { + out.Write([]byte(packerBlockHeader)) + fileContent := hclwrite.NewEmptyFile() + body := fileContent.Body() + packerBody := body.AppendNewBlock("packer", nil).Body() + packerBody.SetAttributeValue("required_version", cty.StringVal(fmt.Sprintf(">= %s", tpl.MinVersion))) + out.Write(fileContent.Bytes()) + } + + out.Write([]byte(inputVarHeader)) + // Output variables section variables := []*template.Variable{} @@ -266,12 +287,29 @@ func (c *HCL2UpgradeCommand) RunContext(buildCtx context.Context, cla *HCL2Upgra return 0 } +type UnhandleableArgumentError struct { + Call string + Correspondance string + Docs string +} + +func (uc UnhandleableArgumentError) Error() string { + return fmt.Sprintf(`unhandled %q call: +# there is no way to automatically upgrade the %[1]q call. +# Please manually upgrade to %s +# Visit %s for more infos.`, uc.Call, uc.Correspondance, uc.Docs) +} + // transposeTemplatingCalls executes parts of blocks as go template files and replaces // their result with their hcl2 variant. If something goes wrong the template // containing the go template string is returned. func transposeTemplatingCalls(s []byte) []byte { fallbackReturn := func(err error) []byte { - return append([]byte(fmt.Sprintf("\n#could not parse template for following block: %q\n", err)), s...) + if strings.Contains(err.Error(), "unhandled") { + return append([]byte(fmt.Sprintf("\n# %s\n", err)), s...) + } + + return append([]byte(fmt.Sprintf("\n# could not parse template for following block: %q\n", err)), s...) } funcMap := texttemplate.FuncMap{ "timestamp": func() string { @@ -289,9 +327,71 @@ func transposeTemplatingCalls(s []byte) []byte { "build": func(a string) string { return fmt.Sprintf("${build.%s}", a) }, + "template_dir": func() string { + return fmt.Sprintf("${path.root}") + }, + "pwd": func() string { + return fmt.Sprintf("${path.cwd}") + }, + "packer_version": func() string { + return fmt.Sprintf("${packer.version}") + }, + "uuid": func() string { + return fmt.Sprintf("${uuidv4()}") + }, + "lower": func(_ string) (string, error) { + return "", UnhandleableArgumentError{ + "lower", + "`lower(var.example)`", + "https://www.packer.io/docs/from-1.5/functions/string/lower", + } + }, + "upper": func(_ string) (string, error) { + return "", UnhandleableArgumentError{ + "upper", + "`upper(var.example)`", + "https://www.packer.io/docs/from-1.5/functions/string/upper", + } + }, + "split": func(_, _ string, _ int) (string, error) { + return "", UnhandleableArgumentError{ + "split", + "`split(separator, string)`", + "https://www.packer.io/docs/from-1.5/functions/string/split", + } + }, + "replace": func(_, _, _ string, _ int) (string, error) { + return "", UnhandleableArgumentError{ + "replace", + "`replace(string, substring, replacement)` or `regex_replace(string, substring, replacement)`", + "https://www.packer.io/docs/from-1.5/functions/string/replace or https://www.packer.io/docs/from-1.5/functions/string/regex_replace", + } + }, + "replace_all": func(_, _, _ string) (string, error) { + return "", UnhandleableArgumentError{ + "replace_all", + "`replace(string, substring, replacement)` or `regex_replace(string, substring, replacement)`", + "https://www.packer.io/docs/from-1.5/functions/string/replace or https://www.packer.io/docs/from-1.5/functions/string/regex_replace", + } + }, + "clean_resource_name": func(_ string) (string, error) { + return "", UnhandleableArgumentError{ + "clean_resource_name", + "use custom validation rules, `replace(string, substring, replacement)` or `regex_replace(string, substring, replacement)`", + "https://packer.io/docs/from-1.5/variables#custom-validation-rules" + + " , https://www.packer.io/docs/from-1.5/functions/string/replace" + + " or https://www.packer.io/docs/from-1.5/functions/string/regex_replace", + } + }, + "build_name": func() string { + return fmt.Sprintf("${build.name}") + }, + "build_type": func() string { + return fmt.Sprintf("${build.type}") + }, } - tpl, err := texttemplate.New("generated"). + tpl, err := texttemplate.New("hcl2_upgrade"). Funcs(funcMap). Parse(string(s)) diff --git a/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl b/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl index ffb88fd7c..97b18111f 100644 --- a/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl +++ b/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl @@ -7,6 +7,15 @@ # once they also need to be in the same folder. 'packer inspect folder/' # will describe to you what is in that folder. +# Avoid mixing go templating calls ( for example ```{{ upper(`string`) }}``` ) +# and HCL2 calls (for example '${ var.string_value_example }' ). They won't be +# executed together and the outcome will be unknown. + +# See https://www.packer.io/docs/from-1.5/blocks/packer for more info +packer { + required_version = ">= 1.6.0" +} + # All generated input variables will be of 'string' type as this is how Packer JSON # views them; you can change their type later on. Read the variables type # constraints documentation @@ -27,6 +36,12 @@ variable "aws_secret_key" { sensitive = true } +variable "secret_account" { + type = string + default = "🤷" + sensitive = true +} + # "timestamp" template function replacement locals { timestamp = regex_replace(timestamp(), "[- TZ:]", "") } @@ -77,14 +92,61 @@ build { sources = ["source.amazon-ebs.autogenerated_1"] provisioner "shell" { - inline = ["echo ${var.secret_account}", "echo ${build.ID}", "echo ${build.SSHPrivateKey}", "sleep 100000"] + except = ["amazon-ebs"] + inline = ["echo ${var.secret_account}", "echo ${build.ID}", "echo ${build.SSHPublicKey} | head -c 14", "echo ${path.root} is not ${path.cwd}", "echo ${packer.version}", "echo ${uuidv4()}"] max_retries = "5" - only = ["amazon-ebs"] - timeout = "5s" + } + + # template: hcl2_upgrade:2:38: executing "hcl2_upgrade" at : error calling clean_resource_name: unhandled "clean_resource_name" call: + # there is no way to automatically upgrade the "clean_resource_name" call. + # Please manually upgrade to use custom validation rules, `replace(string, substring, replacement)` or `regex_replace(string, substring, replacement)` + # Visit https://packer.io/docs/from-1.5/variables#custom-validation-rules , https://www.packer.io/docs/from-1.5/functions/string/replace or https://www.packer.io/docs/from-1.5/functions/string/regex_replace for more infos. + provisioner "shell" { + inline = ["echo mybuild-{{isotime | clean_resource_name}}"] + } + + # template: hcl2_upgrade:2:35: executing "hcl2_upgrade" at : error calling lower: unhandled "lower" call: + # there is no way to automatically upgrade the "lower" call. + # Please manually upgrade to `lower(var.example)` + # Visit https://www.packer.io/docs/from-1.5/functions/string/lower for more infos. + provisioner "shell" { + inline = ["echo {{ `SOMETHING` | lower }}"] + } + + # template: hcl2_upgrade:2:35: executing "hcl2_upgrade" at : error calling upper: unhandled "upper" call: + # there is no way to automatically upgrade the "upper" call. + # Please manually upgrade to `upper(var.example)` + # Visit https://www.packer.io/docs/from-1.5/functions/string/upper for more infos. + provisioner "shell" { + inline = ["echo {{ `something` | upper }}"] + } + + # template: hcl2_upgrade:2:21: executing "hcl2_upgrade" at : error calling split: unhandled "split" call: + # there is no way to automatically upgrade the "split" call. + # Please manually upgrade to `split(separator, string)` + # Visit https://www.packer.io/docs/from-1.5/functions/string/split for more infos. + provisioner "shell" { + inline = ["echo {{ split `some-string` `-` 0 }}"] + } + + # template: hcl2_upgrade:2:21: executing "hcl2_upgrade" at : error calling replace_all: unhandled "replace_all" call: + # there is no way to automatically upgrade the "replace_all" call. + # Please manually upgrade to `replace(string, substring, replacement)` or `regex_replace(string, substring, replacement)` + # Visit https://www.packer.io/docs/from-1.5/functions/string/replace or https://www.packer.io/docs/from-1.5/functions/string/regex_replace for more infos. + provisioner "shell" { + inline = ["echo {{ replace_all `-` `/` build_name }}"] + } + + # template: hcl2_upgrade:2:21: executing "hcl2_upgrade" at : error calling replace: unhandled "replace" call: + # there is no way to automatically upgrade the "replace" call. + # Please manually upgrade to `replace(string, substring, replacement)` or `regex_replace(string, substring, replacement)` + # Visit https://www.packer.io/docs/from-1.5/functions/string/replace or https://www.packer.io/docs/from-1.5/functions/string/regex_replace for more infos. + provisioner "shell" { + inline = ["echo {{ replace `some-string` `-` `/` 1 }}"] } provisioner "shell-local" { - except = ["amazon-ebs"] inline = ["sleep 100000"] + only = ["amazon-ebs"] timeout = "5s" } post-processor "amazon-import" { diff --git a/command/test-fixtures/hcl2_upgrade_basic/input.json b/command/test-fixtures/hcl2_upgrade_basic/input.json index cd4fbb6ae..b6f9a9302 100644 --- a/command/test-fixtures/hcl2_upgrade_basic/input.json +++ b/command/test-fixtures/hcl2_upgrade_basic/input.json @@ -1,5 +1,7 @@ { + "min_packer_version": "1.6.0", "variables": { + "secret_account": "🤷", "aws_region": null, "aws_secret_key": "", "aws_access_key": "" @@ -7,6 +9,7 @@ "sensitive-variables": [ "aws_secret_key", "aws_access_key", + "secret_account", "potato" ], "builders": [ @@ -62,21 +65,58 @@ "provisioners": [ { "type": "shell", - "only": [ + "except": [ "amazon-ebs" ], "max_retries": 5, - "timeout": "5s", "inline": [ "echo {{ user `secret_account` }}", "echo {{ build `ID` }}", - "echo {{ build `SSHPrivateKey` }}", - "sleep 100000" + "echo {{ build `SSHPublicKey` }} | head -c 14", + "echo {{ template_dir }} is not {{ pwd }}", + "echo {{ packer_version }}", + "echo {{ uuid }}" + ] + }, + { + "type": "shell", + "inline": [ + "echo mybuild-{{isotime | clean_resource_name}}" + ] + }, + { + "type": "shell", + "inline": [ + "echo {{ `SOMETHING` | lower }}" + ] + }, + { + "type": "shell", + "inline": [ + "echo {{ `something` | upper }}" + ] + }, + { + "type": "shell", + "inline": [ + "echo {{ split `some-string` `-` 0 }}" + ] + }, + { + "type": "shell", + "inline": [ + "echo {{ replace_all `-` `/` build_name }}" + ] + }, + { + "type": "shell", + "inline": [ + "echo {{ replace `some-string` `-` `/` 1 }}" ] }, { "type": "shell-local", - "except": [ + "only": [ "amazon-ebs" ], "timeout": "5s", From 8ecd16db81fa21341db7f7fb0907f112f19d39bc Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Tue, 10 Nov 2020 08:16:59 -0800 Subject: [PATCH 49/93] regenerate code --- builder/alicloud/ecs/builder.hcl2spec.go | 2 ++ builder/amazon/chroot/builder.hcl2spec.go | 2 ++ builder/amazon/ebs/builder.hcl2spec.go | 2 ++ builder/amazon/ebssurrogate/builder.hcl2spec.go | 2 ++ builder/amazon/ebsvolume/builder.hcl2spec.go | 2 ++ builder/amazon/instance/builder.hcl2spec.go | 2 ++ builder/azure/arm/config.hcl2spec.go | 2 ++ builder/azure/chroot/builder.hcl2spec.go | 2 ++ builder/azure/dtl/config.hcl2spec.go | 2 ++ builder/cloudstack/config.hcl2spec.go | 2 ++ builder/digitalocean/config.hcl2spec.go | 2 ++ builder/docker/config.hcl2spec.go | 2 ++ builder/file/config.hcl2spec.go | 2 ++ builder/googlecompute/config.hcl2spec.go | 2 ++ builder/hcloud/config.hcl2spec.go | 2 ++ builder/hyperone/config.hcl2spec.go | 2 ++ builder/hyperv/iso/builder.hcl2spec.go | 2 ++ builder/hyperv/vmcx/builder.hcl2spec.go | 2 ++ builder/jdcloud/common.hcl2spec.go | 2 ++ builder/linode/config.hcl2spec.go | 2 ++ builder/lxc/config.hcl2spec.go | 2 ++ builder/lxd/config.hcl2spec.go | 2 ++ builder/ncloud/config.hcl2spec.go | 2 ++ builder/null/config.hcl2spec.go | 2 ++ builder/oneandone/config.hcl2spec.go | 2 ++ builder/openstack/builder.hcl2spec.go | 2 ++ builder/oracle/classic/builder.hcl2spec.go | 2 ++ builder/oracle/oci/config.hcl2spec.go | 2 ++ builder/osc/bsu/builder.hcl2spec.go | 2 ++ builder/osc/bsusurrogate/builder.hcl2spec.go | 2 ++ builder/osc/bsuvolume/builder.hcl2spec.go | 2 ++ builder/osc/chroot/builder.hcl2spec.go | 2 ++ builder/parallels/iso/builder.hcl2spec.go | 2 ++ builder/parallels/pvm/config.hcl2spec.go | 2 ++ builder/profitbricks/config.hcl2spec.go | 2 ++ builder/proxmox/clone/config.hcl2spec.go | 2 ++ builder/proxmox/common/config.hcl2spec.go | 2 ++ builder/proxmox/iso/config.hcl2spec.go | 2 ++ builder/qemu/config.hcl2spec.go | 2 ++ builder/scaleway/config.hcl2spec.go | 2 ++ builder/tencentcloud/cvm/builder.hcl2spec.go | 2 ++ builder/triton/config.hcl2spec.go | 2 ++ builder/ucloud/uhost/builder.hcl2spec.go | 2 ++ builder/vagrant/builder.hcl2spec.go | 2 ++ builder/virtualbox/iso/builder.hcl2spec.go | 2 ++ builder/virtualbox/ovf/config.hcl2spec.go | 2 ++ builder/virtualbox/vm/config.hcl2spec.go | 2 ++ builder/vmware/iso/config.hcl2spec.go | 2 ++ builder/vmware/vmx/config.hcl2spec.go | 2 ++ builder/vsphere/clone/config.hcl2spec.go | 2 ++ builder/vsphere/iso/config.hcl2spec.go | 2 ++ builder/yandex/config.hcl2spec.go | 2 ++ common/shell-local/config.hcl2spec.go | 2 ++ post-processor/alicloud-import/post-processor.hcl2spec.go | 2 ++ post-processor/amazon-import/post-processor.hcl2spec.go | 2 ++ post-processor/artifice/post-processor.hcl2spec.go | 2 ++ post-processor/checksum/post-processor.hcl2spec.go | 2 ++ post-processor/compress/post-processor.hcl2spec.go | 2 ++ post-processor/digitalocean-import/post-processor.hcl2spec.go | 2 ++ post-processor/docker-import/post-processor.hcl2spec.go | 2 ++ post-processor/docker-push/post-processor.hcl2spec.go | 2 ++ post-processor/docker-save/post-processor.hcl2spec.go | 2 ++ post-processor/docker-tag/post-processor.hcl2spec.go | 2 ++ post-processor/exoscale-import/post-processor.hcl2spec.go | 2 ++ post-processor/googlecompute-export/post-processor.hcl2spec.go | 2 ++ post-processor/googlecompute-import/post-processor.hcl2spec.go | 2 ++ post-processor/manifest/post-processor.hcl2spec.go | 2 ++ post-processor/ucloud-import/post-processor.hcl2spec.go | 2 ++ post-processor/vagrant-cloud/post-processor.hcl2spec.go | 2 ++ post-processor/vagrant/post-processor.hcl2spec.go | 2 ++ post-processor/vsphere-template/post-processor.hcl2spec.go | 2 ++ post-processor/vsphere/post-processor.hcl2spec.go | 2 ++ post-processor/yandex-export/post-processor.hcl2spec.go | 2 ++ post-processor/yandex-import/post-processor.hcl2spec.go | 2 ++ provisioner/ansible-local/provisioner.hcl2spec.go | 2 ++ provisioner/ansible/provisioner.hcl2spec.go | 2 ++ provisioner/azure-dtlartifact/provisioner.hcl2spec.go | 2 ++ provisioner/breakpoint/provisioner.hcl2spec.go | 2 ++ provisioner/chef-client/provisioner.hcl2spec.go | 2 ++ provisioner/chef-solo/provisioner.hcl2spec.go | 2 ++ provisioner/converge/provisioner.hcl2spec.go | 2 ++ provisioner/file/provisioner.hcl2spec.go | 2 ++ provisioner/inspec/provisioner.hcl2spec.go | 2 ++ provisioner/powershell/provisioner.hcl2spec.go | 2 ++ provisioner/puppet-masterless/provisioner.hcl2spec.go | 2 ++ provisioner/puppet-server/provisioner.hcl2spec.go | 2 ++ provisioner/salt-masterless/provisioner.hcl2spec.go | 2 ++ provisioner/shell/provisioner.hcl2spec.go | 2 ++ provisioner/windows-restart/provisioner.hcl2spec.go | 2 ++ provisioner/windows-shell/provisioner.hcl2spec.go | 2 ++ 90 files changed, 180 insertions(+) diff --git a/builder/alicloud/ecs/builder.hcl2spec.go b/builder/alicloud/ecs/builder.hcl2spec.go index 7a56371f8..862ed5ddf 100644 --- a/builder/alicloud/ecs/builder.hcl2spec.go +++ b/builder/alicloud/ecs/builder.hcl2spec.go @@ -49,6 +49,7 @@ func (*FlatAlicloudDiskDevice) HCL2Spec() map[string]hcldec.Spec { type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -165,6 +166,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/amazon/chroot/builder.hcl2spec.go b/builder/amazon/chroot/builder.hcl2spec.go index 4a2647a34..48b480da0 100644 --- a/builder/amazon/chroot/builder.hcl2spec.go +++ b/builder/amazon/chroot/builder.hcl2spec.go @@ -13,6 +13,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -92,6 +93,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/amazon/ebs/builder.hcl2spec.go b/builder/amazon/ebs/builder.hcl2spec.go index c02289228..279bd073b 100644 --- a/builder/amazon/ebs/builder.hcl2spec.go +++ b/builder/amazon/ebs/builder.hcl2spec.go @@ -13,6 +13,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -161,6 +162,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/amazon/ebssurrogate/builder.hcl2spec.go b/builder/amazon/ebssurrogate/builder.hcl2spec.go index e8fb81726..b56f37b69 100644 --- a/builder/amazon/ebssurrogate/builder.hcl2spec.go +++ b/builder/amazon/ebssurrogate/builder.hcl2spec.go @@ -56,6 +56,7 @@ func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec { type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -205,6 +206,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/amazon/ebsvolume/builder.hcl2spec.go b/builder/amazon/ebsvolume/builder.hcl2spec.go index 2d821e8a2..e76c946cc 100644 --- a/builder/amazon/ebsvolume/builder.hcl2spec.go +++ b/builder/amazon/ebsvolume/builder.hcl2spec.go @@ -58,6 +58,7 @@ func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec { type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -185,6 +186,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/amazon/instance/builder.hcl2spec.go b/builder/amazon/instance/builder.hcl2spec.go index 26ea13940..81378789b 100644 --- a/builder/amazon/instance/builder.hcl2spec.go +++ b/builder/amazon/instance/builder.hcl2spec.go @@ -13,6 +13,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -167,6 +168,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/azure/arm/config.hcl2spec.go b/builder/azure/arm/config.hcl2spec.go index 5da288787..7ce2b4464 100644 --- a/builder/azure/arm/config.hcl2spec.go +++ b/builder/azure/arm/config.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -139,6 +140,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/azure/chroot/builder.hcl2spec.go b/builder/azure/chroot/builder.hcl2spec.go index 03bea01cc..4ace06b46 100644 --- a/builder/azure/chroot/builder.hcl2spec.go +++ b/builder/azure/chroot/builder.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -64,6 +65,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/azure/dtl/config.hcl2spec.go b/builder/azure/dtl/config.hcl2spec.go index be321e92a..4986ced94 100644 --- a/builder/azure/dtl/config.hcl2spec.go +++ b/builder/azure/dtl/config.hcl2spec.go @@ -38,6 +38,7 @@ func (*FlatArtifactParameter) HCL2Spec() map[string]hcldec.Spec { type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -151,6 +152,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/cloudstack/config.hcl2spec.go b/builder/cloudstack/config.hcl2spec.go index 5c2313af3..2fc182ae3 100644 --- a/builder/cloudstack/config.hcl2spec.go +++ b/builder/cloudstack/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -126,6 +127,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/digitalocean/config.hcl2spec.go b/builder/digitalocean/config.hcl2spec.go index 4bcc78324..29cbae1a1 100644 --- a/builder/digitalocean/config.hcl2spec.go +++ b/builder/digitalocean/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -97,6 +98,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/docker/config.hcl2spec.go b/builder/docker/config.hcl2spec.go index 1c650d8d3..c0472c3bb 100644 --- a/builder/docker/config.hcl2spec.go +++ b/builder/docker/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -110,6 +111,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/file/config.hcl2spec.go b/builder/file/config.hcl2spec.go index dc6e144e3..28d36410f 100644 --- a/builder/file/config.hcl2spec.go +++ b/builder/file/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -35,6 +36,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/googlecompute/config.hcl2spec.go b/builder/googlecompute/config.hcl2spec.go index ca9064ca4..c235087f0 100644 --- a/builder/googlecompute/config.hcl2spec.go +++ b/builder/googlecompute/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -133,6 +134,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/hcloud/config.hcl2spec.go b/builder/hcloud/config.hcl2spec.go index b39fdcbe3..1b8430684 100644 --- a/builder/hcloud/config.hcl2spec.go +++ b/builder/hcloud/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -95,6 +96,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/hyperone/config.hcl2spec.go b/builder/hyperone/config.hcl2spec.go index dc7a137a4..4e4e01821 100644 --- a/builder/hyperone/config.hcl2spec.go +++ b/builder/hyperone/config.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -118,6 +119,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/hyperv/iso/builder.hcl2spec.go b/builder/hyperv/iso/builder.hcl2spec.go index 4d2df4065..8cc2b4786 100644 --- a/builder/hyperv/iso/builder.hcl2spec.go +++ b/builder/hyperv/iso/builder.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -132,6 +133,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/hyperv/vmcx/builder.hcl2spec.go b/builder/hyperv/vmcx/builder.hcl2spec.go index 927c91bed..7a038c083 100644 --- a/builder/hyperv/vmcx/builder.hcl2spec.go +++ b/builder/hyperv/vmcx/builder.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -134,6 +135,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/jdcloud/common.hcl2spec.go b/builder/jdcloud/common.hcl2spec.go index 2fa158b84..dadbb8e56 100644 --- a/builder/jdcloud/common.hcl2spec.go +++ b/builder/jdcloud/common.hcl2spec.go @@ -73,6 +73,7 @@ type FlatConfig struct { PublicIpId *string `cty:"public_ip_id" hcl:"public_ip_id"` PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -156,6 +157,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "public_ip_id": &hcldec.AttrSpec{Name: "public_ip_id", Type: cty.String, Required: false}, "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/linode/config.hcl2spec.go b/builder/linode/config.hcl2spec.go index 7af23acce..ca737e789 100644 --- a/builder/linode/config.hcl2spec.go +++ b/builder/linode/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -93,6 +94,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/lxc/config.hcl2spec.go b/builder/lxc/config.hcl2spec.go index 985e34af9..780477b73 100644 --- a/builder/lxc/config.hcl2spec.go +++ b/builder/lxc/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -44,6 +45,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/lxd/config.hcl2spec.go b/builder/lxd/config.hcl2spec.go index ac2391f8a..803571182 100644 --- a/builder/lxd/config.hcl2spec.go +++ b/builder/lxd/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -40,6 +41,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/ncloud/config.hcl2spec.go b/builder/ncloud/config.hcl2spec.go index a7fffd0dd..b0e2013a3 100644 --- a/builder/ncloud/config.hcl2spec.go +++ b/builder/ncloud/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -93,6 +94,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/null/config.hcl2spec.go b/builder/null/config.hcl2spec.go index a4297fa6a..ecea3e994 100644 --- a/builder/null/config.hcl2spec.go +++ b/builder/null/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -81,6 +82,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/oneandone/config.hcl2spec.go b/builder/oneandone/config.hcl2spec.go index b13d2bedd..05ca4c7a4 100644 --- a/builder/oneandone/config.hcl2spec.go +++ b/builder/oneandone/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -89,6 +90,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/openstack/builder.hcl2spec.go b/builder/openstack/builder.hcl2spec.go index dab0f357e..e85e8ecc4 100644 --- a/builder/openstack/builder.hcl2spec.go +++ b/builder/openstack/builder.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -141,6 +142,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/oracle/classic/builder.hcl2spec.go b/builder/oracle/classic/builder.hcl2spec.go index a97463e68..6f7fdad38 100644 --- a/builder/oracle/classic/builder.hcl2spec.go +++ b/builder/oracle/classic/builder.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -102,6 +103,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/oracle/oci/config.hcl2spec.go b/builder/oracle/oci/config.hcl2spec.go index 99603843e..3aef13236 100644 --- a/builder/oracle/oci/config.hcl2spec.go +++ b/builder/oracle/oci/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -109,6 +110,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/osc/bsu/builder.hcl2spec.go b/builder/osc/bsu/builder.hcl2spec.go index 4351186e8..0b09c2099 100644 --- a/builder/osc/bsu/builder.hcl2spec.go +++ b/builder/osc/bsu/builder.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -137,6 +138,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/osc/bsusurrogate/builder.hcl2spec.go b/builder/osc/bsusurrogate/builder.hcl2spec.go index e58e67e24..8912e9f35 100644 --- a/builder/osc/bsusurrogate/builder.hcl2spec.go +++ b/builder/osc/bsusurrogate/builder.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -138,6 +139,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/osc/bsuvolume/builder.hcl2spec.go b/builder/osc/bsuvolume/builder.hcl2spec.go index 5adf365d4..c7adc465b 100644 --- a/builder/osc/bsuvolume/builder.hcl2spec.go +++ b/builder/osc/bsuvolume/builder.hcl2spec.go @@ -51,6 +51,7 @@ func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec { type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -161,6 +162,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/osc/chroot/builder.hcl2spec.go b/builder/osc/chroot/builder.hcl2spec.go index 6a40db920..cf16a909a 100644 --- a/builder/osc/chroot/builder.hcl2spec.go +++ b/builder/osc/chroot/builder.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -76,6 +77,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/parallels/iso/builder.hcl2spec.go b/builder/parallels/iso/builder.hcl2spec.go index 09074a00d..c1a121ea2 100644 --- a/builder/parallels/iso/builder.hcl2spec.go +++ b/builder/parallels/iso/builder.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -117,6 +118,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/parallels/pvm/config.hcl2spec.go b/builder/parallels/pvm/config.hcl2spec.go index 5663ae09d..623ce9180 100644 --- a/builder/parallels/pvm/config.hcl2spec.go +++ b/builder/parallels/pvm/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -100,6 +101,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/profitbricks/config.hcl2spec.go b/builder/profitbricks/config.hcl2spec.go index 47003efdc..c8e57de99 100644 --- a/builder/profitbricks/config.hcl2spec.go +++ b/builder/profitbricks/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -93,6 +94,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/proxmox/clone/config.hcl2spec.go b/builder/proxmox/clone/config.hcl2spec.go index 074f82d6f..0bd4378b6 100644 --- a/builder/proxmox/clone/config.hcl2spec.go +++ b/builder/proxmox/clone/config.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -119,6 +120,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/proxmox/common/config.hcl2spec.go b/builder/proxmox/common/config.hcl2spec.go index 5675e2d69..23b4a14c3 100644 --- a/builder/proxmox/common/config.hcl2spec.go +++ b/builder/proxmox/common/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -116,6 +117,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/proxmox/iso/config.hcl2spec.go b/builder/proxmox/iso/config.hcl2spec.go index 272f8a794..0dbe844ac 100644 --- a/builder/proxmox/iso/config.hcl2spec.go +++ b/builder/proxmox/iso/config.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -125,6 +126,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/qemu/config.hcl2spec.go b/builder/qemu/config.hcl2spec.go index 4db23c9e7..33c7fe131 100644 --- a/builder/qemu/config.hcl2spec.go +++ b/builder/qemu/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -143,6 +144,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/scaleway/config.hcl2spec.go b/builder/scaleway/config.hcl2spec.go index 08fbdb055..75f1acc0d 100644 --- a/builder/scaleway/config.hcl2spec.go +++ b/builder/scaleway/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -97,6 +98,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/tencentcloud/cvm/builder.hcl2spec.go b/builder/tencentcloud/cvm/builder.hcl2spec.go index f0bd22163..f45a443cc 100644 --- a/builder/tencentcloud/cvm/builder.hcl2spec.go +++ b/builder/tencentcloud/cvm/builder.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -120,6 +121,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/triton/config.hcl2spec.go b/builder/triton/config.hcl2spec.go index 19ceb2197..89bef9eab 100644 --- a/builder/triton/config.hcl2spec.go +++ b/builder/triton/config.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -105,6 +106,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/ucloud/uhost/builder.hcl2spec.go b/builder/ucloud/uhost/builder.hcl2spec.go index 499b9ff51..025ce96e6 100644 --- a/builder/ucloud/uhost/builder.hcl2spec.go +++ b/builder/ucloud/uhost/builder.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -107,6 +108,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/vagrant/builder.hcl2spec.go b/builder/vagrant/builder.hcl2spec.go index 4ba3ea3a2..90efb5b7e 100644 --- a/builder/vagrant/builder.hcl2spec.go +++ b/builder/vagrant/builder.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -119,6 +120,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/virtualbox/iso/builder.hcl2spec.go b/builder/virtualbox/iso/builder.hcl2spec.go index 220babd6a..1c67d106a 100644 --- a/builder/virtualbox/iso/builder.hcl2spec.go +++ b/builder/virtualbox/iso/builder.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -142,6 +143,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/virtualbox/ovf/config.hcl2spec.go b/builder/virtualbox/ovf/config.hcl2spec.go index c34436fdc..e6e3a5a41 100644 --- a/builder/virtualbox/ovf/config.hcl2spec.go +++ b/builder/virtualbox/ovf/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -129,6 +130,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/virtualbox/vm/config.hcl2spec.go b/builder/virtualbox/vm/config.hcl2spec.go index 6f9be05b5..abfd53e78 100644 --- a/builder/virtualbox/vm/config.hcl2spec.go +++ b/builder/virtualbox/vm/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -127,6 +128,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/vmware/iso/config.hcl2spec.go b/builder/vmware/iso/config.hcl2spec.go index 76f05a1ec..78ff3681e 100644 --- a/builder/vmware/iso/config.hcl2spec.go +++ b/builder/vmware/iso/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -158,6 +159,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/vmware/vmx/config.hcl2spec.go b/builder/vmware/vmx/config.hcl2spec.go index 1bdbf4d72..72a393b2c 100644 --- a/builder/vmware/vmx/config.hcl2spec.go +++ b/builder/vmware/vmx/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -139,6 +140,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/vsphere/clone/config.hcl2spec.go b/builder/vsphere/clone/config.hcl2spec.go index 78588cd40..ec26d8d42 100644 --- a/builder/vsphere/clone/config.hcl2spec.go +++ b/builder/vsphere/clone/config.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -148,6 +149,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/vsphere/iso/config.hcl2spec.go b/builder/vsphere/iso/config.hcl2spec.go index 4ed6fae66..41061b95a 100644 --- a/builder/vsphere/iso/config.hcl2spec.go +++ b/builder/vsphere/iso/config.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -152,6 +153,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/builder/yandex/config.hcl2spec.go b/builder/yandex/config.hcl2spec.go index 8660f3b6e..180235ec4 100644 --- a/builder/yandex/config.hcl2spec.go +++ b/builder/yandex/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -117,6 +118,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/common/shell-local/config.hcl2spec.go b/common/shell-local/config.hcl2spec.go index e5f99372e..670cfde83 100644 --- a/common/shell-local/config.hcl2spec.go +++ b/common/shell-local/config.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -44,6 +45,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/alicloud-import/post-processor.hcl2spec.go b/post-processor/alicloud-import/post-processor.hcl2spec.go index c254ce01b..8a3a742fe 100644 --- a/post-processor/alicloud-import/post-processor.hcl2spec.go +++ b/post-processor/alicloud-import/post-processor.hcl2spec.go @@ -13,6 +13,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -137,6 +138,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/amazon-import/post-processor.hcl2spec.go b/post-processor/amazon-import/post-processor.hcl2spec.go index 9b144ea50..35959c5ad 100644 --- a/post-processor/amazon-import/post-processor.hcl2spec.go +++ b/post-processor/amazon-import/post-processor.hcl2spec.go @@ -12,6 +12,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -65,6 +66,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/artifice/post-processor.hcl2spec.go b/post-processor/artifice/post-processor.hcl2spec.go index 633940696..d12ec0386 100644 --- a/post-processor/artifice/post-processor.hcl2spec.go +++ b/post-processor/artifice/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -34,6 +35,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/checksum/post-processor.hcl2spec.go b/post-processor/checksum/post-processor.hcl2spec.go index d58b89aec..f9cf480fc 100644 --- a/post-processor/checksum/post-processor.hcl2spec.go +++ b/post-processor/checksum/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -34,6 +35,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/compress/post-processor.hcl2spec.go b/post-processor/compress/post-processor.hcl2spec.go index f556face6..b03a4539e 100644 --- a/post-processor/compress/post-processor.hcl2spec.go +++ b/post-processor/compress/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -37,6 +38,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/digitalocean-import/post-processor.hcl2spec.go b/post-processor/digitalocean-import/post-processor.hcl2spec.go index 6d40b4af6..502598bb8 100644 --- a/post-processor/digitalocean-import/post-processor.hcl2spec.go +++ b/post-processor/digitalocean-import/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -45,6 +46,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/docker-import/post-processor.hcl2spec.go b/post-processor/docker-import/post-processor.hcl2spec.go index c57d7394d..c037be3b3 100644 --- a/post-processor/docker-import/post-processor.hcl2spec.go +++ b/post-processor/docker-import/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -35,6 +36,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/docker-push/post-processor.hcl2spec.go b/post-processor/docker-push/post-processor.hcl2spec.go index e7984712e..39c4778ba 100644 --- a/post-processor/docker-push/post-processor.hcl2spec.go +++ b/post-processor/docker-push/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -41,6 +42,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/docker-save/post-processor.hcl2spec.go b/post-processor/docker-save/post-processor.hcl2spec.go index 95eb7ddcd..7dbb665b3 100644 --- a/post-processor/docker-save/post-processor.hcl2spec.go +++ b/post-processor/docker-save/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -33,6 +34,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/docker-tag/post-processor.hcl2spec.go b/post-processor/docker-tag/post-processor.hcl2spec.go index 4b47c4e5f..03d91f522 100644 --- a/post-processor/docker-tag/post-processor.hcl2spec.go +++ b/post-processor/docker-tag/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -36,6 +37,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/exoscale-import/post-processor.hcl2spec.go b/post-processor/exoscale-import/post-processor.hcl2spec.go index da906f64a..1143cd7ca 100644 --- a/post-processor/exoscale-import/post-processor.hcl2spec.go +++ b/post-processor/exoscale-import/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -44,6 +45,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/googlecompute-export/post-processor.hcl2spec.go b/post-processor/googlecompute-export/post-processor.hcl2spec.go index 573083e0d..5fb383954 100644 --- a/post-processor/googlecompute-export/post-processor.hcl2spec.go +++ b/post-processor/googlecompute-export/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -43,6 +44,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/googlecompute-import/post-processor.hcl2spec.go b/post-processor/googlecompute-import/post-processor.hcl2spec.go index 2c1937d8d..aeed85a0f 100644 --- a/post-processor/googlecompute-import/post-processor.hcl2spec.go +++ b/post-processor/googlecompute-import/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -45,6 +46,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/manifest/post-processor.hcl2spec.go b/post-processor/manifest/post-processor.hcl2spec.go index 30b11d040..6559621a6 100644 --- a/post-processor/manifest/post-processor.hcl2spec.go +++ b/post-processor/manifest/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -36,6 +37,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/ucloud-import/post-processor.hcl2spec.go b/post-processor/ucloud-import/post-processor.hcl2spec.go index 1bada485e..f20f2ca96 100644 --- a/post-processor/ucloud-import/post-processor.hcl2spec.go +++ b/post-processor/ucloud-import/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -48,6 +49,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/vagrant-cloud/post-processor.hcl2spec.go b/post-processor/vagrant-cloud/post-processor.hcl2spec.go index 67f24b8a4..4fe3592e9 100644 --- a/post-processor/vagrant-cloud/post-processor.hcl2spec.go +++ b/post-processor/vagrant-cloud/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -41,6 +42,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/vagrant/post-processor.hcl2spec.go b/post-processor/vagrant/post-processor.hcl2spec.go index 187a218d6..0d0b6f424 100644 --- a/post-processor/vagrant/post-processor.hcl2spec.go +++ b/post-processor/vagrant/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -39,6 +40,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/vsphere-template/post-processor.hcl2spec.go b/post-processor/vsphere-template/post-processor.hcl2spec.go index 7b3768420..2b4de4334 100644 --- a/post-processor/vsphere-template/post-processor.hcl2spec.go +++ b/post-processor/vsphere-template/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -42,6 +43,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/vsphere/post-processor.hcl2spec.go b/post-processor/vsphere/post-processor.hcl2spec.go index fa782612d..57c1199fe 100644 --- a/post-processor/vsphere/post-processor.hcl2spec.go +++ b/post-processor/vsphere/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -47,6 +48,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/yandex-export/post-processor.hcl2spec.go b/post-processor/yandex-export/post-processor.hcl2spec.go index 084c8dd71..8bbaf48c3 100644 --- a/post-processor/yandex-export/post-processor.hcl2spec.go +++ b/post-processor/yandex-export/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -44,6 +45,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/post-processor/yandex-import/post-processor.hcl2spec.go b/post-processor/yandex-import/post-processor.hcl2spec.go index d05da3da0..1de14d668 100644 --- a/post-processor/yandex-import/post-processor.hcl2spec.go +++ b/post-processor/yandex-import/post-processor.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -45,6 +46,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/ansible-local/provisioner.hcl2spec.go b/provisioner/ansible-local/provisioner.hcl2spec.go index d9fdafff3..fc22fd467 100644 --- a/provisioner/ansible-local/provisioner.hcl2spec.go +++ b/provisioner/ansible-local/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -47,6 +48,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/ansible/provisioner.hcl2spec.go b/provisioner/ansible/provisioner.hcl2spec.go index 61217c677..7d2d08079 100644 --- a/provisioner/ansible/provisioner.hcl2spec.go +++ b/provisioner/ansible/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -57,6 +58,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/azure-dtlartifact/provisioner.hcl2spec.go b/provisioner/azure-dtlartifact/provisioner.hcl2spec.go index 65a4d885d..9e89ae8ef 100644 --- a/provisioner/azure-dtlartifact/provisioner.hcl2spec.go +++ b/provisioner/azure-dtlartifact/provisioner.hcl2spec.go @@ -38,6 +38,7 @@ func (*FlatArtifactParameter) HCL2Spec() map[string]hcldec.Spec { type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -75,6 +76,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/breakpoint/provisioner.hcl2spec.go b/provisioner/breakpoint/provisioner.hcl2spec.go index 36947f129..080aee8f4 100644 --- a/provisioner/breakpoint/provisioner.hcl2spec.go +++ b/provisioner/breakpoint/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -34,6 +35,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/chef-client/provisioner.hcl2spec.go b/provisioner/chef-client/provisioner.hcl2spec.go index ab4fa067f..6d961e9a9 100644 --- a/provisioner/chef-client/provisioner.hcl2spec.go +++ b/provisioner/chef-client/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -60,6 +61,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/chef-solo/provisioner.hcl2spec.go b/provisioner/chef-solo/provisioner.hcl2spec.go index 6ed2fc7dc..f886339a2 100644 --- a/provisioner/chef-solo/provisioner.hcl2spec.go +++ b/provisioner/chef-solo/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -50,6 +51,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/converge/provisioner.hcl2spec.go b/provisioner/converge/provisioner.hcl2spec.go index 8cb578ca9..295f4616c 100644 --- a/provisioner/converge/provisioner.hcl2spec.go +++ b/provisioner/converge/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -42,6 +43,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/file/provisioner.hcl2spec.go b/provisioner/file/provisioner.hcl2spec.go index 0d17615b3..2b0372176 100644 --- a/provisioner/file/provisioner.hcl2spec.go +++ b/provisioner/file/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -37,6 +38,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/inspec/provisioner.hcl2spec.go b/provisioner/inspec/provisioner.hcl2spec.go index 179f9d37b..c7942d885 100644 --- a/provisioner/inspec/provisioner.hcl2spec.go +++ b/provisioner/inspec/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -44,6 +45,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/powershell/provisioner.hcl2spec.go b/provisioner/powershell/provisioner.hcl2spec.go index 410955b9c..3e12e7504 100644 --- a/provisioner/powershell/provisioner.hcl2spec.go +++ b/provisioner/powershell/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -50,6 +51,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/puppet-masterless/provisioner.hcl2spec.go b/provisioner/puppet-masterless/provisioner.hcl2spec.go index 61fa9f693..8659f021a 100644 --- a/provisioner/puppet-masterless/provisioner.hcl2spec.go +++ b/provisioner/puppet-masterless/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -48,6 +49,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/puppet-server/provisioner.hcl2spec.go b/provisioner/puppet-server/provisioner.hcl2spec.go index 3db29a7ba..18af2fc8e 100644 --- a/provisioner/puppet-server/provisioner.hcl2spec.go +++ b/provisioner/puppet-server/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -48,6 +49,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/salt-masterless/provisioner.hcl2spec.go b/provisioner/salt-masterless/provisioner.hcl2spec.go index 29e9b23cb..4fe5313e8 100644 --- a/provisioner/salt-masterless/provisioner.hcl2spec.go +++ b/provisioner/salt-masterless/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -49,6 +50,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/shell/provisioner.hcl2spec.go b/provisioner/shell/provisioner.hcl2spec.go index 36c6175e2..1609f541c 100644 --- a/provisioner/shell/provisioner.hcl2spec.go +++ b/provisioner/shell/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -49,6 +50,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/windows-restart/provisioner.hcl2spec.go b/provisioner/windows-restart/provisioner.hcl2spec.go index 3dce6445e..ad6434b2c 100644 --- a/provisioner/windows-restart/provisioner.hcl2spec.go +++ b/provisioner/windows-restart/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -37,6 +38,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, diff --git a/provisioner/windows-shell/provisioner.hcl2spec.go b/provisioner/windows-shell/provisioner.hcl2spec.go index 309d25a48..49510297e 100644 --- a/provisioner/windows-shell/provisioner.hcl2spec.go +++ b/provisioner/windows-shell/provisioner.hcl2spec.go @@ -11,6 +11,7 @@ import ( type FlatConfig struct { PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` @@ -42,6 +43,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, From 3db40194af3f7041510d18d8034faabb82b9c6a2 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Tue, 10 Nov 2020 14:48:06 -0800 Subject: [PATCH 50/93] version files --- builder/alicloud/version/version.go | 8 ++- builder/amazon/version/version.go | 13 +++++ builder/azure/version/version.go | 8 ++- builder/cloudstack/version/version.go | 13 +++++ builder/digitalocean/version/version.go | 13 +++++ builder/docker/version/version.go | 13 +++++ builder/file/version/version.go | 13 +++++ builder/googlecompute/version/version.go | 8 ++- builder/hcloud/version/version.go | 13 +++++ builder/hyperone/version/version.go | 13 +++++ builder/hyperv/version/version.go | 13 +++++ builder/jdcloud/version/version.go | 13 +++++ builder/linode/version/version.go | 8 ++- builder/lxc/version/version.go | 13 +++++ builder/lxd/version/version.go | 13 +++++ builder/ncloud/version/version.go | 13 +++++ builder/null/version/version.go | 13 +++++ builder/oneandone/version/version.go | 13 +++++ builder/openstack/version/version.go | 13 +++++ builder/oracle/version/version.go | 13 +++++ builder/osc/version/version.go | 13 +++++ builder/parallels/version/version.go | 13 +++++ builder/profitbricks/version/version.go | 13 +++++ builder/proxmox/version/version.go | 13 +++++ builder/qemu/version/version.go | 13 +++++ builder/scaleway/version/version.go | 8 ++- builder/tencentcloud/version/version.go | 13 +++++ builder/triton/version/version.go | 13 +++++ builder/ucloud/version/version.go | 8 ++- builder/vagrant/version/version.go | 13 +++++ builder/virtualbox/version/version.go | 13 +++++ builder/vmware/version/version.go | 13 +++++ builder/vsphere/version/version.go | 13 +++++ builder/yandex/version/version.go | 8 ++- helper/version/version.go | 57 ++++++++++++++----- .../exoscale-import/version/version.go | 8 ++- version/version.go | 8 +-- 37 files changed, 437 insertions(+), 43 deletions(-) create mode 100644 builder/amazon/version/version.go create mode 100644 builder/cloudstack/version/version.go create mode 100644 builder/digitalocean/version/version.go create mode 100644 builder/docker/version/version.go create mode 100644 builder/file/version/version.go create mode 100644 builder/hcloud/version/version.go create mode 100644 builder/hyperone/version/version.go create mode 100644 builder/hyperv/version/version.go create mode 100644 builder/jdcloud/version/version.go create mode 100644 builder/lxc/version/version.go create mode 100644 builder/lxd/version/version.go create mode 100644 builder/ncloud/version/version.go create mode 100644 builder/null/version/version.go create mode 100644 builder/oneandone/version/version.go create mode 100644 builder/openstack/version/version.go create mode 100644 builder/oracle/version/version.go create mode 100644 builder/osc/version/version.go create mode 100644 builder/parallels/version/version.go create mode 100644 builder/profitbricks/version/version.go create mode 100644 builder/proxmox/version/version.go create mode 100644 builder/qemu/version/version.go create mode 100644 builder/tencentcloud/version/version.go create mode 100644 builder/triton/version/version.go create mode 100644 builder/vagrant/version/version.go create mode 100644 builder/virtualbox/version/version.go create mode 100644 builder/vmware/version/version.go create mode 100644 builder/vsphere/version/version.go diff --git a/builder/alicloud/version/version.go b/builder/alicloud/version/version.go index 45ac500ca..beca8c69e 100644 --- a/builder/alicloud/version/version.go +++ b/builder/alicloud/version/version.go @@ -5,7 +5,9 @@ import ( packerVersion "github.com/hashicorp/packer/version" ) -var AlicloudPluginVersion = version.PluginVersion{ - Version: packerVersion.Version, - VersionPrerelease: packerVersion.VersionPrerelease, +var AlicloudPluginVersion *version.PluginVersion + +func init() { + AlicloudPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) } diff --git a/builder/amazon/version/version.go b/builder/amazon/version/version.go new file mode 100644 index 000000000..86dee0981 --- /dev/null +++ b/builder/amazon/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var AWSPluginVersion *version.PluginVersion + +func init() { + AWSPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/azure/version/version.go b/builder/azure/version/version.go index 9120955a8..b355acfee 100644 --- a/builder/azure/version/version.go +++ b/builder/azure/version/version.go @@ -5,7 +5,9 @@ import ( packerVersion "github.com/hashicorp/packer/version" ) -var AzurePluginVersion = version.PluginVersion{ - Version: packerVersion.Version, - VersionPrerelease: packerVersion.VersionPrerelease, +var AzurePluginVersion *version.PluginVersion + +func init() { + AzurePluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) } diff --git a/builder/cloudstack/version/version.go b/builder/cloudstack/version/version.go new file mode 100644 index 000000000..a41f3fa46 --- /dev/null +++ b/builder/cloudstack/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var CloudstackPluginVersion *version.PluginVersion + +func init() { + CloudstackPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/digitalocean/version/version.go b/builder/digitalocean/version/version.go new file mode 100644 index 000000000..6cc62555d --- /dev/null +++ b/builder/digitalocean/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var DockerPluginVersion *version.PluginVersion + +func init() { + DockerPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/docker/version/version.go b/builder/docker/version/version.go new file mode 100644 index 000000000..365c5cb86 --- /dev/null +++ b/builder/docker/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var DigitalOceanPluginVersion *version.PluginVersion + +func init() { + DigitalOceanPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/file/version/version.go b/builder/file/version/version.go new file mode 100644 index 000000000..ce251c7cc --- /dev/null +++ b/builder/file/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var FilePluginVersion *version.PluginVersion + +func init() { + FilePluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/googlecompute/version/version.go b/builder/googlecompute/version/version.go index 644d55712..745fa8ddb 100644 --- a/builder/googlecompute/version/version.go +++ b/builder/googlecompute/version/version.go @@ -5,7 +5,9 @@ import ( packerVersion "github.com/hashicorp/packer/version" ) -var GCEPluginVersion = version.PluginVersion{ - Version: packerVersion.Version, - VersionPrerelease: packerVersion.VersionPrerelease, +var GCEPluginVersion *version.PluginVersion + +func init() { + GCEPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) } diff --git a/builder/hcloud/version/version.go b/builder/hcloud/version/version.go new file mode 100644 index 000000000..2efe6aba7 --- /dev/null +++ b/builder/hcloud/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var HcloudPluginVersion *version.PluginVersion + +func init() { + HcloudPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/hyperone/version/version.go b/builder/hyperone/version/version.go new file mode 100644 index 000000000..033630379 --- /dev/null +++ b/builder/hyperone/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var HyperonePluginVersion *version.PluginVersion + +func init() { + HyperonePluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/hyperv/version/version.go b/builder/hyperv/version/version.go new file mode 100644 index 000000000..1cb3f0654 --- /dev/null +++ b/builder/hyperv/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var HypervPluginVersion *version.PluginVersion + +func init() { + HypervPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/jdcloud/version/version.go b/builder/jdcloud/version/version.go new file mode 100644 index 000000000..07ac862c7 --- /dev/null +++ b/builder/jdcloud/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var JDCloudPluginVersion *version.PluginVersion + +func init() { + JDCloudPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/linode/version/version.go b/builder/linode/version/version.go index bf10c2e83..c3ea0c48e 100644 --- a/builder/linode/version/version.go +++ b/builder/linode/version/version.go @@ -5,7 +5,9 @@ import ( packerVersion "github.com/hashicorp/packer/version" ) -var LinodePluginVersion = version.PluginVersion{ - Version: packerVersion.Version, - VersionPrerelease: packerVersion.VersionPrerelease, +var LinodePluginVersion *version.PluginVersion + +func init() { + LinodePluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) } diff --git a/builder/lxc/version/version.go b/builder/lxc/version/version.go new file mode 100644 index 000000000..b64275fe1 --- /dev/null +++ b/builder/lxc/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var LXCPluginVersion *version.PluginVersion + +func init() { + LXCPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/lxd/version/version.go b/builder/lxd/version/version.go new file mode 100644 index 000000000..f84991ceb --- /dev/null +++ b/builder/lxd/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var LXDPluginVersion *version.PluginVersion + +func init() { + LXDPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/ncloud/version/version.go b/builder/ncloud/version/version.go new file mode 100644 index 000000000..6dbaae8ea --- /dev/null +++ b/builder/ncloud/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var NCloudPluginVersion *version.PluginVersion + +func init() { + NCloudPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/null/version/version.go b/builder/null/version/version.go new file mode 100644 index 000000000..2dd98b1d2 --- /dev/null +++ b/builder/null/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var NullPluginVersion *version.PluginVersion + +func init() { + NullPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/oneandone/version/version.go b/builder/oneandone/version/version.go new file mode 100644 index 000000000..15462d810 --- /dev/null +++ b/builder/oneandone/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var OneAndOnePluginVersion *version.PluginVersion + +func init() { + OneAndOnePluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/openstack/version/version.go b/builder/openstack/version/version.go new file mode 100644 index 000000000..0e4e82e44 --- /dev/null +++ b/builder/openstack/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var OpenstackPluginVersion *version.PluginVersion + +func init() { + OpenstackPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/oracle/version/version.go b/builder/oracle/version/version.go new file mode 100644 index 000000000..82195589b --- /dev/null +++ b/builder/oracle/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var OraclePluginVersion *version.PluginVersion + +func init() { + OraclePluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/osc/version/version.go b/builder/osc/version/version.go new file mode 100644 index 000000000..4f3a0966f --- /dev/null +++ b/builder/osc/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var OutscalePluginVersion *version.PluginVersion + +func init() { + OutscalePluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/parallels/version/version.go b/builder/parallels/version/version.go new file mode 100644 index 000000000..1c71f44f3 --- /dev/null +++ b/builder/parallels/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ParallelsPluginVersion *version.PluginVersion + +func init() { + ParallelsPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/profitbricks/version/version.go b/builder/profitbricks/version/version.go new file mode 100644 index 000000000..67677861d --- /dev/null +++ b/builder/profitbricks/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ProfitbricksPluginVersion *version.PluginVersion + +func init() { + ProfitbricksPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/proxmox/version/version.go b/builder/proxmox/version/version.go new file mode 100644 index 000000000..9388b38aa --- /dev/null +++ b/builder/proxmox/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ProxmoxPluginVersion *version.PluginVersion + +func init() { + ProxmoxPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/qemu/version/version.go b/builder/qemu/version/version.go new file mode 100644 index 000000000..76f12152d --- /dev/null +++ b/builder/qemu/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var QemuPluginVersion *version.PluginVersion + +func init() { + QemuPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/scaleway/version/version.go b/builder/scaleway/version/version.go index 8aee52974..79be4643a 100644 --- a/builder/scaleway/version/version.go +++ b/builder/scaleway/version/version.go @@ -5,7 +5,9 @@ import ( packerVersion "github.com/hashicorp/packer/version" ) -var ScalewayPluginVersion = version.PluginVersion{ - Version: packerVersion.Version, - VersionPrerelease: packerVersion.VersionPrerelease, +var ScalewayPluginVersion *version.PluginVersion + +func init() { + ScalewayPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) } diff --git a/builder/tencentcloud/version/version.go b/builder/tencentcloud/version/version.go new file mode 100644 index 000000000..0c738f126 --- /dev/null +++ b/builder/tencentcloud/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var TencentPluginVersion *version.PluginVersion + +func init() { + TencentPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/triton/version/version.go b/builder/triton/version/version.go new file mode 100644 index 000000000..a48e8ced1 --- /dev/null +++ b/builder/triton/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var TritonPluginVersion *version.PluginVersion + +func init() { + TritonPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/ucloud/version/version.go b/builder/ucloud/version/version.go index 1aae958f1..e18d11932 100644 --- a/builder/ucloud/version/version.go +++ b/builder/ucloud/version/version.go @@ -5,7 +5,9 @@ import ( packerVersion "github.com/hashicorp/packer/version" ) -var UcloudPluginVersion = version.PluginVersion{ - Version: packerVersion.Version, - VersionPrerelease: packerVersion.VersionPrerelease, +var UcloudPluginVersion *version.PluginVersion + +func init() { + UcloudPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) } diff --git a/builder/vagrant/version/version.go b/builder/vagrant/version/version.go new file mode 100644 index 000000000..c4747e529 --- /dev/null +++ b/builder/vagrant/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var VagrantPluginVersion *version.PluginVersion + +func init() { + VagrantPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/virtualbox/version/version.go b/builder/virtualbox/version/version.go new file mode 100644 index 000000000..d849210b7 --- /dev/null +++ b/builder/virtualbox/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var VirtualboxPluginVersion *version.PluginVersion + +func init() { + VirtualboxPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/vmware/version/version.go b/builder/vmware/version/version.go new file mode 100644 index 000000000..d9addf68c --- /dev/null +++ b/builder/vmware/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var VMwarePluginVersion *version.PluginVersion + +func init() { + VMwarePluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/vsphere/version/version.go b/builder/vsphere/version/version.go new file mode 100644 index 000000000..6e5234538 --- /dev/null +++ b/builder/vsphere/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var VSpherePluginVersion *version.PluginVersion + +func init() { + VSpherePluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/builder/yandex/version/version.go b/builder/yandex/version/version.go index 5f9969b63..73add8060 100644 --- a/builder/yandex/version/version.go +++ b/builder/yandex/version/version.go @@ -5,7 +5,9 @@ import ( packerVersion "github.com/hashicorp/packer/version" ) -var YandexPluginVersion = version.PluginVersion{ - Version: packerVersion.Version, - VersionPrerelease: packerVersion.VersionPrerelease, +var YandexPluginVersion *version.PluginVersion + +func init() { + YandexPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) } diff --git a/helper/version/version.go b/helper/version/version.go index f40ea536d..a7f312a42 100644 --- a/helper/version/version.go +++ b/helper/version/version.go @@ -12,20 +12,39 @@ import ( // The git commit that was compiled. This will be filled in by the compiler. var GitCommit string +// InitializePluginVersion initializes the SemVer and returns a version var. +// If the provided "version" string is not valid, the call to version.Must +// will panic. Therefore, this function should always be called in a package +// init() function to make sure that plugins are following proper semantic +// versioning and to make sure that plugins which aren't following proper +// semantic versioning crash immediately rather than later. +func InitializePluginVersion(vers, versionPrerelease string) *PluginVersion { + pv := PluginVersion{ + version: vers, + versionPrerelease: versionPrerelease, + } + // This call initializes the SemVer to make sure that if Packer crashes due + // to an invalid SemVer it's at the very beginning of the Packer run. + pv.semVer = version.Must(version.NewVersion(vers)) + return &pv +} + type PluginVersion struct { // The main version number that is being run at the moment. - Version string + version string // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release // such as "dev" (in development), "beta", "rc1", etc. - VersionPrerelease string + versionPrerelease string + // The Semantic Version of the plugin. Used for version constraint comparisons + semVer *version.Version } func (p *PluginVersion) FormattedVersion() string { var versionString bytes.Buffer - fmt.Fprintf(&versionString, "%s", p.Version) - if p.VersionPrerelease != "" { - fmt.Fprintf(&versionString, "-%s", p.VersionPrerelease) + fmt.Fprintf(&versionString, "%s", p.version) + if p.versionPrerelease != "" { + fmt.Fprintf(&versionString, "-%s", p.versionPrerelease) if GitCommit != "" { fmt.Fprintf(&versionString, " (%s)", GitCommit) @@ -35,18 +54,28 @@ func (p *PluginVersion) FormattedVersion() string { return versionString.String() } -func (p *PluginVersion) Semver() *version.Version { - // SemVer is an instance of version.Version. This has the secondary - // benefit of verifying during tests and init time that our version is a - // proper semantic version, which should always be the case. - SemVer := version.Must(version.NewVersion(p.Version)) - return SemVer +func (p *PluginVersion) SemVer() *version.Version { + if p.semVer != nil { + // SemVer is an instance of version.Version. This has the secondary + // benefit of verifying during tests and init time that our version is a + // proper semantic version, which should always be the case. + p.semVer = version.Must(version.NewVersion(p.version)) + } + return p.semVer +} + +func (p *PluginVersion) GetVersion() string { + return p.version +} + +func (p *PluginVersion) GetVersionPrerelease() string { + return p.versionPrerelease } // String returns the complete version string, including prerelease func (p *PluginVersion) String() string { - if p.VersionPrerelease != "" { - return fmt.Sprintf("%s-%s", p.Version, p.VersionPrerelease) + if p.versionPrerelease != "" { + return fmt.Sprintf("%s-%s", p.version, p.versionPrerelease) } - return p.Version + return p.version } diff --git a/post-processor/exoscale-import/version/version.go b/post-processor/exoscale-import/version/version.go index c6e587827..201e16eb9 100644 --- a/post-processor/exoscale-import/version/version.go +++ b/post-processor/exoscale-import/version/version.go @@ -5,7 +5,9 @@ import ( packerVersion "github.com/hashicorp/packer/version" ) -var ExoscaleImportPluginVersion = version.PluginVersion{ - Version: packerVersion.Version, - VersionPrerelease: packerVersion.VersionPrerelease, +var ExoscaleImportPluginVersion *version.PluginVersion + +func init() { + ExoscaleImportPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) } diff --git a/version/version.go b/version/version.go index 3c89bd0ef..e4a12b1ca 100644 --- a/version/version.go +++ b/version/version.go @@ -16,10 +16,7 @@ const Version = "1.6.6" // such as "dev" (in development), "beta", "rc1", etc. const VersionPrerelease = "dev" -var PackerVersion = pluginVersion.PluginVersion{ - Version: Version, - VersionPrerelease: VersionPrerelease, -} +var PackerVersion *pluginVersion.PluginVersion func FormattedVersion() string { return PackerVersion.FormattedVersion() @@ -31,7 +28,8 @@ func FormattedVersion() string { var SemVer *version.Version func init() { - SemVer = version.Must(version.NewVersion(Version)) + PackerVersion = pluginVersion.InitializePluginVersion(Version, VersionPrerelease) + SemVer = PackerVersion.SemVer() } // String returns the complete version string, including prerelease From 2167118126656e5114db19ba9d6d95b22b0cbeb2 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Tue, 10 Nov 2020 14:55:45 -0800 Subject: [PATCH 51/93] add version files for all postprocessors --- post-processor/alicloud-import/version/version.go | 13 +++++++++++++ post-processor/amazon-import/version/version.go | 13 +++++++++++++ post-processor/artifice/version/version.go | 13 +++++++++++++ post-processor/checksum/version/version.go | 13 +++++++++++++ post-processor/compress/version/version.go | 13 +++++++++++++ .../digitalocean-import/version/version.go | 13 +++++++++++++ post-processor/docker-import/version/version.go | 13 +++++++++++++ post-processor/docker-push/version/version.go | 13 +++++++++++++ post-processor/docker-save/version/version.go | 13 +++++++++++++ post-processor/docker-tag/version/version.go | 13 +++++++++++++ .../googlecompute-export/version/version.go | 13 +++++++++++++ .../googlecompute-import/version/version.go | 13 +++++++++++++ post-processor/manifest/version/version.go | 13 +++++++++++++ post-processor/shell-local/version/version.go | 13 +++++++++++++ post-processor/ucloud-import/version/version.go | 13 +++++++++++++ post-processor/vagrant-cloud/version/version.go | 13 +++++++++++++ post-processor/vagrant/version/version.go | 13 +++++++++++++ post-processor/vsphere-template/version/version.go | 13 +++++++++++++ post-processor/vsphere/version/version.go | 13 +++++++++++++ post-processor/yandex-export/version/version.go | 13 +++++++++++++ post-processor/yandex-import/version/version.go | 13 +++++++++++++ 21 files changed, 273 insertions(+) create mode 100644 post-processor/alicloud-import/version/version.go create mode 100644 post-processor/amazon-import/version/version.go create mode 100644 post-processor/artifice/version/version.go create mode 100644 post-processor/checksum/version/version.go create mode 100644 post-processor/compress/version/version.go create mode 100644 post-processor/digitalocean-import/version/version.go create mode 100644 post-processor/docker-import/version/version.go create mode 100644 post-processor/docker-push/version/version.go create mode 100644 post-processor/docker-save/version/version.go create mode 100644 post-processor/docker-tag/version/version.go create mode 100644 post-processor/googlecompute-export/version/version.go create mode 100644 post-processor/googlecompute-import/version/version.go create mode 100644 post-processor/manifest/version/version.go create mode 100644 post-processor/shell-local/version/version.go create mode 100644 post-processor/ucloud-import/version/version.go create mode 100644 post-processor/vagrant-cloud/version/version.go create mode 100644 post-processor/vagrant/version/version.go create mode 100644 post-processor/vsphere-template/version/version.go create mode 100644 post-processor/vsphere/version/version.go create mode 100644 post-processor/yandex-export/version/version.go create mode 100644 post-processor/yandex-import/version/version.go diff --git a/post-processor/alicloud-import/version/version.go b/post-processor/alicloud-import/version/version.go new file mode 100644 index 000000000..85d0e8857 --- /dev/null +++ b/post-processor/alicloud-import/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var AlicloudImportPluginVersion *version.PluginVersion + +func init() { + AlicloudImportPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/amazon-import/version/version.go b/post-processor/amazon-import/version/version.go new file mode 100644 index 000000000..e380c7ef2 --- /dev/null +++ b/post-processor/amazon-import/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var AmazonImportPluginVersion *version.PluginVersion + +func init() { + AmazonImportPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/artifice/version/version.go b/post-processor/artifice/version/version.go new file mode 100644 index 000000000..898bb9be0 --- /dev/null +++ b/post-processor/artifice/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ArtificePluginVersion *version.PluginVersion + +func init() { + ArtificePluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/checksum/version/version.go b/post-processor/checksum/version/version.go new file mode 100644 index 000000000..cf70d50ff --- /dev/null +++ b/post-processor/checksum/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ChecksumPluginVersion *version.PluginVersion + +func init() { + ChecksumPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/compress/version/version.go b/post-processor/compress/version/version.go new file mode 100644 index 000000000..545395816 --- /dev/null +++ b/post-processor/compress/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var CompressPluginVersion *version.PluginVersion + +func init() { + CompressPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/digitalocean-import/version/version.go b/post-processor/digitalocean-import/version/version.go new file mode 100644 index 000000000..afb79416d --- /dev/null +++ b/post-processor/digitalocean-import/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var DigitalOceanImportPluginVersion *version.PluginVersion + +func init() { + DigitalOceanImportPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/docker-import/version/version.go b/post-processor/docker-import/version/version.go new file mode 100644 index 000000000..36e14c2ee --- /dev/null +++ b/post-processor/docker-import/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var DockerImportPluginVersion *version.PluginVersion + +func init() { + DockerImportPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/docker-push/version/version.go b/post-processor/docker-push/version/version.go new file mode 100644 index 000000000..7d1b70054 --- /dev/null +++ b/post-processor/docker-push/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var DockerPushPluginVersion *version.PluginVersion + +func init() { + DockerPushPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/docker-save/version/version.go b/post-processor/docker-save/version/version.go new file mode 100644 index 000000000..e838fb127 --- /dev/null +++ b/post-processor/docker-save/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var DockerSavePluginVersion *version.PluginVersion + +func init() { + DockerSavePluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/docker-tag/version/version.go b/post-processor/docker-tag/version/version.go new file mode 100644 index 000000000..c1a1cf73a --- /dev/null +++ b/post-processor/docker-tag/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var DockerTagPluginVersion *version.PluginVersion + +func init() { + DockerTagPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/googlecompute-export/version/version.go b/post-processor/googlecompute-export/version/version.go new file mode 100644 index 000000000..03abec519 --- /dev/null +++ b/post-processor/googlecompute-export/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var GCPExportPluginVersion *version.PluginVersion + +func init() { + GCPExportPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/googlecompute-import/version/version.go b/post-processor/googlecompute-import/version/version.go new file mode 100644 index 000000000..e0c79d6ab --- /dev/null +++ b/post-processor/googlecompute-import/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var GCPImportPluginVersion *version.PluginVersion + +func init() { + GCPImportPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/manifest/version/version.go b/post-processor/manifest/version/version.go new file mode 100644 index 000000000..8b9275284 --- /dev/null +++ b/post-processor/manifest/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ManifestPluginVersion *version.PluginVersion + +func init() { + ManifestPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/shell-local/version/version.go b/post-processor/shell-local/version/version.go new file mode 100644 index 000000000..554f136a0 --- /dev/null +++ b/post-processor/shell-local/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ShellLocalPluginVersion *version.PluginVersion + +func init() { + ShellLocalPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/ucloud-import/version/version.go b/post-processor/ucloud-import/version/version.go new file mode 100644 index 000000000..5f6a8f96b --- /dev/null +++ b/post-processor/ucloud-import/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var UCloudImportPluginVersion *version.PluginVersion + +func init() { + UCloudImportPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/vagrant-cloud/version/version.go b/post-processor/vagrant-cloud/version/version.go new file mode 100644 index 000000000..56aa23f8c --- /dev/null +++ b/post-processor/vagrant-cloud/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var VagrantCloudPluginVersion *version.PluginVersion + +func init() { + VagrantCloudPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/vagrant/version/version.go b/post-processor/vagrant/version/version.go new file mode 100644 index 000000000..272c46413 --- /dev/null +++ b/post-processor/vagrant/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var VagrantPostprocessorVersion *version.PluginVersion + +func init() { + VagrantPostprocessorVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/vsphere-template/version/version.go b/post-processor/vsphere-template/version/version.go new file mode 100644 index 000000000..ec67a6742 --- /dev/null +++ b/post-processor/vsphere-template/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var VSphereTemplatePostprocessorVersion *version.PluginVersion + +func init() { + VSphereTemplatePostprocessorVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/vsphere/version/version.go b/post-processor/vsphere/version/version.go new file mode 100644 index 000000000..bc1906982 --- /dev/null +++ b/post-processor/vsphere/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var VSpherePostprocessorVersion *version.PluginVersion + +func init() { + VSpherePostprocessorVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/yandex-export/version/version.go b/post-processor/yandex-export/version/version.go new file mode 100644 index 000000000..bc180ee0c --- /dev/null +++ b/post-processor/yandex-export/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var YandexExportPluginVersion *version.PluginVersion + +func init() { + YandexExportPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/post-processor/yandex-import/version/version.go b/post-processor/yandex-import/version/version.go new file mode 100644 index 000000000..03dce1e07 --- /dev/null +++ b/post-processor/yandex-import/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var YandexImportPluginVersion *version.PluginVersion + +func init() { + YandexImportPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} From 46cf8a1602b588de928614faa60b21f88949c68f Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Tue, 10 Nov 2020 15:01:07 -0800 Subject: [PATCH 52/93] add all provisioner version files --- provisioner/ansible-local/version/version.go | 13 +++++++++++++ provisioner/ansible/version/version.go | 13 +++++++++++++ provisioner/azure-dtlartifact/version/version.go | 13 +++++++++++++ provisioner/breakpoint/version/version.go | 13 +++++++++++++ provisioner/chef-client/version/version.go | 13 +++++++++++++ provisioner/chef-solo/version/version.go | 13 +++++++++++++ provisioner/converge/version/version.go | 13 +++++++++++++ provisioner/file/version/version.go | 13 +++++++++++++ provisioner/inspec/version/version.go | 13 +++++++++++++ provisioner/powershell/version/version.go | 13 +++++++++++++ provisioner/puppet-masterless/version/version.go | 13 +++++++++++++ provisioner/puppet-server/version/version.go | 13 +++++++++++++ provisioner/salt-masterless/version/version.go | 13 +++++++++++++ provisioner/shell-local/version/version.go | 13 +++++++++++++ provisioner/shell/version/version.go | 13 +++++++++++++ provisioner/sleep/version/version.go | 13 +++++++++++++ provisioner/windows-restart/version/version.go | 13 +++++++++++++ provisioner/windows-shell/version/version.go | 13 +++++++++++++ 18 files changed, 234 insertions(+) create mode 100644 provisioner/ansible-local/version/version.go create mode 100644 provisioner/ansible/version/version.go create mode 100644 provisioner/azure-dtlartifact/version/version.go create mode 100644 provisioner/breakpoint/version/version.go create mode 100644 provisioner/chef-client/version/version.go create mode 100644 provisioner/chef-solo/version/version.go create mode 100644 provisioner/converge/version/version.go create mode 100644 provisioner/file/version/version.go create mode 100644 provisioner/inspec/version/version.go create mode 100644 provisioner/powershell/version/version.go create mode 100644 provisioner/puppet-masterless/version/version.go create mode 100644 provisioner/puppet-server/version/version.go create mode 100644 provisioner/salt-masterless/version/version.go create mode 100644 provisioner/shell-local/version/version.go create mode 100644 provisioner/shell/version/version.go create mode 100644 provisioner/sleep/version/version.go create mode 100644 provisioner/windows-restart/version/version.go create mode 100644 provisioner/windows-shell/version/version.go diff --git a/provisioner/ansible-local/version/version.go b/provisioner/ansible-local/version/version.go new file mode 100644 index 000000000..ccdb3cf17 --- /dev/null +++ b/provisioner/ansible-local/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var AnsibleLocalPluginVersion *version.PluginVersion + +func init() { + AnsibleLocalPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/ansible/version/version.go b/provisioner/ansible/version/version.go new file mode 100644 index 000000000..f00378d4e --- /dev/null +++ b/provisioner/ansible/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var AnsiblePluginVersion *version.PluginVersion + +func init() { + AnsiblePluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/azure-dtlartifact/version/version.go b/provisioner/azure-dtlartifact/version/version.go new file mode 100644 index 000000000..ceb8c7e5c --- /dev/null +++ b/provisioner/azure-dtlartifact/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var AzureDTLPluginVersion *version.PluginVersion + +func init() { + AzureDTLPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/breakpoint/version/version.go b/provisioner/breakpoint/version/version.go new file mode 100644 index 000000000..22916700b --- /dev/null +++ b/provisioner/breakpoint/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var BreakpointPluginVersion *version.PluginVersion + +func init() { + BreakpointPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/chef-client/version/version.go b/provisioner/chef-client/version/version.go new file mode 100644 index 000000000..a4f45326c --- /dev/null +++ b/provisioner/chef-client/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ChefClientPluginVersion *version.PluginVersion + +func init() { + ChefClientPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/chef-solo/version/version.go b/provisioner/chef-solo/version/version.go new file mode 100644 index 000000000..8d6f43d85 --- /dev/null +++ b/provisioner/chef-solo/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ChefSoloPluginVersion *version.PluginVersion + +func init() { + ChefSoloPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/converge/version/version.go b/provisioner/converge/version/version.go new file mode 100644 index 000000000..ff591a8f6 --- /dev/null +++ b/provisioner/converge/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ConvergePluginVersion *version.PluginVersion + +func init() { + ConvergePluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/file/version/version.go b/provisioner/file/version/version.go new file mode 100644 index 000000000..c96acb65a --- /dev/null +++ b/provisioner/file/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var FileProvisionerVersion *version.PluginVersion + +func init() { + FileProvisionerVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/inspec/version/version.go b/provisioner/inspec/version/version.go new file mode 100644 index 000000000..d28ff6921 --- /dev/null +++ b/provisioner/inspec/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var InspecPluginVersion *version.PluginVersion + +func init() { + InspecPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/powershell/version/version.go b/provisioner/powershell/version/version.go new file mode 100644 index 000000000..72593e041 --- /dev/null +++ b/provisioner/powershell/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var PowershellPluginVersion *version.PluginVersion + +func init() { + PowershellPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/puppet-masterless/version/version.go b/provisioner/puppet-masterless/version/version.go new file mode 100644 index 000000000..32ac77f9d --- /dev/null +++ b/provisioner/puppet-masterless/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var PuppetMasterlessPluginVersion *version.PluginVersion + +func init() { + PuppetMasterlessPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/puppet-server/version/version.go b/provisioner/puppet-server/version/version.go new file mode 100644 index 000000000..64a059562 --- /dev/null +++ b/provisioner/puppet-server/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var PuppetServerPluginVersion *version.PluginVersion + +func init() { + PuppetServerPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/salt-masterless/version/version.go b/provisioner/salt-masterless/version/version.go new file mode 100644 index 000000000..9e413dde8 --- /dev/null +++ b/provisioner/salt-masterless/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var SaltPluginVersion *version.PluginVersion + +func init() { + SaltPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/shell-local/version/version.go b/provisioner/shell-local/version/version.go new file mode 100644 index 000000000..471e2a7b3 --- /dev/null +++ b/provisioner/shell-local/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ShellLocalProvisionerVersion *version.PluginVersion + +func init() { + ShellLocalProvisionerVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/shell/version/version.go b/provisioner/shell/version/version.go new file mode 100644 index 000000000..e206437c1 --- /dev/null +++ b/provisioner/shell/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var ShellPluginVersion *version.PluginVersion + +func init() { + ShellPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/sleep/version/version.go b/provisioner/sleep/version/version.go new file mode 100644 index 000000000..136d95775 --- /dev/null +++ b/provisioner/sleep/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var SleepProvisionerVersion *version.PluginVersion + +func init() { + SleepProvisionerVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/windows-restart/version/version.go b/provisioner/windows-restart/version/version.go new file mode 100644 index 000000000..377ec5a66 --- /dev/null +++ b/provisioner/windows-restart/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var WindowsRestartPluginVersion *version.PluginVersion + +func init() { + WindowsRestartPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} diff --git a/provisioner/windows-shell/version/version.go b/provisioner/windows-shell/version/version.go new file mode 100644 index 000000000..880f131bb --- /dev/null +++ b/provisioner/windows-shell/version/version.go @@ -0,0 +1,13 @@ +package version + +import ( + "github.com/hashicorp/packer/helper/version" + packerVersion "github.com/hashicorp/packer/version" +) + +var WindowsShellPluginVersion *version.PluginVersion + +func init() { + WindowsShellPluginVersion = version.InitializePluginVersion( + packerVersion.Version, packerVersion.VersionPrerelease) +} From deba1484ffb3efccdd5cdf00b0e2d1cc5a7fefad Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 11 Nov 2020 11:27:32 +0100 Subject: [PATCH 53/93] HCL2: allow calling env as input var default value (#10240) * HCL2: allow to use env in default value of input variables --- command/inspect_test.go | 6 ++- .../hcl/inspect/fruit_string.pkr.hcl | 8 +++ hcl2template/function/env.go | 32 ++++++++++++ hcl2template/types.packer_config.go | 13 ++++- hcl2template/types.variables.go | 4 +- website/data/docs-navigation.js | 1 + .../from-1.5/functions/contextual/env.mdx | 52 +++++++++++++++++++ 7 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 hcl2template/function/env.go create mode 100644 website/pages/docs/from-1.5/functions/contextual/env.mdx diff --git a/command/inspect_test.go b/command/inspect_test.go index 5fda6c0d1..4bb594d07 100644 --- a/command/inspect_test.go +++ b/command/inspect_test.go @@ -78,7 +78,9 @@ local.fruit: "banana" > input-variables: +var.default_from_env: "" var.fruit: "peach" +var.other_default_from_env: "" var.unknown_list_of_string: "[\n \"first_peach\",\n \"second_peach\",\n]" var.unknown_string: "also_peach" var.unknown_unknown: "[\"peach_too\"]" @@ -89,11 +91,13 @@ var.unknown_unknown: "[\"peach_too\"]" > builds: `}, - {[]string{"inspect", "-var=fruit=peach", filepath.Join(testFixture("hcl"), "inspect")}, nil, `Packer Inspect: HCL2 mode + {[]string{"inspect", "-var=fruit=peach", "-var=other_default_from_env=apple", filepath.Join(testFixture("hcl"), "inspect")}, []string{"DEFAULT_FROM_ENV=cherry"}, `Packer Inspect: HCL2 mode > input-variables: +var.default_from_env: "cherry" var.fruit: "peach" +var.other_default_from_env: "apple" var.unknown_list_of_string: "" var.unknown_string: "" var.unknown_unknown: "" diff --git a/command/test-fixtures/hcl/inspect/fruit_string.pkr.hcl b/command/test-fixtures/hcl/inspect/fruit_string.pkr.hcl index fb904c368..51bc427f7 100644 --- a/command/test-fixtures/hcl/inspect/fruit_string.pkr.hcl +++ b/command/test-fixtures/hcl/inspect/fruit_string.pkr.hcl @@ -15,3 +15,11 @@ variable "unknown_list_of_string" { variable "unknown_unknown" { } + +variable "default_from_env" { + default = env("DEFAULT_FROM_ENV") +} + +variable "other_default_from_env" { + default = env("OTHER_DEFAULT_FROM_ENV") +} diff --git a/hcl2template/function/env.go b/hcl2template/function/env.go new file mode 100644 index 000000000..98eac11cc --- /dev/null +++ b/hcl2template/function/env.go @@ -0,0 +1,32 @@ +package function + +import ( + "os" + + "github.com/zclconf/go-cty/cty" + "github.com/zclconf/go-cty/cty/function" +) + +// EnvFunc constructs a function that returns a string representation of the +// env var behind a value +var EnvFunc = function.New(&function.Spec{ + Params: []function.Parameter{ + { + Name: "key", + Type: cty.String, + AllowNull: false, + AllowUnknown: false, + }, + }, + Type: function.StaticReturnType(cty.String), + Impl: func(args []cty.Value, retType cty.Type) (cty.Value, error) { + key := args[0].AsString() + value := os.Getenv(key) + return cty.StringVal(value), nil + }, +}) + +// Env returns a string representation of the env var behind key. +func Env(key cty.Value) (cty.Value, error) { + return EnvFunc.Call([]cty.Value{key}) +} diff --git a/hcl2template/types.packer_config.go b/hcl2template/types.packer_config.go index daf80a209..b642b826a 100644 --- a/hcl2template/types.packer_config.go +++ b/hcl2template/types.packer_config.go @@ -8,9 +8,11 @@ import ( "github.com/gobwas/glob" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" + pkrfunction "github.com/hashicorp/packer/hcl2template/function" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/version" "github.com/zclconf/go-cty/cty" + "github.com/zclconf/go-cty/cty/function" ) // PackerConfig represents a loaded Packer HCL config. It will contain @@ -107,16 +109,23 @@ func (c *PackerConfig) decodeInputVariables(f *hcl.File) hcl.Diagnostics { content, moreDiags := f.Body.Content(configSchema) diags = append(diags, moreDiags...) + // for input variables we allow to use env in the default value section. + ectx := &hcl.EvalContext{ + Functions: map[string]function.Function{ + "env": pkrfunction.EnvFunc, + }, + } + for _, block := range content.Blocks { switch block.Type { case variableLabel: - moreDiags := c.InputVariables.decodeVariableBlock(block, nil) + moreDiags := c.InputVariables.decodeVariableBlock(block, ectx) diags = append(diags, moreDiags...) case variablesLabel: attrs, moreDiags := block.Body.JustAttributes() diags = append(diags, moreDiags...) for key, attr := range attrs { - moreDiags = c.InputVariables.decodeVariable(key, attr, nil) + moreDiags = c.InputVariables.decodeVariable(key, attr, ectx) diags = append(diags, moreDiags...) } } diff --git a/hcl2template/types.variables.go b/hcl2template/types.variables.go index 6e09893ef..ede4a014c 100644 --- a/hcl2template/types.variables.go +++ b/hcl2template/types.variables.go @@ -246,7 +246,8 @@ var variableBlockSchema = &hcl.BodySchema{ }, } -// decodeVariableBlock decodes a "variables" section the way packer 1 used to +// decodeVariableBlock decodes a "variable" block +// ectx is passed only in the evaluation of the default value. func (variables *Variables) decodeVariableBlock(block *hcl.Block, ectx *hcl.EvalContext) hcl.Diagnostics { if (*variables) == nil { (*variables) = Variables{} @@ -473,6 +474,7 @@ func decodeVariableValidationBlock(varName string, block *hcl.Block) (*VariableV // Packer's specific style, rather than that they are going to try to work // around these rules to write a lower-quality message. func looksLikeSentences(s string) bool { + s = strings.TrimSpace(s) if len(s) < 1 { return false } diff --git a/website/data/docs-navigation.js b/website/data/docs-navigation.js index 8400ff6ed..efc9e70ff 100644 --- a/website/data/docs-navigation.js +++ b/website/data/docs-navigation.js @@ -35,6 +35,7 @@ export default [ content: [ 'aws_secretsmanager', 'consul', + 'env', 'vault', ], }, diff --git a/website/pages/docs/from-1.5/functions/contextual/env.mdx b/website/pages/docs/from-1.5/functions/contextual/env.mdx new file mode 100644 index 000000000..347ea3374 --- /dev/null +++ b/website/pages/docs/from-1.5/functions/contextual/env.mdx @@ -0,0 +1,52 @@ +--- +layout: docs +page_title: env - Functions - Configuration Language +sidebar_title: env +description: The env function retrieves environment values for input variables. +--- + +# `env` Function + +```hcl +variable "aws_region" { + default = env("AWS_DEFAULT_REGION") +} +``` + +`env` allows you to get the value for an environment variable inside input +variables _only_. This is the only function that is callable from a variable +block and it can only be used in the default input. `env` cannot be called from +other places. + +In the previous example, the value of `aws_region` will be what's stored in the +`AWS_DEFAULT_REGION` env var, unless aws_region is also set in a [manner that takes +precedence](/docs/from-1.5/variables#variable-definition-precedence). + + +-> **Why can't I use environment variables elsewhere?** User variables are the +single source of configurable input. We felt that having environment variables +used _anywhere_ in a configuration would confuse the user about the possible inputs +to a template. By allowing environment variables only within default values for +input variables, input variables remain as the single source of input to a +template that a user can easily discover using `packer inspect`. + +When the environment variable is not set at all -- not even with the empty +string -- the value returned by `env` will be an an empty string. It will still +be possible to set it using other means but you could use [custom validation +rules](/docs/from-1.5/variables#custom-validation-rules) to error in that case +to make sure it is set, for example: + +```hcl +variable "aws_region" { + default = env("AWS_DEFAULT_REGION") + + validation { + condition = length(var.aws_region) > 0 + error_message = < Date: Wed, 11 Nov 2020 11:49:39 -0500 Subject: [PATCH 54/93] Add packer fmt command (#10225) * Add packer fmt command This change adds a new command that allows users to format one or more HCL2 Packer configuration template files. Related to: #9174 * command/fmt: Add check flag Packer's fmt command now supports a check flag that will output the name of any file that would be changed by the HCL2 formatting engine. The check flag is mutually exclusive with the write flag and will only check if formatting is needed. The update write flag will now overwrite the source files with the newly formatted HCL2 source unless the `-write=false` or `-check` is passed at the command line. * Returns a diagnostic error if Format is unable to show a diff - equivalent to `terraform fmt` * Updates testing to run against #Format and not the private methods of the HCL2Formatter; fixes ShowDiff test failure on Windows * Updates comments for exported functions * Add docs for fmt command --- command/cli.go | 16 +- command/fmt.go | 109 +++++++++++++ commands.go | 34 ++-- hcl2template/formatter.go | 151 ++++++++++++++++++ hcl2template/formatter_test.go | 110 +++++++++++++ .../testdata/format/formatted.pkr.hcl | 149 +++++++++++++++++ .../testdata/format/unformatted.pkr.hcl | 149 +++++++++++++++++ website/data/docs-navigation.js | 2 +- website/pages/docs/commands/fmt.mdx | 46 ++++++ 9 files changed, 749 insertions(+), 17 deletions(-) create mode 100644 command/fmt.go create mode 100644 hcl2template/formatter.go create mode 100644 hcl2template/formatter_test.go create mode 100644 hcl2template/testdata/format/formatted.pkr.hcl create mode 100644 hcl2template/testdata/format/unformatted.pkr.hcl create mode 100644 website/pages/docs/commands/fmt.mdx diff --git a/command/cli.go b/command/cli.go index fbf95dca1..f273692ce 100644 --- a/command/cli.go +++ b/command/cli.go @@ -137,8 +137,22 @@ func (va *HCL2UpgradeArgs) AddFlagSets(flags *flag.FlagSet) { va.MetaArgs.AddFlagSets(flags) } -// HCL2UpgradeArgs represents a parsed cli line for a `packer build` +// HCL2UpgradeArgs represents a parsed cli line for a `packer hcl2_upgrade` type HCL2UpgradeArgs struct { MetaArgs OutputFile string } + +func (va *FormatArgs) AddFlagSets(flags *flag.FlagSet) { + flags.BoolVar(&va.Check, "check", false, "check if the input is formatted") + flags.BoolVar(&va.Diff, "diff", false, "display the diff of formatting changes") + flags.BoolVar(&va.Write, "write", true, "overwrite source files instead of writing to stdout") + + va.MetaArgs.AddFlagSets(flags) +} + +// FormatArgs represents a parsed cli line for `packer fmt` +type FormatArgs struct { + MetaArgs + Check, Diff, Write bool +} diff --git a/command/fmt.go b/command/fmt.go new file mode 100644 index 000000000..d2533f6d8 --- /dev/null +++ b/command/fmt.go @@ -0,0 +1,109 @@ +package command + +import ( + "context" + "os" + "strings" + + hclutils "github.com/hashicorp/packer/hcl2template" + "github.com/posener/complete" +) + +type FormatCommand struct { + Meta +} + +func (c *FormatCommand) Run(args []string) int { + ctx := context.Background() + cfg, ret := c.ParseArgs(args) + if ret != 0 { + return ret + } + + return c.RunContext(ctx, cfg) +} + +func (c *FormatCommand) ParseArgs(args []string) (*FormatArgs, int) { + var cfg FormatArgs + flags := c.Meta.FlagSet("format", FlagSetNone) + flags.Usage = func() { c.Ui.Say(c.Help()) } + cfg.AddFlagSets(flags) + if err := flags.Parse(args); err != nil { + return &cfg, 1 + } + + args = flags.Args() + if len(args) != 1 { + flags.Usage() + return &cfg, 1 + } + + cfg.Path = args[0] + return &cfg, 0 +} + +func (c *FormatCommand) RunContext(ctx context.Context, cla *FormatArgs) int { + if cla.Check { + cla.Write = false + } + + formatter := hclutils.HCL2Formatter{ + ShowDiff: cla.Diff, + Write: cla.Write, + Output: os.Stdout, + } + + bytesModified, diags := formatter.Format(cla.Path) + ret := writeDiags(c.Ui, nil, diags) + if ret != 0 { + return ret + } + + if cla.Check && bytesModified > 0 { + // exit code taken from `terraform fmt` command + return 3 + } + + return 0 +} + +func (*FormatCommand) Help() string { + helpText := ` +Usage: packer fmt [options] [TEMPLATE] + + Rewrites all Packer configuration files to a canonical format. Both + configuration files (.pkr.hcl) and variable files (.pkrvars) are updated. + JSON files (.json) are not modified. + + If TEMPATE is "." the current directory will be used. The given content must + be in Packer's HCL2 configuration language; JSON is not supported. + +Options: + -check Check if the input is formatted. Exit status will be 0 if all + input is properly formatted and non-zero otherwise. + + -diff Display diffs of formatting change + + -write=false Don't write to source files + (always disabled if using -check) + +` + + return strings.TrimSpace(helpText) +} + +func (*FormatCommand) Synopsis() string { + return "Rewrites HCL2 config files to canonical format" +} + +func (*FormatCommand) AutocompleteArgs() complete.Predictor { + return complete.PredictNothing +} + +func (*FormatCommand) AutocompleteFlags() complete.Flags { + return complete.Flags{ + "-check": complete.PredictNothing, + "-diff": complete.PredictNothing, + "-write": complete.PredictNothing, + } +} diff --git a/commands.go b/commands.go index 32bdd17b5..e98242496 100644 --- a/commands.go +++ b/commands.go @@ -18,9 +18,7 @@ const OutputPrefix = "o:" func init() { Commands = map[string]cli.CommandFactory{ "build": func() (cli.Command, error) { - return &command.BuildCommand{ - Meta: *CommandMeta, - }, nil + return &command.BuildCommand{Meta: *CommandMeta}, nil }, "console": func() (cli.Command, error) { return &command.ConsoleCommand{ @@ -34,12 +32,30 @@ func init() { }, nil }, + "fmt": func() (cli.Command, error) { + return &command.FormatCommand{ + Meta: *CommandMeta, + }, nil + }, + + "hcl2_upgrade": func() (cli.Command, error) { + return &command.HCL2UpgradeCommand{ + Meta: *CommandMeta, + }, nil + }, + "inspect": func() (cli.Command, error) { return &command.InspectCommand{ Meta: *CommandMeta, }, nil }, + "plugin": func() (cli.Command, error) { + return &command.PluginCommand{ + Meta: *CommandMeta, + }, nil + }, + "validate": func() (cli.Command, error) { return &command.ValidateCommand{ Meta: *CommandMeta, @@ -52,17 +68,5 @@ func init() { CheckFunc: commandVersionCheck, }, nil }, - - "plugin": func() (cli.Command, error) { - return &command.PluginCommand{ - Meta: *CommandMeta, - }, nil - }, - - "hcl2_upgrade": func() (cli.Command, error) { - return &command.HCL2UpgradeCommand{ - Meta: *CommandMeta, - }, nil - }, } } diff --git a/hcl2template/formatter.go b/hcl2template/formatter.go new file mode 100644 index 000000000..e6b1c6634 --- /dev/null +++ b/hcl2template/formatter.go @@ -0,0 +1,151 @@ +package hcl2template + +import ( + "bytes" + "fmt" + "io" + "io/ioutil" + "os" + "os/exec" + + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclparse" + "github.com/hashicorp/hcl/v2/hclwrite" +) + +type HCL2Formatter struct { + ShowDiff, Write bool + Output io.Writer + parser *hclparse.Parser +} + +// NewHCL2Formatter creates a new formatter, ready to format configuration files. +func NewHCL2Formatter() *HCL2Formatter { + return &HCL2Formatter{ + parser: hclparse.NewParser(), + } +} + +// Format all HCL2 files in path and return the total bytes formatted. +// If any error is encountered, zero bytes will be returned. +// +// Path can be a directory or a file. +func (f *HCL2Formatter) Format(path string) (int, hcl.Diagnostics) { + hclFiles, _, diags := GetHCL2Files(path, hcl2FileExt, hcl2JsonFileExt) + if diags.HasErrors() { + return 0, diags + } + + hclVarFiles, _, diags := GetHCL2Files(path, hcl2VarFileExt, hcl2VarJsonFileExt) + if diags.HasErrors() { + return 0, diags + } + + allHclFiles := append(hclFiles, hclVarFiles...) + + if len(allHclFiles) == 0 { + diags = append(diags, &hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: fmt.Sprintf("Cannot tell whether %s contains HCL2 configuration data", path), + }) + + return 0, diags + } + + if f.parser == nil { + f.parser = hclparse.NewParser() + } + + var bytesModified int + for _, fn := range allHclFiles { + data, err := f.processFile(fn) + if err != nil { + diags = append(diags, &hcl.Diagnostic{ + Severity: hcl.DiagError, + Summary: fmt.Sprintf("encountered an error while formatting %s", fn), + Detail: err.Error(), + }) + } + bytesModified += len(data) + } + + return bytesModified, diags +} + +// processFile formats the source contents of filename and return the formatted data. +// overwriting the contents of the original when the f.Write is true; a diff of the changes +// will be outputted if f.ShowDiff is true. +func (f *HCL2Formatter) processFile(filename string) ([]byte, error) { + if f.Output == nil { + f.Output = os.Stdout + } + + in, err := os.Open(filename) + if err != nil { + return nil, fmt.Errorf("failed to open %s: %s", filename, err) + } + + inSrc, err := ioutil.ReadAll(in) + if err != nil { + return nil, fmt.Errorf("failed to read %s: %s", filename, err) + } + + _, diags := f.parser.ParseHCL(inSrc, filename) + if diags.HasErrors() { + return nil, fmt.Errorf("failed to parse HCL %s", filename) + } + + outSrc := hclwrite.Format(inSrc) + + if bytes.Equal(inSrc, outSrc) { + return nil, nil + } + + s := []byte(fmt.Sprintf("%s\n", filename)) + _, _ = f.Output.Write(s) + + if f.Write { + if err := ioutil.WriteFile(filename, outSrc, 0644); err != nil { + return nil, err + } + } + + if f.ShowDiff { + diff, err := bytesDiff(inSrc, outSrc, filename) + if err != nil { + return outSrc, fmt.Errorf("failed to generate diff for %s: %s", filename, err) + } + _, _ = f.Output.Write(diff) + } + + return outSrc, nil +} + +// bytesDiff returns the unified diff of b1 and b2 +// Shamelessly copied from Terraform's fmt command. +func bytesDiff(b1, b2 []byte, path string) (data []byte, err error) { + f1, err := ioutil.TempFile("", "") + if err != nil { + return + } + defer os.Remove(f1.Name()) + defer f1.Close() + + f2, err := ioutil.TempFile("", "") + if err != nil { + return + } + defer os.Remove(f2.Name()) + defer f2.Close() + + _, _ = f1.Write(b1) + _, _ = f2.Write(b2) + + data, err = exec.Command("diff", "--label=old/"+path, "--label=new/"+path, "-u", f1.Name(), f2.Name()).CombinedOutput() + if len(data) > 0 { + // diff exits with a non-zero status when the files don't match. + // Ignore that failure as long as we get output. + err = nil + } + return +} diff --git a/hcl2template/formatter_test.go b/hcl2template/formatter_test.go new file mode 100644 index 000000000..d015884c9 --- /dev/null +++ b/hcl2template/formatter_test.go @@ -0,0 +1,110 @@ +package hcl2template + +import ( + "bytes" + "io/ioutil" + "os" + "os/exec" + "strings" + "testing" + + "github.com/google/go-cmp/cmp" +) + +func TestHCL2Formatter_Format(t *testing.T) { + tt := []struct { + Name string + Path string + FormatExpected bool + }{ + {Name: "Unformatted file", Path: "testdata/format/unformatted.pkr.hcl", FormatExpected: true}, + {Name: "Formatted file", Path: "testdata/format/formatted.pkr.hcl"}, + {Name: "Directory", Path: "testdata/format", FormatExpected: true}, + } + + for _, tc := range tt { + tc := tc + var buf bytes.Buffer + f := NewHCL2Formatter() + f.Output = &buf + _, diags := f.Format(tc.Path) + if diags.HasErrors() { + t.Fatalf("the call to Format failed unexpectedly %s", diags.Error()) + } + + if buf.String() != "" && tc.FormatExpected == false { + t.Errorf("Format(%q) should contain the name of the formatted file(s), but got %q", tc.Path, buf.String()) + } + + } +} + +func TestHCL2Formatter_Format_Write(t *testing.T) { + + var buf bytes.Buffer + f := NewHCL2Formatter() + f.Output = &buf + f.Write = true + + unformattedData, err := ioutil.ReadFile("testdata/format/unformatted.pkr.hcl") + if err != nil { + t.Fatalf("failed to open the unformatted fixture %s", err) + } + + tf, err := ioutil.TempFile("", "*.pkr.hcl") + if err != nil { + t.Fatalf("failed to create tempfile for test %s", err) + } + defer os.Remove(tf.Name()) + + _, _ = tf.Write(unformattedData) + tf.Close() + + _, diags := f.Format(tf.Name()) + if diags.HasErrors() { + t.Fatalf("the call to Format failed unexpectedly %s", diags.Error()) + } + + //lets re-read the tempfile which should now be formatted + data, err := ioutil.ReadFile(tf.Name()) + if err != nil { + t.Fatalf("failed to open the newly formatted fixture %s", err) + } + + formattedData, err := ioutil.ReadFile("testdata/format/formatted.pkr.hcl") + if err != nil { + t.Fatalf("failed to open the formatted fixture %s", err) + } + + if diff := cmp.Diff(string(data), string(formattedData)); diff != "" { + t.Errorf("Unexpected format output %s", diff) + } +} + +func TestHCL2Formatter_Format_ShowDiff(t *testing.T) { + + if _, err := exec.LookPath("diff"); err != nil { + t.Skip("Skipping test because diff is not in the executable PATH") + } + + var buf bytes.Buffer + f := HCL2Formatter{ + Output: &buf, + ShowDiff: true, + } + + _, diags := f.Format("testdata/format/unformatted.pkr.hcl") + if diags.HasErrors() { + t.Fatalf("the call to Format failed unexpectedly %s", diags.Error()) + } + + diffHeader := ` +--- old/testdata/format/unformatted.pkr.hcl ++++ new/testdata/format/unformatted.pkr.hcl +@@ -1,149 +1,149 @@ +` + if !strings.Contains(buf.String(), diffHeader) { + t.Errorf("expected buf to contain a file diff, but instead we got %s", buf.String()) + } + +} diff --git a/hcl2template/testdata/format/formatted.pkr.hcl b/hcl2template/testdata/format/formatted.pkr.hcl new file mode 100644 index 000000000..17a84d81c --- /dev/null +++ b/hcl2template/testdata/format/formatted.pkr.hcl @@ -0,0 +1,149 @@ + +// starts resources to provision them. +build { + sources = [ + "source.amazon-ebs.ubuntu-1604", + "source.virtualbox-iso.ubuntu-1204", + ] + + provisioner "shell" { + string = coalesce(null, "", "string") + int = "${41 + 1}" + int64 = "${42 + 1}" + bool = "true" + trilean = true + duration = "${9 + 1}s" + map_string_string = { + a = "b" + c = "d" + } + slice_string = [ + "a", + "b", + "c", + ] + slice_slice_string = [ + ["a", "b"], + ["c", "d"] + ] + + nested { + string = "string" + int = 42 + int64 = 43 + bool = true + trilean = true + duration = "10s" + map_string_string = { + a = "b" + c = "d" + } + slice_string = [ + "a", + "b", + "c", + ] + slice_slice_string = [ + ["a", "b"], + ["c", "d"] + ] + } + + nested_slice { + } + } + + provisioner "file" { + string = "string" + int = 42 + int64 = 43 + bool = true + trilean = true + duration = "10s" + map_string_string = { + a = "b" + c = "d" + } + slice_string = [ + "a", + "b", + "c", + ] + slice_slice_string = [ + ["a", "b"], + ["c", "d"] + ] + + nested { + string = "string" + int = 42 + int64 = 43 + bool = true + trilean = true + duration = "10s" + map_string_string = { + a = "b" + c = "d" + } + slice_string = [ + "a", + "b", + "c", + ] + slice_slice_string = [ + ["a", "b"], + ["c", "d"] + ] + } + + nested_slice { + } + } + + post-processor "amazon-import" { + string = "string" + int = 42 + int64 = 43 + bool = true + trilean = true + duration = "10s" + map_string_string = { + a = "b" + c = "d" + } + slice_string = [ + "a", + "b", + "c", + ] + slice_slice_string = [ + ["a", "b"], + ["c", "d"] + ] + + nested { + string = "string" + int = 42 + int64 = 43 + bool = true + trilean = true + duration = "10s" + map_string_string = { + a = "b" + c = "d" + } + slice_string = [ + "a", + "b", + "c", + ] + slice_slice_string = [ + ["a", "b"], + ["c", "d"] + ] + } + + nested_slice { + } + } +} diff --git a/hcl2template/testdata/format/unformatted.pkr.hcl b/hcl2template/testdata/format/unformatted.pkr.hcl new file mode 100644 index 000000000..86aa3a154 --- /dev/null +++ b/hcl2template/testdata/format/unformatted.pkr.hcl @@ -0,0 +1,149 @@ + +// starts resources to provision them. +build { + sources = [ + "source.amazon-ebs.ubuntu-1604", + "source.virtualbox-iso.ubuntu-1204", + ] + + provisioner "shell" { + string = coalesce(null, "", "string") + int = "${41 + 1}" + int64 = "${42 + 1}" + bool = "true" + trilean = true + duration = "${9 + 1}s" + map_string_string = { + a = "b" + c = "d" + } + slice_string = [ + "a", + "b", + "c", + ] + slice_slice_string = [ + ["a","b"], + ["c","d"] + ] + + nested { + string = "string" + int = 42 + int64 = 43 + bool = true + trilean = true + duration = "10s" + map_string_string = { + a = "b" + c = "d" + } + slice_string = [ + "a", + "b", + "c", + ] + slice_slice_string = [ + ["a","b"], + ["c","d"] + ] + } + + nested_slice { + } + } + + provisioner "file" { + string = "string" + int = 42 + int64 = 43 + bool = true + trilean = true + duration = "10s" + map_string_string = { + a = "b" + c = "d" + } + slice_string = [ + "a", + "b", + "c", + ] + slice_slice_string = [ + ["a","b"], + ["c","d"] + ] + + nested { + string = "string" + int = 42 + int64 = 43 + bool = true + trilean = true + duration = "10s" + map_string_string = { + a = "b" + c = "d" + } + slice_string = [ + "a", + "b", + "c", + ] + slice_slice_string = [ + ["a","b"], + ["c","d"] + ] + } + + nested_slice { + } + } + + post-processor "amazon-import" { + string = "string" + int = 42 + int64 = 43 + bool = true + trilean = true + duration = "10s" + map_string_string = { + a = "b" + c = "d" + } + slice_string = [ + "a", + "b", + "c", + ] + slice_slice_string = [ + ["a","b"], + ["c","d"] + ] + + nested { + string = "string" + int = 42 + int64 = 43 + bool = true + trilean = true + duration = "10s" + map_string_string = { + a = "b" + c = "d" + } + slice_string = [ + "a", + "b", + "c", + ] + slice_slice_string = [ + ["a","b"], + ["c","d"] + ] + } + + nested_slice { + } + } +} diff --git a/website/data/docs-navigation.js b/website/data/docs-navigation.js index efc9e70ff..bfc385afe 100644 --- a/website/data/docs-navigation.js +++ b/website/data/docs-navigation.js @@ -170,7 +170,7 @@ export default [ 'terminology', { category: 'commands', - content: ['build', 'console', 'fix', 'inspect', 'validate', 'hcl2_upgrade'], + content: ['build', 'console', 'fix', 'fmt', 'inspect', 'validate', 'hcl2_upgrade'], }, { category: 'templates', diff --git a/website/pages/docs/commands/fmt.mdx b/website/pages/docs/commands/fmt.mdx new file mode 100644 index 000000000..b277dbc76 --- /dev/null +++ b/website/pages/docs/commands/fmt.mdx @@ -0,0 +1,46 @@ +--- +description: | + The `packer fmt` Packer command is used to format HCL2 + configuration files to a canonical format and style. +layout: docs +page_title: packer fmt - Commands +sidebar_title: fmt +--- + +# `fmt` Command + +The `packer fmt` Packer command is used to format HCL2 configuration files to +a canonical format and style. JSON files (.json) are not modified. This command +applies a subset of HCL language style conventions, along with other minor +adjustments for readability. + +`packer fmt` will display the name of the configuration file(s) that need formatting, +and write any formatted changes back to the original configuration file(s). + +Example usage: + +Check if configuration file(s) need to be formatted, but don't write the changes. + +```shell-session +$ packer fmt -check . +my-template.json + +``` + +Format a configuration file, writing the changes back to the original file. + +```shell-session +$ packer fmt my-template.json +my-template.json + +``` + +## Options + +- `-check` - Checks if the input is formatted. Exit status will be 0 if all +input is properly formatted and non-zero otherwise. + +- `-diff` - Display diffs of any formatting change + +- `-write=false` - Don't write formatting changes to source files +(always disabled if using -check) From 2e9e7d13b6d9c0dbdd6361e5040ed733db856e7c Mon Sep 17 00:00:00 2001 From: Wilken Rivera Date: Wed, 11 Nov 2020 13:46:18 -0500 Subject: [PATCH 55/93] update CHANGELOG --- CHANGELOG.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85061925a..24aab6991 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,30 @@ ## 1.6.6 (Upcoming) ### FEATURES: +* **New command** `fmt` allows users to format existing HCL2 configuration + files into a canonical style. Please see [fmt command + docs](https://packer.io/docs/commands/fmt) for more details. [GH-10225] +* **New function** `env`allows users to set the default value of a variable to + the value of some environment variable. Please see [env function + docs](https://www.packer.io/docs/from-1.5/functions/contextual/env") for + more details. [GH-10240] * builder/azure-arm: Create keyvaults with SoftDelete enabled [GH-10210] * builder/outscale: Add x509 certificate support [GH-10161] -* post-processor/yandex-export: Verify the access to a specific bucket [GH-10188] +* post-processor/yandex-export: Verify the access to a specific bucket + [GH-10188] + +### IMPROVEMENTS +* builder/amazon-ebs: Add tags to launch template. [GH-10203] +* builder/azure-arm: Add Azure CLI authentication support to builder. + [GH-10157] +* core/hcl: Update to `hcl2_upgrade` command to support complex variable + values, and packer version blocks. [GH-10221] +* post-processor/vagrant-cloud: Add support for uploading directly to storage + on Vagrant Cloud. [GH-10193] + +### BUG FIXES +* builder/amazon: Fix single `tag` interpolation to allow for template engine + usage. [GH-10224] ## 1.6.5 (October 30, 2020) From 1a08bf8ce9a6c6244fdd67b4cfbe38d7856d116d Mon Sep 17 00:00:00 2001 From: Wilken Rivera Date: Wed, 11 Nov 2020 13:55:50 -0500 Subject: [PATCH 56/93] update CHANGELOG * fix spacing, typos --- CHANGELOG.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24aab6991..f320c681c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,8 @@ * **New command** `fmt` allows users to format existing HCL2 configuration files into a canonical style. Please see [fmt command docs](https://packer.io/docs/commands/fmt) for more details. [GH-10225] -* **New function** `env`allows users to set the default value of a variable to - the value of some environment variable. Please see [env function +* **New function** `env` allows users to set the default value of a variable to + the value of an environment variable. Please see [env function docs](https://www.packer.io/docs/from-1.5/functions/contextual/env") for more details. [GH-10240] * builder/azure-arm: Create keyvaults with SoftDelete enabled [GH-10210] @@ -14,16 +14,16 @@ [GH-10188] ### IMPROVEMENTS -* builder/amazon-ebs: Add tags to launch template. [GH-10203] +* builder/amazon-ebs: Add tags to launch templates. [GH-10203] * builder/azure-arm: Add Azure CLI authentication support to builder. [GH-10157] * core/hcl: Update to `hcl2_upgrade` command to support complex variable - values, and packer version blocks. [GH-10221] + values and packer version blocks. [GH-10221] * post-processor/vagrant-cloud: Add support for uploading directly to storage on Vagrant Cloud. [GH-10193] ### BUG FIXES -* builder/amazon: Fix single `tag` interpolation to allow for template engine +* builder/amazon: Fix single `tag` interpolation to allow for templating engine usage. [GH-10224] ## 1.6.5 (October 30, 2020) From f44e9120727366dcca31b6163e9b173b8943e723 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 11 Nov 2020 20:54:22 +0100 Subject: [PATCH 57/93] Update hcl2upgrade command to update env calls + tests (#10244) --- command/hcl2_upgrade.go | 2 +- command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl | 5 +++++ command/test-fixtures/hcl2_upgrade_basic/input.json | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/command/hcl2_upgrade.go b/command/hcl2_upgrade.go index 13148c430..bcb6936b2 100644 --- a/command/hcl2_upgrade.go +++ b/command/hcl2_upgrade.go @@ -322,7 +322,7 @@ func transposeTemplatingCalls(s []byte) []byte { return fmt.Sprintf("${var.%s}", in) }, "env": func(in string) string { - return fmt.Sprintf("${var.%s}", in) + return fmt.Sprintf("${env(%q)}", in) }, "build": func(a string) string { return fmt.Sprintf("${build.%s}", a) diff --git a/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl b/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl index 97b18111f..31091a90a 100644 --- a/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl +++ b/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl @@ -30,6 +30,11 @@ variable "aws_region" { type = string } +variable "aws_secondary_region" { + type = string + default = "${env("AWS_DEFAULT_REGION")}" +} + variable "aws_secret_key" { type = string default = "" diff --git a/command/test-fixtures/hcl2_upgrade_basic/input.json b/command/test-fixtures/hcl2_upgrade_basic/input.json index b6f9a9302..a7fca659b 100644 --- a/command/test-fixtures/hcl2_upgrade_basic/input.json +++ b/command/test-fixtures/hcl2_upgrade_basic/input.json @@ -3,6 +3,7 @@ "variables": { "secret_account": "🤷", "aws_region": null, + "aws_secondary_region": "{{ env `AWS_DEFAULT_REGION` }}", "aws_secret_key": "", "aws_access_key": "" }, From 67e2c0b83ccdc71f7098686d45b68eaf50814f65 Mon Sep 17 00:00:00 2001 From: Wilken Rivera Date: Thu, 12 Nov 2020 11:26:54 -0500 Subject: [PATCH 58/93] Add nullStep as return for multistep.If (#10247) This change introduces a new nullStep type that can be used in place of a nil step. This fixes an issue where multistep.If would return a nil step if the condition was not met causing a builder to crash when executed using `-on-error=ask` or `-on-error=abort`. Closes #10241 --- helper/multistep/if.go | 2 +- helper/multistep/multistep.go | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/helper/multistep/if.go b/helper/multistep/if.go index f485c50dc..f9705af62 100644 --- a/helper/multistep/if.go +++ b/helper/multistep/if.go @@ -3,7 +3,7 @@ package multistep // if returns step only if on is true. func If(on bool, step Step) Step { if on == false { - return nil + return &nullStep{} } return step } diff --git a/helper/multistep/multistep.go b/helper/multistep/multistep.go index a4629bacf..a3e427c0c 100644 --- a/helper/multistep/multistep.go +++ b/helper/multistep/multistep.go @@ -61,3 +61,11 @@ type Runner interface { // Run runs the steps with the given initial state. Run(context.Context, StateBag) } + +type nullStep struct{} + +func (s nullStep) Run(ctx context.Context, state StateBag) StepAction { + return ActionContinue +} + +func (s nullStep) Cleanup(state StateBag) {} From 38c50cf00eea0e674e03404aa0b98a8d98d38ea6 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Fri, 13 Nov 2020 11:05:57 +0100 Subject: [PATCH 59/93] HCL2: Add more documentation to path-variables (#10245) * HCL2: Add more documentation to path-variables Co-authored-by: Wilken Rivera --- .../pages/docs/from-1.5/path-variables.mdx | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/website/pages/docs/from-1.5/path-variables.mdx b/website/pages/docs/from-1.5/path-variables.mdx index 619b7526b..d95e468de 100644 --- a/website/pages/docs/from-1.5/path-variables.mdx +++ b/website/pages/docs/from-1.5/path-variables.mdx @@ -12,3 +12,30 @@ description: |- - `path.cwd`: the directory from where Packer was started. - `path.root`: the directory of the input HCL file or the input folder. + + +## Examples + +```HCL +locals { + settings_file = "${path.cwd}/settings.txt" + scripts_folder = "${path.root}/scripts" + root = path.root +} +``` + +## Related Functions + +- [`abspath`](/docs/from-1.5/functions/file/abspath) takes a string containing + a filesystem path and converts it to an absolute path. + +- [`basename`](/docs/from-1.5/functions/file/basename) returns _only_ the last + portion of a filesystem path, discarding the portion that would be returned + by `dirname`. + +- [`fileset`](/docs/from-1.5/functions/file/fileset) enumerates a set of + regular file names given a path and pattern. + +- [`dirname`](/docs/from-1.5/functions/file/dirname) returns all of the + segments of a filesystem path _except_ the last, discarding the portion that + would be returned by `basename`. From fe9dca4c7524af55a55092bfe4aaedd555ba50b2 Mon Sep 17 00:00:00 2001 From: Roman Mingazeev Date: Fri, 13 Nov 2020 16:11:58 +0300 Subject: [PATCH 60/93] change disk creation method to manual --- builder/yandex/step_create_instance.go | 56 +++++++++++++++++++++----- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/builder/yandex/step_create_instance.go b/builder/yandex/step_create_instance.go index e89ba5269..3b48096d9 100644 --- a/builder/yandex/step_create_instance.go +++ b/builder/yandex/step_create_instance.go @@ -56,6 +56,40 @@ func createNetwork(ctx context.Context, c *Config, d Driver) (*vpc.Network, erro return network, nil } +func createDisk(ctx context.Context, c *Config, d Driver, sourceImage *Image) (*compute.Disk, error) { + req := &compute.CreateDiskRequest{ + Name: c.DiskName, + FolderId: c.FolderID, + TypeId: c.DiskType, + ZoneId: c.Zone, + Size: int64((datasize.ByteSize(c.DiskSizeGb) * datasize.GB).Bytes()), + Source: &compute.CreateDiskRequest_ImageId{ + ImageId: sourceImage.ID, + }, + } + sdk := d.SDK() + + op, err := sdk.WrapOperation(sdk.Compute().Disk().Create(ctx, req)) + if err != nil { + return nil, err + } + err = op.Wait(ctx) + if err != nil { + return nil, err + } + resp, err := op.Response() + if err != nil { + return nil, err + } + + image, ok := resp.(*compute.Disk) + if !ok { + return nil, errors.New("disk create operation response doesn't contain Disk") + } + return image, nil + +} + func createSubnet(ctx context.Context, c *Config, d Driver, networkID string) (*vpc.Subnet, error) { req := &vpc.CreateSubnetRequest{ FolderId: c.FolderID, @@ -154,6 +188,14 @@ func (s *StepCreateInstance) Run(ctx context.Context, state multistep.StateBag) instanceSubnetID = config.SubnetID } + // Create a disk manually to have a delete ID + ui.Say("Creating disk...") + disk, err := createDisk(ctx, config, driver, sourceImage) + if err != nil { + return stepHaltWithError(state, fmt.Errorf("Error creating disk: %s", err)) + } + state.Put("disk_id", disk.Id) + // Create an instance based on the configuration ui.Say("Creating instance...") @@ -189,15 +231,8 @@ runcmd: Metadata: instanceMetadata, BootDiskSpec: &compute.AttachedDiskSpec{ AutoDelete: false, - Disk: &compute.AttachedDiskSpec_DiskSpec_{ - DiskSpec: &compute.AttachedDiskSpec_DiskSpec{ - Name: config.DiskName, - TypeId: config.DiskType, - Size: int64((datasize.ByteSize(config.DiskSizeGb) * datasize.GB).Bytes()), - Source: &compute.AttachedDiskSpec_DiskSpec_ImageId{ - ImageId: sourceImage.ID, - }, - }, + Disk: &compute.AttachedDiskSpec_DiskId{ + DiskId: disk.Id, }, }, NetworkInterfaceSpecs: []*compute.NetworkInterfaceSpec{ @@ -255,14 +290,13 @@ runcmd: return stepHaltWithError(state, fmt.Errorf("response doesn't contain Instance")) } - state.Put("disk_id", instance.BootDisk.DiskId) // instance_id is the generic term used so that users can have access to the // instance id inside of the provisioners, used in step_provision. state.Put("instance_id", instance.Id) if s.Debug { ui.Message(fmt.Sprintf("Instance ID %s started. Current instance status %s", instance.Id, instance.Status)) - ui.Message(fmt.Sprintf("Disk ID %s. ", instance.BootDisk.DiskId)) + ui.Message(fmt.Sprintf("Disk ID %s. ", disk.Id)) } // provision generated_data from declared in Builder.Prepare func From 6a327b133031eb513e51e4b849dd43db9774a952 Mon Sep 17 00:00:00 2001 From: Roman Mingazeev Date: Fri, 13 Nov 2020 16:35:48 +0300 Subject: [PATCH 61/93] add labels for temp disk --- builder/yandex/config.go | 2 ++ builder/yandex/config.hcl2spec.go | 2 ++ builder/yandex/step_create_instance.go | 1 + website/pages/partials/builder/yandex/Config-not-required.mdx | 2 ++ 4 files changed, 7 insertions(+) diff --git a/builder/yandex/config.go b/builder/yandex/config.go index 12b7245b3..ed6b337b6 100644 --- a/builder/yandex/config.go +++ b/builder/yandex/config.go @@ -44,6 +44,8 @@ type Config struct { DiskSizeGb int `mapstructure:"disk_size_gb" required:"false"` // Specify disk type for the launched instance. Defaults to `network-hdd`. DiskType string `mapstructure:"disk_type" required:"false"` + // Key/value pair labels to apply to the temporary disk. + DiskLabels map[string]string `mapstructure:"disk_labels" required:"false"` // The description of the resulting image. ImageDescription string `mapstructure:"image_description" required:"false"` // The family name of the resulting image. diff --git a/builder/yandex/config.hcl2spec.go b/builder/yandex/config.hcl2spec.go index 8660f3b6e..4dd70db3d 100644 --- a/builder/yandex/config.hcl2spec.go +++ b/builder/yandex/config.hcl2spec.go @@ -74,6 +74,7 @@ type FlatConfig struct { DiskName *string `mapstructure:"disk_name" required:"false" cty:"disk_name" hcl:"disk_name"` DiskSizeGb *int `mapstructure:"disk_size_gb" required:"false" cty:"disk_size_gb" hcl:"disk_size_gb"` DiskType *string `mapstructure:"disk_type" required:"false" cty:"disk_type" hcl:"disk_type"` + DiskLabels map[string]string `mapstructure:"disk_labels" required:"false" cty:"disk_labels" hcl:"disk_labels"` ImageDescription *string `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"` ImageFamily *string `mapstructure:"image_family" required:"false" cty:"image_family" hcl:"image_family"` ImageLabels map[string]string `mapstructure:"image_labels" required:"false" cty:"image_labels" hcl:"image_labels"` @@ -180,6 +181,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "disk_name": &hcldec.AttrSpec{Name: "disk_name", Type: cty.String, Required: false}, "disk_size_gb": &hcldec.AttrSpec{Name: "disk_size_gb", Type: cty.Number, Required: false}, "disk_type": &hcldec.AttrSpec{Name: "disk_type", Type: cty.String, Required: false}, + "disk_labels": &hcldec.AttrSpec{Name: "disk_labels", Type: cty.Map(cty.String), Required: false}, "image_description": &hcldec.AttrSpec{Name: "image_description", Type: cty.String, Required: false}, "image_family": &hcldec.AttrSpec{Name: "image_family", Type: cty.String, Required: false}, "image_labels": &hcldec.AttrSpec{Name: "image_labels", Type: cty.Map(cty.String), Required: false}, diff --git a/builder/yandex/step_create_instance.go b/builder/yandex/step_create_instance.go index 3b48096d9..9f54f2948 100644 --- a/builder/yandex/step_create_instance.go +++ b/builder/yandex/step_create_instance.go @@ -61,6 +61,7 @@ func createDisk(ctx context.Context, c *Config, d Driver, sourceImage *Image) (* Name: c.DiskName, FolderId: c.FolderID, TypeId: c.DiskType, + Labels: c.DiskLabels, ZoneId: c.Zone, Size: int64((datasize.ByteSize(c.DiskSizeGb) * datasize.GB).Bytes()), Source: &compute.CreateDiskRequest_ImageId{ diff --git a/website/pages/partials/builder/yandex/Config-not-required.mdx b/website/pages/partials/builder/yandex/Config-not-required.mdx index 2d933cb3e..cd3a4dfd3 100644 --- a/website/pages/partials/builder/yandex/Config-not-required.mdx +++ b/website/pages/partials/builder/yandex/Config-not-required.mdx @@ -9,6 +9,8 @@ - `disk_type` (string) - Specify disk type for the launched instance. Defaults to `network-hdd`. +- `disk_labels` (map[string]string) - Key/value pair labels to apply to the temporary disk. + - `image_description` (string) - The description of the resulting image. - `image_family` (string) - The family name of the resulting image. From 5bf03df694465903f682276e493a2a28dbff66f2 Mon Sep 17 00:00:00 2001 From: Roman Mingazeev Date: Fri, 13 Nov 2020 16:44:15 +0300 Subject: [PATCH 62/93] fix fmt --- builder/yandex/step_create_instance.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/yandex/step_create_instance.go b/builder/yandex/step_create_instance.go index 9f54f2948..f3be5e4dc 100644 --- a/builder/yandex/step_create_instance.go +++ b/builder/yandex/step_create_instance.go @@ -61,7 +61,7 @@ func createDisk(ctx context.Context, c *Config, d Driver, sourceImage *Image) (* Name: c.DiskName, FolderId: c.FolderID, TypeId: c.DiskType, - Labels: c.DiskLabels, + Labels: c.DiskLabels, ZoneId: c.Zone, Size: int64((datasize.ByteSize(c.DiskSizeGb) * datasize.GB).Bytes()), Source: &compute.CreateDiskRequest_ImageId{ From 14abb8ce2b929894eb994958823eedffa922ba0c Mon Sep 17 00:00:00 2001 From: Roman Mingazeev Date: Fri, 13 Nov 2020 17:21:32 +0300 Subject: [PATCH 63/93] Update website/pages/partials/builder/yandex/Config-not-required.mdx Co-authored-by: GennadySpb --- website/pages/partials/builder/yandex/Config-not-required.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/pages/partials/builder/yandex/Config-not-required.mdx b/website/pages/partials/builder/yandex/Config-not-required.mdx index cd3a4dfd3..806a1d3ee 100644 --- a/website/pages/partials/builder/yandex/Config-not-required.mdx +++ b/website/pages/partials/builder/yandex/Config-not-required.mdx @@ -9,7 +9,7 @@ - `disk_type` (string) - Specify disk type for the launched instance. Defaults to `network-hdd`. -- `disk_labels` (map[string]string) - Key/value pair labels to apply to the temporary disk. +- `disk_labels` (map[string]string) - Key/value pair labels to apply to the disk. - `image_description` (string) - The description of the resulting image. From 6be26e50e0febe398c7f8f33570f7c4acc7f91a4 Mon Sep 17 00:00:00 2001 From: Roman Mingazeev Date: Fri, 13 Nov 2020 17:27:50 +0300 Subject: [PATCH 64/93] Update builder/yandex/config.go Co-authored-by: GennadySpb --- builder/yandex/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/yandex/config.go b/builder/yandex/config.go index ed6b337b6..22683bc35 100644 --- a/builder/yandex/config.go +++ b/builder/yandex/config.go @@ -44,7 +44,7 @@ type Config struct { DiskSizeGb int `mapstructure:"disk_size_gb" required:"false"` // Specify disk type for the launched instance. Defaults to `network-hdd`. DiskType string `mapstructure:"disk_type" required:"false"` - // Key/value pair labels to apply to the temporary disk. + // Key/value pair labels to apply to the disk. DiskLabels map[string]string `mapstructure:"disk_labels" required:"false"` // The description of the resulting image. ImageDescription string `mapstructure:"image_description" required:"false"` From df9febef1bcd5e3857fb5e608f03503151262b91 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 11 Nov 2020 10:07:49 -0800 Subject: [PATCH 65/93] move communicators into sdk-internals directory --- builder/vmware/common/driver_esx5.go | 2 +- helper/communicator/config.go | 2 +- helper/communicator/step_connect.go | 2 +- helper/communicator/step_connect_ssh.go | 2 +- helper/communicator/step_connect_winrm.go | 2 +- helper/ssh/tunnel.go | 2 +- helper/ssh/tunnel_test.go | 2 +- .../communicator}/none/communicator.go | 0 .../communicator}/none/communicator_test.go | 0 .../communicator}/ssh/communicator.go | 0 .../communicator}/ssh/communicator_test.go | 0 {communicator => sdk-internals/communicator}/ssh/connect.go | 0 .../communicator}/ssh/connect_test.go | 0 {communicator => sdk-internals/communicator}/ssh/connection.go | 0 .../communicator}/ssh/keyboard_interactive.go | 0 .../communicator}/ssh/keyboard_interactive_test.go | 0 {communicator => sdk-internals/communicator}/ssh/password.go | 0 .../communicator}/ssh/password_test.go | 0 {communicator => sdk-internals/communicator}/ssh/tunnel.go | 0 .../communicator}/winrm/communicator.go | 0 .../communicator}/winrm/communicator_test.go | 0 {communicator => sdk-internals/communicator}/winrm/config.go | 0 {communicator => sdk-internals/communicator}/winrm/time.go | 0 {communicator => sdk-internals/communicator}/winrm/time_test.go | 0 24 files changed, 7 insertions(+), 7 deletions(-) rename {communicator => sdk-internals/communicator}/none/communicator.go (100%) rename {communicator => sdk-internals/communicator}/none/communicator_test.go (100%) rename {communicator => sdk-internals/communicator}/ssh/communicator.go (100%) rename {communicator => sdk-internals/communicator}/ssh/communicator_test.go (100%) rename {communicator => sdk-internals/communicator}/ssh/connect.go (100%) rename {communicator => sdk-internals/communicator}/ssh/connect_test.go (100%) rename {communicator => sdk-internals/communicator}/ssh/connection.go (100%) rename {communicator => sdk-internals/communicator}/ssh/keyboard_interactive.go (100%) rename {communicator => sdk-internals/communicator}/ssh/keyboard_interactive_test.go (100%) rename {communicator => sdk-internals/communicator}/ssh/password.go (100%) rename {communicator => sdk-internals/communicator}/ssh/password_test.go (100%) rename {communicator => sdk-internals/communicator}/ssh/tunnel.go (100%) rename {communicator => sdk-internals/communicator}/winrm/communicator.go (100%) rename {communicator => sdk-internals/communicator}/winrm/communicator_test.go (100%) rename {communicator => sdk-internals/communicator}/winrm/config.go (100%) rename {communicator => sdk-internals/communicator}/winrm/time.go (100%) rename {communicator => sdk-internals/communicator}/winrm/time_test.go (100%) diff --git a/builder/vmware/common/driver_esx5.go b/builder/vmware/common/driver_esx5.go index bdfa86e70..9b2ceff90 100644 --- a/builder/vmware/common/driver_esx5.go +++ b/builder/vmware/common/driver_esx5.go @@ -28,11 +28,11 @@ import ( "github.com/vmware/govmomi/vim25/types" "github.com/hashicorp/go-getter/v2" - "github.com/hashicorp/packer/communicator/ssh" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/sdk-internals/communicator/ssh" gossh "golang.org/x/crypto/ssh" ) diff --git a/helper/communicator/config.go b/helper/communicator/config.go index f27cd2a76..e6a346db7 100644 --- a/helper/communicator/config.go +++ b/helper/communicator/config.go @@ -12,11 +12,11 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - packerssh "github.com/hashicorp/packer/communicator/ssh" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + packerssh "github.com/hashicorp/packer/sdk-internals/communicator/ssh" "github.com/hashicorp/packer/template/interpolate" "github.com/masterzen/winrm" "golang.org/x/crypto/ssh" diff --git a/helper/communicator/step_connect.go b/helper/communicator/step_connect.go index 1eaf48bf8..a8dc18dd0 100644 --- a/helper/communicator/step_connect.go +++ b/helper/communicator/step_connect.go @@ -6,9 +6,9 @@ import ( "log" "time" - "github.com/hashicorp/packer/communicator/none" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/sdk-internals/communicator/none" gossh "golang.org/x/crypto/ssh" ) diff --git a/helper/communicator/step_connect_ssh.go b/helper/communicator/step_connect_ssh.go index 3ddaed115..4f00000df 100644 --- a/helper/communicator/step_connect_ssh.go +++ b/helper/communicator/step_connect_ssh.go @@ -13,10 +13,10 @@ import ( "golang.org/x/crypto/ssh/terminal" - "github.com/hashicorp/packer/communicator/ssh" "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/sdk-internals/communicator/ssh" gossh "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" "golang.org/x/net/proxy" diff --git a/helper/communicator/step_connect_winrm.go b/helper/communicator/step_connect_winrm.go index 2600440ee..81ec99a2f 100644 --- a/helper/communicator/step_connect_winrm.go +++ b/helper/communicator/step_connect_winrm.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "github.com/hashicorp/packer/communicator/winrm" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/sdk-internals/communicator/winrm" winrmcmd "github.com/masterzen/winrm" "golang.org/x/net/http/httpproxy" ) diff --git a/helper/ssh/tunnel.go b/helper/ssh/tunnel.go index eeb45b51e..ea73a57f7 100644 --- a/helper/ssh/tunnel.go +++ b/helper/ssh/tunnel.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/hashicorp/packer/communicator/ssh" + "github.com/hashicorp/packer/sdk-internals/communicator/ssh" ) // ParseTunnelArgument parses an SSH tunneling argument compatible with the openssh client form. diff --git a/helper/ssh/tunnel_test.go b/helper/ssh/tunnel_test.go index 447a71ef3..cc81de031 100644 --- a/helper/ssh/tunnel_test.go +++ b/helper/ssh/tunnel_test.go @@ -3,7 +3,7 @@ package ssh import ( "testing" - "github.com/hashicorp/packer/communicator/ssh" + "github.com/hashicorp/packer/sdk-internals/communicator/ssh" ) const ( diff --git a/communicator/none/communicator.go b/sdk-internals/communicator/none/communicator.go similarity index 100% rename from communicator/none/communicator.go rename to sdk-internals/communicator/none/communicator.go diff --git a/communicator/none/communicator_test.go b/sdk-internals/communicator/none/communicator_test.go similarity index 100% rename from communicator/none/communicator_test.go rename to sdk-internals/communicator/none/communicator_test.go diff --git a/communicator/ssh/communicator.go b/sdk-internals/communicator/ssh/communicator.go similarity index 100% rename from communicator/ssh/communicator.go rename to sdk-internals/communicator/ssh/communicator.go diff --git a/communicator/ssh/communicator_test.go b/sdk-internals/communicator/ssh/communicator_test.go similarity index 100% rename from communicator/ssh/communicator_test.go rename to sdk-internals/communicator/ssh/communicator_test.go diff --git a/communicator/ssh/connect.go b/sdk-internals/communicator/ssh/connect.go similarity index 100% rename from communicator/ssh/connect.go rename to sdk-internals/communicator/ssh/connect.go diff --git a/communicator/ssh/connect_test.go b/sdk-internals/communicator/ssh/connect_test.go similarity index 100% rename from communicator/ssh/connect_test.go rename to sdk-internals/communicator/ssh/connect_test.go diff --git a/communicator/ssh/connection.go b/sdk-internals/communicator/ssh/connection.go similarity index 100% rename from communicator/ssh/connection.go rename to sdk-internals/communicator/ssh/connection.go diff --git a/communicator/ssh/keyboard_interactive.go b/sdk-internals/communicator/ssh/keyboard_interactive.go similarity index 100% rename from communicator/ssh/keyboard_interactive.go rename to sdk-internals/communicator/ssh/keyboard_interactive.go diff --git a/communicator/ssh/keyboard_interactive_test.go b/sdk-internals/communicator/ssh/keyboard_interactive_test.go similarity index 100% rename from communicator/ssh/keyboard_interactive_test.go rename to sdk-internals/communicator/ssh/keyboard_interactive_test.go diff --git a/communicator/ssh/password.go b/sdk-internals/communicator/ssh/password.go similarity index 100% rename from communicator/ssh/password.go rename to sdk-internals/communicator/ssh/password.go diff --git a/communicator/ssh/password_test.go b/sdk-internals/communicator/ssh/password_test.go similarity index 100% rename from communicator/ssh/password_test.go rename to sdk-internals/communicator/ssh/password_test.go diff --git a/communicator/ssh/tunnel.go b/sdk-internals/communicator/ssh/tunnel.go similarity index 100% rename from communicator/ssh/tunnel.go rename to sdk-internals/communicator/ssh/tunnel.go diff --git a/communicator/winrm/communicator.go b/sdk-internals/communicator/winrm/communicator.go similarity index 100% rename from communicator/winrm/communicator.go rename to sdk-internals/communicator/winrm/communicator.go diff --git a/communicator/winrm/communicator_test.go b/sdk-internals/communicator/winrm/communicator_test.go similarity index 100% rename from communicator/winrm/communicator_test.go rename to sdk-internals/communicator/winrm/communicator_test.go diff --git a/communicator/winrm/config.go b/sdk-internals/communicator/winrm/config.go similarity index 100% rename from communicator/winrm/config.go rename to sdk-internals/communicator/winrm/config.go diff --git a/communicator/winrm/time.go b/sdk-internals/communicator/winrm/time.go similarity index 100% rename from communicator/winrm/time.go rename to sdk-internals/communicator/winrm/time.go diff --git a/communicator/winrm/time_test.go b/sdk-internals/communicator/winrm/time_test.go similarity index 100% rename from communicator/winrm/time_test.go rename to sdk-internals/communicator/winrm/time_test.go From 64023620189ab52f06bf33528dc03749eb07cb5a Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 11 Nov 2020 10:21:37 -0800 Subject: [PATCH 66/93] create packer-plugin-sdk directory and begin moving the relevant folders into it. --- builder/alicloud/ecs/access_config.go | 2 +- builder/alicloud/ecs/builder.go | 2 +- builder/alicloud/ecs/image_config.go | 2 +- builder/alicloud/ecs/run_config.go | 2 +- builder/amazon/chroot/builder.go | 2 +- builder/amazon/chroot/step_create_volume.go | 2 +- builder/amazon/chroot/step_mount_device.go | 2 +- builder/amazon/common/access_config.go | 2 +- builder/amazon/common/ami_config.go | 2 +- builder/amazon/common/block_device.go | 2 +- builder/amazon/common/run_config.go | 2 +- builder/amazon/common/step_create_tags.go | 2 +- builder/amazon/common/step_modify_ami_attributes.go | 2 +- builder/amazon/common/step_run_source_instance.go | 2 +- builder/amazon/common/step_run_spot_instance.go | 2 +- builder/amazon/common/tags.go | 2 +- builder/amazon/ebs/builder.go | 2 +- builder/amazon/ebssurrogate/block_device.go | 2 +- builder/amazon/ebssurrogate/builder.go | 2 +- builder/amazon/ebssurrogate/root_block_device.go | 2 +- builder/amazon/ebssurrogate/step_snapshot_volumes.go | 2 +- builder/amazon/ebsvolume/block_device.go | 2 +- builder/amazon/ebsvolume/builder.go | 2 +- builder/amazon/ebsvolume/step_tag_ebs_volumes.go | 2 +- builder/amazon/instance/builder.go | 2 +- builder/amazon/instance/step_bundle_volume.go | 2 +- builder/amazon/instance/step_upload_bundle.go | 2 +- builder/azure/arm/config.go | 2 +- builder/azure/chroot/builder.go | 2 +- builder/azure/chroot/step_mount_device.go | 2 +- builder/azure/dtl/config.go | 2 +- builder/cloudstack/config.go | 2 +- builder/cloudstack/step_create_instance.go | 2 +- builder/digitalocean/config.go | 2 +- builder/docker/communicator_test.go | 2 +- builder/docker/config.go | 2 +- builder/docker/driver_docker.go | 2 +- builder/file/config.go | 2 +- builder/googlecompute/config.go | 2 +- builder/hcloud/config.go | 2 +- builder/hyperone/builder.go | 2 +- builder/hyperone/config.go | 2 +- builder/hyperone/utils.go | 2 +- builder/hyperv/common/config.go | 2 +- builder/hyperv/common/output_config.go | 2 +- builder/hyperv/common/output_config_test.go | 2 +- builder/hyperv/common/ssh_config.go | 2 +- builder/hyperv/common/step_type_boot_command.go | 2 +- builder/hyperv/iso/builder.go | 2 +- builder/hyperv/vmcx/builder.go | 2 +- builder/jdcloud/builder.go | 2 +- builder/jdcloud/common.go | 2 +- builder/jdcloud/credential_config.go | 2 +- builder/jdcloud/instance_config.go | 2 +- builder/linode/config.go | 2 +- builder/lxc/builder.go | 2 +- builder/lxc/config.go | 2 +- builder/lxd/builder.go | 2 +- builder/lxd/config.go | 2 +- builder/ncloud/config.go | 2 +- builder/null/config.go | 2 +- builder/oneandone/config.go | 2 +- builder/openstack/access_config.go | 2 +- builder/openstack/builder.go | 2 +- builder/openstack/image_config.go | 2 +- builder/openstack/run_config.go | 2 +- builder/oracle/classic/config.go | 2 +- builder/oracle/classic/pv_config.go | 2 +- builder/oracle/classic/step_upload_image.go | 2 +- builder/oracle/oci/config.go | 2 +- builder/osc/bsu/builder.go | 2 +- builder/osc/bsusurrogate/builder.go | 2 +- builder/osc/bsusurrogate/root_block_device.go | 2 +- builder/osc/bsuvolume/block_device.go | 2 +- builder/osc/bsuvolume/builder.go | 2 +- builder/osc/bsuvolume/step_tag_bsu_volumes.go | 2 +- builder/osc/chroot/builder.go | 2 +- builder/osc/chroot/run_local_commands.go | 2 +- builder/osc/chroot/step_create_volume.go | 2 +- builder/osc/chroot/step_mount_device.go | 2 +- builder/osc/common/access_config.go | 2 +- builder/osc/common/block_device.go | 2 +- builder/osc/common/omi_config.go | 2 +- builder/osc/common/run_config.go | 2 +- builder/osc/common/step_create_tags.go | 2 +- builder/osc/common/step_run_source_vm.go | 2 +- builder/osc/common/step_update_omi.go | 2 +- builder/osc/common/tags.go | 2 +- builder/parallels/common/hw_config.go | 2 +- builder/parallels/common/hw_config_test.go | 2 +- builder/parallels/common/output_config.go | 2 +- builder/parallels/common/output_config_test.go | 2 +- builder/parallels/common/prlctl_config.go | 2 +- builder/parallels/common/prlctl_config_test.go | 2 +- builder/parallels/common/prlctl_post_config.go | 2 +- builder/parallels/common/prlctl_post_config_test.go | 2 +- builder/parallels/common/prlctl_version_config.go | 2 +- builder/parallels/common/prlctl_version_config_test.go | 2 +- builder/parallels/common/ssh_config.go | 2 +- builder/parallels/common/ssh_config_test.go | 2 +- builder/parallels/common/step_prlctl.go | 2 +- builder/parallels/common/step_type_boot_command.go | 2 +- builder/parallels/common/step_upload_parallels_tools.go | 2 +- builder/parallels/common/tools_config.go | 2 +- builder/parallels/common/tools_config_test.go | 2 +- builder/parallels/iso/builder.go | 2 +- builder/parallels/pvm/config.go | 2 +- builder/profitbricks/config.go | 2 +- builder/proxmox/common/config.go | 2 +- builder/proxmox/common/step_type_boot_command.go | 2 +- builder/proxmox/iso/config_test.go | 2 +- builder/qemu/comm_config.go | 2 +- builder/qemu/comm_config_test.go | 2 +- builder/qemu/config.go | 2 +- builder/qemu/step_run.go | 2 +- builder/qemu/step_type_boot_command.go | 2 +- builder/scaleway/config.go | 2 +- builder/tencentcloud/cvm/access_config.go | 2 +- builder/tencentcloud/cvm/builder.go | 2 +- builder/tencentcloud/cvm/image_config.go | 2 +- builder/tencentcloud/cvm/run_config.go | 2 +- builder/triton/access_config.go | 2 +- builder/triton/config.go | 2 +- builder/triton/source_machine_config.go | 2 +- builder/triton/target_image_config.go | 2 +- builder/ucloud/common/access_config.go | 2 +- builder/ucloud/common/image_config.go | 2 +- builder/ucloud/common/run_config.go | 2 +- builder/ucloud/uhost/builder.go | 2 +- builder/vagrant/builder.go | 2 +- builder/virtualbox/common/comm_config.go | 2 +- builder/virtualbox/common/comm_config_test.go | 2 +- builder/virtualbox/common/export_config.go | 2 +- builder/virtualbox/common/export_config_test.go | 2 +- builder/virtualbox/common/guest_additions_config.go | 2 +- builder/virtualbox/common/guest_additions_config_test.go | 2 +- builder/virtualbox/common/hw_config.go | 2 +- builder/virtualbox/common/hw_config_test.go | 2 +- builder/virtualbox/common/output_config.go | 2 +- builder/virtualbox/common/output_config_test.go | 2 +- builder/virtualbox/common/run_config.go | 2 +- builder/virtualbox/common/run_config_test.go | 2 +- builder/virtualbox/common/shutdown_config.go | 2 +- builder/virtualbox/common/shutdown_config_test.go | 2 +- builder/virtualbox/common/step_download_guest_additions.go | 2 +- builder/virtualbox/common/step_type_boot_command.go | 2 +- builder/virtualbox/common/step_upload_guest_additions.go | 2 +- builder/virtualbox/common/step_vboxmanage.go | 2 +- builder/virtualbox/common/vbox_version_config.go | 2 +- builder/virtualbox/common/vbox_version_config_test.go | 2 +- builder/virtualbox/common/vboxbundle_config.go | 2 +- builder/virtualbox/common/vboxbundle_config_test.go | 2 +- builder/virtualbox/common/vboxmanage_config.go | 2 +- builder/virtualbox/common/vboxmanage_config_test.go | 2 +- builder/virtualbox/iso/builder.go | 2 +- builder/virtualbox/ovf/config.go | 2 +- builder/virtualbox/vm/config.go | 2 +- builder/vmware/common/disk_config.go | 2 +- builder/vmware/common/driver_config.go | 2 +- builder/vmware/common/driver_config_test.go | 2 +- builder/vmware/common/driver_esx5.go | 2 +- builder/vmware/common/export_config.go | 2 +- builder/vmware/common/hw_config.go | 2 +- builder/vmware/common/hw_config_test.go | 2 +- builder/vmware/common/output_config.go | 2 +- builder/vmware/common/output_config_test.go | 2 +- builder/vmware/common/run_config.go | 2 +- builder/vmware/common/run_config_test.go | 2 +- builder/vmware/common/ssh_config.go | 2 +- builder/vmware/common/ssh_config_test.go | 2 +- builder/vmware/common/step_upload_tools.go | 2 +- builder/vmware/common/step_vnc_boot_command.go | 2 +- builder/vmware/common/tools_config.go | 2 +- builder/vmware/common/tools_config_test.go | 2 +- builder/vmware/common/vmx_config.go | 2 +- builder/vmware/common/vmx_config_test.go | 2 +- builder/vmware/iso/config.go | 2 +- builder/vmware/iso/step_create_vmx.go | 2 +- builder/vmware/iso/step_create_vmx_test.go | 2 +- builder/vmware/vmx/config.go | 2 +- builder/vsphere/clone/config.go | 2 +- builder/vsphere/common/output_config.go | 2 +- builder/vsphere/common/step_boot_command.go | 2 +- builder/vsphere/common/step_export.go | 2 +- builder/vsphere/common/step_import_to_content_library.go | 2 +- builder/vsphere/iso/config.go | 2 +- builder/yandex/access_config.go | 2 +- builder/yandex/config.go | 2 +- command/build.go | 2 +- command/fix.go | 2 +- command/hcl2_upgrade.go | 2 +- command/meta.go | 2 +- common/bootcommand/config.go | 2 +- common/bootcommand/config_test.go | 2 +- common/chroot/interpolate_context_provider.go | 2 +- common/chroot/run_local_commands.go | 2 +- common/extra_iso_config.go | 2 +- common/floppy_config.go | 2 +- common/http_config.go | 2 +- common/iso_config.go | 2 +- common/shell-local/config.go | 2 +- common/shell-local/run.go | 2 +- common/shutdowncommand/config.go | 2 +- common/shutdowncommand/config_test.go | 2 +- common/template/funcs.go | 2 +- helper/builder/testing/testing.go | 2 +- helper/communicator/config.go | 4 ++-- helper/communicator/config_test.go | 2 +- helper/communicator/step_connect.go | 2 +- helper/communicator/step_connect_ssh.go | 2 +- helper/communicator/step_connect_winrm.go | 2 +- helper/config/decode.go | 2 +- helper/config/decode_test.go | 2 +- helper/ssh/tunnel.go | 2 +- helper/ssh/tunnel_test.go | 2 +- .../sdk-internals}/communicator/none/communicator.go | 0 .../sdk-internals}/communicator/none/communicator_test.go | 0 .../sdk-internals}/communicator/ssh/communicator.go | 0 .../sdk-internals}/communicator/ssh/communicator_test.go | 0 .../sdk-internals}/communicator/ssh/connect.go | 0 .../sdk-internals}/communicator/ssh/connect_test.go | 0 .../sdk-internals}/communicator/ssh/connection.go | 0 .../sdk-internals}/communicator/ssh/keyboard_interactive.go | 0 .../communicator/ssh/keyboard_interactive_test.go | 0 .../sdk-internals}/communicator/ssh/password.go | 0 .../sdk-internals}/communicator/ssh/password_test.go | 0 .../sdk-internals}/communicator/ssh/tunnel.go | 0 .../sdk-internals}/communicator/winrm/communicator.go | 0 .../sdk-internals}/communicator/winrm/communicator_test.go | 0 .../sdk-internals}/communicator/winrm/config.go | 0 .../sdk-internals}/communicator/winrm/time.go | 0 .../sdk-internals}/communicator/winrm/time_test.go | 0 .../interpolate/aws/secretsmanager/secretsmanager.go | 0 .../interpolate/aws/secretsmanager/secretsmanager_test.go | 0 .../template}/interpolate/aws/secretsmanager/types.go | 0 {template => packer-plugin-sdk/template}/interpolate/funcs.go | 0 .../template}/interpolate/funcs_test.go | 0 {template => packer-plugin-sdk/template}/interpolate/i.go | 0 .../template}/interpolate/i_test.go | 0 {template => packer-plugin-sdk/template}/interpolate/parse.go | 0 .../template}/interpolate/parse_test.go | 0 .../template}/interpolate/render.go | 0 .../template}/interpolate/render_test.go | 0 {template => packer-plugin-sdk/template}/parse.go | 0 {template => packer-plugin-sdk/template}/parse_test.go | 0 {template => packer-plugin-sdk/template}/template.go | 0 {template => packer-plugin-sdk/template}/template.hcl2spec.go | 0 {template => packer-plugin-sdk/template}/template_test.go | 0 .../template}/test-fixtures/error-beginning.json | 0 .../template}/test-fixtures/error-duplicate-config.json | 0 .../template}/test-fixtures/error-duplicate-variables.json | 0 .../template}/test-fixtures/error-end.json | 0 .../template}/test-fixtures/error-middle.json | 0 .../template}/test-fixtures/malformed.json | 0 .../template}/test-fixtures/parse-basic-config.json | 0 .../template}/test-fixtures/parse-basic.json | 0 .../template}/test-fixtures/parse-builder-no-type.json | 0 .../template}/test-fixtures/parse-builder-repeat.json | 0 .../template}/test-fixtures/parse-comment.json | 0 .../template}/test-fixtures/parse-contents.json | 0 .../template}/test-fixtures/parse-description.json | 0 .../template}/test-fixtures/parse-min-version.json | 0 .../template}/test-fixtures/parse-monolithic.json | 0 .../template}/test-fixtures/parse-pp-basic.json | 0 .../template}/test-fixtures/parse-pp-except.json | 0 .../template}/test-fixtures/parse-pp-keep.json | 0 .../template}/test-fixtures/parse-pp-map.json | 0 .../template}/test-fixtures/parse-pp-multi.json | 0 .../template}/test-fixtures/parse-pp-no-type.json | 0 .../template}/test-fixtures/parse-pp-only.json | 0 .../template}/test-fixtures/parse-pp-slice.json | 0 .../template}/test-fixtures/parse-pp-string.json | 0 .../template}/test-fixtures/parse-provisioner-basic.json | 0 .../template}/test-fixtures/parse-provisioner-config.json | 0 .../template}/test-fixtures/parse-provisioner-except.json | 0 .../template}/test-fixtures/parse-provisioner-no-type.json | 0 .../template}/test-fixtures/parse-provisioner-only.json | 0 .../template}/test-fixtures/parse-provisioner-override.json | 0 .../test-fixtures/parse-provisioner-pause-before.json | 0 .../template}/test-fixtures/parse-provisioner-retry.json | 0 .../template}/test-fixtures/parse-provisioner-timeout.json | 0 .../template}/test-fixtures/parse-variable-default.json | 0 .../template}/test-fixtures/parse-variable-required.json | 0 .../template}/test-fixtures/validate-bad-override.json | 0 .../template}/test-fixtures/validate-bad-pp-except.json | 0 .../template}/test-fixtures/validate-bad-pp-only.json | 0 .../template}/test-fixtures/validate-bad-prov-except.json | 0 .../template}/test-fixtures/validate-bad-prov-only.json | 0 .../template}/test-fixtures/validate-good-override.json | 0 .../template}/test-fixtures/validate-good-pp-except.json | 0 .../template}/test-fixtures/validate-good-pp-only.json | 0 .../template}/test-fixtures/validate-good-prov-except.json | 0 .../template}/test-fixtures/validate-good-prov-only.json | 0 .../template}/test-fixtures/validate-good-prov-timeout.json | 0 .../template}/test-fixtures/validate-no-builders.json | 0 packer/core.go | 4 ++-- packer/core_test.go | 2 +- post-processor/alicloud-import/post-processor.go | 2 +- post-processor/amazon-import/post-processor.go | 2 +- post-processor/artifice/post-processor.go | 2 +- post-processor/checksum/post-processor.go | 2 +- post-processor/checksum/post-processor_test.go | 2 +- post-processor/compress/post-processor.go | 2 +- post-processor/compress/post-processor_test.go | 2 +- post-processor/digitalocean-import/post-processor.go | 2 +- post-processor/docker-import/post-processor.go | 2 +- post-processor/docker-push/post-processor.go | 2 +- post-processor/docker-save/post-processor.go | 2 +- post-processor/docker-tag/post-processor.go | 2 +- post-processor/googlecompute-export/post-processor.go | 2 +- post-processor/googlecompute-import/post-processor.go | 2 +- post-processor/manifest/post-processor.go | 2 +- post-processor/ucloud-import/post-processor.go | 2 +- post-processor/vagrant-cloud/post-processor.go | 2 +- post-processor/vagrant/post-processor.go | 2 +- post-processor/vsphere-template/post-processor.go | 2 +- post-processor/vsphere/post-processor.go | 2 +- post-processor/yandex-export/post-processor.go | 2 +- post-processor/yandex-import/post-processor.go | 2 +- provisioner/ansible-local/provisioner.go | 2 +- provisioner/ansible-local/provisioner_test.go | 2 +- provisioner/ansible/provisioner.go | 2 +- provisioner/azure-dtlartifact/provisioner.go | 2 +- provisioner/breakpoint/provisioner.go | 2 +- provisioner/chef-client/provisioner.go | 2 +- provisioner/chef-solo/provisioner.go | 2 +- provisioner/converge/provisioner.go | 2 +- provisioner/file/provisioner.go | 2 +- provisioner/inspec/provisioner.go | 2 +- provisioner/powershell/provisioner.go | 2 +- provisioner/puppet-masterless/provisioner.go | 2 +- provisioner/puppet-masterless/provisioner_test.go | 2 +- provisioner/puppet-server/provisioner.go | 2 +- provisioner/salt-masterless/provisioner.go | 2 +- provisioner/shell/provisioner.go | 2 +- provisioner/windows-restart/provisioner.go | 2 +- provisioner/windows-shell/provisioner.go | 2 +- 337 files changed, 259 insertions(+), 259 deletions(-) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/none/communicator.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/none/communicator_test.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/communicator.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/communicator_test.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/connect.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/connect_test.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/connection.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/keyboard_interactive.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/keyboard_interactive_test.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/password.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/password_test.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/tunnel.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/winrm/communicator.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/winrm/communicator_test.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/winrm/config.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/winrm/time.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/winrm/time_test.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/aws/secretsmanager/secretsmanager.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/aws/secretsmanager/secretsmanager_test.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/aws/secretsmanager/types.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/funcs.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/funcs_test.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/i.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/i_test.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/parse.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/parse_test.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/render.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/render_test.go (100%) rename {template => packer-plugin-sdk/template}/parse.go (100%) rename {template => packer-plugin-sdk/template}/parse_test.go (100%) rename {template => packer-plugin-sdk/template}/template.go (100%) rename {template => packer-plugin-sdk/template}/template.hcl2spec.go (100%) rename {template => packer-plugin-sdk/template}/template_test.go (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/error-beginning.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/error-duplicate-config.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/error-duplicate-variables.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/error-end.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/error-middle.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/malformed.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-basic-config.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-basic.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-builder-no-type.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-builder-repeat.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-comment.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-contents.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-description.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-min-version.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-monolithic.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-basic.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-except.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-keep.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-map.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-multi.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-no-type.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-only.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-slice.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-string.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-basic.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-config.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-except.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-no-type.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-only.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-override.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-pause-before.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-retry.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-timeout.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-variable-default.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-variable-required.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-bad-override.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-bad-pp-except.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-bad-pp-only.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-bad-prov-except.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-bad-prov-only.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-good-override.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-good-pp-except.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-good-pp-only.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-good-prov-except.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-good-prov-only.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-good-prov-timeout.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-no-builders.json (100%) diff --git a/builder/alicloud/ecs/access_config.go b/builder/alicloud/ecs/access_config.go index 3def01411..222f1ce12 100644 --- a/builder/alicloud/ecs/access_config.go +++ b/builder/alicloud/ecs/access_config.go @@ -12,7 +12,7 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" "github.com/hashicorp/packer/builder/alicloud/version" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-homedir" ) diff --git a/builder/alicloud/ecs/builder.go b/builder/alicloud/ecs/builder.go index 95091ad98..446d324a1 100644 --- a/builder/alicloud/ecs/builder.go +++ b/builder/alicloud/ecs/builder.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/alicloud/ecs/image_config.go b/builder/alicloud/ecs/image_config.go index ef3c5292c..575a1c1c5 100644 --- a/builder/alicloud/ecs/image_config.go +++ b/builder/alicloud/ecs/image_config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The "AlicloudDiskDevice" object us used for the `ECSSystemDiskMapping` and diff --git a/builder/alicloud/ecs/run_config.go b/builder/alicloud/ecs/run_config.go index 7381e6294..500487139 100644 --- a/builder/alicloud/ecs/run_config.go +++ b/builder/alicloud/ecs/run_config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type RunConfig struct { diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index fb80639fe..a87170c2d 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/amazon/chroot/step_create_volume.go b/builder/amazon/chroot/step_create_volume.go index 7b01eced3..36c6414d7 100644 --- a/builder/amazon/chroot/step_create_volume.go +++ b/builder/amazon/chroot/step_create_volume.go @@ -11,7 +11,7 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // StepCreateVolume creates a new volume from the snapshot of the root diff --git a/builder/amazon/chroot/step_mount_device.go b/builder/amazon/chroot/step_mount_device.go index af796d4b6..17d9cd74e 100644 --- a/builder/amazon/chroot/step_mount_device.go +++ b/builder/amazon/chroot/step_mount_device.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type mountPathData struct { diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go index cd6aafb44..bd3e9e933 100644 --- a/builder/amazon/common/access_config.go +++ b/builder/amazon/common/access_config.go @@ -18,7 +18,7 @@ import ( awsbase "github.com/hashicorp/aws-sdk-go-base" cleanhttp "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" vaultapi "github.com/hashicorp/vault/api" ) diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go index e498ebbaa..2675a2d4f 100644 --- a/builder/amazon/common/ami_config.go +++ b/builder/amazon/common/ami_config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // AMIConfig is for common configuration related to creating AMIs. diff --git a/builder/amazon/common/block_device.go b/builder/amazon/common/block_device.go index 6dc35d719..5c2ae01d3 100644 --- a/builder/amazon/common/block_device.go +++ b/builder/amazon/common/block_device.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // These will be attached when launching your instance. Your diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go index 3e57d3a57..80162f34c 100644 --- a/builder/amazon/common/run_config.go +++ b/builder/amazon/common/run_config.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$") diff --git a/builder/amazon/common/step_create_tags.go b/builder/amazon/common/step_create_tags.go index 4805b1255..aadb70716 100644 --- a/builder/amazon/common/step_create_tags.go +++ b/builder/amazon/common/step_create_tags.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type StepCreateTags struct { diff --git a/builder/amazon/common/step_modify_ami_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go index e51bcda41..6879e3f7f 100644 --- a/builder/amazon/common/step_modify_ami_attributes.go +++ b/builder/amazon/common/step_modify_ami_attributes.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type StepModifyAMIAttributes struct { diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go index ed228a128..45f7144c9 100644 --- a/builder/amazon/common/step_run_source_instance.go +++ b/builder/amazon/common/step_run_source_instance.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type StepRunSourceInstance struct { diff --git a/builder/amazon/common/step_run_spot_instance.go b/builder/amazon/common/step_run_spot_instance.go index dc196817a..2b4a52e07 100644 --- a/builder/amazon/common/step_run_spot_instance.go +++ b/builder/amazon/common/step_run_spot_instance.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type EC2BlockDeviceMappingsBuilder interface { diff --git a/builder/amazon/common/tags.go b/builder/amazon/common/tags.go index f15925134..8842db6e6 100644 --- a/builder/amazon/common/tags.go +++ b/builder/amazon/common/tags.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type TagMap map[string]string diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index f3d099042..04142b796 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/amazon/ebssurrogate/block_device.go b/builder/amazon/ebssurrogate/block_device.go index 18e442f22..dc00d4d00 100644 --- a/builder/amazon/ebssurrogate/block_device.go +++ b/builder/amazon/ebssurrogate/block_device.go @@ -5,7 +5,7 @@ package ebssurrogate import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type BlockDevice struct { diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index a351bfe89..6934ce0dc 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "mitchellh.amazon.ebssurrogate" diff --git a/builder/amazon/ebssurrogate/root_block_device.go b/builder/amazon/ebssurrogate/root_block_device.go index 146803a09..2a52b37ba 100644 --- a/builder/amazon/ebssurrogate/root_block_device.go +++ b/builder/amazon/ebssurrogate/root_block_device.go @@ -5,7 +5,7 @@ package ebssurrogate import ( "errors" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type RootBlockDevice struct { diff --git a/builder/amazon/ebssurrogate/step_snapshot_volumes.go b/builder/amazon/ebssurrogate/step_snapshot_volumes.go index 543b9edb5..9facef0e0 100644 --- a/builder/amazon/ebssurrogate/step_snapshot_volumes.go +++ b/builder/amazon/ebssurrogate/step_snapshot_volumes.go @@ -12,7 +12,7 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // StepSnapshotVolumes creates snapshots of the created volumes. diff --git a/builder/amazon/ebsvolume/block_device.go b/builder/amazon/ebsvolume/block_device.go index 2d7166373..47f22c9b2 100644 --- a/builder/amazon/ebsvolume/block_device.go +++ b/builder/amazon/ebsvolume/block_device.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/hcl2template" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type BlockDevice struct { diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index ac31f94f7..f9324c0ca 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/builder/amazon/ebsvolume/builder.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "mitchellh.amazon.ebsvolume" diff --git a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go index 5d8bea217..ecbf2c56d 100644 --- a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go +++ b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go @@ -10,7 +10,7 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type stepTagEBSVolumes struct { diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index d07e26150..a717a7750 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/amazon/instance/step_bundle_volume.go b/builder/amazon/instance/step_bundle_volume.go index fe8f291ab..affbe0845 100644 --- a/builder/amazon/instance/step_bundle_volume.go +++ b/builder/amazon/instance/step_bundle_volume.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type bundleCmdData struct { diff --git a/builder/amazon/instance/step_upload_bundle.go b/builder/amazon/instance/step_upload_bundle.go index b19a1a3d7..794ba593e 100644 --- a/builder/amazon/instance/step_upload_bundle.go +++ b/builder/amazon/instance/step_upload_bundle.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type uploadCmdData struct { diff --git a/builder/azure/arm/config.go b/builder/azure/arm/config.go index 799ae51f2..ce8913d72 100644 --- a/builder/azure/arm/config.go +++ b/builder/azure/arm/config.go @@ -33,7 +33,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "golang.org/x/crypto/ssh" ) diff --git a/builder/azure/chroot/builder.go b/builder/azure/chroot/builder.go index e0e0eacc4..a34ceb223 100644 --- a/builder/azure/chroot/builder.go +++ b/builder/azure/chroot/builder.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/azure" diff --git a/builder/azure/chroot/step_mount_device.go b/builder/azure/chroot/step_mount_device.go index 99fbb9d90..82ae6cb5d 100644 --- a/builder/azure/chroot/step_mount_device.go +++ b/builder/azure/chroot/step_mount_device.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var _ multistep.Step = &StepMountDevice{} diff --git a/builder/azure/dtl/config.go b/builder/azure/dtl/config.go index d46cd82dc..309c56a9c 100644 --- a/builder/azure/dtl/config.go +++ b/builder/azure/dtl/config.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "golang.org/x/crypto/ssh" ) diff --git a/builder/cloudstack/config.go b/builder/cloudstack/config.go index 183b6f6d5..5ef0f5e29 100644 --- a/builder/cloudstack/config.go +++ b/builder/cloudstack/config.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config holds all the details needed to configure the builder. diff --git a/builder/cloudstack/step_create_instance.go b/builder/cloudstack/step_create_instance.go index 3a6b3d2c3..aaba68bd6 100644 --- a/builder/cloudstack/step_create_instance.go +++ b/builder/cloudstack/step_create_instance.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/digitalocean/config.go b/builder/digitalocean/config.go index 37ff5640c..7a722b5f9 100644 --- a/builder/digitalocean/config.go +++ b/builder/digitalocean/config.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/docker/communicator_test.go b/builder/docker/communicator_test.go index afaa5e60f..6abba8cd5 100644 --- a/builder/docker/communicator_test.go +++ b/builder/docker/communicator_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/hashicorp/packer/provisioner/file" "github.com/hashicorp/packer/provisioner/shell" - "github.com/hashicorp/packer/template" ) // TestUploadDownload verifies that basic upload / download functionality works diff --git a/builder/docker/config.go b/builder/docker/config.go index aa0b785e4..28743f448 100644 --- a/builder/docker/config.go +++ b/builder/docker/config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/docker/driver_docker.go b/builder/docker/driver_docker.go index ba5693b91..81058a754 100644 --- a/builder/docker/driver_docker.go +++ b/builder/docker/driver_docker.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/go-version" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type DockerDriver struct { diff --git a/builder/file/config.go b/builder/file/config.go index 730c497f5..ac97a2f74 100644 --- a/builder/file/config.go +++ b/builder/file/config.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var ErrTargetRequired = fmt.Errorf("target required") diff --git a/builder/googlecompute/config.go b/builder/googlecompute/config.go index 055cd2a28..6908f4f1d 100644 --- a/builder/googlecompute/config.go +++ b/builder/googlecompute/config.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" compute "google.golang.org/api/compute/v1" ) diff --git a/builder/hcloud/config.go b/builder/hcloud/config.go index 878c7cc1f..7478e7cdb 100644 --- a/builder/hcloud/config.go +++ b/builder/hcloud/config.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hetznercloud/hcloud-go/hcloud" "github.com/mitchellh/mapstructure" ) diff --git a/builder/hyperone/builder.go b/builder/hyperone/builder.go index 525db4abf..c5f1f3c1a 100644 --- a/builder/hyperone/builder.go +++ b/builder/hyperone/builder.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/config.go b/builder/hyperone/config.go index 8f9b32aab..e88ee39ad 100644 --- a/builder/hyperone/config.go +++ b/builder/hyperone/config.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-homedir" "github.com/mitchellh/mapstructure" ) diff --git a/builder/hyperone/utils.go b/builder/hyperone/utils.go index 696747de6..594e6a164 100644 --- a/builder/hyperone/utils.go +++ b/builder/hyperone/utils.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperv/common/config.go b/builder/hyperv/common/config.go index 84473e2dc..74de2cbe6 100644 --- a/builder/hyperv/common/config.go +++ b/builder/hyperv/common/config.go @@ -11,7 +11,7 @@ import ( powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell" "github.com/hashicorp/packer/builder/hyperv/common/powershell/hyperv" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/builder/hyperv/common/output_config.go b/builder/hyperv/common/output_config.go index 3a1538312..f1839f83e 100644 --- a/builder/hyperv/common/output_config.go +++ b/builder/hyperv/common/output_config.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type OutputConfig struct { diff --git a/builder/hyperv/common/output_config_test.go b/builder/hyperv/common/output_config_test.go index a5aa0b8fe..a5ac7dfd9 100644 --- a/builder/hyperv/common/output_config_test.go +++ b/builder/hyperv/common/output_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestOutputConfigPrepare(t *testing.T) { diff --git a/builder/hyperv/common/ssh_config.go b/builder/hyperv/common/ssh_config.go index 152230ccd..48ffad38a 100644 --- a/builder/hyperv/common/ssh_config.go +++ b/builder/hyperv/common/ssh_config.go @@ -2,7 +2,7 @@ package common import ( "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type SSHConfig struct { diff --git a/builder/hyperv/common/step_type_boot_command.go b/builder/hyperv/common/step_type_boot_command.go index 8b7ed40e4..c34c5a04c 100644 --- a/builder/hyperv/common/step_type_boot_command.go +++ b/builder/hyperv/common/step_type_boot_command.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type bootCommandTemplateData struct { diff --git a/builder/hyperv/iso/builder.go b/builder/hyperv/iso/builder.go index 8fa9d9844..91e2bc676 100644 --- a/builder/hyperv/iso/builder.go +++ b/builder/hyperv/iso/builder.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/builder/hyperv/vmcx/builder.go b/builder/hyperv/vmcx/builder.go index b2968abf6..ec4dea9a0 100644 --- a/builder/hyperv/vmcx/builder.go +++ b/builder/hyperv/vmcx/builder.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/builder/jdcloud/builder.go b/builder/jdcloud/builder.go index 9fb801018..8ed2c59cd 100644 --- a/builder/jdcloud/builder.go +++ b/builder/jdcloud/builder.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func (b *Builder) ConfigSpec() hcldec.ObjectSpec { return b.config.FlatMapstructure().HCL2Spec() } diff --git a/builder/jdcloud/common.go b/builder/jdcloud/common.go index 1de7efe22..d89965846 100644 --- a/builder/jdcloud/common.go +++ b/builder/jdcloud/common.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client" vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client" ) diff --git a/builder/jdcloud/credential_config.go b/builder/jdcloud/credential_config.go index 28768b8e7..0648c6565 100644 --- a/builder/jdcloud/credential_config.go +++ b/builder/jdcloud/credential_config.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/jdcloud-api/jdcloud-sdk-go/core" vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client" vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client" diff --git a/builder/jdcloud/instance_config.go b/builder/jdcloud/instance_config.go index c63ae046b..1d43142f9 100644 --- a/builder/jdcloud/instance_config.go +++ b/builder/jdcloud/instance_config.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type JDCloudInstanceSpecConfig struct { diff --git a/builder/linode/config.go b/builder/linode/config.go index 44a1a9d2b..08aadc3df 100644 --- a/builder/linode/config.go +++ b/builder/linode/config.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/lxc/builder.go b/builder/lxc/builder.go index ec0205f97..feca45e90 100644 --- a/builder/lxc/builder.go +++ b/builder/lxc/builder.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/lxc/config.go b/builder/lxc/config.go index c9a58026b..bd2a781fe 100644 --- a/builder/lxc/config.go +++ b/builder/lxc/config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/lxd/builder.go b/builder/lxd/builder.go index 5130e8d19..1a4ae2778 100644 --- a/builder/lxd/builder.go +++ b/builder/lxd/builder.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/lxd/config.go b/builder/lxd/config.go index 707f6aaec..840cdaabe 100644 --- a/builder/lxd/config.go +++ b/builder/lxd/config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/ncloud/config.go b/builder/ncloud/config.go index 55437c6ae..18a544879 100644 --- a/builder/ncloud/config.go +++ b/builder/ncloud/config.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is structure to use packer builder plugin for Naver Cloud Platform diff --git a/builder/null/config.go b/builder/null/config.go index 6c7fcb9c2..490bc04e2 100644 --- a/builder/null/config.go +++ b/builder/null/config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/oneandone/config.go b/builder/oneandone/config.go index a0a5e6109..f48666930 100644 --- a/builder/oneandone/config.go +++ b/builder/oneandone/config.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/openstack/access_config.go b/builder/openstack/access_config.go index 0fe669666..fafcdae65 100644 --- a/builder/openstack/access_config.go +++ b/builder/openstack/access_config.go @@ -17,7 +17,7 @@ import ( "github.com/gophercloud/utils/openstack/clientconfig" "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // AccessConfig is for common configuration related to openstack access diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go index 44df3ff9e..99c226c9a 100644 --- a/builder/openstack/builder.go +++ b/builder/openstack/builder.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/openstack/image_config.go b/builder/openstack/image_config.go index f5c8d5a11..d36e5caae 100644 --- a/builder/openstack/image_config.go +++ b/builder/openstack/image_config.go @@ -7,7 +7,7 @@ import ( "strings" imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // ImageConfig is for common configuration related to creating Images. diff --git a/builder/openstack/run_config.go b/builder/openstack/run_config.go index f8bc3b514..6acd5f152 100644 --- a/builder/openstack/run_config.go +++ b/builder/openstack/run_config.go @@ -9,7 +9,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // RunConfig contains configuration for running an instance from a source image diff --git a/builder/oracle/classic/config.go b/builder/oracle/classic/config.go index 6f66d7a81..2cdf75b9e 100644 --- a/builder/oracle/classic/config.go +++ b/builder/oracle/classic/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/oracle/classic/pv_config.go b/builder/oracle/classic/pv_config.go index e101dc8d8..8321dee5f 100644 --- a/builder/oracle/classic/pv_config.go +++ b/builder/oracle/classic/pv_config.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const imageListDefault = "/oracle/public/OL_7.2_UEKR4_x86_64" diff --git a/builder/oracle/classic/step_upload_image.go b/builder/oracle/classic/step_upload_image.go index 746637042..5833ebfaf 100644 --- a/builder/oracle/classic/step_upload_image.go +++ b/builder/oracle/classic/step_upload_image.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type stepUploadImage struct { diff --git a/builder/oracle/oci/config.go b/builder/oracle/oci/config.go index cc47c893e..847b19f45 100644 --- a/builder/oracle/oci/config.go +++ b/builder/oracle/oci/config.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ocicommon "github.com/oracle/oci-go-sdk/common" ociauth "github.com/oracle/oci-go-sdk/common/auth" ) diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go index 83de3d0c0..1d3507cfc 100644 --- a/builder/osc/bsu/builder.go +++ b/builder/osc/bsu/builder.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/osc/bsusurrogate/builder.go b/builder/osc/bsusurrogate/builder.go index b38ea3d8d..fe276aa3b 100644 --- a/builder/osc/bsusurrogate/builder.go +++ b/builder/osc/bsusurrogate/builder.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "oapi.outscale.bsusurrogate" diff --git a/builder/osc/bsusurrogate/root_block_device.go b/builder/osc/bsusurrogate/root_block_device.go index 78616f3d4..987636b12 100644 --- a/builder/osc/bsusurrogate/root_block_device.go +++ b/builder/osc/bsusurrogate/root_block_device.go @@ -3,7 +3,7 @@ package bsusurrogate import ( "errors" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type RootBlockDevice struct { diff --git a/builder/osc/bsuvolume/block_device.go b/builder/osc/bsuvolume/block_device.go index 3217fef7f..e2ee2d375 100644 --- a/builder/osc/bsuvolume/block_device.go +++ b/builder/osc/bsuvolume/block_device.go @@ -2,7 +2,7 @@ package bsuvolume import ( osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type BlockDevice struct { diff --git a/builder/osc/bsuvolume/builder.go b/builder/osc/bsuvolume/builder.go index 48fd55e26..d04366dfd 100644 --- a/builder/osc/bsuvolume/builder.go +++ b/builder/osc/bsuvolume/builder.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "oapi.outscale.bsuvolume" diff --git a/builder/osc/bsuvolume/step_tag_bsu_volumes.go b/builder/osc/bsuvolume/step_tag_bsu_volumes.go index 06ef9421f..400916c95 100644 --- a/builder/osc/bsuvolume/step_tag_bsu_volumes.go +++ b/builder/osc/bsuvolume/step_tag_bsu_volumes.go @@ -7,7 +7,7 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/builder.go b/builder/osc/chroot/builder.go index 389fd60d3..3bc45dc51 100644 --- a/builder/osc/chroot/builder.go +++ b/builder/osc/chroot/builder.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/osc/chroot/run_local_commands.go b/builder/osc/chroot/run_local_commands.go index 9a93f8791..b34f3a397 100644 --- a/builder/osc/chroot/run_local_commands.go +++ b/builder/osc/chroot/run_local_commands.go @@ -6,7 +6,7 @@ import ( sl "github.com/hashicorp/packer/common/shell-local" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func RunLocalCommands(commands []string, wrappedCommand CommandWrapper, ictx interpolate.Context, ui packer.Ui) error { diff --git a/builder/osc/chroot/step_create_volume.go b/builder/osc/chroot/step_create_volume.go index cd6bfc499..b60263003 100644 --- a/builder/osc/chroot/step_create_volume.go +++ b/builder/osc/chroot/step_create_volume.go @@ -10,7 +10,7 @@ import ( osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_mount_device.go b/builder/osc/chroot/step_mount_device.go index 5a27c1403..5007a339e 100644 --- a/builder/osc/chroot/step_mount_device.go +++ b/builder/osc/chroot/step_mount_device.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type mountPathData struct { diff --git a/builder/osc/common/access_config.go b/builder/osc/common/access_config.go index 46530429b..beb040dfe 100644 --- a/builder/osc/common/access_config.go +++ b/builder/osc/common/access_config.go @@ -7,7 +7,7 @@ import ( "net/http" "os" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/block_device.go b/builder/osc/common/block_device.go index 765adbc80..32484de3e 100644 --- a/builder/osc/common/block_device.go +++ b/builder/osc/common/block_device.go @@ -5,7 +5,7 @@ import ( "log" "strings" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/omi_config.go b/builder/osc/common/omi_config.go index c4c8e5e0d..a316d0298 100644 --- a/builder/osc/common/omi_config.go +++ b/builder/osc/common/omi_config.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // OMIConfig is for common configuration related to creating OMIs. diff --git a/builder/osc/common/run_config.go b/builder/osc/common/run_config.go index ff79d6bc6..d090489cb 100644 --- a/builder/osc/common/run_config.go +++ b/builder/osc/common/run_config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$") diff --git a/builder/osc/common/step_create_tags.go b/builder/osc/common/step_create_tags.go index f9a8e46b9..f0382f560 100644 --- a/builder/osc/common/step_create_tags.go +++ b/builder/osc/common/step_create_tags.go @@ -9,7 +9,7 @@ import ( retry "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_run_source_vm.go b/builder/osc/common/step_run_source_vm.go index 996973a34..2eb251c47 100644 --- a/builder/osc/common/step_run_source_vm.go +++ b/builder/osc/common/step_run_source_vm.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/builder/osc/common/step_update_omi.go b/builder/osc/common/step_update_omi.go index 2be6b4e4f..9857d8482 100644 --- a/builder/osc/common/step_update_omi.go +++ b/builder/osc/common/step_update_omi.go @@ -7,7 +7,7 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/tags.go b/builder/osc/common/tags.go index 77b6525bf..bcb78451b 100644 --- a/builder/osc/common/tags.go +++ b/builder/osc/common/tags.go @@ -7,7 +7,7 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/parallels/common/hw_config.go b/builder/parallels/common/hw_config.go index f803450c8..06e27c411 100644 --- a/builder/parallels/common/hw_config.go +++ b/builder/parallels/common/hw_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type HWConfig struct { diff --git a/builder/parallels/common/hw_config_test.go b/builder/parallels/common/hw_config_test.go index 9576eecc7..d6b40ea13 100644 --- a/builder/parallels/common/hw_config_test.go +++ b/builder/parallels/common/hw_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestHWConfigPrepare(t *testing.T) { diff --git a/builder/parallels/common/output_config.go b/builder/parallels/common/output_config.go index 8508c427e..edc93a721 100644 --- a/builder/parallels/common/output_config.go +++ b/builder/parallels/common/output_config.go @@ -8,7 +8,7 @@ import ( "path" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // OutputConfig contains the configuration for builder's output. diff --git a/builder/parallels/common/output_config_test.go b/builder/parallels/common/output_config_test.go index 0256b5730..6e5ad3752 100644 --- a/builder/parallels/common/output_config_test.go +++ b/builder/parallels/common/output_config_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestOutputConfigPrepare(t *testing.T) { diff --git a/builder/parallels/common/prlctl_config.go b/builder/parallels/common/prlctl_config.go index d22217651..4db738c82 100644 --- a/builder/parallels/common/prlctl_config.go +++ b/builder/parallels/common/prlctl_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // PrlctlConfig contains the configuration for running "prlctl" commands diff --git a/builder/parallels/common/prlctl_config_test.go b/builder/parallels/common/prlctl_config_test.go index 31bb5ae91..006ee44d3 100644 --- a/builder/parallels/common/prlctl_config_test.go +++ b/builder/parallels/common/prlctl_config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestPrlctlConfigPrepare_Prlctl(t *testing.T) { diff --git a/builder/parallels/common/prlctl_post_config.go b/builder/parallels/common/prlctl_post_config.go index 6b8dc43cc..c071e24e9 100644 --- a/builder/parallels/common/prlctl_post_config.go +++ b/builder/parallels/common/prlctl_post_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // PrlctlPostConfig contains the configuration for running "prlctl" commands diff --git a/builder/parallels/common/prlctl_post_config_test.go b/builder/parallels/common/prlctl_post_config_test.go index bbbcfad89..0f6abf065 100644 --- a/builder/parallels/common/prlctl_post_config_test.go +++ b/builder/parallels/common/prlctl_post_config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestPrlctlPostConfigPrepare_PrlctlPost(t *testing.T) { diff --git a/builder/parallels/common/prlctl_version_config.go b/builder/parallels/common/prlctl_version_config.go index fd6a5e54e..cd6e7de2e 100644 --- a/builder/parallels/common/prlctl_version_config.go +++ b/builder/parallels/common/prlctl_version_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // PrlctlVersionConfig contains the configuration for `prlctl` version. diff --git a/builder/parallels/common/prlctl_version_config_test.go b/builder/parallels/common/prlctl_version_config_test.go index cadfb8a4f..32f24f0a6 100644 --- a/builder/parallels/common/prlctl_version_config_test.go +++ b/builder/parallels/common/prlctl_version_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestPrlctlVersionConfigPrepare_BootWait(t *testing.T) { diff --git a/builder/parallels/common/ssh_config.go b/builder/parallels/common/ssh_config.go index 14ba9d1df..270239b35 100644 --- a/builder/parallels/common/ssh_config.go +++ b/builder/parallels/common/ssh_config.go @@ -2,7 +2,7 @@ package common import ( "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // SSHConfig contains the configuration for SSH communicator. diff --git a/builder/parallels/common/ssh_config_test.go b/builder/parallels/common/ssh_config_test.go index 5b190ba6d..e9b42c69a 100644 --- a/builder/parallels/common/ssh_config_test.go +++ b/builder/parallels/common/ssh_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testSSHConfig() *SSHConfig { diff --git a/builder/parallels/common/step_prlctl.go b/builder/parallels/common/step_prlctl.go index eac00f916..43f9941d2 100644 --- a/builder/parallels/common/step_prlctl.go +++ b/builder/parallels/common/step_prlctl.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type commandTemplate struct { diff --git a/builder/parallels/common/step_type_boot_command.go b/builder/parallels/common/step_type_boot_command.go index fdb54ae97..95b7dc5f8 100644 --- a/builder/parallels/common/step_type_boot_command.go +++ b/builder/parallels/common/step_type_boot_command.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type bootCommandTemplateData struct { diff --git a/builder/parallels/common/step_upload_parallels_tools.go b/builder/parallels/common/step_upload_parallels_tools.go index 85620ff93..b1c2f10dd 100644 --- a/builder/parallels/common/step_upload_parallels_tools.go +++ b/builder/parallels/common/step_upload_parallels_tools.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // This step uploads the Parallels Tools ISO to the virtual machine. diff --git a/builder/parallels/common/tools_config.go b/builder/parallels/common/tools_config.go index 470f25840..00565d1fa 100644 --- a/builder/parallels/common/tools_config.go +++ b/builder/parallels/common/tools_config.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // These are the different valid mode values for "parallels_tools_mode" which diff --git a/builder/parallels/common/tools_config_test.go b/builder/parallels/common/tools_config_test.go index 59321a524..89156fdcd 100644 --- a/builder/parallels/common/tools_config_test.go +++ b/builder/parallels/common/tools_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testToolsConfig() *ToolsConfig { diff --git a/builder/parallels/iso/builder.go b/builder/parallels/iso/builder.go index 92ca28f42..40549cc20 100644 --- a/builder/parallels/iso/builder.go +++ b/builder/parallels/iso/builder.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "rickard-von-essen.parallels" diff --git a/builder/parallels/pvm/config.go b/builder/parallels/pvm/config.go index bd9b421f6..0f74308d2 100644 --- a/builder/parallels/pvm/config.go +++ b/builder/parallels/pvm/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is the configuration structure for the builder. diff --git a/builder/profitbricks/config.go b/builder/profitbricks/config.go index 275f7b5f2..58155eb90 100644 --- a/builder/profitbricks/config.go +++ b/builder/profitbricks/config.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/proxmox/common/config.go b/builder/proxmox/common/config.go index 1428345f9..63d9277f4 100644 --- a/builder/proxmox/common/config.go +++ b/builder/proxmox/common/config.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/proxmox/common/step_type_boot_command.go b/builder/proxmox/common/step_type_boot_command.go index 17c1ec962..3ba1c910b 100644 --- a/builder/proxmox/common/step_type_boot_command.go +++ b/builder/proxmox/common/step_type_boot_command.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // stepTypeBootCommand takes the started VM, and sends the keystrokes required to start diff --git a/builder/proxmox/iso/config_test.go b/builder/proxmox/iso/config_test.go index fe519a05b..509d360a2 100644 --- a/builder/proxmox/iso/config_test.go +++ b/builder/proxmox/iso/config_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" ) func TestBasicExampleFromDocsIsValid(t *testing.T) { diff --git a/builder/qemu/comm_config.go b/builder/qemu/comm_config.go index 46b3ab082..45fe39f5d 100644 --- a/builder/qemu/comm_config.go +++ b/builder/qemu/comm_config.go @@ -5,7 +5,7 @@ import ( "errors" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type CommConfig struct { diff --git a/builder/qemu/comm_config_test.go b/builder/qemu/comm_config_test.go index 4912c7d96..150621d0f 100644 --- a/builder/qemu/comm_config_test.go +++ b/builder/qemu/comm_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testCommConfig() *CommConfig { diff --git a/builder/qemu/config.go b/builder/qemu/config.go index 1af05df37..13f6c6320 100644 --- a/builder/qemu/config.go +++ b/builder/qemu/config.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var accels = map[string]struct{}{ diff --git a/builder/qemu/step_run.go b/builder/qemu/step_run.go index 8fe59f6dc..1273a846e 100644 --- a/builder/qemu/step_run.go +++ b/builder/qemu/step_run.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-version" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // stepRun runs the virtual machine diff --git a/builder/qemu/step_type_boot_command.go b/builder/qemu/step_type_boot_command.go index c836db9e3..d183e9777 100644 --- a/builder/qemu/step_type_boot_command.go +++ b/builder/qemu/step_type_boot_command.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-vnc" ) diff --git a/builder/scaleway/config.go b/builder/scaleway/config.go index d5ffba5fc..1c85f9bf0 100644 --- a/builder/scaleway/config.go +++ b/builder/scaleway/config.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/useragent" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/builder/tencentcloud/cvm/access_config.go b/builder/tencentcloud/cvm/access_config.go index 91eb484b8..a1c021fc6 100644 --- a/builder/tencentcloud/cvm/access_config.go +++ b/builder/tencentcloud/cvm/access_config.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" ) diff --git a/builder/tencentcloud/cvm/builder.go b/builder/tencentcloud/cvm/builder.go index 30cc4c42d..89c799c18 100644 --- a/builder/tencentcloud/cvm/builder.go +++ b/builder/tencentcloud/cvm/builder.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "tencent.cloud" diff --git a/builder/tencentcloud/cvm/image_config.go b/builder/tencentcloud/cvm/image_config.go index 3d5b3a324..91f89427f 100644 --- a/builder/tencentcloud/cvm/image_config.go +++ b/builder/tencentcloud/cvm/image_config.go @@ -6,7 +6,7 @@ import ( "fmt" "unicode/utf8" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type TencentCloudImageConfig struct { diff --git a/builder/tencentcloud/cvm/run_config.go b/builder/tencentcloud/cvm/run_config.go index 52fb4d292..31deea558 100644 --- a/builder/tencentcloud/cvm/run_config.go +++ b/builder/tencentcloud/cvm/run_config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/pkg/errors" ) diff --git a/builder/triton/access_config.go b/builder/triton/access_config.go index 3617f9a90..92dded501 100644 --- a/builder/triton/access_config.go +++ b/builder/triton/access_config.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" tgo "github.com/joyent/triton-go" "github.com/joyent/triton-go/authentication" "github.com/joyent/triton-go/compute" diff --git a/builder/triton/config.go b/builder/triton/config.go index e01fce6dc..6d0a6b128 100644 --- a/builder/triton/config.go +++ b/builder/triton/config.go @@ -5,7 +5,7 @@ package triton import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/triton/source_machine_config.go b/builder/triton/source_machine_config.go index 8733a06b0..cb0292fdb 100644 --- a/builder/triton/source_machine_config.go +++ b/builder/triton/source_machine_config.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/hashicorp/packer/hcl2template" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // SourceMachineConfig represents the configuration to run a machine using diff --git a/builder/triton/target_image_config.go b/builder/triton/target_image_config.go index a9ce24695..f3c62fce4 100644 --- a/builder/triton/target_image_config.go +++ b/builder/triton/target_image_config.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/hashicorp/packer/hcl2template" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // TargetImageConfig represents the configuration for the image to be created diff --git a/builder/ucloud/common/access_config.go b/builder/ucloud/common/access_config.go index 3e0c060e6..192fd35b9 100644 --- a/builder/ucloud/common/access_config.go +++ b/builder/ucloud/common/access_config.go @@ -11,7 +11,7 @@ import ( "runtime" "github.com/hashicorp/packer/builder/ucloud/version" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/ucloud/ucloud-sdk-go/external" "github.com/ucloud/ucloud-sdk-go/private/protocol/http" "github.com/ucloud/ucloud-sdk-go/services/uaccount" diff --git a/builder/ucloud/common/image_config.go b/builder/ucloud/common/image_config.go index 2f327b484..cf312000c 100644 --- a/builder/ucloud/common/image_config.go +++ b/builder/ucloud/common/image_config.go @@ -7,7 +7,7 @@ import ( "fmt" "regexp" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type ImageDestination struct { diff --git a/builder/ucloud/common/run_config.go b/builder/ucloud/common/run_config.go index 84539ba58..30d541848 100644 --- a/builder/ucloud/common/run_config.go +++ b/builder/ucloud/common/run_config.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type RunConfig struct { diff --git a/builder/ucloud/uhost/builder.go b/builder/ucloud/uhost/builder.go index ecabecb48..21c9204df 100644 --- a/builder/ucloud/uhost/builder.go +++ b/builder/ucloud/uhost/builder.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/vagrant/builder.go b/builder/vagrant/builder.go index f1bbefc99..8dd88464e 100644 --- a/builder/vagrant/builder.go +++ b/builder/vagrant/builder.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Builder implements packer.Builder and builds the actual VirtualBox diff --git a/builder/virtualbox/common/comm_config.go b/builder/virtualbox/common/comm_config.go index 03256814a..8fa25b0d3 100644 --- a/builder/virtualbox/common/comm_config.go +++ b/builder/virtualbox/common/comm_config.go @@ -6,7 +6,7 @@ import ( "errors" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type CommConfig struct { diff --git a/builder/virtualbox/common/comm_config_test.go b/builder/virtualbox/common/comm_config_test.go index 777dca492..eb0bc4060 100644 --- a/builder/virtualbox/common/comm_config_test.go +++ b/builder/virtualbox/common/comm_config_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testCommConfig() *CommConfig { diff --git a/builder/virtualbox/common/export_config.go b/builder/virtualbox/common/export_config.go index f8a468265..113d6cb64 100644 --- a/builder/virtualbox/common/export_config.go +++ b/builder/virtualbox/common/export_config.go @@ -5,7 +5,7 @@ package common import ( "errors" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type ExportConfig struct { diff --git a/builder/virtualbox/common/export_config_test.go b/builder/virtualbox/common/export_config_test.go index fdf6ccc6d..a08a047c0 100644 --- a/builder/virtualbox/common/export_config_test.go +++ b/builder/virtualbox/common/export_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestExportConfigPrepare_BootWait(t *testing.T) { diff --git a/builder/virtualbox/common/guest_additions_config.go b/builder/virtualbox/common/guest_additions_config.go index 5b57c154c..3f8b25bd0 100644 --- a/builder/virtualbox/common/guest_additions_config.go +++ b/builder/virtualbox/common/guest_additions_config.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // These are the different valid mode values for "guest_additions_mode" which diff --git a/builder/virtualbox/common/guest_additions_config_test.go b/builder/virtualbox/common/guest_additions_config_test.go index 210dd2d81..8bd0aa715 100644 --- a/builder/virtualbox/common/guest_additions_config_test.go +++ b/builder/virtualbox/common/guest_additions_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestGuestAdditionsConfigPrepare(t *testing.T) { diff --git a/builder/virtualbox/common/hw_config.go b/builder/virtualbox/common/hw_config.go index 739bc1850..2b86383e4 100644 --- a/builder/virtualbox/common/hw_config.go +++ b/builder/virtualbox/common/hw_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type HWConfig struct { diff --git a/builder/virtualbox/common/hw_config_test.go b/builder/virtualbox/common/hw_config_test.go index 9576eecc7..d6b40ea13 100644 --- a/builder/virtualbox/common/hw_config_test.go +++ b/builder/virtualbox/common/hw_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestHWConfigPrepare(t *testing.T) { diff --git a/builder/virtualbox/common/output_config.go b/builder/virtualbox/common/output_config.go index aedfa5cf7..3790998a6 100644 --- a/builder/virtualbox/common/output_config.go +++ b/builder/virtualbox/common/output_config.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type OutputConfig struct { diff --git a/builder/virtualbox/common/output_config_test.go b/builder/virtualbox/common/output_config_test.go index a5aa0b8fe..a5ac7dfd9 100644 --- a/builder/virtualbox/common/output_config_test.go +++ b/builder/virtualbox/common/output_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestOutputConfigPrepare(t *testing.T) { diff --git a/builder/virtualbox/common/run_config.go b/builder/virtualbox/common/run_config.go index 14c2bf923..a2f8a7ff8 100644 --- a/builder/virtualbox/common/run_config.go +++ b/builder/virtualbox/common/run_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type RunConfig struct { diff --git a/builder/virtualbox/common/run_config_test.go b/builder/virtualbox/common/run_config_test.go index b29fb5ee8..e96d50c6a 100644 --- a/builder/virtualbox/common/run_config_test.go +++ b/builder/virtualbox/common/run_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestRunConfigPrepare_VRDPBindAddress(t *testing.T) { diff --git a/builder/virtualbox/common/shutdown_config.go b/builder/virtualbox/common/shutdown_config.go index 29f0b0b72..963f32d91 100644 --- a/builder/virtualbox/common/shutdown_config.go +++ b/builder/virtualbox/common/shutdown_config.go @@ -5,7 +5,7 @@ package common import ( "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type ShutdownConfig struct { diff --git a/builder/virtualbox/common/shutdown_config_test.go b/builder/virtualbox/common/shutdown_config_test.go index 3e177fd5f..4d68d6e1c 100644 --- a/builder/virtualbox/common/shutdown_config_test.go +++ b/builder/virtualbox/common/shutdown_config_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testShutdownConfig() *ShutdownConfig { diff --git a/builder/virtualbox/common/step_download_guest_additions.go b/builder/virtualbox/common/step_download_guest_additions.go index ba111fea2..3e3e2936e 100644 --- a/builder/virtualbox/common/step_download_guest_additions.go +++ b/builder/virtualbox/common/step_download_guest_additions.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) var additionsVersionMap = map[string]string{ diff --git a/builder/virtualbox/common/step_type_boot_command.go b/builder/virtualbox/common/step_type_boot_command.go index 404a02a32..e152318ef 100644 --- a/builder/virtualbox/common/step_type_boot_command.go +++ b/builder/virtualbox/common/step_type_boot_command.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const KeyLeftShift uint32 = 0xFFE1 diff --git a/builder/virtualbox/common/step_upload_guest_additions.go b/builder/virtualbox/common/step_upload_guest_additions.go index 98f46a982..739f20c8c 100644 --- a/builder/virtualbox/common/step_upload_guest_additions.go +++ b/builder/virtualbox/common/step_upload_guest_additions.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type guestAdditionsPathTemplate struct { diff --git a/builder/virtualbox/common/step_vboxmanage.go b/builder/virtualbox/common/step_vboxmanage.go index 12fe42671..1428a9d21 100644 --- a/builder/virtualbox/common/step_vboxmanage.go +++ b/builder/virtualbox/common/step_vboxmanage.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type commandTemplate struct { diff --git a/builder/virtualbox/common/vbox_version_config.go b/builder/virtualbox/common/vbox_version_config.go index 4e81f4fa0..be7b793a4 100644 --- a/builder/virtualbox/common/vbox_version_config.go +++ b/builder/virtualbox/common/vbox_version_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type VBoxVersionConfig struct { diff --git a/builder/virtualbox/common/vbox_version_config_test.go b/builder/virtualbox/common/vbox_version_config_test.go index 398a0aa11..0ed1f9e33 100644 --- a/builder/virtualbox/common/vbox_version_config_test.go +++ b/builder/virtualbox/common/vbox_version_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestVBoxVersionConfigPrepare_BootWait(t *testing.T) { diff --git a/builder/virtualbox/common/vboxbundle_config.go b/builder/virtualbox/common/vboxbundle_config.go index 8936eacf2..8386a7f63 100644 --- a/builder/virtualbox/common/vboxbundle_config.go +++ b/builder/virtualbox/common/vboxbundle_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type VBoxBundleConfig struct { diff --git a/builder/virtualbox/common/vboxbundle_config_test.go b/builder/virtualbox/common/vboxbundle_config_test.go index 53ccca8b6..2509a2f34 100644 --- a/builder/virtualbox/common/vboxbundle_config_test.go +++ b/builder/virtualbox/common/vboxbundle_config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestVBoxBundleConfigPrepare_VBoxBundle(t *testing.T) { diff --git a/builder/virtualbox/common/vboxmanage_config.go b/builder/virtualbox/common/vboxmanage_config.go index c73010c2a..3664d3098 100644 --- a/builder/virtualbox/common/vboxmanage_config.go +++ b/builder/virtualbox/common/vboxmanage_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) //In order to perform extra customization of the virtual machine, a template can diff --git a/builder/virtualbox/common/vboxmanage_config_test.go b/builder/virtualbox/common/vboxmanage_config_test.go index a35fe2cae..1b7f0c671 100644 --- a/builder/virtualbox/common/vboxmanage_config_test.go +++ b/builder/virtualbox/common/vboxmanage_config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestVBoxManageConfigPrepare_VBoxManage(t *testing.T) { diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go index 207473f7a..f2b18b94f 100644 --- a/builder/virtualbox/iso/builder.go +++ b/builder/virtualbox/iso/builder.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "mitchellh.virtualbox" diff --git a/builder/virtualbox/ovf/config.go b/builder/virtualbox/ovf/config.go index ac8be5e7b..ab14c132c 100644 --- a/builder/virtualbox/ovf/config.go +++ b/builder/virtualbox/ovf/config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is the configuration structure for the builder. diff --git a/builder/virtualbox/vm/config.go b/builder/virtualbox/vm/config.go index 6f4b6b823..690141c97 100644 --- a/builder/virtualbox/vm/config.go +++ b/builder/virtualbox/vm/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is the configuration structure for the builder. diff --git a/builder/vmware/common/disk_config.go b/builder/vmware/common/disk_config.go index a6e844db7..96fc8fe09 100644 --- a/builder/vmware/common/disk_config.go +++ b/builder/vmware/common/disk_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type DiskConfig struct { diff --git a/builder/vmware/common/driver_config.go b/builder/vmware/common/driver_config.go index 8e45ff293..82fc0a23d 100644 --- a/builder/vmware/common/driver_config.go +++ b/builder/vmware/common/driver_config.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type DriverConfig struct { diff --git a/builder/vmware/common/driver_config_test.go b/builder/vmware/common/driver_config_test.go index ccb7d545e..6bba215a9 100644 --- a/builder/vmware/common/driver_config_test.go +++ b/builder/vmware/common/driver_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestDriverConfigPrepare(t *testing.T) { diff --git a/builder/vmware/common/driver_esx5.go b/builder/vmware/common/driver_esx5.go index 9b2ceff90..d713a5cc4 100644 --- a/builder/vmware/common/driver_esx5.go +++ b/builder/vmware/common/driver_esx5.go @@ -32,7 +32,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/sdk-internals/communicator/ssh" + "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" gossh "golang.org/x/crypto/ssh" ) diff --git a/builder/vmware/common/export_config.go b/builder/vmware/common/export_config.go index 0d38e6176..505795041 100644 --- a/builder/vmware/common/export_config.go +++ b/builder/vmware/common/export_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type ExportConfig struct { diff --git a/builder/vmware/common/hw_config.go b/builder/vmware/common/hw_config.go index 4a432d92e..ecc764921 100644 --- a/builder/vmware/common/hw_config.go +++ b/builder/vmware/common/hw_config.go @@ -8,7 +8,7 @@ import ( "runtime" "strings" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type HWConfig struct { diff --git a/builder/vmware/common/hw_config_test.go b/builder/vmware/common/hw_config_test.go index d523aecb3..46d1d6ff1 100644 --- a/builder/vmware/common/hw_config_test.go +++ b/builder/vmware/common/hw_config_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestHWConfigPrepare(t *testing.T) { diff --git a/builder/vmware/common/output_config.go b/builder/vmware/common/output_config.go index 5cc859a64..bcc0c7df4 100644 --- a/builder/vmware/common/output_config.go +++ b/builder/vmware/common/output_config.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type OutputConfig struct { diff --git a/builder/vmware/common/output_config_test.go b/builder/vmware/common/output_config_test.go index 6dd522d98..6d46d2089 100644 --- a/builder/vmware/common/output_config_test.go +++ b/builder/vmware/common/output_config_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestOutputConfigPrepare(t *testing.T) { diff --git a/builder/vmware/common/run_config.go b/builder/vmware/common/run_config.go index 06af92bca..67d2da30d 100644 --- a/builder/vmware/common/run_config.go +++ b/builder/vmware/common/run_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // ~> **Note:** If [vnc_over_websocket](#vnc_over_websocket) is set to true, any other VNC configuration will be ignored. diff --git a/builder/vmware/common/run_config_test.go b/builder/vmware/common/run_config_test.go index 6b2cea1cc..6119223eb 100644 --- a/builder/vmware/common/run_config_test.go +++ b/builder/vmware/common/run_config_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/packer/common/bootcommand" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestRunConfig_Prepare(t *testing.T) { diff --git a/builder/vmware/common/ssh_config.go b/builder/vmware/common/ssh_config.go index aa83c3692..b386c629b 100644 --- a/builder/vmware/common/ssh_config.go +++ b/builder/vmware/common/ssh_config.go @@ -4,7 +4,7 @@ package common import ( "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type SSHConfig struct { diff --git a/builder/vmware/common/ssh_config_test.go b/builder/vmware/common/ssh_config_test.go index 5b190ba6d..e9b42c69a 100644 --- a/builder/vmware/common/ssh_config_test.go +++ b/builder/vmware/common/ssh_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testSSHConfig() *SSHConfig { diff --git a/builder/vmware/common/step_upload_tools.go b/builder/vmware/common/step_upload_tools.go index d76836b10..94f7072f4 100644 --- a/builder/vmware/common/step_upload_tools.go +++ b/builder/vmware/common/step_upload_tools.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type toolsUploadPathTemplate struct { diff --git a/builder/vmware/common/step_vnc_boot_command.go b/builder/vmware/common/step_vnc_boot_command.go index 0471fbc07..ff35cfed2 100644 --- a/builder/vmware/common/step_vnc_boot_command.go +++ b/builder/vmware/common/step_vnc_boot_command.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-vnc" ) diff --git a/builder/vmware/common/tools_config.go b/builder/vmware/common/tools_config.go index dd37831bf..53cad2e00 100644 --- a/builder/vmware/common/tools_config.go +++ b/builder/vmware/common/tools_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type ToolsConfig struct { diff --git a/builder/vmware/common/tools_config_test.go b/builder/vmware/common/tools_config_test.go index 8294661ca..272671c14 100644 --- a/builder/vmware/common/tools_config_test.go +++ b/builder/vmware/common/tools_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestToolsConfigPrepare_Empty(t *testing.T) { diff --git a/builder/vmware/common/vmx_config.go b/builder/vmware/common/vmx_config.go index b7ee6a0e7..6c5b330d0 100644 --- a/builder/vmware/common/vmx_config.go +++ b/builder/vmware/common/vmx_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type VMXConfig struct { diff --git a/builder/vmware/common/vmx_config_test.go b/builder/vmware/common/vmx_config_test.go index cf6bdc6fd..a192d6d6a 100644 --- a/builder/vmware/common/vmx_config_test.go +++ b/builder/vmware/common/vmx_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestVMXConfigPrepare(t *testing.T) { diff --git a/builder/vmware/iso/config.go b/builder/vmware/iso/config.go index becb555c3..e40f7320c 100644 --- a/builder/vmware/iso/config.go +++ b/builder/vmware/iso/config.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/vmware/iso/step_create_vmx.go b/builder/vmware/iso/step_create_vmx.go index d764d5aeb..04c796a5e 100644 --- a/builder/vmware/iso/step_create_vmx.go +++ b/builder/vmware/iso/step_create_vmx.go @@ -12,8 +12,8 @@ import ( vmwcommon "github.com/hashicorp/packer/builder/vmware/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) type vmxTemplateData struct { diff --git a/builder/vmware/iso/step_create_vmx_test.go b/builder/vmware/iso/step_create_vmx_test.go index 480afccc3..9982998f8 100644 --- a/builder/vmware/iso/step_create_vmx_test.go +++ b/builder/vmware/iso/step_create_vmx_test.go @@ -16,8 +16,8 @@ import ( "testing" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/hashicorp/packer/provisioner/shell" - "github.com/hashicorp/packer/template" ) var vmxTestBuilderConfig = map[string]string{ diff --git a/builder/vmware/vmx/config.go b/builder/vmware/vmx/config.go index e7c34616e..060030a85 100644 --- a/builder/vmware/vmx/config.go +++ b/builder/vmware/vmx/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is the configuration structure for the builder. diff --git a/builder/vsphere/clone/config.go b/builder/vsphere/clone/config.go index f7b2fd588..1d0bd7388 100644 --- a/builder/vsphere/clone/config.go +++ b/builder/vsphere/clone/config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/vsphere/common/output_config.go b/builder/vsphere/common/output_config.go index 8692a507a..ddf9af1c4 100644 --- a/builder/vsphere/common/output_config.go +++ b/builder/vsphere/common/output_config.go @@ -9,7 +9,7 @@ import ( "path/filepath" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type OutputConfig struct { diff --git a/builder/vsphere/common/step_boot_command.go b/builder/vsphere/common/step_boot_command.go index 5f831f070..1c8f28cc6 100644 --- a/builder/vsphere/common/step_boot_command.go +++ b/builder/vsphere/common/step_boot_command.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "golang.org/x/mobile/event/key" ) diff --git a/builder/vsphere/common/step_export.go b/builder/vsphere/common/step_export.go index a50a329b4..057b732c7 100644 --- a/builder/vsphere/common/step_export.go +++ b/builder/vsphere/common/step_export.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/pkg/errors" "github.com/vmware/govmomi/nfc" "github.com/vmware/govmomi/vim25/soap" diff --git a/builder/vsphere/common/step_import_to_content_library.go b/builder/vsphere/common/step_import_to_content_library.go index 2e5be7a39..91720389c 100644 --- a/builder/vsphere/common/step_import_to_content_library.go +++ b/builder/vsphere/common/step_import_to_content_library.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/vmware/govmomi/vapi/vcenter" ) diff --git a/builder/vsphere/iso/config.go b/builder/vsphere/iso/config.go index 791f80cc9..95cf4e3bd 100644 --- a/builder/vsphere/iso/config.go +++ b/builder/vsphere/iso/config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/yandex/access_config.go b/builder/yandex/access_config.go index 89a150e05..9554d0b83 100644 --- a/builder/yandex/access_config.go +++ b/builder/yandex/access_config.go @@ -8,7 +8,7 @@ import ( "os" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/yandex-cloud/go-sdk/iamkey" ) diff --git a/builder/yandex/config.go b/builder/yandex/config.go index 12b7245b3..7a0f6b75a 100644 --- a/builder/yandex/config.go +++ b/builder/yandex/config.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const defaultGpuPlatformID = "gpu-standard-v1" diff --git a/command/build.go b/command/build.go index ce1421315..da0036ed1 100644 --- a/command/build.go +++ b/command/build.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/hcl/v2/hclparse" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/hashicorp/packer/version" "golang.org/x/sync/semaphore" diff --git a/command/fix.go b/command/fix.go index 7e382eed9..6672d9035 100644 --- a/command/fix.go +++ b/command/fix.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/hashicorp/packer/fix" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/posener/complete" ) diff --git a/command/hcl2_upgrade.go b/command/hcl2_upgrade.go index 9da3dc645..40e39fc62 100644 --- a/command/hcl2_upgrade.go +++ b/command/hcl2_upgrade.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/hcl/v2/hclwrite" hcl2shim "github.com/hashicorp/packer/hcl2template/shim" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/posener/complete" "github.com/zclconf/go-cty/cty" ) diff --git a/command/meta.go b/command/meta.go index 50c767892..2d35fc9ab 100644 --- a/command/meta.go +++ b/command/meta.go @@ -9,7 +9,7 @@ import ( kvflag "github.com/hashicorp/packer/helper/flag-kv" "github.com/hashicorp/packer/helper/wrappedstreams" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" ) // FlagSetFlags is an enum to define what flags are present in the diff --git a/common/bootcommand/config.go b/common/bootcommand/config.go index 8a1cff791..ad5e8b700 100644 --- a/common/bootcommand/config.go +++ b/common/bootcommand/config.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The boot configuration is very important: `boot_command` specifies the keys diff --git a/common/bootcommand/config_test.go b/common/bootcommand/config_test.go index 0f56e1c15..6abf9b0ad 100644 --- a/common/bootcommand/config_test.go +++ b/common/bootcommand/config_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestConfigPrepare(t *testing.T) { diff --git a/common/chroot/interpolate_context_provider.go b/common/chroot/interpolate_context_provider.go index ee19a19de..9d30b0dc1 100644 --- a/common/chroot/interpolate_context_provider.go +++ b/common/chroot/interpolate_context_provider.go @@ -1,6 +1,6 @@ package chroot -import "github.com/hashicorp/packer/template/interpolate" +import "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" type interpolateContextProvider interface { GetContext() interpolate.Context diff --git a/common/chroot/run_local_commands.go b/common/chroot/run_local_commands.go index 8141d09e5..c760abb8c 100644 --- a/common/chroot/run_local_commands.go +++ b/common/chroot/run_local_commands.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/packer/common" sl "github.com/hashicorp/packer/common/shell-local" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func RunLocalCommands(commands []string, wrappedCommand common.CommandWrapper, ictx interpolate.Context, ui packer.Ui) error { diff --git a/common/extra_iso_config.go b/common/extra_iso_config.go index 56665bbc3..5f4707c27 100644 --- a/common/extra_iso_config.go +++ b/common/extra_iso_config.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // An iso (CD) containing custom files can be made available for your build. diff --git a/common/floppy_config.go b/common/floppy_config.go index 5a78b4f7a..175d36f73 100644 --- a/common/floppy_config.go +++ b/common/floppy_config.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // A floppy can be made available for your build. This is most useful for diff --git a/common/http_config.go b/common/http_config.go index 4977b68ce..0cb176eb4 100644 --- a/common/http_config.go +++ b/common/http_config.go @@ -5,7 +5,7 @@ package common import ( "errors" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Packer will create an http server serving `http_directory` when it is set, a diff --git a/common/iso_config.go b/common/iso_config.go index a84d5076d..14addecd1 100644 --- a/common/iso_config.go +++ b/common/iso_config.go @@ -12,7 +12,7 @@ import ( getter "github.com/hashicorp/go-getter/v2" urlhelper "github.com/hashicorp/go-getter/v2/helper/url" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // By default, Packer will symlink, download or copy image files to the Packer diff --git a/common/shell-local/config.go b/common/shell-local/config.go index cc819ae30..e86d82676 100644 --- a/common/shell-local/config.go +++ b/common/shell-local/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/common/shell" configHelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/common/shell-local/run.go b/common/shell-local/run.go index 7bf657123..85ade3696 100644 --- a/common/shell-local/run.go +++ b/common/shell-local/run.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) func Run(ctx context.Context, ui packer.Ui, config *Config, generatedData map[string]interface{}) (bool, error) { diff --git a/common/shutdowncommand/config.go b/common/shutdowncommand/config.go index efea7db8d..ba8427206 100644 --- a/common/shutdowncommand/config.go +++ b/common/shutdowncommand/config.go @@ -5,7 +5,7 @@ package shutdowncommand import ( "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type ShutdownConfig struct { diff --git a/common/shutdowncommand/config_test.go b/common/shutdowncommand/config_test.go index ada363a2f..50380b926 100644 --- a/common/shutdowncommand/config_test.go +++ b/common/shutdowncommand/config_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testShutdownConfig() *ShutdownConfig { diff --git a/common/template/funcs.go b/common/template/funcs.go index 06911cfdb..01d19d25a 100644 --- a/common/template/funcs.go +++ b/common/template/funcs.go @@ -9,7 +9,7 @@ import ( "sync" consulapi "github.com/hashicorp/consul/api" - awssmapi "github.com/hashicorp/packer/template/interpolate/aws/secretsmanager" + awssmapi "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate/aws/secretsmanager" vaultapi "github.com/hashicorp/vault/api" ) diff --git a/helper/builder/testing/testing.go b/helper/builder/testing/testing.go index 06b0a31b6..dc4129e74 100644 --- a/helper/builder/testing/testing.go +++ b/helper/builder/testing/testing.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" ) // TestEnvVar must be set to a non-empty value for acceptance tests to run. diff --git a/helper/communicator/config.go b/helper/communicator/config.go index e6a346db7..62b0fafde 100644 --- a/helper/communicator/config.go +++ b/helper/communicator/config.go @@ -16,8 +16,8 @@ import ( "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" - packerssh "github.com/hashicorp/packer/sdk-internals/communicator/ssh" - "github.com/hashicorp/packer/template/interpolate" + packerssh "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/masterzen/winrm" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/helper/communicator/config_test.go b/helper/communicator/config_test.go index b09916d0c..a6bbba87f 100644 --- a/helper/communicator/config_test.go +++ b/helper/communicator/config_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/helper/multistep" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/masterzen/winrm" ) diff --git a/helper/communicator/step_connect.go b/helper/communicator/step_connect.go index a8dc18dd0..6fed68d23 100644 --- a/helper/communicator/step_connect.go +++ b/helper/communicator/step_connect.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/sdk-internals/communicator/none" + "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/none" gossh "golang.org/x/crypto/ssh" ) diff --git a/helper/communicator/step_connect_ssh.go b/helper/communicator/step_connect_ssh.go index 4f00000df..80ccf3422 100644 --- a/helper/communicator/step_connect_ssh.go +++ b/helper/communicator/step_connect_ssh.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/sdk-internals/communicator/ssh" + "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" gossh "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" "golang.org/x/net/proxy" diff --git a/helper/communicator/step_connect_winrm.go b/helper/communicator/step_connect_winrm.go index 81ec99a2f..21c6fef7b 100644 --- a/helper/communicator/step_connect_winrm.go +++ b/helper/communicator/step_connect_winrm.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/sdk-internals/communicator/winrm" + "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/winrm" winrmcmd "github.com/masterzen/winrm" "golang.org/x/net/http/httpproxy" ) diff --git a/helper/config/decode.go b/helper/config/decode.go index 0bd1b0950..4aa78530e 100644 --- a/helper/config/decode.go +++ b/helper/config/decode.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" "github.com/ryanuber/go-glob" "github.com/zclconf/go-cty/cty" diff --git a/helper/config/decode_test.go b/helper/config/decode_test.go index 4bc68d93a..d5caafb4c 100644 --- a/helper/config/decode_test.go +++ b/helper/config/decode_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestDecode(t *testing.T) { diff --git a/helper/ssh/tunnel.go b/helper/ssh/tunnel.go index ea73a57f7..a9695d011 100644 --- a/helper/ssh/tunnel.go +++ b/helper/ssh/tunnel.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/hashicorp/packer/sdk-internals/communicator/ssh" + "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" ) // ParseTunnelArgument parses an SSH tunneling argument compatible with the openssh client form. diff --git a/helper/ssh/tunnel_test.go b/helper/ssh/tunnel_test.go index cc81de031..e834201b7 100644 --- a/helper/ssh/tunnel_test.go +++ b/helper/ssh/tunnel_test.go @@ -3,7 +3,7 @@ package ssh import ( "testing" - "github.com/hashicorp/packer/sdk-internals/communicator/ssh" + "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" ) const ( diff --git a/sdk-internals/communicator/none/communicator.go b/packer-plugin-sdk/sdk-internals/communicator/none/communicator.go similarity index 100% rename from sdk-internals/communicator/none/communicator.go rename to packer-plugin-sdk/sdk-internals/communicator/none/communicator.go diff --git a/sdk-internals/communicator/none/communicator_test.go b/packer-plugin-sdk/sdk-internals/communicator/none/communicator_test.go similarity index 100% rename from sdk-internals/communicator/none/communicator_test.go rename to packer-plugin-sdk/sdk-internals/communicator/none/communicator_test.go diff --git a/sdk-internals/communicator/ssh/communicator.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go similarity index 100% rename from sdk-internals/communicator/ssh/communicator.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go diff --git a/sdk-internals/communicator/ssh/communicator_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator_test.go similarity index 100% rename from sdk-internals/communicator/ssh/communicator_test.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/communicator_test.go diff --git a/sdk-internals/communicator/ssh/connect.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/connect.go similarity index 100% rename from sdk-internals/communicator/ssh/connect.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/connect.go diff --git a/sdk-internals/communicator/ssh/connect_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go similarity index 100% rename from sdk-internals/communicator/ssh/connect_test.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go diff --git a/sdk-internals/communicator/ssh/connection.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/connection.go similarity index 100% rename from sdk-internals/communicator/ssh/connection.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/connection.go diff --git a/sdk-internals/communicator/ssh/keyboard_interactive.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive.go similarity index 100% rename from sdk-internals/communicator/ssh/keyboard_interactive.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive.go diff --git a/sdk-internals/communicator/ssh/keyboard_interactive_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive_test.go similarity index 100% rename from sdk-internals/communicator/ssh/keyboard_interactive_test.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive_test.go diff --git a/sdk-internals/communicator/ssh/password.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/password.go similarity index 100% rename from sdk-internals/communicator/ssh/password.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/password.go diff --git a/sdk-internals/communicator/ssh/password_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/password_test.go similarity index 100% rename from sdk-internals/communicator/ssh/password_test.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/password_test.go diff --git a/sdk-internals/communicator/ssh/tunnel.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/tunnel.go similarity index 100% rename from sdk-internals/communicator/ssh/tunnel.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/tunnel.go diff --git a/sdk-internals/communicator/winrm/communicator.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/communicator.go similarity index 100% rename from sdk-internals/communicator/winrm/communicator.go rename to packer-plugin-sdk/sdk-internals/communicator/winrm/communicator.go diff --git a/sdk-internals/communicator/winrm/communicator_test.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/communicator_test.go similarity index 100% rename from sdk-internals/communicator/winrm/communicator_test.go rename to packer-plugin-sdk/sdk-internals/communicator/winrm/communicator_test.go diff --git a/sdk-internals/communicator/winrm/config.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/config.go similarity index 100% rename from sdk-internals/communicator/winrm/config.go rename to packer-plugin-sdk/sdk-internals/communicator/winrm/config.go diff --git a/sdk-internals/communicator/winrm/time.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/time.go similarity index 100% rename from sdk-internals/communicator/winrm/time.go rename to packer-plugin-sdk/sdk-internals/communicator/winrm/time.go diff --git a/sdk-internals/communicator/winrm/time_test.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/time_test.go similarity index 100% rename from sdk-internals/communicator/winrm/time_test.go rename to packer-plugin-sdk/sdk-internals/communicator/winrm/time_test.go diff --git a/template/interpolate/aws/secretsmanager/secretsmanager.go b/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager.go similarity index 100% rename from template/interpolate/aws/secretsmanager/secretsmanager.go rename to packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager.go diff --git a/template/interpolate/aws/secretsmanager/secretsmanager_test.go b/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager_test.go similarity index 100% rename from template/interpolate/aws/secretsmanager/secretsmanager_test.go rename to packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager_test.go diff --git a/template/interpolate/aws/secretsmanager/types.go b/packer-plugin-sdk/template/interpolate/aws/secretsmanager/types.go similarity index 100% rename from template/interpolate/aws/secretsmanager/types.go rename to packer-plugin-sdk/template/interpolate/aws/secretsmanager/types.go diff --git a/template/interpolate/funcs.go b/packer-plugin-sdk/template/interpolate/funcs.go similarity index 100% rename from template/interpolate/funcs.go rename to packer-plugin-sdk/template/interpolate/funcs.go diff --git a/template/interpolate/funcs_test.go b/packer-plugin-sdk/template/interpolate/funcs_test.go similarity index 100% rename from template/interpolate/funcs_test.go rename to packer-plugin-sdk/template/interpolate/funcs_test.go diff --git a/template/interpolate/i.go b/packer-plugin-sdk/template/interpolate/i.go similarity index 100% rename from template/interpolate/i.go rename to packer-plugin-sdk/template/interpolate/i.go diff --git a/template/interpolate/i_test.go b/packer-plugin-sdk/template/interpolate/i_test.go similarity index 100% rename from template/interpolate/i_test.go rename to packer-plugin-sdk/template/interpolate/i_test.go diff --git a/template/interpolate/parse.go b/packer-plugin-sdk/template/interpolate/parse.go similarity index 100% rename from template/interpolate/parse.go rename to packer-plugin-sdk/template/interpolate/parse.go diff --git a/template/interpolate/parse_test.go b/packer-plugin-sdk/template/interpolate/parse_test.go similarity index 100% rename from template/interpolate/parse_test.go rename to packer-plugin-sdk/template/interpolate/parse_test.go diff --git a/template/interpolate/render.go b/packer-plugin-sdk/template/interpolate/render.go similarity index 100% rename from template/interpolate/render.go rename to packer-plugin-sdk/template/interpolate/render.go diff --git a/template/interpolate/render_test.go b/packer-plugin-sdk/template/interpolate/render_test.go similarity index 100% rename from template/interpolate/render_test.go rename to packer-plugin-sdk/template/interpolate/render_test.go diff --git a/template/parse.go b/packer-plugin-sdk/template/parse.go similarity index 100% rename from template/parse.go rename to packer-plugin-sdk/template/parse.go diff --git a/template/parse_test.go b/packer-plugin-sdk/template/parse_test.go similarity index 100% rename from template/parse_test.go rename to packer-plugin-sdk/template/parse_test.go diff --git a/template/template.go b/packer-plugin-sdk/template/template.go similarity index 100% rename from template/template.go rename to packer-plugin-sdk/template/template.go diff --git a/template/template.hcl2spec.go b/packer-plugin-sdk/template/template.hcl2spec.go similarity index 100% rename from template/template.hcl2spec.go rename to packer-plugin-sdk/template/template.hcl2spec.go diff --git a/template/template_test.go b/packer-plugin-sdk/template/template_test.go similarity index 100% rename from template/template_test.go rename to packer-plugin-sdk/template/template_test.go diff --git a/template/test-fixtures/error-beginning.json b/packer-plugin-sdk/template/test-fixtures/error-beginning.json similarity index 100% rename from template/test-fixtures/error-beginning.json rename to packer-plugin-sdk/template/test-fixtures/error-beginning.json diff --git a/template/test-fixtures/error-duplicate-config.json b/packer-plugin-sdk/template/test-fixtures/error-duplicate-config.json similarity index 100% rename from template/test-fixtures/error-duplicate-config.json rename to packer-plugin-sdk/template/test-fixtures/error-duplicate-config.json diff --git a/template/test-fixtures/error-duplicate-variables.json b/packer-plugin-sdk/template/test-fixtures/error-duplicate-variables.json similarity index 100% rename from template/test-fixtures/error-duplicate-variables.json rename to packer-plugin-sdk/template/test-fixtures/error-duplicate-variables.json diff --git a/template/test-fixtures/error-end.json b/packer-plugin-sdk/template/test-fixtures/error-end.json similarity index 100% rename from template/test-fixtures/error-end.json rename to packer-plugin-sdk/template/test-fixtures/error-end.json diff --git a/template/test-fixtures/error-middle.json b/packer-plugin-sdk/template/test-fixtures/error-middle.json similarity index 100% rename from template/test-fixtures/error-middle.json rename to packer-plugin-sdk/template/test-fixtures/error-middle.json diff --git a/template/test-fixtures/malformed.json b/packer-plugin-sdk/template/test-fixtures/malformed.json similarity index 100% rename from template/test-fixtures/malformed.json rename to packer-plugin-sdk/template/test-fixtures/malformed.json diff --git a/template/test-fixtures/parse-basic-config.json b/packer-plugin-sdk/template/test-fixtures/parse-basic-config.json similarity index 100% rename from template/test-fixtures/parse-basic-config.json rename to packer-plugin-sdk/template/test-fixtures/parse-basic-config.json diff --git a/template/test-fixtures/parse-basic.json b/packer-plugin-sdk/template/test-fixtures/parse-basic.json similarity index 100% rename from template/test-fixtures/parse-basic.json rename to packer-plugin-sdk/template/test-fixtures/parse-basic.json diff --git a/template/test-fixtures/parse-builder-no-type.json b/packer-plugin-sdk/template/test-fixtures/parse-builder-no-type.json similarity index 100% rename from template/test-fixtures/parse-builder-no-type.json rename to packer-plugin-sdk/template/test-fixtures/parse-builder-no-type.json diff --git a/template/test-fixtures/parse-builder-repeat.json b/packer-plugin-sdk/template/test-fixtures/parse-builder-repeat.json similarity index 100% rename from template/test-fixtures/parse-builder-repeat.json rename to packer-plugin-sdk/template/test-fixtures/parse-builder-repeat.json diff --git a/template/test-fixtures/parse-comment.json b/packer-plugin-sdk/template/test-fixtures/parse-comment.json similarity index 100% rename from template/test-fixtures/parse-comment.json rename to packer-plugin-sdk/template/test-fixtures/parse-comment.json diff --git a/template/test-fixtures/parse-contents.json b/packer-plugin-sdk/template/test-fixtures/parse-contents.json similarity index 100% rename from template/test-fixtures/parse-contents.json rename to packer-plugin-sdk/template/test-fixtures/parse-contents.json diff --git a/template/test-fixtures/parse-description.json b/packer-plugin-sdk/template/test-fixtures/parse-description.json similarity index 100% rename from template/test-fixtures/parse-description.json rename to packer-plugin-sdk/template/test-fixtures/parse-description.json diff --git a/template/test-fixtures/parse-min-version.json b/packer-plugin-sdk/template/test-fixtures/parse-min-version.json similarity index 100% rename from template/test-fixtures/parse-min-version.json rename to packer-plugin-sdk/template/test-fixtures/parse-min-version.json diff --git a/template/test-fixtures/parse-monolithic.json b/packer-plugin-sdk/template/test-fixtures/parse-monolithic.json similarity index 100% rename from template/test-fixtures/parse-monolithic.json rename to packer-plugin-sdk/template/test-fixtures/parse-monolithic.json diff --git a/template/test-fixtures/parse-pp-basic.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-basic.json similarity index 100% rename from template/test-fixtures/parse-pp-basic.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-basic.json diff --git a/template/test-fixtures/parse-pp-except.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-except.json similarity index 100% rename from template/test-fixtures/parse-pp-except.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-except.json diff --git a/template/test-fixtures/parse-pp-keep.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-keep.json similarity index 100% rename from template/test-fixtures/parse-pp-keep.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-keep.json diff --git a/template/test-fixtures/parse-pp-map.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-map.json similarity index 100% rename from template/test-fixtures/parse-pp-map.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-map.json diff --git a/template/test-fixtures/parse-pp-multi.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-multi.json similarity index 100% rename from template/test-fixtures/parse-pp-multi.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-multi.json diff --git a/template/test-fixtures/parse-pp-no-type.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-no-type.json similarity index 100% rename from template/test-fixtures/parse-pp-no-type.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-no-type.json diff --git a/template/test-fixtures/parse-pp-only.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-only.json similarity index 100% rename from template/test-fixtures/parse-pp-only.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-only.json diff --git a/template/test-fixtures/parse-pp-slice.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-slice.json similarity index 100% rename from template/test-fixtures/parse-pp-slice.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-slice.json diff --git a/template/test-fixtures/parse-pp-string.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-string.json similarity index 100% rename from template/test-fixtures/parse-pp-string.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-string.json diff --git a/template/test-fixtures/parse-provisioner-basic.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-basic.json similarity index 100% rename from template/test-fixtures/parse-provisioner-basic.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-basic.json diff --git a/template/test-fixtures/parse-provisioner-config.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-config.json similarity index 100% rename from template/test-fixtures/parse-provisioner-config.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-config.json diff --git a/template/test-fixtures/parse-provisioner-except.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-except.json similarity index 100% rename from template/test-fixtures/parse-provisioner-except.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-except.json diff --git a/template/test-fixtures/parse-provisioner-no-type.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-no-type.json similarity index 100% rename from template/test-fixtures/parse-provisioner-no-type.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-no-type.json diff --git a/template/test-fixtures/parse-provisioner-only.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-only.json similarity index 100% rename from template/test-fixtures/parse-provisioner-only.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-only.json diff --git a/template/test-fixtures/parse-provisioner-override.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-override.json similarity index 100% rename from template/test-fixtures/parse-provisioner-override.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-override.json diff --git a/template/test-fixtures/parse-provisioner-pause-before.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-pause-before.json similarity index 100% rename from template/test-fixtures/parse-provisioner-pause-before.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-pause-before.json diff --git a/template/test-fixtures/parse-provisioner-retry.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-retry.json similarity index 100% rename from template/test-fixtures/parse-provisioner-retry.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-retry.json diff --git a/template/test-fixtures/parse-provisioner-timeout.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-timeout.json similarity index 100% rename from template/test-fixtures/parse-provisioner-timeout.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-timeout.json diff --git a/template/test-fixtures/parse-variable-default.json b/packer-plugin-sdk/template/test-fixtures/parse-variable-default.json similarity index 100% rename from template/test-fixtures/parse-variable-default.json rename to packer-plugin-sdk/template/test-fixtures/parse-variable-default.json diff --git a/template/test-fixtures/parse-variable-required.json b/packer-plugin-sdk/template/test-fixtures/parse-variable-required.json similarity index 100% rename from template/test-fixtures/parse-variable-required.json rename to packer-plugin-sdk/template/test-fixtures/parse-variable-required.json diff --git a/template/test-fixtures/validate-bad-override.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-override.json similarity index 100% rename from template/test-fixtures/validate-bad-override.json rename to packer-plugin-sdk/template/test-fixtures/validate-bad-override.json diff --git a/template/test-fixtures/validate-bad-pp-except.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-pp-except.json similarity index 100% rename from template/test-fixtures/validate-bad-pp-except.json rename to packer-plugin-sdk/template/test-fixtures/validate-bad-pp-except.json diff --git a/template/test-fixtures/validate-bad-pp-only.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-pp-only.json similarity index 100% rename from template/test-fixtures/validate-bad-pp-only.json rename to packer-plugin-sdk/template/test-fixtures/validate-bad-pp-only.json diff --git a/template/test-fixtures/validate-bad-prov-except.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-prov-except.json similarity index 100% rename from template/test-fixtures/validate-bad-prov-except.json rename to packer-plugin-sdk/template/test-fixtures/validate-bad-prov-except.json diff --git a/template/test-fixtures/validate-bad-prov-only.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-prov-only.json similarity index 100% rename from template/test-fixtures/validate-bad-prov-only.json rename to packer-plugin-sdk/template/test-fixtures/validate-bad-prov-only.json diff --git a/template/test-fixtures/validate-good-override.json b/packer-plugin-sdk/template/test-fixtures/validate-good-override.json similarity index 100% rename from template/test-fixtures/validate-good-override.json rename to packer-plugin-sdk/template/test-fixtures/validate-good-override.json diff --git a/template/test-fixtures/validate-good-pp-except.json b/packer-plugin-sdk/template/test-fixtures/validate-good-pp-except.json similarity index 100% rename from template/test-fixtures/validate-good-pp-except.json rename to packer-plugin-sdk/template/test-fixtures/validate-good-pp-except.json diff --git a/template/test-fixtures/validate-good-pp-only.json b/packer-plugin-sdk/template/test-fixtures/validate-good-pp-only.json similarity index 100% rename from template/test-fixtures/validate-good-pp-only.json rename to packer-plugin-sdk/template/test-fixtures/validate-good-pp-only.json diff --git a/template/test-fixtures/validate-good-prov-except.json b/packer-plugin-sdk/template/test-fixtures/validate-good-prov-except.json similarity index 100% rename from template/test-fixtures/validate-good-prov-except.json rename to packer-plugin-sdk/template/test-fixtures/validate-good-prov-except.json diff --git a/template/test-fixtures/validate-good-prov-only.json b/packer-plugin-sdk/template/test-fixtures/validate-good-prov-only.json similarity index 100% rename from template/test-fixtures/validate-good-prov-only.json rename to packer-plugin-sdk/template/test-fixtures/validate-good-prov-only.json diff --git a/template/test-fixtures/validate-good-prov-timeout.json b/packer-plugin-sdk/template/test-fixtures/validate-good-prov-timeout.json similarity index 100% rename from template/test-fixtures/validate-good-prov-timeout.json rename to packer-plugin-sdk/template/test-fixtures/validate-good-prov-timeout.json diff --git a/template/test-fixtures/validate-no-builders.json b/packer-plugin-sdk/template/test-fixtures/validate-no-builders.json similarity index 100% rename from template/test-fixtures/validate-no-builders.json rename to packer-plugin-sdk/template/test-fixtures/validate-no-builders.json diff --git a/packer/core.go b/packer/core.go index 400914b33..218c764a8 100644 --- a/packer/core.go +++ b/packer/core.go @@ -15,8 +15,8 @@ import ( multierror "github.com/hashicorp/go-multierror" version "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/packer/template" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Core is the main executor of Packer. If Packer is being used as a diff --git a/packer/core_test.go b/packer/core_test.go index 864080072..d60af3472 100644 --- a/packer/core_test.go +++ b/packer/core_test.go @@ -9,7 +9,7 @@ import ( "testing" configHelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" ) func TestCoreBuildNames(t *testing.T) { diff --git a/post-processor/alicloud-import/post-processor.go b/post-processor/alicloud-import/post-processor.go index 67fa91e5f..cc87a221d 100644 --- a/post-processor/alicloud-import/post-processor.go +++ b/post-processor/alicloud-import/post-processor.go @@ -21,7 +21,7 @@ import ( packerecs "github.com/hashicorp/packer/builder/alicloud/ecs" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/post-processor/amazon-import/post-processor.go b/post-processor/amazon-import/post-processor.go index 51e5eb829..32849f704 100644 --- a/post-processor/amazon-import/post-processor.go +++ b/post-processor/amazon-import/post-processor.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "packer.post-processor.amazon-import" diff --git a/post-processor/artifice/post-processor.go b/post-processor/artifice/post-processor.go index 9c80aba75..9efcc4df6 100644 --- a/post-processor/artifice/post-processor.go +++ b/post-processor/artifice/post-processor.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The artifact-override post-processor allows you to specify arbitrary files as diff --git a/post-processor/checksum/post-processor.go b/post-processor/checksum/post-processor.go index ce8496812..207dda872 100644 --- a/post-processor/checksum/post-processor.go +++ b/post-processor/checksum/post-processor.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/post-processor/checksum/post-processor_test.go b/post-processor/checksum/post-processor_test.go index e52974ec4..ce527ab23 100644 --- a/post-processor/checksum/post-processor_test.go +++ b/post-processor/checksum/post-processor_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" ) const expectedFileContents = "Hello world!" diff --git a/post-processor/compress/post-processor.go b/post-processor/compress/post-processor.go index 6b84852cb..2eeab4bf9 100644 --- a/post-processor/compress/post-processor.go +++ b/post-processor/compress/post-processor.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/klauspost/pgzip" "github.com/pierrec/lz4" "github.com/ulikunitz/xz" diff --git a/post-processor/compress/post-processor_test.go b/post-processor/compress/post-processor_test.go index 5b4cfcd9f..1e1a7b8a4 100644 --- a/post-processor/compress/post-processor_test.go +++ b/post-processor/compress/post-processor_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" ) func TestDetectFilename(t *testing.T) { diff --git a/post-processor/digitalocean-import/post-processor.go b/post-processor/digitalocean-import/post-processor.go index 74b63aec1..6cda2f483 100644 --- a/post-processor/digitalocean-import/post-processor.go +++ b/post-processor/digitalocean-import/post-processor.go @@ -24,7 +24,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "packer.post-processor.digitalocean-import" diff --git a/post-processor/docker-import/post-processor.go b/post-processor/docker-import/post-processor.go index 711ff7af2..68260ea6e 100644 --- a/post-processor/docker-import/post-processor.go +++ b/post-processor/docker-import/post-processor.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" - "github.com/hashicorp/packer/template/interpolate" ) const BuilderId = "packer.post-processor.docker-import" diff --git a/post-processor/docker-push/post-processor.go b/post-processor/docker-push/post-processor.go index 7c642988f..ba264d418 100644 --- a/post-processor/docker-push/post-processor.go +++ b/post-processor/docker-push/post-processor.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" dockertag "github.com/hashicorp/packer/post-processor/docker-tag" - "github.com/hashicorp/packer/template/interpolate" ) const BuilderIdImport = "packer.post-processor.docker-import" diff --git a/post-processor/docker-save/post-processor.go b/post-processor/docker-save/post-processor.go index db572a200..0ab8a3374 100644 --- a/post-processor/docker-save/post-processor.go +++ b/post-processor/docker-save/post-processor.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" dockertag "github.com/hashicorp/packer/post-processor/docker-tag" - "github.com/hashicorp/packer/template/interpolate" ) const BuilderId = "packer.post-processor.docker-save" diff --git a/post-processor/docker-tag/post-processor.go b/post-processor/docker-tag/post-processor.go index 466176402..4a26e5b41 100644 --- a/post-processor/docker-tag/post-processor.go +++ b/post-processor/docker-tag/post-processor.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" - "github.com/hashicorp/packer/template/interpolate" ) const BuilderId = "packer.post-processor.docker-tag" diff --git a/post-processor/googlecompute-export/post-processor.go b/post-processor/googlecompute-export/post-processor.go index 264338884..d24018617 100644 --- a/post-processor/googlecompute-export/post-processor.go +++ b/post-processor/googlecompute-export/post-processor.go @@ -16,8 +16,8 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" - "github.com/hashicorp/packer/template/interpolate" ) type Config struct { diff --git a/post-processor/googlecompute-import/post-processor.go b/post-processor/googlecompute-import/post-processor.go index e61af45cd..09fcee685 100644 --- a/post-processor/googlecompute-import/post-processor.go +++ b/post-processor/googlecompute-import/post-processor.go @@ -19,9 +19,9 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" "github.com/hashicorp/packer/post-processor/compress" - "github.com/hashicorp/packer/template/interpolate" ) type Config struct { diff --git a/post-processor/manifest/post-processor.go b/post-processor/manifest/post-processor.go index c723d17fd..7b5fa88a9 100644 --- a/post-processor/manifest/post-processor.go +++ b/post-processor/manifest/post-processor.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/post-processor/ucloud-import/post-processor.go b/post-processor/ucloud-import/post-processor.go index 276ab907a..9850c70e6 100644 --- a/post-processor/ucloud-import/post-processor.go +++ b/post-processor/ucloud-import/post-processor.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/ucloud/ucloud-sdk-go/services/ufile" "github.com/ucloud/ucloud-sdk-go/services/uhost" "github.com/ucloud/ucloud-sdk-go/ucloud" diff --git a/post-processor/vagrant-cloud/post-processor.go b/post-processor/vagrant-cloud/post-processor.go index 088bcb6d0..487fde5b1 100644 --- a/post-processor/vagrant-cloud/post-processor.go +++ b/post-processor/vagrant-cloud/post-processor.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var builtins = map[string]string{ diff --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go index 43cde6855..91a5344bb 100644 --- a/post-processor/vagrant/post-processor.go +++ b/post-processor/vagrant/post-processor.go @@ -19,9 +19,9 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" "github.com/hashicorp/packer/post-processor/artifice" - "github.com/hashicorp/packer/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/post-processor/vsphere-template/post-processor.go b/post-processor/vsphere-template/post-processor.go index bc3e314f5..3d3675cd8 100644 --- a/post-processor/vsphere-template/post-processor.go +++ b/post-processor/vsphere-template/post-processor.go @@ -19,8 +19,8 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" - "github.com/hashicorp/packer/template/interpolate" "github.com/vmware/govmomi" ) diff --git a/post-processor/vsphere/post-processor.go b/post-processor/vsphere/post-processor.go index b816f31cb..9c25dff10 100644 --- a/post-processor/vsphere/post-processor.go +++ b/post-processor/vsphere/post-processor.go @@ -19,7 +19,7 @@ import ( shelllocal "github.com/hashicorp/packer/common/shell-local" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var ovftool string = "ovftool" diff --git a/post-processor/yandex-export/post-processor.go b/post-processor/yandex-export/post-processor.go index c3d225e42..40f8639fa 100644 --- a/post-processor/yandex-export/post-processor.go +++ b/post-processor/yandex-export/post-processor.go @@ -18,8 +18,8 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" - "github.com/hashicorp/packer/template/interpolate" ) const defaultStorageEndpoint = "storage.yandexcloud.net" diff --git a/post-processor/yandex-import/post-processor.go b/post-processor/yandex-import/post-processor.go index a4913eebb..e855fe5da 100644 --- a/post-processor/yandex-import/post-processor.go +++ b/post-processor/yandex-import/post-processor.go @@ -14,10 +14,10 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" "github.com/hashicorp/packer/post-processor/compress" yandexexport "github.com/hashicorp/packer/post-processor/yandex-export" - "github.com/hashicorp/packer/template/interpolate" "github.com/yandex-cloud/go-genproto/yandex/cloud/iam/v1/awscompatibility" ) diff --git a/provisioner/ansible-local/provisioner.go b/provisioner/ansible-local/provisioner.go index 75338465d..62077fd67 100644 --- a/provisioner/ansible-local/provisioner.go +++ b/provisioner/ansible-local/provisioner.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) const DefaultStagingDir = "/tmp/packer-provisioner-ansible-local" diff --git a/provisioner/ansible-local/provisioner_test.go b/provisioner/ansible-local/provisioner_test.go index 1b8e5e34a..9d55d549d 100644 --- a/provisioner/ansible-local/provisioner_test.go +++ b/provisioner/ansible-local/provisioner_test.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/packer/builder/docker" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/hashicorp/packer/provisioner/file" - "github.com/hashicorp/packer/template" ) func TestProvisioner_Impl(t *testing.T) { diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go index a82aab702..27dee7bbb 100644 --- a/provisioner/ansible/provisioner.go +++ b/provisioner/ansible/provisioner.go @@ -34,8 +34,8 @@ import ( "github.com/hashicorp/packer/common/adapter" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) type Config struct { diff --git a/provisioner/azure-dtlartifact/provisioner.go b/provisioner/azure-dtlartifact/provisioner.go index 5772b98d1..9065bd07e 100644 --- a/provisioner/azure-dtlartifact/provisioner.go +++ b/provisioner/azure-dtlartifact/provisioner.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type DtlArtifact struct { diff --git a/provisioner/breakpoint/provisioner.go b/provisioner/breakpoint/provisioner.go index d1674bf1a..2e5da91a8 100644 --- a/provisioner/breakpoint/provisioner.go +++ b/provisioner/breakpoint/provisioner.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/chef-client/provisioner.go b/provisioner/chef-client/provisioner.go index 3d953aef8..ac9d0bdb9 100644 --- a/provisioner/chef-client/provisioner.go +++ b/provisioner/chef-client/provisioner.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type guestOSTypeConfig struct { diff --git a/provisioner/chef-solo/provisioner.go b/provisioner/chef-solo/provisioner.go index cc9178794..3775d8cf1 100644 --- a/provisioner/chef-solo/provisioner.go +++ b/provisioner/chef-solo/provisioner.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type guestOSTypeConfig struct { diff --git a/provisioner/converge/provisioner.go b/provisioner/converge/provisioner.go index 47aa4843d..ee8aa25a0 100644 --- a/provisioner/converge/provisioner.go +++ b/provisioner/converge/provisioner.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config for Converge provisioner diff --git a/provisioner/file/provisioner.go b/provisioner/file/provisioner.go index 3b25a1df6..acbeebcf6 100644 --- a/provisioner/file/provisioner.go +++ b/provisioner/file/provisioner.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/inspec/provisioner.go b/provisioner/inspec/provisioner.go index 0644663ff..edcda418f 100644 --- a/provisioner/inspec/provisioner.go +++ b/provisioner/inspec/provisioner.go @@ -32,7 +32,7 @@ import ( "github.com/hashicorp/packer/common/adapter" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var SupportedBackends = map[string]bool{"docker": true, "local": true, "ssh": true, "winrm": true} diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go index fd3f34fda..639314b96 100644 --- a/provisioner/powershell/provisioner.go +++ b/provisioner/powershell/provisioner.go @@ -24,8 +24,8 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) var retryableSleep = 2 * time.Second diff --git a/provisioner/puppet-masterless/provisioner.go b/provisioner/puppet-masterless/provisioner.go index a398a4204..4ec0c36a5 100644 --- a/provisioner/puppet-masterless/provisioner.go +++ b/provisioner/puppet-masterless/provisioner.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/puppet-masterless/provisioner_test.go b/provisioner/puppet-masterless/provisioner_test.go index 582b8d311..2a9b21e6b 100644 --- a/provisioner/puppet-masterless/provisioner_test.go +++ b/provisioner/puppet-masterless/provisioner_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/puppet-server/provisioner.go b/provisioner/puppet-server/provisioner.go index c4625f508..f971a1c49 100644 --- a/provisioner/puppet-server/provisioner.go +++ b/provisioner/puppet-server/provisioner.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go index 2e12b1af5..638912f9f 100644 --- a/provisioner/salt-masterless/provisioner.go +++ b/provisioner/salt-masterless/provisioner.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go index b66a6d793..aec7dc021 100644 --- a/provisioner/shell/provisioner.go +++ b/provisioner/shell/provisioner.go @@ -23,8 +23,8 @@ import ( "github.com/hashicorp/packer/common/shell" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) type Config struct { diff --git a/provisioner/windows-restart/provisioner.go b/provisioner/windows-restart/provisioner.go index 8fc800ed8..3cbbc3518 100644 --- a/provisioner/windows-restart/provisioner.go +++ b/provisioner/windows-restart/provisioner.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/masterzen/winrm" ) diff --git a/provisioner/windows-shell/provisioner.go b/provisioner/windows-shell/provisioner.go index e081c7151..7654154d3 100644 --- a/provisioner/windows-shell/provisioner.go +++ b/provisioner/windows-shell/provisioner.go @@ -21,8 +21,8 @@ import ( "github.com/hashicorp/packer/common/shell" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) //FIXME query remote host or use %SYSTEMROOT%, %TEMP% and more creative filename From e04eaa89e65bdbd6151c72e22deb286dc6603a93 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 11 Nov 2020 15:04:28 -0800 Subject: [PATCH 67/93] move steps and step configs from packer/common to packer/common/commonsteps --- builder/alicloud/ecs/builder.go | 7 +- builder/amazon/chroot/builder.go | 3 +- builder/amazon/ebs/builder.go | 7 +- builder/amazon/ebssurrogate/builder.go | 7 +- builder/amazon/ebsvolume/builder.go | 7 +- builder/amazon/instance/builder.go | 7 +- builder/azure/arm/builder.go | 10 +- builder/azure/chroot/builder.go | 3 +- builder/azure/dtl/builder.go | 10 +- builder/cloudstack/builder.go | 10 +- builder/cloudstack/config.go | 7 +- builder/digitalocean/builder.go | 8 +- builder/docker/builder.go | 8 +- builder/googlecompute/builder.go | 8 +- builder/hcloud/builder.go | 8 +- builder/hyperone/builder.go | 6 +- builder/hyperone/step_chroot_provision.go | 4 +- builder/hyperv/common/config.go | 5 +- builder/hyperv/iso/builder.go | 21 +- builder/hyperv/vmcx/builder.go | 21 +- builder/jdcloud/builder.go | 6 +- builder/linode/builder.go | 8 +- builder/lxc/builder.go | 4 +- builder/lxc/step_provision.go | 4 +- builder/lxd/builder.go | 4 +- builder/lxd/step_provision.go | 4 +- builder/ncloud/builder.go | 10 +- builder/null/builder.go | 6 +- builder/oneandone/builder.go | 8 +- builder/openstack/builder.go | 7 +- builder/oracle/classic/builder.go | 12 +- builder/oracle/oci/builder.go | 8 +- builder/osc/bsu/builder.go | 7 +- builder/osc/bsusurrogate/builder.go | 7 +- builder/osc/bsuvolume/builder.go | 7 +- builder/osc/chroot/builder.go | 3 +- builder/osc/chroot/step_chroot_provision.go | 4 +- builder/parallels/iso/builder.go | 19 +- builder/parallels/pvm/builder.go | 10 +- builder/parallels/pvm/config.go | 3 +- builder/profitbricks/builder.go | 8 +- builder/proxmox/common/builder.go | 10 +- builder/proxmox/common/config.go | 21 +- builder/proxmox/iso/builder.go | 6 +- builder/proxmox/iso/config.go | 12 +- builder/proxmox/iso/step_upload_iso_test.go | 10 +- builder/qemu/builder.go | 16 +- builder/qemu/config.go | 9 +- builder/qemu/step_run_test.go | 3 +- builder/scaleway/builder.go | 8 +- builder/tencentcloud/cvm/builder.go | 7 +- builder/triton/builder.go | 8 +- builder/ucloud/uhost/builder.go | 5 +- builder/vagrant/builder.go | 19 +- .../common/step_download_guest_additions.go | 6 +- builder/virtualbox/iso/builder.go | 25 +- builder/virtualbox/ovf/builder.go | 18 +- builder/virtualbox/ovf/config.go | 7 +- builder/virtualbox/vm/builder.go | 16 +- builder/virtualbox/vm/config.go | 7 +- builder/vmware/iso/builder.go | 16 +- builder/vmware/iso/config.go | 9 +- builder/vmware/vmx/builder.go | 14 +- builder/vmware/vmx/config.go | 7 +- builder/vsphere/clone/builder.go | 12 +- builder/vsphere/clone/config.go | 5 +- builder/vsphere/clone/config.hcl2spec.go | 2 - builder/vsphere/iso/builder.go | 14 +- builder/vsphere/iso/config.go | 7 +- builder/vsphere/iso/config.hcl2spec.go | 2 - builder/yandex/builder.go | 8 +- common/bootcommand/config.go | 9 + common/bootcommand/pc_xt_driver.go | 6 +- common/bootcommand/usb_driver.go | 5 +- common/bootcommand/vnc_driver.go | 6 +- common/chroot/step_chroot_provision.go | 3 +- common/{ => commonsteps}/extra_iso_config.go | 2 +- .../extra_iso_config_test.go | 2 +- common/{ => commonsteps}/floppy_config.go | 2 +- .../{ => commonsteps}/floppy_config_test.go | 2 +- common/{ => commonsteps}/http_config.go | 2 +- common/{ => commonsteps}/http_config_test.go | 2 +- common/{ => commonsteps}/iso_config.go | 2 +- common/{ => commonsteps}/iso_config_test.go | 2 +- common/{ => commonsteps}/multistep_debug.go | 2 +- common/{ => commonsteps}/multistep_runner.go | 9 +- .../step_cleanup_temp_keys.go | 2 +- common/{ => commonsteps}/step_create_cdrom.go | 2 +- .../step_create_cdrom_test.go | 2 +- .../{ => commonsteps}/step_create_floppy.go | 2 +- .../step_create_floppy_test.go | 2 +- common/{ => commonsteps}/step_download.go | 2 +- .../{ => commonsteps}/step_download_test.go | 2 +- common/{ => commonsteps}/step_http_server.go | 2 +- common/{ => commonsteps}/step_output_dir.go | 2 +- .../{ => commonsteps}/step_output_dir_test.go | 2 +- common/{ => commonsteps}/step_provision.go | 2 +- .../{ => commonsteps}/step_provision_test.go | 2 +- common/config.go | 14 - common/shell-local/run.go | 8 +- go.mod | 9 +- go.sum | 11 + post-processor/docker-push/post-processor.go | 1 + .../googlecompute-export/post-processor.go | 3 +- .../vagrant-cloud/post-processor.go | 3 +- .../vsphere-template/post-processor.go | 8 +- .../yandex-export/post-processor.go | 3 +- provisioner/ansible/provisioner.go | 3 +- provisioner/ansible/provisioner_test.go | 25 +- provisioner/powershell/provisioner.go | 8 +- provisioner/powershell/provisioner_test.go | 7 +- provisioner/shell/provisioner.go | 8 +- provisioner/shell/provisioner_test.go | 7 +- provisioner/windows-shell/provisioner.go | 8 +- provisioner/windows-shell/provisioner_test.go | 7 +- .../oneandone-cloudserver-sdk-go/errors.go | 4 +- .../services/server/access_control_group.go | 10 +- .../services/server/access_control_rule.go | 14 +- .../add_nas_volume_access_control_request.go | 6 +- .../add_nas_volume_access_control_response.go | 11 +- .../add_port_forwarding_rules_request.go | 4 +- .../add_port_forwarding_rules_response.go | 19 +- .../services/server/api_client.go | 6 +- .../services/server/api_response.go | 8 +- ..._public_ip_with_server_instance_request.go | 4 +- ...public_ip_with_server_instance_response.go | 11 +- .../attach_block_storage_instance_request.go | 4 +- .../attach_block_storage_instance_response.go | 11 +- .../attach_network_interface_request.go | 4 +- .../attach_network_interface_response.go | 7 +- .../services/server/block_storage_instance.go | 38 +- .../server/block_storage_snapshot_instance.go | 24 +- .../server/change_nas_volume_size_request.go | 4 +- .../server/change_nas_volume_size_response.go | 11 +- .../change_server_instance_spec_request.go | 4 +- .../change_server_instance_spec_response.go | 11 +- .../services/server/common_code.go | 4 +- .../create_block_storage_instance_request.go | 10 +- .../create_block_storage_instance_response.go | 11 +- ...block_storage_snapshot_instance_request.go | 6 +- ...lock_storage_snapshot_instance_response.go | 11 +- .../server/create_instance_tags_request.go | 4 +- .../server/create_instance_tags_response.go | 11 +- .../server/create_login_key_request.go | 2 +- .../server/create_login_key_response.go | 9 +- .../create_member_server_image_request.go | 6 +- .../create_member_server_image_response.go | 11 +- .../create_nas_volume_instance_request.go | 20 +- .../create_nas_volume_instance_response.go | 11 +- .../create_network_interface_request.go | 14 +- .../create_network_interface_response.go | 7 +- .../create_public_ip_instance_request.go | 10 +- .../create_public_ip_instance_response.go | 11 +- .../server/create_server_instances_request.go | 32 +- .../create_server_instances_response.go | 11 +- .../delete_block_storage_instances_request.go | 2 +- ...delete_block_storage_instances_response.go | 11 +- ...lock_storage_snapshot_instances_request.go | 2 +- ...ock_storage_snapshot_instances_response.go | 11 +- .../server/delete_instance_tags_request.go | 4 +- .../server/delete_instance_tags_response.go | 9 +- .../server/delete_login_key_request.go | 2 +- .../server/delete_login_key_response.go | 7 +- .../delete_member_server_images_request.go | 2 +- .../delete_member_server_images_response.go | 11 +- .../delete_nas_volume_instance_request.go | 2 +- .../delete_nas_volume_instance_response.go | 11 +- .../delete_network_interface_request.go | 2 +- .../delete_network_interface_response.go | 7 +- .../delete_port_forwarding_rules_request.go | 4 +- .../delete_port_forwarding_rules_response.go | 12 +- .../delete_public_ip_instances_request.go | 2 +- .../delete_public_ip_instances_response.go | 11 +- .../detach_block_storage_instances_request.go | 2 +- ...detach_block_storage_instances_response.go | 11 +- .../detach_network_interface_request.go | 4 +- .../detach_network_interface_response.go | 7 +- ..._public_ip_from_server_instance_request.go | 2 +- ...public_ip_from_server_instance_response.go | 11 +- .../get_access_control_group_list_request.go | 10 +- .../get_access_control_group_list_response.go | 11 +- ...trol_group_server_instance_list_request.go | 2 +- ...rol_group_server_instance_list_response.go | 11 +- .../get_access_control_rule_list_request.go | 2 +- .../get_access_control_rule_list_response.go | 11 +- ...get_block_storage_instance_list_request.go | 28 +- ...et_block_storage_instance_list_response.go | 11 +- ..._storage_snapshot_instance_list_request.go | 10 +- ...storage_snapshot_instance_list_response.go | 11 +- .../server/get_instance_tag_list_request.go | 10 +- .../server/get_instance_tag_list_response.go | 11 +- .../server/get_login_key_list_request.go | 6 +- .../server/get_login_key_list_response.go | 11 +- .../get_member_server_image_list_request.go | 14 +- .../get_member_server_image_list_response.go | 11 +- .../get_nas_volume_instance_list_request.go | 12 +- .../get_nas_volume_instance_list_response.go | 11 +- ...nas_volume_instance_rating_list_request.go | 8 +- ...as_volume_instance_rating_list_response.go | 11 +- .../get_network_interface_list_request.go | 8 +- .../get_network_interface_list_response.go | 11 +- .../get_port_forwarding_rule_list_request.go | 6 +- .../get_port_forwarding_rule_list_response.go | 12 +- ...et_private_subnet_instance_list_request.go | 6 +- ...t_private_subnet_instance_list_response.go | 11 +- .../get_public_ip_instance_list_request.go | 24 +- .../get_public_ip_instance_list_response.go | 11 +- ..._ip_target_server_instance_list_request.go | 6 +- ...ip_target_server_instance_list_response.go | 11 +- .../services/server/get_raid_list_response.go | 11 +- .../server/get_region_list_response.go | 11 +- .../server/get_root_password_request.go | 4 +- .../server/get_root_password_response.go | 11 +- .../get_server_image_product_list_request.go | 12 +- .../get_server_image_product_list_response.go | 11 +- .../get_server_instance_list_request.go | 32 +- .../get_server_instance_list_response.go | 11 +- .../server/get_server_product_list_request.go | 12 +- .../get_server_product_list_response.go | 11 +- .../services/server/get_zone_list_request.go | 2 +- .../services/server/get_zone_list_response.go | 9 +- .../server/import_login_key_request.go | 4 +- .../server/import_login_key_response.go | 11 +- .../services/server/instance_tag.go | 8 +- .../services/server/instance_tag_parameter.go | 4 +- .../services/server/login_key.go | 6 +- .../services/server/member_server_image.go | 38 +- .../services/server/nas_volume_instance.go | 50 +- .../server/nas_volume_instance_custom_ip.go | 2 +- .../server/nas_volume_instance_rating.go | 42 +- .../services/server/network_interface.go | 16 +- .../services/server/port_forwarding_rule.go | 6 +- .../server/port_forwarding_rule_parameter.go | 6 +- .../server/private_subnet_instance.go | 18 +- .../services/server/product.go | 28 +- .../services/server/public_ip_instance.go | 24 +- .../ncloud-sdk-go-v2/services/server/raid.go | 4 +- .../server/reboot_server_instances_request.go | 2 +- .../reboot_server_instances_response.go | 11 +- .../recreate_server_instance_request.go | 10 +- .../recreate_server_instance_response.go | 11 +- .../services/server/region.go | 7 +- ...emove_nas_volume_access_control_request.go | 6 +- ...move_nas_volume_access_control_response.go | 11 +- .../services/server/server_instance.go | 64 +- .../set_nas_volume_access_control_request.go | 6 +- .../set_nas_volume_access_control_response.go | 11 +- .../server/start_server_instances_request.go | 2 +- .../server/start_server_instances_response.go | 11 +- .../server/stop_server_instances_request.go | 2 +- .../server/stop_server_instances_response.go | 11 +- .../terminate_server_instances_request.go | 2 +- .../terminate_server_instances_response.go | 11 +- .../services/server/v2_api.go | 1338 ++-- .../ncloud-sdk-go-v2/services/server/zone.go | 10 +- .../sdk/endpoints/endpoints_config.go | 4 +- .../sdk/responses/response.go | 1 + .../aliyun/aliyun-oss-go-sdk/oss/type.go | 6 +- vendor/github.com/chzyer/readline/runebuf.go | 6 +- .../internal/constants/constants.gen.go | 1 - .../digitalocean/go-libvirt/libvirt.gen.go | 2979 ++++---- .../digitalocean/go-libvirt/units.go | 8 +- .../collections/stack/stack.go | 19 +- .../hashicorp/go-getter/gcs/v2/get_gcs.go | 2 +- .../hashicorp/go-sockaddr/ifaddrs.go | 3 +- .../go-sockaddr/route_info_android.go | 1 - vendor/github.com/hashicorp/go-uuid/uuid.go | 3 +- .../golang-lru/simplelru/lru_interface.go | 4 +- .../jdcloud-api/jdcloud-sdk-go/core/Config.go | 2 +- .../jdcloud-api/jdcloud-sdk-go/core/Const.go | 1 - .../jdcloud-sdk-go/core/JdcloudClient.go | 6 +- .../jdcloud-api/jdcloud-sdk-go/core/Logger.go | 7 +- .../jdcloud-sdk-go/core/ParameterBuilder.go | 10 +- .../jdcloud-sdk-go/core/ResponseProcessor.go | 6 +- .../jdcloud-api/jdcloud-sdk-go/core/Signer.go | 27 +- .../jdcloud-api/jdcloud-sdk-go/core/Utils.go | 2 +- .../services/charge/models/Charge.go | 21 +- .../services/charge/models/ChargeSpec.go | 13 +- .../services/common/models/Filter.go | 13 +- .../services/common/models/Quota.go | 13 +- .../services/common/models/SimpleResponses.go | 5 +- .../services/common/models/Sort.go | 9 +- .../services/common/models/TagFilter.go | 9 +- .../services/disk/models/Disk.go | 68 +- .../services/disk/models/DiskAttachment.go | 25 +- .../services/disk/models/DiskSpec.go | 36 +- .../services/disk/models/DiskSpecification.go | 45 +- .../services/disk/models/Quota.go | 9 +- .../services/disk/models/ShareInfo.go | 9 +- .../services/disk/models/Snapshot.go | 45 +- .../services/disk/models/SnapshotSpec.go | 13 +- .../services/disk/models/Soldout.go | 13 +- .../services/disk/models/Tag.go | 9 +- .../services/disk/models/TagFilter.go | 9 +- .../services/vm/apis/AssociateElasticIp.go | 91 +- .../services/vm/apis/AttachDisk.go | 111 +- .../vm/apis/AttachNetworkInterface.go | 101 +- .../services/vm/apis/CopyImages.go | 95 +- .../services/vm/apis/CreateImage.go | 119 +- .../services/vm/apis/CreateInstances.go | 111 +- .../services/vm/apis/CreateKeypair.go | 89 +- .../services/vm/apis/DeleteImage.go | 77 +- .../services/vm/apis/DeleteInstance.go | 77 +- .../services/vm/apis/DeleteKeypair.go | 77 +- .../services/vm/apis/DescribeImage.go | 81 +- .../vm/apis/DescribeImageConstraints.go | 81 +- .../vm/apis/DescribeImageConstraintsBatch.go | 77 +- .../services/vm/apis/DescribeImageMembers.go | 79 +- .../services/vm/apis/DescribeImages.go | 139 +- .../services/vm/apis/DescribeInstance.go | 81 +- .../apis/DescribeInstancePrivateIpAddress.go | 119 +- .../vm/apis/DescribeInstanceStatus.go | 119 +- .../services/vm/apis/DescribeInstanceTypes.go | 89 +- .../vm/apis/DescribeInstanceVncUrl.go | 79 +- .../services/vm/apis/DescribeInstances.go | 125 +- .../services/vm/apis/DescribeKeypairs.go | 105 +- .../services/vm/apis/DescribeQuotas.go | 93 +- .../services/vm/apis/DetachDisk.go | 101 +- .../vm/apis/DetachNetworkInterface.go | 91 +- .../services/vm/apis/DisassociateElasticIp.go | 91 +- .../services/vm/apis/ImportKeypair.go | 101 +- .../services/vm/apis/ModifyImageAttribute.go | 97 +- .../vm/apis/ModifyInstanceAttribute.go | 97 +- .../vm/apis/ModifyInstanceDiskAttribute.go | 89 +- .../vm/apis/ModifyInstanceNetworkAttribute.go | 89 +- .../vm/apis/ModifyInstancePassword.go | 91 +- .../services/vm/apis/RebootInstance.go | 77 +- .../services/vm/apis/RebuildInstance.go | 111 +- .../services/vm/apis/ResizeInstance.go | 91 +- .../services/vm/apis/ShareImage.go | 87 +- .../services/vm/apis/StartInstance.go | 77 +- .../services/vm/apis/StopInstance.go | 77 +- .../services/vm/apis/UnShareImage.go | 87 +- .../services/vm/client/VmClient.go | 1177 ++- .../jdcloud-sdk-go/services/vm/models/Ag.go | 9 +- .../services/vm/models/CopyImage.go | 9 +- .../jdcloud-sdk-go/services/vm/models/Gpu.go | 9 +- .../services/vm/models/Image.go | 69 +- .../services/vm/models/ImageConstraint.go | 9 +- .../vm/models/ImageInstanceTypeConstraint.go | 9 +- .../services/vm/models/Instance.go | 88 +- .../vm/models/InstanceDiskAttachment.go | 36 +- .../vm/models/InstanceDiskAttachmentSpec.go | 40 +- .../vm/models/InstanceDiskAttribute.go | 15 +- .../vm/models/InstanceNetworkAttribute.go | 9 +- .../vm/models/InstanceNetworkInterface.go | 32 +- .../InstanceNetworkInterfaceAttachment.go | 13 +- .../InstanceNetworkInterfaceAttachmentSpec.go | 8 +- .../vm/models/InstancePrivateIpAddress.go | 9 +- .../services/vm/models/InstanceSpec.go | 64 +- .../services/vm/models/InstanceStatus.go | 9 +- .../services/vm/models/InstanceTemplate.go | 25 +- .../vm/models/InstanceTemplateData.go | 37 +- .../vm/models/InstanceTemplateDisk.go | 13 +- .../models/InstanceTemplateDiskAttachment.go | 41 +- .../InstanceTemplateDiskAttachmentSpec.go | 37 +- .../vm/models/InstanceTemplateDiskSpec.go | 13 +- .../vm/models/InstanceTemplateElasticIp.go | 13 +- .../models/InstanceTemplateElasticIpSpec.go | 13 +- ...eTemplateNetworkInterfaceAttachmentSpec.go | 13 +- .../InstanceTemplateNetworkInterfaceSpec.go | 13 +- .../vm/models/InstanceTemplateSpec.go | 33 +- .../services/vm/models/InstanceType.go | 37 +- .../services/vm/models/InstanceTypeState.go | 9 +- .../services/vm/models/Keypair.go | 13 +- .../services/vm/models/LocalDisk.go | 9 +- .../services/vm/models/Quota.go | 13 +- .../services/vm/models/SecurityGroupSimple.go | 9 +- .../jdcloud-sdk-go/services/vm/models/Tag.go | 9 +- .../services/vm/models/TagFilter.go | 9 +- .../services/vpc/apis/AddNetworkAclRules.go | 93 +- .../vpc/apis/AddNetworkSecurityGroupRules.go | 93 +- .../services/vpc/apis/AddRouteTableRules.go | 93 +- .../services/vpc/apis/AssignSecondaryIps.go | 107 +- .../services/vpc/apis/AssociateElasticIp.go | 107 +- .../services/vpc/apis/AssociateNetworkAcl.go | 91 +- .../services/vpc/apis/AssociateRouteTable.go | 91 +- .../services/vpc/apis/CreateElasticIps.go | 107 +- .../services/vpc/apis/CreateNetworkAcl.go | 103 +- .../vpc/apis/CreateNetworkInterface.go | 159 +- .../vpc/apis/CreateNetworkSecurityGroup.go | 103 +- .../services/vpc/apis/CreateRouteTable.go | 103 +- .../services/vpc/apis/CreateSubnet.go | 127 +- .../services/vpc/apis/CreateVpc.go | 99 +- .../services/vpc/apis/CreateVpcPeering.go | 119 +- .../services/vpc/apis/DeleteElasticIp.go | 77 +- .../services/vpc/apis/DeleteNetworkAcl.go | 77 +- .../vpc/apis/DeleteNetworkInterface.go | 77 +- .../vpc/apis/DeleteNetworkSecurityGroup.go | 77 +- .../services/vpc/apis/DeleteRouteTable.go | 77 +- .../services/vpc/apis/DeleteSubnet.go | 77 +- .../services/vpc/apis/DeleteVpc.go | 77 +- .../services/vpc/apis/DeleteVpcPeering.go | 77 +- .../services/vpc/apis/DescribeElasticIp.go | 81 +- .../services/vpc/apis/DescribeElasticIps.go | 109 +- .../services/vpc/apis/DescribeNetworkAcl.go | 81 +- .../services/vpc/apis/DescribeNetworkAcls.go | 109 +- .../vpc/apis/DescribeNetworkInterface.go | 81 +- .../vpc/apis/DescribeNetworkInterfaces.go | 113 +- .../vpc/apis/DescribeNetworkSecurityGroup.go | 81 +- .../vpc/apis/DescribeNetworkSecurityGroups.go | 109 +- .../services/vpc/apis/DescribeQuota.go | 89 +- .../services/vpc/apis/DescribeRouteTable.go | 81 +- .../services/vpc/apis/DescribeRouteTables.go | 109 +- .../services/vpc/apis/DescribeSubnet.go | 81 +- .../services/vpc/apis/DescribeSubnets.go | 113 +- .../services/vpc/apis/DescribeVpc.go | 81 +- .../services/vpc/apis/DescribeVpcPeering.go | 81 +- .../services/vpc/apis/DescribeVpcPeerings.go | 111 +- .../services/vpc/apis/DescribeVpcs.go | 107 +- .../vpc/apis/DisassociateElasticIp.go | 97 +- .../vpc/apis/DisassociateNetworkAcl.go | 91 +- .../vpc/apis/DisassociateRouteTable.go | 91 +- .../services/vpc/apis/ModifyElasticIp.go | 91 +- .../services/vpc/apis/ModifyNetworkAcl.go | 97 +- .../vpc/apis/ModifyNetworkAclRules.go | 93 +- .../vpc/apis/ModifyNetworkInterface.go | 107 +- .../vpc/apis/ModifyNetworkSecurityGroup.go | 97 +- .../apis/ModifyNetworkSecurityGroupRules.go | 93 +- .../services/vpc/apis/ModifyRouteTable.go | 97 +- .../vpc/apis/ModifyRouteTableRules.go | 93 +- .../services/vpc/apis/ModifySubnet.go | 97 +- .../services/vpc/apis/ModifyVpc.go | 97 +- .../services/vpc/apis/ModifyVpcPeering.go | 97 +- .../vpc/apis/RemoveNetworkAclRules.go | 91 +- .../apis/RemoveNetworkSecurityGroupRules.go | 91 +- .../vpc/apis/RemoveRouteTableRules.go | 91 +- .../services/vpc/apis/UnassignSecondaryIps.go | 87 +- .../services/vpc/client/VpcClient.go | 1665 +++-- .../vpc/models/AddNetworkAclRuleSpec.go | 33 +- .../vpc/models/AddNetworkAclRulesSpec.go | 5 +- .../AddNetworkSecurityGroupRulesSpec.go | 5 +- .../services/vpc/models/AddRouteTableRules.go | 17 +- .../vpc/models/AddRouteTableRulesSpec.go | 5 +- .../vpc/models/AddSecurityGroupRules.go | 25 +- .../vpc/models/AssignSecondaryIpsSpec.go | 13 +- .../vpc/models/AssociateElasticIpSpec.go | 13 +- .../vpc/models/AssociateRouteTableSpec.go | 5 +- .../vpc/models/CreateElasticIpSpec.go | 13 +- .../vpc/models/CreateVpcPeeringSpec.go | 17 +- .../vpc/models/DisassociateElasticIpSpec.go | 9 +- .../vpc/models/DisassociateRouteTableSpec.go | 5 +- .../services/vpc/models/ElasticIp.go | 44 +- .../services/vpc/models/ElasticIpSpec.go | 12 +- .../vpc/models/ModifyElasticIpSpec.go | 5 +- .../vpc/models/ModifyNetworkAclRuleSpec.go | 33 +- .../vpc/models/ModifyNetworkAclRuleSpecs.go | 5 +- .../vpc/models/ModifyNetworkAclRulesSpec.go | 5 +- .../vpc/models/ModifyNetworkAclSpec.go | 9 +- .../vpc/models/ModifyNetworkInterfaceSpec.go | 13 +- .../models/ModifyNetworkSecurityGroupSpec.go | 9 +- .../services/vpc/models/ModifyQuotaSpec.go | 13 +- .../vpc/models/ModifyRouteTableRules.go | 21 +- .../vpc/models/ModifyRouteTableRulesSpec.go | 5 +- .../vpc/models/ModifyRouteTableSpec.go | 9 +- .../vpc/models/ModifySecurityGroupRuleSpec.go | 5 +- .../vpc/models/ModifySecurityGroupRules.go | 25 +- .../services/vpc/models/ModifySubnetSpec.go | 9 +- .../vpc/models/ModifyVpcPeeringSpec.go | 9 +- .../services/vpc/models/ModifyVpcSpec.go | 9 +- .../services/vpc/models/NetworkAcl.go | 29 +- .../services/vpc/models/NetworkAclRule.go | 41 +- .../services/vpc/models/NetworkAclSpec.go | 13 +- .../services/vpc/models/NetworkInterface.go | 69 +- .../vpc/models/NetworkInterfacePrivateIp.go | 13 +- .../vpc/models/NetworkInterfaceSpec.go | 37 +- .../vpc/models/NetworkSecurityGroup.go | 25 +- .../vpc/models/NetworkSecurityGroupSpec.go | 13 +- .../services/vpc/models/Quota.go | 17 +- .../services/vpc/models/RouteTable.go | 33 +- .../services/vpc/models/RouteTableRule.go | 21 +- .../services/vpc/models/RouteTableSpec.go | 13 +- .../services/vpc/models/SecurityGroupRule.go | 37 +- .../services/vpc/models/Segment.go | 33 +- .../services/vpc/models/Subnet.go | 45 +- .../services/vpc/models/SubnetSpec.go | 21 +- .../vpc/models/UnassignSecondaryIpsSpec.go | 5 +- .../jdcloud-sdk-go/services/vpc/models/Vpc.go | 33 +- .../services/vpc/models/VpcPeering.go | 29 +- .../services/vpc/models/VpcPeeringVpcInfo.go | 13 +- .../services/vpc/models/VpcSpec.go | 13 +- .../masterzen/simplexml/dom/document.go | 12 +- .../masterzen/simplexml/dom/element.go | 53 +- vendor/github.com/masterzen/winrm/ntlm.go | 5 +- vendor/github.com/mattn/go-tty/tty_plan9.go | 2 +- vendor/github.com/mattn/go-tty/tty_windows.go | 2 +- .../mitchellh/go-vnc/client_auth.go | 4 +- vendor/github.com/modern-go/concurrent/log.go | 6 +- .../concurrent/unbounded_executor.go | 2 +- .../github.com/modern-go/reflect2/reflect2.go | 6 +- vendor/github.com/nu7hatch/gouuid/uuid.go | 2 +- .../outscale/osc-sdk-go/osc/api_access_key.go | 22 +- .../outscale/osc-sdk-go/osc/api_account.go | 26 +- .../outscale/osc-sdk-go/osc/api_api_log.go | 6 +- .../osc-sdk-go/osc/api_client_gateway.go | 14 +- .../outscale/osc-sdk-go/osc/api_default.go | 6 +- .../osc-sdk-go/osc/api_dhcp_option.go | 14 +- .../osc-sdk-go/osc/api_direct_link.go | 14 +- .../osc/api_direct_link_interface.go | 14 +- .../osc-sdk-go/osc/api_flexible_gpu.go | 30 +- .../outscale/osc-sdk-go/osc/api_image.go | 26 +- .../osc-sdk-go/osc/api_internet_service.go | 22 +- .../outscale/osc-sdk-go/osc/api_keypair.go | 14 +- .../outscale/osc-sdk-go/osc/api_listener.go | 26 +- .../osc-sdk-go/osc/api_load_balancer.go | 42 +- .../osc/api_load_balancer_policy.go | 10 +- .../outscale/osc-sdk-go/osc/api_location.go | 6 +- .../osc-sdk-go/osc/api_nat_service.go | 14 +- .../outscale/osc-sdk-go/osc/api_net.go | 18 +- .../osc-sdk-go/osc/api_net_access_point.go | 22 +- .../osc-sdk-go/osc/api_net_peering.go | 22 +- .../outscale/osc-sdk-go/osc/api_nic.go | 34 +- .../osc-sdk-go/osc/api_product_type.go | 6 +- .../outscale/osc-sdk-go/osc/api_public_ip.go | 26 +- .../outscale/osc-sdk-go/osc/api_quota.go | 6 +- .../outscale/osc-sdk-go/osc/api_region.go | 6 +- .../outscale/osc-sdk-go/osc/api_route.go | 14 +- .../osc-sdk-go/osc/api_route_table.go | 22 +- .../osc-sdk-go/osc/api_security_group.go | 14 +- .../osc-sdk-go/osc/api_security_group_rule.go | 10 +- .../osc-sdk-go/osc/api_server_certificate.go | 18 +- .../outscale/osc-sdk-go/osc/api_snapshot.go | 26 +- .../outscale/osc-sdk-go/osc/api_subnet.go | 18 +- .../outscale/osc-sdk-go/osc/api_subregion.go | 6 +- .../outscale/osc-sdk-go/osc/api_tag.go | 14 +- .../outscale/osc-sdk-go/osc/api_task.go | 6 +- .../osc-sdk-go/osc/api_virtual_gateway.go | 26 +- .../outscale/osc-sdk-go/osc/api_vm.go | 46 +- .../outscale/osc-sdk-go/osc/api_volume.go | 22 +- .../osc-sdk-go/osc/api_vpn_connection.go | 22 +- .../outscale/osc-sdk-go/osc/client.go | 9 +- .../outscale/osc-sdk-go/osc/configuration.go | 20 +- .../osc/model_accept_net_peering_request.go | 1 + .../osc/model_accept_net_peering_response.go | 3 +- .../osc-sdk-go/osc/model_accepter_net.go | 1 + .../osc-sdk-go/osc/model_access_key.go | 1 + .../osc/model_access_key_secret_key.go | 1 + .../osc-sdk-go/osc/model_access_log.go | 1 + .../outscale/osc-sdk-go/osc/model_account.go | 1 + .../model_application_sticky_cookie_policy.go | 1 + .../osc-sdk-go/osc/model_backend_vm_health.go | 1 + .../osc/model_block_device_mapping_created.go | 1 + .../osc/model_block_device_mapping_image.go | 1 + .../model_block_device_mapping_vm_creation.go | 1 + .../model_block_device_mapping_vm_update.go | 1 + .../osc-sdk-go/osc/model_bsu_created.go | 1 + .../osc-sdk-go/osc/model_bsu_to_create.go | 1 + .../osc-sdk-go/osc/model_bsu_to_update_vm.go | 1 + .../osc/model_check_authentication_request.go | 1 + .../model_check_authentication_response.go | 1 + .../osc-sdk-go/osc/model_client_gateway.go | 1 + .../osc-sdk-go/osc/model_consumption_entry.go | 1 + .../osc/model_create_access_key_request.go | 1 + .../osc/model_create_access_key_response.go | 5 +- .../osc/model_create_account_request.go | 1 + .../osc/model_create_account_response.go | 3 +- .../model_create_client_gateway_request.go | 1 + .../model_create_client_gateway_response.go | 3 +- .../osc/model_create_dhcp_options_request.go | 1 + .../osc/model_create_dhcp_options_response.go | 3 +- ...el_create_direct_link_interface_request.go | 3 +- ...l_create_direct_link_interface_response.go | 3 +- .../osc/model_create_direct_link_request.go | 1 + .../osc/model_create_direct_link_response.go | 3 +- .../osc/model_create_flexible_gpu_request.go | 1 + .../osc/model_create_flexible_gpu_response.go | 3 +- .../model_create_image_export_task_request.go | 3 +- ...model_create_image_export_task_response.go | 1 + .../osc/model_create_image_request.go | 1 + .../osc/model_create_image_response.go | 3 +- .../model_create_internet_service_request.go | 1 + .../model_create_internet_service_response.go | 1 + .../osc/model_create_keypair_request.go | 1 + .../osc/model_create_keypair_response.go | 3 +- .../osc/model_create_listener_rule_request.go | 5 +- .../model_create_listener_rule_response.go | 3 +- ..._create_load_balancer_listeners_request.go | 1 + ...create_load_balancer_listeners_response.go | 3 +- ...del_create_load_balancer_policy_request.go | 1 + ...el_create_load_balancer_policy_response.go | 3 +- .../osc/model_create_load_balancer_request.go | 1 + .../model_create_load_balancer_response.go | 3 +- ...model_create_load_balancer_tags_request.go | 1 + ...odel_create_load_balancer_tags_response.go | 1 + .../osc/model_create_nat_service_request.go | 1 + .../osc/model_create_nat_service_response.go | 3 +- .../model_create_net_access_point_request.go | 1 + .../model_create_net_access_point_response.go | 3 +- .../osc/model_create_net_peering_request.go | 1 + .../osc/model_create_net_peering_response.go | 3 +- .../osc/model_create_net_request.go | 1 + .../osc/model_create_net_response.go | 3 +- .../osc/model_create_nic_request.go | 1 + .../osc/model_create_nic_response.go | 3 +- .../osc/model_create_public_ip_request.go | 1 + .../osc/model_create_public_ip_response.go | 3 +- .../osc/model_create_route_request.go | 1 + .../osc/model_create_route_response.go | 3 +- .../osc/model_create_route_table_request.go | 1 + .../osc/model_create_route_table_response.go | 3 +- .../model_create_security_group_request.go | 1 + .../model_create_security_group_response.go | 3 +- ...odel_create_security_group_rule_request.go | 1 + ...del_create_security_group_rule_response.go | 3 +- ...model_create_server_certificate_request.go | 1 + ...odel_create_server_certificate_response.go | 3 +- ...del_create_snapshot_export_task_request.go | 3 +- ...el_create_snapshot_export_task_response.go | 3 +- .../osc/model_create_snapshot_request.go | 1 + .../osc/model_create_snapshot_response.go | 3 +- .../osc/model_create_subnet_request.go | 1 + .../osc/model_create_subnet_response.go | 3 +- .../osc/model_create_tags_request.go | 1 + .../osc/model_create_tags_response.go | 1 + .../model_create_virtual_gateway_request.go | 1 + .../model_create_virtual_gateway_response.go | 3 +- .../osc/model_create_vms_request.go | 5 +- .../osc/model_create_vms_response.go | 1 + .../osc/model_create_volume_request.go | 3 +- .../osc/model_create_volume_response.go | 3 +- .../model_create_vpn_connection_request.go | 1 + .../model_create_vpn_connection_response.go | 3 +- ...del_create_vpn_connection_route_request.go | 1 + ...el_create_vpn_connection_route_response.go | 1 + .../osc/model_delete_access_key_request.go | 1 + .../osc/model_delete_access_key_response.go | 1 + .../model_delete_client_gateway_request.go | 1 + .../model_delete_client_gateway_response.go | 1 + .../osc/model_delete_dhcp_options_request.go | 1 + .../osc/model_delete_dhcp_options_response.go | 1 + ...el_delete_direct_link_interface_request.go | 1 + ...l_delete_direct_link_interface_response.go | 1 + .../osc/model_delete_direct_link_request.go | 1 + .../osc/model_delete_direct_link_response.go | 1 + .../osc/model_delete_export_task_request.go | 1 + .../osc/model_delete_export_task_response.go | 1 + .../osc/model_delete_flexible_gpu_request.go | 1 + .../osc/model_delete_flexible_gpu_response.go | 1 + .../osc/model_delete_image_request.go | 1 + .../osc/model_delete_image_response.go | 1 + .../model_delete_internet_service_request.go | 1 + .../model_delete_internet_service_response.go | 1 + .../osc/model_delete_keypair_request.go | 1 + .../osc/model_delete_keypair_response.go | 1 + .../osc/model_delete_listener_rule_request.go | 1 + .../model_delete_listener_rule_response.go | 1 + ..._delete_load_balancer_listeners_request.go | 1 + ...delete_load_balancer_listeners_response.go | 3 +- ...del_delete_load_balancer_policy_request.go | 1 + ...el_delete_load_balancer_policy_response.go | 3 +- .../osc/model_delete_load_balancer_request.go | 1 + .../model_delete_load_balancer_response.go | 1 + ...model_delete_load_balancer_tags_request.go | 1 + ...odel_delete_load_balancer_tags_response.go | 1 + .../osc/model_delete_nat_service_request.go | 1 + .../osc/model_delete_nat_service_response.go | 1 + .../model_delete_net_access_point_request.go | 1 + .../model_delete_net_access_point_response.go | 1 + .../osc/model_delete_net_peering_request.go | 1 + .../osc/model_delete_net_peering_response.go | 1 + .../osc/model_delete_net_request.go | 1 + .../osc/model_delete_net_response.go | 1 + .../osc/model_delete_nic_request.go | 1 + .../osc/model_delete_nic_response.go | 1 + .../osc/model_delete_public_ip_request.go | 1 + .../osc/model_delete_public_ip_response.go | 1 + .../osc/model_delete_route_request.go | 1 + .../osc/model_delete_route_response.go | 3 +- .../osc/model_delete_route_table_request.go | 1 + .../osc/model_delete_route_table_response.go | 1 + .../model_delete_security_group_request.go | 1 + .../model_delete_security_group_response.go | 1 + ...odel_delete_security_group_rule_request.go | 1 + ...del_delete_security_group_rule_response.go | 3 +- ...model_delete_server_certificate_request.go | 1 + ...odel_delete_server_certificate_response.go | 1 + .../osc/model_delete_snapshot_request.go | 1 + .../osc/model_delete_snapshot_response.go | 1 + .../osc/model_delete_subnet_request.go | 1 + .../osc/model_delete_subnet_response.go | 1 + .../osc/model_delete_tags_request.go | 1 + .../osc/model_delete_tags_response.go | 1 + .../model_delete_virtual_gateway_request.go | 1 + .../model_delete_virtual_gateway_response.go | 1 + .../osc/model_delete_vms_request.go | 1 + .../osc/model_delete_vms_response.go | 1 + .../osc/model_delete_volume_request.go | 1 + .../osc/model_delete_volume_response.go | 1 + .../model_delete_vpn_connection_request.go | 1 + .../model_delete_vpn_connection_response.go | 1 + ...del_delete_vpn_connection_route_request.go | 1 + ...el_delete_vpn_connection_route_response.go | 1 + ...deregister_vms_in_load_balancer_request.go | 1 + ...eregister_vms_in_load_balancer_response.go | 1 + .../osc-sdk-go/osc/model_dhcp_options_set.go | 1 + .../osc-sdk-go/osc/model_direct_link.go | 1 + .../osc/model_direct_link_interface.go | 1 + .../osc/model_direct_link_interfaces.go | 1 + .../osc-sdk-go/osc/model_error_response.go | 3 +- .../outscale/osc-sdk-go/osc/model_errors.go | 1 + .../osc/model_filters_access_keys.go | 1 + .../osc-sdk-go/osc/model_filters_api_log.go | 1 + .../osc/model_filters_client_gateway.go | 1 + .../osc/model_filters_dhcp_options.go | 1 + .../osc/model_filters_direct_link.go | 1 + .../model_filters_direct_link_interface.go | 1 + .../osc/model_filters_export_task.go | 1 + .../osc/model_filters_flexible_gpu.go | 1 + .../osc-sdk-go/osc/model_filters_image.go | 1 + .../osc/model_filters_internet_service.go | 1 + .../osc-sdk-go/osc/model_filters_keypair.go | 1 + .../osc/model_filters_listener_rule.go | 1 + .../osc/model_filters_load_balancer.go | 1 + .../osc/model_filters_nat_service.go | 1 + .../osc-sdk-go/osc/model_filters_net.go | 1 + .../osc/model_filters_net_access_point.go | 1 + .../osc/model_filters_net_peering.go | 1 + .../osc-sdk-go/osc/model_filters_nic.go | 1 + .../osc/model_filters_product_type.go | 1 + .../osc-sdk-go/osc/model_filters_public_ip.go | 1 + .../osc-sdk-go/osc/model_filters_quota.go | 1 + .../osc/model_filters_route_table.go | 1 + .../osc/model_filters_security_group.go | 1 + .../osc/model_filters_server_certificate.go | 1 + .../osc-sdk-go/osc/model_filters_service.go | 1 + .../osc-sdk-go/osc/model_filters_snapshot.go | 1 + .../osc-sdk-go/osc/model_filters_subnet.go | 1 + .../osc-sdk-go/osc/model_filters_subregion.go | 1 + .../osc-sdk-go/osc/model_filters_tag.go | 1 + .../osc/model_filters_virtual_gateway.go | 1 + .../osc-sdk-go/osc/model_filters_vm.go | 1 + .../osc-sdk-go/osc/model_filters_vm_type.go | 1 + .../osc-sdk-go/osc/model_filters_vms_state.go | 1 + .../osc-sdk-go/osc/model_filters_volume.go | 1 + .../osc/model_filters_vpn_connection.go | 1 + .../osc-sdk-go/osc/model_flexible_gpu.go | 1 + .../osc/model_flexible_gpu_catalog.go | 1 + .../osc-sdk-go/osc/model_health_check.go | 1 + .../outscale/osc-sdk-go/osc/model_image.go | 5 +- .../osc-sdk-go/osc/model_image_export_task.go | 3 +- .../osc-sdk-go/osc/model_internet_service.go | 1 + .../outscale/osc-sdk-go/osc/model_keypair.go | 1 + .../osc-sdk-go/osc/model_keypair_created.go | 1 + .../osc/model_link_flexible_gpu_request.go | 1 + .../osc/model_link_flexible_gpu_response.go | 1 + .../model_link_internet_service_request.go | 1 + .../model_link_internet_service_response.go | 1 + .../outscale/osc-sdk-go/osc/model_link_nic.go | 1 + .../osc-sdk-go/osc/model_link_nic_light.go | 1 + .../osc-sdk-go/osc/model_link_nic_request.go | 1 + .../osc-sdk-go/osc/model_link_nic_response.go | 3 +- .../osc/model_link_nic_to_update.go | 1 + .../osc/model_link_private_ips_request.go | 1 + .../osc/model_link_private_ips_response.go | 1 + .../osc-sdk-go/osc/model_link_public_ip.go | 1 + .../osc/model_link_public_ip_light_for_vm.go | 1 + .../osc/model_link_public_ip_request.go | 1 + .../osc/model_link_public_ip_response.go | 3 +- .../osc-sdk-go/osc/model_link_route_table.go | 1 + .../osc/model_link_route_table_request.go | 1 + .../osc/model_link_route_table_response.go | 5 +- .../osc/model_link_virtual_gateway_request.go | 1 + .../model_link_virtual_gateway_response.go | 3 +- .../osc/model_link_volume_request.go | 1 + .../osc/model_link_volume_response.go | 1 + .../osc-sdk-go/osc/model_linked_volume.go | 1 + .../outscale/osc-sdk-go/osc/model_listener.go | 1 + .../osc/model_listener_for_creation.go | 1 + .../osc-sdk-go/osc/model_listener_rule.go | 1 + .../osc/model_listener_rule_for_creation.go | 3 +- .../osc-sdk-go/osc/model_load_balancer.go | 5 +- .../osc/model_load_balancer_light.go | 1 + ...odel_load_balancer_sticky_cookie_policy.go | 1 + .../osc-sdk-go/osc/model_load_balancer_tag.go | 1 + .../outscale/osc-sdk-go/osc/model_location.go | 1 + .../outscale/osc-sdk-go/osc/model_log.go | 1 + .../osc-sdk-go/osc/model_maintenance_event.go | 1 + .../osc-sdk-go/osc/model_nat_service.go | 1 + .../outscale/osc-sdk-go/osc/model_net.go | 1 + .../osc-sdk-go/osc/model_net_access_point.go | 1 + .../osc-sdk-go/osc/model_net_peering.go | 7 +- .../osc-sdk-go/osc/model_net_peering_state.go | 1 + .../osc/model_net_to_virtual_gateway_link.go | 1 + .../outscale/osc-sdk-go/osc/model_nic.go | 7 +- .../osc/model_nic_for_vm_creation.go | 1 + .../osc-sdk-go/osc/model_nic_light.go | 7 +- .../osc-sdk-go/osc/model_osu_api_key.go | 1 + .../osc-sdk-go/osc/model_osu_export.go | 5 +- .../osc/model_permissions_on_resource.go | 1 + .../model_permissions_on_resource_creation.go | 3 +- .../osc-sdk-go/osc/model_placement.go | 1 + .../osc-sdk-go/osc/model_private_ip.go | 3 +- .../osc-sdk-go/osc/model_private_ip_light.go | 1 + .../osc/model_private_ip_light_for_vm.go | 3 +- .../osc-sdk-go/osc/model_product_type.go | 1 + .../osc-sdk-go/osc/model_public_ip.go | 1 + .../osc-sdk-go/osc/model_public_ip_light.go | 1 + .../outscale/osc-sdk-go/osc/model_quota.go | 1 + .../osc-sdk-go/osc/model_quota_types.go | 1 + .../osc/model_read_access_keys_request.go | 3 +- .../osc/model_read_access_keys_response.go | 3 +- .../osc/model_read_accounts_request.go | 1 + .../osc/model_read_accounts_response.go | 3 +- .../osc/model_read_admin_password_request.go | 1 + .../osc/model_read_admin_password_response.go | 3 +- .../osc/model_read_api_logs_request.go | 5 +- .../osc/model_read_api_logs_response.go | 3 +- .../osc/model_read_client_gateways_request.go | 3 +- .../model_read_client_gateways_response.go | 3 +- .../osc/model_read_console_output_request.go | 1 + .../osc/model_read_console_output_response.go | 3 +- .../model_read_consumption_account_request.go | 1 + ...model_read_consumption_account_response.go | 3 +- .../osc/model_read_dhcp_options_request.go | 3 +- .../osc/model_read_dhcp_options_response.go | 3 +- ...del_read_direct_link_interfaces_request.go | 3 +- ...el_read_direct_link_interfaces_response.go | 3 +- .../osc/model_read_direct_links_request.go | 3 +- .../osc/model_read_direct_links_response.go | 3 +- ...model_read_flexible_gpu_catalog_request.go | 1 + ...odel_read_flexible_gpu_catalog_response.go | 3 +- .../osc/model_read_flexible_gpus_request.go | 3 +- .../osc/model_read_flexible_gpus_response.go | 3 +- .../model_read_image_export_tasks_request.go | 3 +- .../model_read_image_export_tasks_response.go | 3 +- .../osc/model_read_images_request.go | 3 +- .../osc/model_read_images_response.go | 3 +- .../model_read_internet_services_request.go | 3 +- .../model_read_internet_services_response.go | 3 +- .../osc/model_read_keypairs_request.go | 3 +- .../osc/model_read_keypairs_response.go | 3 +- .../osc/model_read_listener_rules_request.go | 3 +- .../osc/model_read_listener_rules_response.go | 3 +- .../model_read_load_balancer_tags_request.go | 1 + .../model_read_load_balancer_tags_response.go | 1 + .../osc/model_read_load_balancers_request.go | 3 +- .../osc/model_read_load_balancers_response.go | 3 +- .../osc/model_read_locations_request.go | 1 + .../osc/model_read_locations_response.go | 3 +- .../osc/model_read_nat_services_request.go | 3 +- .../osc/model_read_nat_services_response.go | 3 +- ..._read_net_access_point_services_request.go | 3 +- ...read_net_access_point_services_response.go | 1 + .../model_read_net_access_points_request.go | 3 +- .../model_read_net_access_points_response.go | 3 +- .../osc/model_read_net_peerings_request.go | 3 +- .../osc/model_read_net_peerings_response.go | 3 +- .../osc-sdk-go/osc/model_read_nets_request.go | 3 +- .../osc/model_read_nets_response.go | 3 +- .../osc-sdk-go/osc/model_read_nics_request.go | 3 +- .../osc/model_read_nics_response.go | 3 +- .../osc/model_read_product_types_request.go | 3 +- .../osc/model_read_product_types_response.go | 3 +- .../model_read_public_ip_ranges_request.go | 1 + .../model_read_public_ip_ranges_response.go | 3 +- .../osc/model_read_public_ips_request.go | 3 +- .../osc/model_read_public_ips_response.go | 3 +- .../osc/model_read_quotas_request.go | 3 +- .../osc/model_read_quotas_response.go | 3 +- .../osc/model_read_regions_request.go | 1 + .../osc/model_read_regions_response.go | 3 +- .../osc/model_read_route_tables_request.go | 3 +- .../osc/model_read_route_tables_response.go | 1 + .../model_read_secret_access_key_request.go | 1 + .../model_read_secret_access_key_response.go | 5 +- .../osc/model_read_security_groups_request.go | 3 +- .../model_read_security_groups_response.go | 1 + .../model_read_server_certificates_request.go | 3 +- ...model_read_server_certificates_response.go | 1 + ...odel_read_snapshot_export_tasks_request.go | 3 +- ...del_read_snapshot_export_tasks_response.go | 1 + .../osc/model_read_snapshots_request.go | 3 +- .../osc/model_read_snapshots_response.go | 1 + .../osc/model_read_subnets_request.go | 3 +- .../osc/model_read_subnets_response.go | 1 + .../osc/model_read_subregions_request.go | 3 +- .../osc/model_read_subregions_response.go | 1 + .../osc-sdk-go/osc/model_read_tags_request.go | 3 +- .../osc/model_read_tags_response.go | 1 + .../model_read_virtual_gateways_request.go | 3 +- .../model_read_virtual_gateways_response.go | 1 + .../osc/model_read_vm_types_request.go | 3 +- .../osc/model_read_vm_types_response.go | 1 + .../osc/model_read_vms_health_request.go | 1 + .../osc/model_read_vms_health_response.go | 3 +- .../osc-sdk-go/osc/model_read_vms_request.go | 3 +- .../osc-sdk-go/osc/model_read_vms_response.go | 1 + .../osc/model_read_vms_state_request.go | 3 +- .../osc/model_read_vms_state_response.go | 1 + .../osc/model_read_volumes_request.go | 3 +- .../osc/model_read_volumes_response.go | 1 + .../osc/model_read_vpn_connections_request.go | 3 +- .../model_read_vpn_connections_response.go | 1 + .../osc/model_reboot_vms_request.go | 1 + .../osc/model_reboot_vms_response.go | 1 + .../outscale/osc-sdk-go/osc/model_region.go | 1 + ...l_register_vms_in_load_balancer_request.go | 1 + ..._register_vms_in_load_balancer_response.go | 1 + .../osc/model_reject_net_peering_request.go | 1 + .../osc/model_reject_net_peering_response.go | 1 + .../model_reset_account_password_request.go | 1 + .../model_reset_account_password_response.go | 1 + .../osc/model_resource_load_balancer_tag.go | 1 + .../osc-sdk-go/osc/model_resource_tag.go | 1 + .../osc-sdk-go/osc/model_response_context.go | 1 + .../outscale/osc-sdk-go/osc/model_route.go | 1 + .../osc-sdk-go/osc/model_route_light.go | 1 + ...model_route_propagating_virtual_gateway.go | 1 + .../osc-sdk-go/osc/model_route_table.go | 1 + .../osc-sdk-go/osc/model_security_group.go | 1 + .../osc/model_security_group_light.go | 1 + .../osc/model_security_group_rule.go | 1 + .../osc/model_security_groups_member.go | 1 + ...model_send_reset_password_email_request.go | 1 + ...odel_send_reset_password_email_response.go | 1 + .../osc/model_server_certificate.go | 1 + .../outscale/osc-sdk-go/osc/model_service.go | 1 + .../outscale/osc-sdk-go/osc/model_snapshot.go | 3 +- .../osc/model_snapshot_export_task.go | 3 +- .../osc-sdk-go/osc/model_source_net.go | 1 + .../osc/model_source_security_group.go | 1 + .../osc-sdk-go/osc/model_start_vms_request.go | 1 + .../osc/model_start_vms_response.go | 1 + .../osc-sdk-go/osc/model_state_comment.go | 1 + .../osc-sdk-go/osc/model_stop_vms_request.go | 1 + .../osc-sdk-go/osc/model_stop_vms_response.go | 1 + .../outscale/osc-sdk-go/osc/model_subnet.go | 1 + .../osc-sdk-go/osc/model_subregion.go | 1 + .../outscale/osc-sdk-go/osc/model_tag.go | 1 + .../osc/model_unlink_flexible_gpu_request.go | 1 + .../osc/model_unlink_flexible_gpu_response.go | 1 + .../model_unlink_internet_service_request.go | 1 + .../model_unlink_internet_service_response.go | 1 + .../osc/model_unlink_nic_request.go | 1 + .../osc/model_unlink_nic_response.go | 1 + .../osc/model_unlink_private_ips_request.go | 1 + .../osc/model_unlink_private_ips_response.go | 1 + .../osc/model_unlink_public_ip_request.go | 1 + .../osc/model_unlink_public_ip_response.go | 1 + .../osc/model_unlink_route_table_request.go | 1 + .../osc/model_unlink_route_table_response.go | 1 + .../model_unlink_virtual_gateway_request.go | 1 + .../model_unlink_virtual_gateway_response.go | 1 + .../osc/model_unlink_volume_request.go | 1 + .../osc/model_unlink_volume_response.go | 1 + .../osc/model_update_access_key_request.go | 1 + .../osc/model_update_access_key_response.go | 3 +- .../osc/model_update_account_request.go | 1 + .../osc/model_update_account_response.go | 3 +- .../osc/model_update_flexible_gpu_request.go | 1 + .../osc/model_update_flexible_gpu_response.go | 3 +- .../osc/model_update_image_request.go | 3 +- .../osc/model_update_image_response.go | 3 +- .../osc/model_update_listener_rule_request.go | 1 + .../model_update_listener_rule_response.go | 3 +- .../osc/model_update_load_balancer_request.go | 3 +- .../model_update_load_balancer_response.go | 3 +- .../model_update_net_access_point_request.go | 1 + .../model_update_net_access_point_response.go | 3 +- .../osc/model_update_net_request.go | 1 + .../osc/model_update_net_response.go | 3 +- .../osc/model_update_nic_request.go | 3 +- .../osc/model_update_nic_response.go | 3 +- .../model_update_route_propagation_request.go | 1 + ...model_update_route_propagation_response.go | 3 +- .../osc/model_update_route_request.go | 1 + .../osc/model_update_route_response.go | 3 +- ...model_update_server_certificate_request.go | 1 + ...odel_update_server_certificate_response.go | 3 +- .../osc/model_update_snapshot_request.go | 3 +- .../osc/model_update_snapshot_response.go | 3 +- .../osc/model_update_subnet_request.go | 1 + .../osc/model_update_subnet_response.go | 3 +- .../osc-sdk-go/osc/model_update_vm_request.go | 1 + .../osc/model_update_vm_response.go | 3 +- .../osc-sdk-go/osc/model_virtual_gateway.go | 1 + .../outscale/osc-sdk-go/osc/model_vm.go | 5 +- .../outscale/osc-sdk-go/osc/model_vm_state.go | 1 + .../osc-sdk-go/osc/model_vm_states.go | 1 + .../outscale/osc-sdk-go/osc/model_vm_type.go | 1 + .../outscale/osc-sdk-go/osc/model_volume.go | 1 + .../osc-sdk-go/osc/model_vpn_connection.go | 1 + .../outscale/osc-sdk-go/osc/model_with.go | 1 + vendor/github.com/shirou/w32/constants.go | 146 +- .../sirupsen/logrus/terminal_check_bsd.go | 1 - .../sirupsen/logrus/terminal_check_unix.go | 1 - .../tencentcloud/cvm/v20170312/client.go | 2063 +++--- .../tencentcloud/cvm/v20170312/models.go | 792 +- .../tencentcloud/vpc/v20170312/client.go | 6431 ++++++++--------- .../tencentcloud/vpc/v20170312/models.go | 2582 +++---- .../ufilesdk-dev/ufile-gosdk/file.go | 5 +- .../file_mutipart_upload_with_policy.go | 7 +- .../ufilesdk-dev/ufile-gosdk/request.go | 16 +- vendor/github.com/ugorji/go/codec/0doc.go | 20 +- .../ugorji/go/codec/gen.generated.go | 1 - .../github.com/zclconf/go-cty-yaml/readerc.go | 2 +- .../go-cty/cty/function/stdlib/string.go | 1 - vendor/gopkg.in/ini.v1/key.go | 6 +- vendor/gopkg.in/yaml.v2/readerc.go | 2 +- vendor/gopkg.in/yaml.v2/resolve.go | 2 +- vendor/gopkg.in/yaml.v2/sorter.go | 2 +- .../CDConfig-not-required.mdx | 2 +- .../common/{ => commonsteps}/CDConfig.mdx | 2 +- .../FloppyConfig-not-required.mdx | 2 +- .../common/{ => commonsteps}/FloppyConfig.mdx | 2 +- .../HTTPConfig-not-required.mdx | 2 +- .../common/{ => commonsteps}/HTTPConfig.mdx | 2 +- .../ISOConfig-not-required.mdx | 2 +- .../{ => commonsteps}/ISOConfig-required.mdx | 2 +- .../common/{ => commonsteps}/ISOConfig.mdx | 2 +- 1010 files changed, 17238 insertions(+), 17372 deletions(-) rename common/{ => commonsteps}/extra_iso_config.go (99%) rename common/{ => commonsteps}/extra_iso_config_test.go (99%) rename common/{ => commonsteps}/floppy_config.go (99%) rename common/{ => commonsteps}/floppy_config_test.go (98%) rename common/{ => commonsteps}/http_config.go (99%) rename common/{ => commonsteps}/http_config_test.go (97%) rename common/{ => commonsteps}/iso_config.go (99%) rename common/{ => commonsteps}/iso_config_test.go (99%) rename common/{ => commonsteps}/multistep_debug.go (98%) rename common/{ => commonsteps}/multistep_runner.go (91%) rename common/{ => commonsteps}/step_cleanup_temp_keys.go (99%) rename common/{ => commonsteps}/step_create_cdrom.go (99%) rename common/{ => commonsteps}/step_create_cdrom_test.go (99%) rename common/{ => commonsteps}/step_create_floppy.go (99%) rename common/{ => commonsteps}/step_create_floppy_test.go (99%) rename common/{ => commonsteps}/step_download.go (99%) rename common/{ => commonsteps}/step_download_test.go (99%) rename common/{ => commonsteps}/step_http_server.go (98%) rename common/{ => commonsteps}/step_output_dir.go (98%) rename common/{ => commonsteps}/step_output_dir_test.go (99%) rename common/{ => commonsteps}/step_provision.go (99%) rename common/{ => commonsteps}/step_provision_test.go (99%) delete mode 100644 common/config.go rename website/pages/partials/common/{ => commonsteps}/CDConfig-not-required.mdx (96%) rename website/pages/partials/common/{ => commonsteps}/CDConfig.mdx (87%) rename website/pages/partials/common/{ => commonsteps}/FloppyConfig-not-required.mdx (93%) rename website/pages/partials/common/{ => commonsteps}/FloppyConfig.mdx (90%) rename website/pages/partials/common/{ => commonsteps}/HTTPConfig-not-required.mdx (94%) rename website/pages/partials/common/{ => commonsteps}/HTTPConfig.mdx (85%) rename website/pages/partials/common/{ => commonsteps}/ISOConfig-not-required.mdx (92%) rename website/pages/partials/common/{ => commonsteps}/ISOConfig-required.mdx (95%) rename website/pages/partials/common/{ => commonsteps}/ISOConfig.mdx (96%) diff --git a/builder/alicloud/ecs/builder.go b/builder/alicloud/ecs/builder.go index 446d324a1..50a81c058 100644 --- a/builder/alicloud/ecs/builder.go +++ b/builder/alicloud/ecs/builder.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -164,8 +165,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack b.config.SSHPrivateIp), SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.RunConfig.Comm, }, &stepStopAlicloudInstance{ @@ -206,7 +207,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }) // Run! - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index a87170c2d..af2893b10 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -17,6 +17,7 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/chroot" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/config" @@ -478,7 +479,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ) // Run! - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 04142b796..6a2077a8b 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -17,6 +17,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" @@ -298,8 +299,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack &awscommon.StepSetGeneratedData{ GeneratedData: generatedData, }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.RunConfig.Comm, }, &awscommon.StepStopEBSBackedInstance{ @@ -350,7 +351,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run! - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that if rawErr, ok := state.GetOk("error"); ok { diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index 6934ce0dc..5d80cc5fa 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -15,6 +15,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" @@ -322,8 +323,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack &awscommon.StepSetGeneratedData{ GeneratedData: generatedData, }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.RunConfig.Comm, }, &awscommon.StepStopEBSBackedInstance{ @@ -389,7 +390,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run! - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index f9324c0ca..eb352f48b 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/builder/amazon/ebsvolume/builder.go @@ -14,6 +14,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" @@ -299,8 +300,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack &awscommon.StepSetGeneratedData{ GeneratedData: generatedData, }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.RunConfig.Comm, }, &awscommon.StepStopEBSBackedInstance{ @@ -315,7 +316,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run! - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index a717a7750..7e606104d 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -17,6 +17,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" @@ -369,8 +370,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack &awscommon.StepSetGeneratedData{ GeneratedData: generatedData, }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.RunConfig.Comm, }, &StepUploadX509Cert{}, @@ -420,7 +421,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run! - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/azure/arm/builder.go b/builder/azure/arm/builder.go index 90bbcc413..7cb551770 100644 --- a/builder/azure/arm/builder.go +++ b/builder/azure/arm/builder.go @@ -18,7 +18,7 @@ import ( packerAzureCommon "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/constants" "github.com/hashicorp/packer/builder/azure/common/lin" - packerCommon "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -211,8 +211,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: lin.SSHHost, SSHConfig: b.config.Comm.SSHConfigFunc(), }, - &packerCommon.StepProvision{}, - &packerCommon.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, NewStepGetOSDisk(azureClient, ui), @@ -254,7 +254,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, nil }, }, - &packerCommon.StepProvision{}, + &commonsteps.StepProvision{}, NewStepGetOSDisk(azureClient, ui), NewStepGetAdditionalDisks(azureClient, ui), NewStepPowerOffCompute(azureClient, ui), @@ -279,7 +279,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } } - b.runner = packerCommon.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, b.stateBag) // Report any errors. diff --git a/builder/azure/chroot/builder.go b/builder/azure/chroot/builder.go index a34ceb223..a6e53af84 100644 --- a/builder/azure/chroot/builder.go +++ b/builder/azure/chroot/builder.go @@ -20,6 +20,7 @@ import ( "github.com/hashicorp/packer/builder/azure/common/client" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/chroot" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -439,7 +440,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack steps := buildsteps(b.config, info) // Run! - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/azure/dtl/builder.go b/builder/azure/dtl/builder.go index 02334ba36..303af3322 100644 --- a/builder/azure/dtl/builder.go +++ b/builder/azure/dtl/builder.go @@ -17,7 +17,7 @@ import ( packerAzureCommon "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/constants" "github.com/hashicorp/packer/builder/azure/common/lin" - packerCommon "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -187,8 +187,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: lin.SSHHost, SSHConfig: b.config.Comm.SSHConfigFunc(), }, - &packerCommon.StepProvision{}, - &packerCommon.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, NewStepPowerOffCompute(azureClient, ui, b.config), @@ -215,7 +215,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, nil }, }, - &packerCommon.StepProvision{}, + &commonsteps.StepProvision{}, NewStepPowerOffCompute(azureClient, ui, b.config), NewStepCaptureImage(azureClient, ui, b.config), NewStepPublishToSharedImageGallery(azureClient, ui, b.config), @@ -237,7 +237,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } } - b.runner = packerCommon.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, b.stateBag) // Report any errors. diff --git a/builder/cloudstack/builder.go b/builder/cloudstack/builder.go index c7454d0a2..68e46f523 100644 --- a/builder/cloudstack/builder.go +++ b/builder/cloudstack/builder.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -60,7 +60,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack // Build the steps. steps := []multistep.Step{ &stepPrepareConfig{}, - &common.StepHTTPServer{ + &commonsteps.StepHTTPServer{ HTTPDir: b.config.HTTPDir, HTTPPortMin: b.config.HTTPPortMin, HTTPPortMax: b.config.HTTPPortMax, @@ -85,8 +85,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack SSHPort: commPort, WinRMPort: commPort, }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, &stepShutdownInstance{}, @@ -94,7 +94,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Configure the runner and run the steps. - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/cloudstack/config.go b/builder/cloudstack/config.go index 5ef0f5e29..219667933 100644 --- a/builder/cloudstack/config.go +++ b/builder/cloudstack/config.go @@ -10,6 +10,7 @@ import ( "time" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" @@ -19,9 +20,9 @@ import ( // Config holds all the details needed to configure the builder. type Config struct { - common.PackerConfig `mapstructure:",squash"` - common.HTTPConfig `mapstructure:",squash"` - Comm communicator.Config `mapstructure:",squash"` + common.PackerConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` + Comm communicator.Config `mapstructure:",squash"` // The CloudStack API endpoint we will connect to. It can // also be specified via environment variable CLOUDSTACK_API_URL, if set. diff --git a/builder/digitalocean/builder.go b/builder/digitalocean/builder.go index b4492d7d5..21d7be7c8 100644 --- a/builder/digitalocean/builder.go +++ b/builder/digitalocean/builder.go @@ -11,7 +11,7 @@ import ( "github.com/digitalocean/godo" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -91,8 +91,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: communicator.CommHost(b.config.Comm.Host(), "droplet_ip"), SSHConfig: b.config.Comm.SSHConfigFunc(), }, - new(common.StepProvision), - &common.StepCleanupTempKeys{ + new(commonsteps.StepProvision), + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, new(stepShutdown), @@ -103,7 +103,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run the steps - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/docker/builder.go b/builder/docker/builder.go index 3097007f2..f1487f9c0 100644 --- a/builder/docker/builder.go +++ b/builder/docker/builder.go @@ -5,7 +5,7 @@ import ( "log" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" @@ -70,8 +70,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack "dockerWindowsContainer": &StepConnectDocker{}, }, }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, } @@ -93,7 +93,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run! - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/googlecompute/builder.go b/builder/googlecompute/builder.go index 74df7f53d..032ba3457 100644 --- a/builder/googlecompute/builder.go +++ b/builder/googlecompute/builder.go @@ -8,7 +8,7 @@ import ( "log" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -95,8 +95,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack SSHConfig: b.config.Comm.SSHConfigFunc(), WinRMConfig: winrmConfig, }, - new(common.StepProvision), - &common.StepCleanupTempKeys{ + new(commonsteps.StepProvision), + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, } @@ -106,7 +106,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack steps = append(steps, new(StepTeardownInstance), new(StepCreateImage)) // Run the steps. - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // Report any errors. diff --git a/builder/hcloud/builder.go b/builder/hcloud/builder.go index be311e7bc..34688984e 100644 --- a/builder/hcloud/builder.go +++ b/builder/hcloud/builder.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -61,15 +61,15 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: getServerIP, SSHConfig: b.config.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, &stepShutdownServer{}, &stepCreateSnapshot{}, } // Run the steps - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that if rawErr, ok := state.GetOk("error"); ok { diff --git a/builder/hyperone/builder.go b/builder/hyperone/builder.go index c5f1f3c1a..7364d69ae 100644 --- a/builder/hyperone/builder.go +++ b/builder/hyperone/builder.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -91,13 +91,13 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ) } else { steps = append(steps, - &common.StepProvision{}, + &commonsteps.StepProvision{}, &stepStopVM{}, &stepCreateImage{}, ) } - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) if rawErr, ok := state.GetOk("error"); ok { diff --git a/builder/hyperone/step_chroot_provision.go b/builder/hyperone/step_chroot_provision.go index 005c869c5..f0aa6acb0 100644 --- a/builder/hyperone/step_chroot_provision.go +++ b/builder/hyperone/step_chroot_provision.go @@ -3,7 +3,7 @@ package hyperone import ( "context" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" ) @@ -21,7 +21,7 @@ func (s *stepChrootProvision) Run(ctx context.Context, state multistep.StateBag) Wrapped: sshCommunicator, } - stepProvision := common.StepProvision{Comm: comm} + stepProvision := commonsteps.StepProvision{Comm: comm} return stepProvision.Run(ctx, state) } diff --git a/builder/hyperv/common/config.go b/builder/hyperv/common/config.go index 74de2cbe6..2c1e47c34 100644 --- a/builder/hyperv/common/config.go +++ b/builder/hyperv/common/config.go @@ -11,6 +11,7 @@ import ( powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell" "github.com/hashicorp/packer/builder/hyperv/common/powershell/hyperv" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) @@ -36,8 +37,8 @@ const ( ) type CommonConfig struct { - common.FloppyConfig `mapstructure:",squash"` - common.CDConfig `mapstructure:",squash"` + commonsteps.FloppyConfig `mapstructure:",squash"` + commonsteps.CDConfig `mapstructure:",squash"` // The block size of the VHD to be created. // Recommended disk block size for Linux hyper-v guests is 1 MiB. This // defaults to "32" MiB. diff --git a/builder/hyperv/iso/builder.go b/builder/hyperv/iso/builder.go index 91e2bc676..9bd604b18 100644 --- a/builder/hyperv/iso/builder.go +++ b/builder/hyperv/iso/builder.go @@ -15,6 +15,7 @@ import ( hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/bootcommand" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" @@ -53,8 +54,8 @@ type Builder struct { type Config struct { common.PackerConfig `mapstructure:",squash"` - common.HTTPConfig `mapstructure:",squash"` - common.ISOConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` + commonsteps.ISOConfig `mapstructure:",squash"` bootcommand.BootConfig `mapstructure:",squash"` hypervcommon.OutputConfig `mapstructure:",squash"` hypervcommon.SSHConfig `mapstructure:",squash"` @@ -193,11 +194,11 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack &hypervcommon.StepCreateBuildDir{ TempPath: b.config.TempPath, }, - &common.StepOutputDir{ + &commonsteps.StepOutputDir{ Force: b.config.PackerForce, Path: b.config.OutputDir, }, - &common.StepDownload{ + &commonsteps.StepDownload{ Checksum: b.config.ISOChecksum, Description: "ISO", ResultKey: "iso_path", @@ -205,12 +206,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Extension: b.config.TargetExtension, TargetPath: b.config.TargetPath, }, - &common.StepCreateFloppy{ + &commonsteps.StepCreateFloppy{ Files: b.config.FloppyConfig.FloppyFiles, Directories: b.config.FloppyConfig.FloppyDirectories, Label: b.config.FloppyConfig.FloppyLabel, }, - &common.StepHTTPServer{ + &commonsteps.StepHTTPServer{ HTTPDir: b.config.HTTPDir, HTTPPortMin: b.config.HTTPPortMin, HTTPPortMax: b.config.HTTPPortMax, @@ -255,7 +256,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack GuestAdditionsPath: b.config.GuestAdditionsPath, Generation: b.config.Generation, }, - &common.StepCreateCD{ + &commonsteps.StepCreateCD{ Files: b.config.CDConfig.CDFiles, Label: b.config.CDConfig.CDLabel, }, @@ -298,10 +299,10 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, // provision requires communicator to be setup - &common.StepProvision{}, + &commonsteps.StepProvision{}, // Remove ephemeral key from authorized_hosts if using SSH communicator - &common.StepCleanupTempKeys{ + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.SSHConfig.Comm, }, @@ -337,7 +338,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run the steps. - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // Report any errors. diff --git a/builder/hyperv/vmcx/builder.go b/builder/hyperv/vmcx/builder.go index ec4dea9a0..ed688a89f 100644 --- a/builder/hyperv/vmcx/builder.go +++ b/builder/hyperv/vmcx/builder.go @@ -15,6 +15,7 @@ import ( powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/bootcommand" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" @@ -44,8 +45,8 @@ type Builder struct { type Config struct { common.PackerConfig `mapstructure:",squash"` - common.HTTPConfig `mapstructure:",squash"` - common.ISOConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` + commonsteps.ISOConfig `mapstructure:",squash"` bootcommand.BootConfig `mapstructure:",squash"` hypervcommon.OutputConfig `mapstructure:",squash"` hypervcommon.SSHConfig `mapstructure:",squash"` @@ -233,11 +234,11 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack &hypervcommon.StepCreateBuildDir{ TempPath: b.config.TempPath, }, - &common.StepOutputDir{ + &commonsteps.StepOutputDir{ Force: b.config.PackerForce, Path: b.config.OutputDir, }, - &common.StepDownload{ + &commonsteps.StepDownload{ Checksum: b.config.ISOChecksum, Description: "ISO", ResultKey: "iso_path", @@ -245,12 +246,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Extension: b.config.TargetExtension, TargetPath: b.config.TargetPath, }, - &common.StepCreateFloppy{ + &commonsteps.StepCreateFloppy{ Files: b.config.FloppyFiles, Directories: b.config.FloppyConfig.FloppyDirectories, Label: b.config.FloppyConfig.FloppyLabel, }, - &common.StepHTTPServer{ + &commonsteps.StepHTTPServer{ HTTPDir: b.config.HTTPDir, HTTPPortMin: b.config.HTTPPortMin, HTTPPortMax: b.config.HTTPPortMax, @@ -295,7 +296,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack GuestAdditionsPath: b.config.GuestAdditionsPath, Generation: b.config.Generation, }, - &common.StepCreateCD{ + &commonsteps.StepCreateCD{ Files: b.config.CDConfig.CDFiles, Label: b.config.CDConfig.CDLabel, }, @@ -338,10 +339,10 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, // provision requires communicator to be setup - &common.StepProvision{}, + &commonsteps.StepProvision{}, // Remove ephemeral SSH keys, if using - &common.StepCleanupTempKeys{ + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.SSHConfig.Comm, }, @@ -377,7 +378,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack // the clean up actions for each step will be executed reverse order // Run the steps. - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // Report any errors. diff --git a/builder/jdcloud/builder.go b/builder/jdcloud/builder.go index 8ed2c59cd..76f1b3b3d 100644 --- a/builder/jdcloud/builder.go +++ b/builder/jdcloud/builder.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -70,7 +70,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: instanceHost, }, - &common.StepProvision{}, + &commonsteps.StepProvision{}, &stepStopJDCloudInstance{ InstanceSpecConfig: &b.config.JDCloudInstanceSpecConfig, @@ -81,7 +81,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, } - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) if rawErr, ok := state.GetOk("error"); ok { diff --git a/builder/linode/builder.go b/builder/linode/builder.go index 0eff01aec..8141cb091 100644 --- a/builder/linode/builder.go +++ b/builder/linode/builder.go @@ -9,9 +9,9 @@ import ( "log" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" "github.com/linode/linodego" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -62,15 +62,15 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (ret Host: commHost(b.config.Comm.Host()), SSHConfig: b.config.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, &stepShutdownLinode{client}, &stepCreateImage{client}, } - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) if rawErr, ok := state.GetOk("error"); ok { diff --git a/builder/lxc/builder.go b/builder/lxc/builder.go index feca45e90..86e125c14 100644 --- a/builder/lxc/builder.go +++ b/builder/lxc/builder.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" @@ -59,7 +59,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("wrappedCommand", CommandWrapper(wrappedCommand)) // Run - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/lxc/step_provision.go b/builder/lxc/step_provision.go index fe9f3264b..3a76f26e4 100644 --- a/builder/lxc/step_provision.go +++ b/builder/lxc/step_provision.go @@ -4,7 +4,7 @@ import ( "context" "log" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" ) @@ -28,7 +28,7 @@ func (s *StepProvision) Run(ctx context.Context, state multistep.StateBag) multi } // Loads hook data from builder's state, if it has been set. - hookData := common.PopulateProvisionHookData(state) + hookData := commonsteps.PopulateProvisionHookData(state) // Update state generated_data with complete hookData // to make them accessible by post-processors diff --git a/builder/lxd/builder.go b/builder/lxd/builder.go index 1a4ae2778..24e700949 100644 --- a/builder/lxd/builder.go +++ b/builder/lxd/builder.go @@ -4,7 +4,7 @@ import ( "context" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" @@ -53,7 +53,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("wrappedCommand", CommandWrapper(wrappedCommand)) // Run - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/lxd/step_provision.go b/builder/lxd/step_provision.go index 79f43b21a..114be8fce 100644 --- a/builder/lxd/step_provision.go +++ b/builder/lxd/step_provision.go @@ -4,7 +4,7 @@ import ( "context" "log" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" ) @@ -25,7 +25,7 @@ func (s *StepProvision) Run(ctx context.Context, state multistep.StateBag) multi } // Loads hook data from builder's state, if it has been set. - hookData := common.PopulateProvisionHookData(state) + hookData := commonsteps.PopulateProvisionHookData(state) // Update state generated_data with complete hookData // to make them accessible by post-processors diff --git a/builder/ncloud/builder.go b/builder/ncloud/builder.go index 5645471b5..c802a2ada 100644 --- a/builder/ncloud/builder.go +++ b/builder/ncloud/builder.go @@ -5,7 +5,7 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -65,8 +65,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, SSHConfig: b.config.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, NewStepStopServerInstance(conn, ui), @@ -94,7 +94,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, nil }, }, - &common.StepProvision{}, + &commonsteps.StepProvision{}, NewStepStopServerInstance(conn, ui), NewStepCreateServerImage(conn, ui, &b.config), NewStepDeleteBlockStorageInstance(conn, ui, &b.config), @@ -103,7 +103,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run! - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, b.stateBag) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, b.stateBag) b.runner.Run(ctx, b.stateBag) // If there was an error, return that diff --git a/builder/null/builder.go b/builder/null/builder.go index 1d2fc40e4..3af67c187 100644 --- a/builder/null/builder.go +++ b/builder/null/builder.go @@ -4,7 +4,7 @@ import ( "context" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -40,7 +40,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ) steps = append(steps, - new(common.StepProvision), + new(commonsteps.StepProvision), ) // Setup the state bag and initial state for the steps @@ -50,7 +50,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("instance_id", "Null") // Run! - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/oneandone/builder.go b/builder/oneandone/builder.go index 8fe3526fd..1600bf7f6 100644 --- a/builder/oneandone/builder.go +++ b/builder/oneandone/builder.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -49,14 +49,14 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: communicator.CommHost(b.config.Comm.Host(), "server_ip"), SSHConfig: b.config.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, new(stepTakeSnapshot), } - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) if rawErr, ok := state.GetOk("error"); ok { diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go index 99c226c9a..c93553fcc 100644 --- a/builder/openstack/builder.go +++ b/builder/openstack/builder.go @@ -11,6 +11,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -155,8 +156,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack b.config.SSHIPVersion), SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.RunConfig.Comm, }, &StepStopServer{}, @@ -173,7 +174,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run! - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/oracle/classic/builder.go b/builder/oracle/classic/builder.go index 6a49f808a..87f351ea2 100644 --- a/builder/oracle/classic/builder.go +++ b/builder/oracle/classic/builder.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/go-oracle-terraform/opc" "github.com/hashicorp/hcl/v2/hcldec" ocommon "github.com/hashicorp/packer/builder/oracle/common" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -106,7 +106,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: communicator.CommHost(b.config.Comm.Host(), "instance_ip"), SSHConfig: b.config.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, + &commonsteps.StepProvision{}, &stepTerminatePVMaster{}, &stepSecurity{ SecurityListKey: "security_list_builder", @@ -142,7 +142,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, &stepCreateImage{}, &stepListImages{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, } @@ -169,8 +169,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: communicator.CommHost(b.config.Comm.Host(), "instance_ip"), SSHConfig: b.config.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, &stepSnapshot{}, @@ -179,7 +179,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run the steps - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/oracle/oci/builder.go b/builder/oracle/oci/builder.go index 96eaee591..f10be1e8c 100644 --- a/builder/oracle/oci/builder.go +++ b/builder/oracle/oci/builder.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" ocommon "github.com/hashicorp/packer/builder/oracle/common" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -70,15 +70,15 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: communicator.CommHost(b.config.Comm.Host(), "instance_ip"), SSHConfig: b.config.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, &stepImage{}, } // Run the steps - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go index 1d3507cfc..e495547c6 100644 --- a/builder/osc/bsu/builder.go +++ b/builder/osc/bsu/builder.go @@ -14,6 +14,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -163,8 +164,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack b.config.SSHInterface), SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.RunConfig.Comm, }, &osccommon.StepStopBSUBackedVm{ @@ -194,7 +195,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, } - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/osc/bsusurrogate/builder.go b/builder/osc/bsusurrogate/builder.go index fe276aa3b..d01e97c44 100644 --- a/builder/osc/bsusurrogate/builder.go +++ b/builder/osc/bsusurrogate/builder.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -185,8 +186,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack b.config.SSHInterface), SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.RunConfig.Comm, }, &osccommon.StepStopBSUBackedVm{ @@ -221,7 +222,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, } - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/osc/bsuvolume/builder.go b/builder/osc/bsuvolume/builder.go index d04366dfd..e265bbd2e 100644 --- a/builder/osc/bsuvolume/builder.go +++ b/builder/osc/bsuvolume/builder.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -173,8 +174,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack b.config.SSHInterface), SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.RunConfig.Comm, }, &osccommon.StepStopBSUBackedVm{ @@ -184,7 +185,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run! - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/osc/chroot/builder.go b/builder/osc/chroot/builder.go index 3bc45dc51..099cb4f7f 100644 --- a/builder/osc/chroot/builder.go +++ b/builder/osc/chroot/builder.go @@ -14,6 +14,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -278,7 +279,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ) // Run! - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/osc/chroot/step_chroot_provision.go b/builder/osc/chroot/step_chroot_provision.go index e621f2fb6..39f034901 100644 --- a/builder/osc/chroot/step_chroot_provision.go +++ b/builder/osc/chroot/step_chroot_provision.go @@ -4,7 +4,7 @@ import ( "context" "log" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" ) @@ -26,7 +26,7 @@ func (s *StepChrootProvision) Run(ctx context.Context, state multistep.StateBag) } // Loads hook data from builder's state, if it has been set. - hookData := common.PopulateProvisionHookData(state) + hookData := commonsteps.PopulateProvisionHookData(state) // Update state generated_data with complete hookData // to make them accessible by post-processors diff --git a/builder/parallels/iso/builder.go b/builder/parallels/iso/builder.go index 40549cc20..55d395f61 100644 --- a/builder/parallels/iso/builder.go +++ b/builder/parallels/iso/builder.go @@ -12,6 +12,7 @@ import ( parallelscommon "github.com/hashicorp/packer/builder/parallels/common" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/bootcommand" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" @@ -29,9 +30,9 @@ type Builder struct { type Config struct { common.PackerConfig `mapstructure:",squash"` - common.HTTPConfig `mapstructure:",squash"` - common.ISOConfig `mapstructure:",squash"` - common.FloppyConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` + commonsteps.ISOConfig `mapstructure:",squash"` + commonsteps.FloppyConfig `mapstructure:",squash"` bootcommand.BootConfig `mapstructure:",squash"` parallelscommon.OutputConfig `mapstructure:",squash"` parallelscommon.HWConfig `mapstructure:",squash"` @@ -191,7 +192,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ParallelsToolsFlavor: b.config.ParallelsToolsFlavor, ParallelsToolsMode: b.config.ParallelsToolsMode, }, - &common.StepDownload{ + &commonsteps.StepDownload{ Checksum: b.config.ISOChecksum, Description: "ISO", Extension: b.config.TargetExtension, @@ -203,12 +204,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Force: b.config.PackerForce, Path: b.config.OutputDir, }, - &common.StepCreateFloppy{ + &commonsteps.StepCreateFloppy{ Files: b.config.FloppyConfig.FloppyFiles, Directories: b.config.FloppyConfig.FloppyDirectories, Label: b.config.FloppyConfig.FloppyLabel, }, - &common.StepHTTPServer{ + &commonsteps.StepHTTPServer{ HTTPDir: b.config.HTTPDir, HTTPPortMin: b.config.HTTPPortMin, HTTPPortMax: b.config.HTTPPortMax, @@ -249,8 +250,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ParallelsToolsMode: b.config.ParallelsToolsMode, Ctx: b.config.ctx, }, - new(common.StepProvision), - &common.StepCleanupTempKeys{ + new(commonsteps.StepProvision), + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.SSHConfig.Comm, }, ¶llelscommon.StepShutdown{ @@ -275,7 +276,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("ui", ui) // Run - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/parallels/pvm/builder.go b/builder/parallels/pvm/builder.go index 5add2b27a..dcf6ce2eb 100644 --- a/builder/parallels/pvm/builder.go +++ b/builder/parallels/pvm/builder.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -59,7 +59,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Force: b.config.PackerForce, Path: b.config.OutputDir, }, - &common.StepCreateFloppy{ + &commonsteps.StepCreateFloppy{ Files: b.config.FloppyConfig.FloppyFiles, Directories: b.config.FloppyConfig.FloppyDirectories, Label: b.config.FloppyConfig.FloppyLabel, @@ -99,12 +99,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ParallelsToolsMode: b.config.ParallelsToolsMode, Ctx: b.config.ctx, }, - new(common.StepProvision), + new(commonsteps.StepProvision), ¶llelscommon.StepShutdown{ Command: b.config.ShutdownCommand, Timeout: b.config.ShutdownTimeout, }, - &common.StepCleanupTempKeys{ + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.SSHConfig.Comm, }, ¶llelscommon.StepPrlctl{ @@ -117,7 +117,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run the steps. - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) // Report any errors. diff --git a/builder/parallels/pvm/config.go b/builder/parallels/pvm/config.go index 0f74308d2..49afa0bd6 100644 --- a/builder/parallels/pvm/config.go +++ b/builder/parallels/pvm/config.go @@ -10,6 +10,7 @@ import ( parallelscommon "github.com/hashicorp/packer/builder/parallels/common" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/bootcommand" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" @@ -19,7 +20,7 @@ import ( // Config is the configuration structure for the builder. type Config struct { common.PackerConfig `mapstructure:",squash"` - common.FloppyConfig `mapstructure:",squash"` + commonsteps.FloppyConfig `mapstructure:",squash"` parallelscommon.OutputConfig `mapstructure:",squash"` parallelscommon.PrlctlConfig `mapstructure:",squash"` parallelscommon.PrlctlPostConfig `mapstructure:",squash"` diff --git a/builder/profitbricks/builder.go b/builder/profitbricks/builder.go index f55d6ae0b..1cf8cc1f8 100644 --- a/builder/profitbricks/builder.go +++ b/builder/profitbricks/builder.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -46,8 +46,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: communicator.CommHost(b.config.Comm.Host(), "server_ip"), SSHConfig: b.config.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, new(stepTakeSnapshot), @@ -55,7 +55,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack config := state.Get("config").(*Config) - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) if rawErr, ok := state.GetOk("error"); ok { diff --git a/builder/proxmox/common/builder.go b/builder/proxmox/common/builder.go index a4b407520..784549160 100644 --- a/builder/proxmox/common/builder.go +++ b/builder/proxmox/common/builder.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -61,7 +61,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook, state &stepStartVM{ vmCreator: b.vmCreator, }, - &common.StepHTTPServer{ + &commonsteps.StepHTTPServer{ HTTPDir: b.config.HTTPDir, HTTPPortMin: b.config.HTTPPortMin, HTTPPortMax: b.config.HTTPPortMax, @@ -76,8 +76,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook, state Host: commHost((*comm).Host()), SSHConfig: (*comm).SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, &stepConvertToTemplate{}, @@ -87,7 +87,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook, state steps := append(b.preSteps, coreSteps...) steps = append(steps, b.postSteps...) // Run the steps - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that if rawErr, ok := state.GetOk("error"); ok { diff --git a/builder/proxmox/common/config.go b/builder/proxmox/common/config.go index 63d9277f4..4202b3390 100644 --- a/builder/proxmox/common/config.go +++ b/builder/proxmox/common/config.go @@ -13,6 +13,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/bootcommand" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" @@ -23,7 +24,7 @@ import ( type Config struct { common.PackerConfig `mapstructure:",squash"` - common.HTTPConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` bootcommand.BootConfig `mapstructure:",squash"` BootKeyInterval time.Duration `mapstructure:"boot_key_interval"` Comm communicator.Config `mapstructure:",squash"` @@ -65,13 +66,13 @@ type Config struct { } type storageConfig struct { - common.ISOConfig `mapstructure:",squash"` - Device string `mapstructure:"device"` - ISOFile string `mapstructure:"iso_file"` - ISOStoragePool string `mapstructure:"iso_storage_pool"` - Unmount bool `mapstructure:"unmount"` - ShouldUploadISO bool - DownloadPathKey string + commonsteps.ISOConfig `mapstructure:",squash"` + Device string `mapstructure:"device"` + ISOFile string `mapstructure:"iso_file"` + ISOStoragePool string `mapstructure:"iso_storage_pool"` + Unmount bool `mapstructure:"unmount"` + ShouldUploadISO bool + DownloadPathKey string } type nicConfig struct { @@ -132,9 +133,9 @@ func (c *Config) Prepare(upper interface{}, raws ...interface{}) ([]string, []st if c.Password == "" { c.Password = os.Getenv("PROXMOX_PASSWORD") } - if c.BootKeyInterval == 0 && os.Getenv(common.PackerKeyEnv) != "" { + if c.BootKeyInterval == 0 && os.Getenv(bootcommand.PackerKeyEnv) != "" { var err error - c.BootKeyInterval, err = time.ParseDuration(os.Getenv(common.PackerKeyEnv)) + c.BootKeyInterval, err = time.ParseDuration(os.Getenv(bootcommand.PackerKeyEnv)) if err != nil { errs = packer.MultiErrorAppend(errs, err) } diff --git a/builder/proxmox/iso/builder.go b/builder/proxmox/iso/builder.go index 3c7fb960b..699308b58 100644 --- a/builder/proxmox/iso/builder.go +++ b/builder/proxmox/iso/builder.go @@ -6,7 +6,7 @@ import ( proxmoxapi "github.com/Telmate/proxmox-api-go/proxmox" "github.com/hashicorp/hcl/v2/hcldec" proxmox "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" ) @@ -34,7 +34,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("iso-config", &b.config) preSteps := []multistep.Step{ - &common.StepDownload{ + &commonsteps.StepDownload{ Checksum: b.config.ISOChecksum, Description: "ISO", Extension: b.config.TargetExtension, @@ -44,7 +44,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, } for idx := range b.config.AdditionalISOFiles { - preSteps = append(preSteps, &common.StepDownload{ + preSteps = append(preSteps, &commonsteps.StepDownload{ Checksum: b.config.AdditionalISOFiles[idx].ISOChecksum, Description: "additional ISO", Extension: b.config.AdditionalISOFiles[idx].TargetExtension, diff --git a/builder/proxmox/iso/config.go b/builder/proxmox/iso/config.go index a04c41c05..4f80fe28f 100644 --- a/builder/proxmox/iso/config.go +++ b/builder/proxmox/iso/config.go @@ -10,18 +10,18 @@ import ( "strings" proxmox "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/packer" ) type Config struct { proxmox.Config `mapstructure:",squash"` - common.ISOConfig `mapstructure:",squash"` - ISOFile string `mapstructure:"iso_file"` - ISOStoragePool string `mapstructure:"iso_storage_pool"` - UnmountISO bool `mapstructure:"unmount_iso"` - shouldUploadISO bool + commonsteps.ISOConfig `mapstructure:",squash"` + ISOFile string `mapstructure:"iso_file"` + ISOStoragePool string `mapstructure:"iso_storage_pool"` + UnmountISO bool `mapstructure:"unmount_iso"` + shouldUploadISO bool } func (c *Config) Prepare(raws ...interface{}) ([]string, []string, error) { diff --git a/builder/proxmox/iso/step_upload_iso_test.go b/builder/proxmox/iso/step_upload_iso_test.go index 418005a0c..a6b7fa4fd 100644 --- a/builder/proxmox/iso/step_upload_iso_test.go +++ b/builder/proxmox/iso/step_upload_iso_test.go @@ -6,7 +6,7 @@ import ( "io" "testing" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" ) @@ -51,7 +51,7 @@ func TestUploadISO(t *testing.T) { builderConfig: &Config{ shouldUploadISO: true, ISOStoragePool: "local", - ISOConfig: common.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}}, + ISOConfig: commonsteps.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}}, }, downloadPath: "testdata/test.iso", @@ -64,7 +64,7 @@ func TestUploadISO(t *testing.T) { builderConfig: &Config{ shouldUploadISO: true, ISOStoragePool: "local", - ISOConfig: common.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}}, + ISOConfig: commonsteps.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}}, }, downloadPath: "testdata/test.iso", failUpload: true, @@ -78,7 +78,7 @@ func TestUploadISO(t *testing.T) { builderConfig: &Config{ shouldUploadISO: true, ISOStoragePool: "local", - ISOConfig: common.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}}, + ISOConfig: commonsteps.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}}, }, expectError: true, @@ -90,7 +90,7 @@ func TestUploadISO(t *testing.T) { builderConfig: &Config{ shouldUploadISO: true, ISOStoragePool: "local", - ISOConfig: common.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}}, + ISOConfig: commonsteps.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}}, }, downloadPath: "testdata/non-existent.iso", diff --git a/builder/qemu/builder.go b/builder/qemu/builder.go index 6f0939f69..1c94ad70a 100644 --- a/builder/qemu/builder.go +++ b/builder/qemu/builder.go @@ -10,7 +10,7 @@ import ( "path/filepath" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -43,7 +43,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack steps := []multistep.Step{} if !b.config.ISOSkipCache { - steps = append(steps, &common.StepDownload{ + steps = append(steps, &commonsteps.StepDownload{ Checksum: b.config.ISOChecksum, Description: "ISO", Extension: b.config.TargetExtension, @@ -59,12 +59,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } steps = append(steps, new(stepPrepareOutputDir), - &common.StepCreateFloppy{ + &commonsteps.StepCreateFloppy{ Files: b.config.FloppyConfig.FloppyFiles, Directories: b.config.FloppyConfig.FloppyDirectories, Label: b.config.FloppyConfig.FloppyLabel, }, - &common.StepCreateCD{ + &commonsteps.StepCreateCD{ Files: b.config.CDConfig.CDFiles, Label: b.config.CDConfig.CDLabel, }, @@ -96,7 +96,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack QemuImgArgs: b.config.QemuImgArgs, }, new(stepHTTPIPDiscover), - &common.StepHTTPServer{ + &commonsteps.StepHTTPServer{ HTTPDir: b.config.HTTPDir, HTTPPortMin: b.config.HTTPPortMin, HTTPPortMax: b.config.HTTPPortMax, @@ -126,8 +126,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack SSHPort: commPort, WinRMPort: commPort, }, - new(common.StepProvision), - &common.StepCleanupTempKeys{ + new(commonsteps.StepProvision), + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.CommConfig.Comm, }, &stepShutdown{ @@ -154,7 +154,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("ui", ui) // Run - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/qemu/config.go b/builder/qemu/config.go index 13f6c6320..7f3541ba7 100644 --- a/builder/qemu/config.go +++ b/builder/qemu/config.go @@ -15,6 +15,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/bootcommand" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" @@ -65,13 +66,13 @@ type QemuImgArgs struct { type Config struct { common.PackerConfig `mapstructure:",squash"` - common.HTTPConfig `mapstructure:",squash"` - common.ISOConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` + commonsteps.ISOConfig `mapstructure:",squash"` bootcommand.VNCConfig `mapstructure:",squash"` shutdowncommand.ShutdownConfig `mapstructure:",squash"` CommConfig CommConfig `mapstructure:",squash"` - common.FloppyConfig `mapstructure:",squash"` - common.CDConfig `mapstructure:",squash"` + commonsteps.FloppyConfig `mapstructure:",squash"` + commonsteps.CDConfig `mapstructure:",squash"` // Use iso from provided url. Qemu must support // curl block device. This defaults to `false`. ISOSkipCache bool `mapstructure:"iso_skip_cache" required:"false"` diff --git a/builder/qemu/step_run_test.go b/builder/qemu/step_run_test.go index 3bd5375c5..2b59448ec 100644 --- a/builder/qemu/step_run_test.go +++ b/builder/qemu/step_run_test.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -40,7 +39,7 @@ func Test_UserOverrides(t *testing.T) { testcases := []testCase{ { &Config{ - HTTPConfig: common.HTTPConfig{ + HTTPConfig: commonsteps.HTTPConfig{ HTTPDir: "http/directory", }, OutputDir: "output/directory", diff --git a/builder/scaleway/builder.go b/builder/scaleway/builder.go index e25d4cd0e..157fe624a 100644 --- a/builder/scaleway/builder.go +++ b/builder/scaleway/builder.go @@ -9,7 +9,7 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -82,8 +82,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: communicator.CommHost(b.config.Comm.Host(), "server_ip"), SSHConfig: b.config.Comm.SSHConfigFunc(), }, - new(common.StepProvision), - &common.StepCleanupTempKeys{ + new(commonsteps.StepProvision), + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Comm, }, new(stepShutdown), @@ -91,7 +91,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack new(stepImage), } - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) if rawErr, ok := state.GetOk("error"); ok { diff --git a/builder/tencentcloud/cvm/builder.go b/builder/tencentcloud/cvm/builder.go index 89c799c18..9bbc04a79 100644 --- a/builder/tencentcloud/cvm/builder.go +++ b/builder/tencentcloud/cvm/builder.go @@ -8,6 +8,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -123,8 +124,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack SSHConfig: b.config.TencentCloudRunConfig.Comm.SSHConfigFunc(), Host: SSHHost(b.config.AssociatePublicIpAddress), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.TencentCloudRunConfig.Comm, }, // We need this step to detach keypair from instance, otherwise @@ -140,7 +141,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, } - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) if rawErr, ok := state.GetOk("error"); ok { diff --git a/builder/triton/builder.go b/builder/triton/builder.go index 70e8cd88d..5375552b3 100644 --- a/builder/triton/builder.go +++ b/builder/triton/builder.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -71,8 +71,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: commHost(b.config.Comm.Host()), SSHConfig: b.config.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &config.Comm, }, &StepStopMachine{}, @@ -80,7 +80,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack &StepDeleteMachine{}, } - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/ucloud/uhost/builder.go b/builder/ucloud/uhost/builder.go index 21c9204df..24b9a68e4 100644 --- a/builder/ucloud/uhost/builder.go +++ b/builder/ucloud/uhost/builder.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -125,7 +126,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack b.config.UseSSHPrivateIp), SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(), }, - &common.StepProvision{}, + &commonsteps.StepProvision{}, &stepStopInstance{}, &stepCreateImage{}, &stepCopyUCloudImage{ @@ -137,7 +138,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run! - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/vagrant/builder.go b/builder/vagrant/builder.go index 8dd88464e..bdacf9a42 100644 --- a/builder/vagrant/builder.go +++ b/builder/vagrant/builder.go @@ -16,6 +16,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/bootcommand" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -31,11 +32,11 @@ type Builder struct { } type Config struct { - common.PackerConfig `mapstructure:",squash"` - common.HTTPConfig `mapstructure:",squash"` - common.ISOConfig `mapstructure:",squash"` - common.FloppyConfig `mapstructure:",squash"` - bootcommand.BootConfig `mapstructure:",squash"` + common.PackerConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` + commonsteps.ISOConfig `mapstructure:",squash"` + commonsteps.FloppyConfig `mapstructure:",squash"` + bootcommand.BootConfig `mapstructure:",squash"` Comm communicator.Config `mapstructure:",squash"` // The directory to create that will contain your output box. We always @@ -298,7 +299,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack steps := []multistep.Step{} // Download if source box isn't from vagrant cloud. if strings.HasSuffix(b.config.SourceBox, ".box") { - steps = append(steps, &common.StepDownload{ + steps = append(steps, &commonsteps.StepDownload{ Checksum: b.config.Checksum, Description: "Box", Extension: "box", @@ -307,7 +308,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }) } steps = append(steps, - &common.StepOutputDir{ + &commonsteps.StepOutputDir{ Force: b.config.PackerForce, Path: b.config.OutputDir, }, @@ -347,7 +348,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: CommHost(), SSHConfig: b.config.Comm.SSHConfigFunc(), }, - new(common.StepProvision), + new(commonsteps.StepProvision), &StepPackage{ SkipPackage: b.config.SkipPackage, Include: b.config.PackageInclude, @@ -356,7 +357,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }) // Run the steps. - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) // Report any errors. diff --git a/builder/virtualbox/common/step_download_guest_additions.go b/builder/virtualbox/common/step_download_guest_additions.go index 3e3e2936e..fbe78b3ec 100644 --- a/builder/virtualbox/common/step_download_guest_additions.go +++ b/builder/virtualbox/common/step_download_guest_additions.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" @@ -121,7 +121,7 @@ func (s *StepDownloadGuestAdditions) Run(ctx context.Context, state multistep.St log.Printf("Guest additions URL: %s", url) // We're good, so let's go ahead and download this thing.. - downStep := &common.StepDownload{ + downStep := &commonsteps.StepDownload{ Checksum: checksum, Description: "Guest additions", ResultKey: "guest_additions_path", @@ -151,7 +151,7 @@ func (s *StepDownloadGuestAdditions) downloadAdditionsSHA256(ctx context.Context defer os.Remove(checksumsFile.Name()) checksumsFile.Close() - downStep := &common.StepDownload{ + downStep := &commonsteps.StepDownload{ Description: "Guest additions checksums", ResultKey: "guest_additions_checksums_path", Url: []string{checksumsUrl}, diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go index f2b18b94f..c1c940ff9 100644 --- a/builder/virtualbox/iso/builder.go +++ b/builder/virtualbox/iso/builder.go @@ -12,6 +12,7 @@ import ( vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/bootcommand" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -28,10 +29,10 @@ type Builder struct { type Config struct { common.PackerConfig `mapstructure:",squash"` - common.HTTPConfig `mapstructure:",squash"` - common.ISOConfig `mapstructure:",squash"` - common.FloppyConfig `mapstructure:",squash"` - common.CDConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` + commonsteps.ISOConfig `mapstructure:",squash"` + commonsteps.FloppyConfig `mapstructure:",squash"` + commonsteps.CDConfig `mapstructure:",squash"` bootcommand.BootConfig `mapstructure:",squash"` vboxcommon.ExportConfig `mapstructure:",squash"` vboxcommon.OutputConfig `mapstructure:",squash"` @@ -243,7 +244,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack GuestAdditionsSHA256: b.config.GuestAdditionsSHA256, Ctx: b.config.ctx, }, - &common.StepDownload{ + &commonsteps.StepDownload{ Checksum: b.config.ISOChecksum, Description: "ISO", Extension: b.config.TargetExtension, @@ -251,21 +252,21 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack TargetPath: b.config.TargetPath, Url: b.config.ISOUrls, }, - &common.StepOutputDir{ + &commonsteps.StepOutputDir{ Force: b.config.PackerForce, Path: b.config.OutputDir, }, - &common.StepCreateFloppy{ + &commonsteps.StepCreateFloppy{ Files: b.config.FloppyConfig.FloppyFiles, Directories: b.config.FloppyConfig.FloppyDirectories, Label: b.config.FloppyConfig.FloppyLabel, }, - &common.StepCreateCD{ + &commonsteps.StepCreateCD{ Files: b.config.CDConfig.CDFiles, Label: b.config.CDConfig.CDLabel, }, new(vboxcommon.StepHTTPIPDiscover), - &common.StepHTTPServer{ + &commonsteps.StepHTTPServer{ HTTPDir: b.config.HTTPDir, HTTPPortMin: b.config.HTTPPortMin, HTTPPortMax: b.config.HTTPPortMax, @@ -327,8 +328,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack GuestAdditionsPath: b.config.GuestAdditionsPath, Ctx: b.config.ctx, }, - new(common.StepProvision), - &common.StepCleanupTempKeys{ + new(commonsteps.StepProvision), + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.CommConfig.Comm, }, &vboxcommon.StepShutdown{ @@ -365,7 +366,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack state.Put("ui", ui) // Run - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/virtualbox/ovf/builder.go b/builder/virtualbox/ovf/builder.go index 14949c1fc..0165be197 100644 --- a/builder/virtualbox/ovf/builder.go +++ b/builder/virtualbox/ovf/builder.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -50,22 +50,22 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack // Build the steps. steps := []multistep.Step{ - &common.StepOutputDir{ + &commonsteps.StepOutputDir{ Force: b.config.PackerForce, Path: b.config.OutputDir, }, new(vboxcommon.StepSuppressMessages), - &common.StepCreateFloppy{ + &commonsteps.StepCreateFloppy{ Files: b.config.FloppyConfig.FloppyFiles, Directories: b.config.FloppyConfig.FloppyDirectories, Label: b.config.FloppyConfig.FloppyLabel, }, - &common.StepCreateCD{ + &commonsteps.StepCreateCD{ Files: b.config.CDConfig.CDFiles, Label: b.config.CDConfig.CDLabel, }, new(vboxcommon.StepHTTPIPDiscover), - &common.StepHTTPServer{ + &commonsteps.StepHTTPServer{ HTTPDir: b.config.HTTPDir, HTTPPortMin: b.config.HTTPPortMin, HTTPPortMax: b.config.HTTPPortMax, @@ -82,7 +82,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack GuestAdditionsSHA256: b.config.GuestAdditionsSHA256, Ctx: b.config.ctx, }, - &common.StepDownload{ + &commonsteps.StepDownload{ Checksum: b.config.Checksum, Description: "OVF/OVA", Extension: "ova", @@ -143,8 +143,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack GuestAdditionsPath: b.config.GuestAdditionsPath, Ctx: b.config.ctx, }, - new(common.StepProvision), - &common.StepCleanupTempKeys{ + new(commonsteps.StepProvision), + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.CommConfig.Comm, }, &vboxcommon.StepShutdown{ @@ -170,7 +170,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run the steps. - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) // Report any errors. diff --git a/builder/virtualbox/ovf/config.go b/builder/virtualbox/ovf/config.go index ab14c132c..ba99f5684 100644 --- a/builder/virtualbox/ovf/config.go +++ b/builder/virtualbox/ovf/config.go @@ -9,6 +9,7 @@ import ( vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/bootcommand" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" @@ -17,9 +18,9 @@ import ( // Config is the configuration structure for the builder. type Config struct { common.PackerConfig `mapstructure:",squash"` - common.HTTPConfig `mapstructure:",squash"` - common.FloppyConfig `mapstructure:",squash"` - common.CDConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` + commonsteps.FloppyConfig `mapstructure:",squash"` + commonsteps.CDConfig `mapstructure:",squash"` bootcommand.BootConfig `mapstructure:",squash"` vboxcommon.ExportConfig `mapstructure:",squash"` vboxcommon.OutputConfig `mapstructure:",squash"` diff --git a/builder/virtualbox/vm/builder.go b/builder/virtualbox/vm/builder.go index 1e7e5f083..fb1e0fa76 100644 --- a/builder/virtualbox/vm/builder.go +++ b/builder/virtualbox/vm/builder.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -50,11 +50,11 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack // Build the steps. steps := []multistep.Step{ new(vboxcommon.StepSuppressMessages), - &common.StepCreateFloppy{ + &commonsteps.StepCreateFloppy{ Files: b.config.FloppyConfig.FloppyFiles, Directories: b.config.FloppyConfig.FloppyDirectories, }, - &common.StepCreateCD{ + &commonsteps.StepCreateCD{ Files: b.config.CDConfig.CDFiles, Label: b.config.CDConfig.CDLabel, }, @@ -64,7 +64,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack KeepRegistered: b.config.KeepRegistered, }, new(vboxcommon.StepHTTPIPDiscover), - &common.StepHTTPServer{ + &commonsteps.StepHTTPServer{ HTTPDir: b.config.HTTPDir, HTTPPortMin: b.config.HTTPPortMin, HTTPPortMax: b.config.HTTPPortMax, @@ -127,8 +127,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack GuestAdditionsPath: b.config.GuestAdditionsPath, Ctx: b.config.ctx, }, - new(common.StepProvision), - &common.StepCleanupTempKeys{ + new(commonsteps.StepProvision), + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.CommConfig.Comm, }, &vboxcommon.StepShutdown{ @@ -160,13 +160,13 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack if !b.config.SkipExport { steps = append(steps, nil) copy(steps[1:], steps) - steps[0] = &common.StepOutputDir{ + steps[0] = &commonsteps.StepOutputDir{ Force: b.config.PackerForce, Path: b.config.OutputDir, } } // Run the steps. - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) // Report any errors. diff --git a/builder/virtualbox/vm/config.go b/builder/virtualbox/vm/config.go index 690141c97..46235aeec 100644 --- a/builder/virtualbox/vm/config.go +++ b/builder/virtualbox/vm/config.go @@ -11,6 +11,7 @@ import ( vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/bootcommand" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" @@ -19,9 +20,9 @@ import ( // Config is the configuration structure for the builder. type Config struct { common.PackerConfig `mapstructure:",squash"` - common.HTTPConfig `mapstructure:",squash"` - common.FloppyConfig `mapstructure:",squash"` - common.CDConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` + commonsteps.FloppyConfig `mapstructure:",squash"` + commonsteps.CDConfig `mapstructure:",squash"` bootcommand.BootConfig `mapstructure:",squash"` vboxcommon.ExportConfig `mapstructure:",squash"` vboxcommon.OutputConfig `mapstructure:",squash"` diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go index db4afcd6b..18e068fdf 100644 --- a/builder/vmware/iso/builder.go +++ b/builder/vmware/iso/builder.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -57,7 +57,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack RemoteType: b.config.RemoteType, ToolsUploadFlavor: b.config.ToolsUploadFlavor, }, - &common.StepDownload{ + &commonsteps.StepDownload{ Checksum: b.config.ISOChecksum, Description: "ISO", Extension: b.config.TargetExtension, @@ -71,12 +71,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack RemoteType: b.config.RemoteType, VMName: b.config.VMName, }, - &common.StepCreateFloppy{ + &commonsteps.StepCreateFloppy{ Files: b.config.FloppyConfig.FloppyFiles, Directories: b.config.FloppyConfig.FloppyDirectories, Label: b.config.FloppyConfig.FloppyLabel, }, - &common.StepCreateCD{ + &commonsteps.StepCreateCD{ Files: b.config.CDConfig.CDFiles, Label: b.config.CDConfig.CDLabel, }, @@ -117,7 +117,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, &vmwcommon.StepSuppressMessages{}, &vmwcommon.StepHTTPIPDiscover{}, - &common.StepHTTPServer{ + &commonsteps.StepHTTPServer{ HTTPDir: b.config.HTTPDir, HTTPPortMin: b.config.HTTPPortMin, HTTPPortMax: b.config.HTTPPortMax, @@ -161,8 +161,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ToolsUploadPath: b.config.ToolsUploadPath, Ctx: b.config.ctx, }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.SSHConfig.Comm, }, &vmwcommon.StepShutdown{ @@ -196,7 +196,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run! - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) // If there was an error, return that diff --git a/builder/vmware/iso/config.go b/builder/vmware/iso/config.go index e40f7320c..3bb7908be 100644 --- a/builder/vmware/iso/config.go +++ b/builder/vmware/iso/config.go @@ -12,6 +12,7 @@ import ( vmwcommon "github.com/hashicorp/packer/builder/vmware/common" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/bootcommand" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" @@ -20,10 +21,10 @@ import ( type Config struct { common.PackerConfig `mapstructure:",squash"` - common.HTTPConfig `mapstructure:",squash"` - common.ISOConfig `mapstructure:",squash"` - common.FloppyConfig `mapstructure:",squash"` - common.CDConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` + commonsteps.ISOConfig `mapstructure:",squash"` + commonsteps.FloppyConfig `mapstructure:",squash"` + commonsteps.CDConfig `mapstructure:",squash"` bootcommand.VNCConfig `mapstructure:",squash"` vmwcommon.DriverConfig `mapstructure:",squash"` vmwcommon.HWConfig `mapstructure:",squash"` diff --git a/builder/vmware/vmx/builder.go b/builder/vmware/vmx/builder.go index 9b283b9d0..daf27282d 100644 --- a/builder/vmware/vmx/builder.go +++ b/builder/vmware/vmx/builder.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -68,12 +68,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack RemoteType: b.config.RemoteType, VMName: b.config.VMName, }, - &common.StepCreateFloppy{ + &commonsteps.StepCreateFloppy{ Files: b.config.FloppyConfig.FloppyFiles, Directories: b.config.FloppyConfig.FloppyDirectories, Label: b.config.FloppyConfig.FloppyLabel, }, - &common.StepCreateCD{ + &commonsteps.StepCreateCD{ Files: b.config.CDConfig.CDFiles, Label: b.config.CDConfig.CDLabel, }, @@ -107,7 +107,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }, &vmwcommon.StepSuppressMessages{}, &vmwcommon.StepHTTPIPDiscover{}, - &common.StepHTTPServer{ + &commonsteps.StepHTTPServer{ HTTPDir: b.config.HTTPDir, HTTPPortMin: b.config.HTTPPortMin, HTTPPortMax: b.config.HTTPPortMax, @@ -154,8 +154,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ToolsUploadPath: b.config.ToolsUploadPath, Ctx: b.config.ctx, }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.SSHConfig.Comm, }, &vmwcommon.StepShutdown{ @@ -189,7 +189,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run the steps. - b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) // Report any errors. diff --git a/builder/vmware/vmx/config.go b/builder/vmware/vmx/config.go index 060030a85..6892156a6 100644 --- a/builder/vmware/vmx/config.go +++ b/builder/vmware/vmx/config.go @@ -10,6 +10,7 @@ import ( vmwcommon "github.com/hashicorp/packer/builder/vmware/common" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/bootcommand" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" @@ -19,10 +20,10 @@ import ( // Config is the configuration structure for the builder. type Config struct { common.PackerConfig `mapstructure:",squash"` - common.HTTPConfig `mapstructure:",squash"` - common.FloppyConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` + commonsteps.FloppyConfig `mapstructure:",squash"` bootcommand.VNCConfig `mapstructure:",squash"` - common.CDConfig `mapstructure:",squash"` + commonsteps.CDConfig `mapstructure:",squash"` vmwcommon.DriverConfig `mapstructure:",squash"` vmwcommon.OutputConfig `mapstructure:",squash"` vmwcommon.RunConfig `mapstructure:",squash"` diff --git a/builder/vsphere/clone/builder.go b/builder/vsphere/clone/builder.go index 92d574187..5c8bbdf7d 100644 --- a/builder/vsphere/clone/builder.go +++ b/builder/vsphere/clone/builder.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - packerCommon "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -41,7 +41,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack &common.StepConnect{ Config: &b.config.ConnectConfig, }, - &packerCommon.StepCreateCD{ + &commonsteps.StepCreateCD{ Files: b.config.CDConfig.CDFiles, Label: b.config.CDConfig.CDLabel, }, @@ -74,7 +74,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack if b.config.Comm.Type != "none" { steps = append(steps, - &packerCommon.StepCreateFloppy{ + &commonsteps.StepCreateFloppy{ Files: b.config.FloppyFiles, Directories: b.config.FloppyDirectories, Label: b.config.FloppyLabel, @@ -89,7 +89,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack HTTPIP: b.config.BootConfig.HTTPIP, Network: b.config.WaitIpConfig.GetIPNet(), }, - &packerCommon.StepHTTPServer{ + &commonsteps.StepHTTPServer{ HTTPDir: b.config.HTTPDir, HTTPPortMin: b.config.HTTPPortMin, HTTPPortMax: b.config.HTTPPortMax, @@ -117,7 +117,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: common.CommHost(b.config.Comm.Host()), SSHConfig: b.config.Comm.SSHConfigFunc(), }, - &packerCommon.StepProvision{}, + &commonsteps.StepProvision{}, &common.StepShutdown{ Config: &b.config.ShutdownConfig, }, @@ -157,7 +157,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }) } - b.runner = packerCommon.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) if rawErr, ok := state.GetOk("error"); ok { diff --git a/builder/vsphere/clone/config.go b/builder/vsphere/clone/config.go index 1d0bd7388..dd612c9b7 100644 --- a/builder/vsphere/clone/config.go +++ b/builder/vsphere/clone/config.go @@ -6,6 +6,7 @@ package clone import ( "github.com/hashicorp/packer/builder/vsphere/common" packerCommon "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" @@ -14,8 +15,8 @@ import ( type Config struct { packerCommon.PackerConfig `mapstructure:",squash"` - packerCommon.HTTPConfig `mapstructure:",squash"` - packerCommon.CDConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` + commonsteps.CDConfig `mapstructure:",squash"` common.ConnectConfig `mapstructure:",squash"` CloneConfig `mapstructure:",squash"` diff --git a/builder/vsphere/clone/config.hcl2spec.go b/builder/vsphere/clone/config.hcl2spec.go index ec26d8d42..21d0c1a51 100644 --- a/builder/vsphere/clone/config.hcl2spec.go +++ b/builder/vsphere/clone/config.hcl2spec.go @@ -64,7 +64,6 @@ type FlatConfig struct { CdromType *string `mapstructure:"cdrom_type" cty:"cdrom_type" hcl:"cdrom_type"` ISOPaths []string `mapstructure:"iso_paths" cty:"iso_paths" hcl:"iso_paths"` RemoveCdrom *bool `mapstructure:"remove_cdrom" cty:"remove_cdrom" hcl:"remove_cdrom"` - FloppyIMGPath *string `mapstructure:"floppy_img_path" cty:"floppy_img_path" hcl:"floppy_img_path"` FloppyFiles []string `mapstructure:"floppy_files" cty:"floppy_files" hcl:"floppy_files"` FloppyDirectories []string `mapstructure:"floppy_dirs" cty:"floppy_dirs" hcl:"floppy_dirs"` FloppyLabel *string `mapstructure:"floppy_label" cty:"floppy_label" hcl:"floppy_label"` @@ -201,7 +200,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "cdrom_type": &hcldec.AttrSpec{Name: "cdrom_type", Type: cty.String, Required: false}, "iso_paths": &hcldec.AttrSpec{Name: "iso_paths", Type: cty.List(cty.String), Required: false}, "remove_cdrom": &hcldec.AttrSpec{Name: "remove_cdrom", Type: cty.Bool, Required: false}, - "floppy_img_path": &hcldec.AttrSpec{Name: "floppy_img_path", Type: cty.String, Required: false}, "floppy_files": &hcldec.AttrSpec{Name: "floppy_files", Type: cty.List(cty.String), Required: false}, "floppy_dirs": &hcldec.AttrSpec{Name: "floppy_dirs", Type: cty.List(cty.String), Required: false}, "floppy_label": &hcldec.AttrSpec{Name: "floppy_label", Type: cty.String, Required: false}, diff --git a/builder/vsphere/iso/builder.go b/builder/vsphere/iso/builder.go index 45fe1ca0b..ff2d58cb5 100644 --- a/builder/vsphere/iso/builder.go +++ b/builder/vsphere/iso/builder.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - packerCommon "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -41,7 +41,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Config: &b.config.ConnectConfig, }, &common.StepDownload{ - DownloadStep: &packerCommon.StepDownload{ + DownloadStep: &commonsteps.StepDownload{ Checksum: b.config.ISOChecksum, Description: "ISO", Extension: b.config.TargetExtension, @@ -54,7 +54,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Datastore: b.config.Datastore, Host: b.config.Host, }, - &packerCommon.StepCreateCD{ + &commonsteps.StepCreateCD{ Files: b.config.CDConfig.CDFiles, Label: b.config.CDConfig.CDLabel, }, @@ -77,7 +77,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack &common.StepConfigParams{ Config: &b.config.ConfigParamsConfig, }, - &packerCommon.StepCreateFloppy{ + &commonsteps.StepCreateFloppy{ Files: b.config.FloppyFiles, Directories: b.config.FloppyDirectories, Label: b.config.FloppyLabel, @@ -92,7 +92,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack HTTPIP: b.config.BootConfig.HTTPIP, Network: b.config.WaitIpConfig.GetIPNet(), }, - &packerCommon.StepHTTPServer{ + &commonsteps.StepHTTPServer{ HTTPDir: b.config.HTTPDir, HTTPPortMin: b.config.HTTPPortMin, HTTPPortMax: b.config.HTTPPortMax, @@ -119,7 +119,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: common.CommHost(b.config.Comm.Host()), SSHConfig: b.config.Comm.SSHConfigFunc(), }, - &packerCommon.StepProvision{}, + &commonsteps.StepProvision{}, ) } @@ -159,7 +159,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack }) } - b.runner = packerCommon.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) + b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state) b.runner.Run(ctx, state) if rawErr, ok := state.GetOk("error"); ok { diff --git a/builder/vsphere/iso/config.go b/builder/vsphere/iso/config.go index 95cf4e3bd..09b9b1723 100644 --- a/builder/vsphere/iso/config.go +++ b/builder/vsphere/iso/config.go @@ -6,6 +6,7 @@ package iso import ( "github.com/hashicorp/packer/builder/vsphere/common" packerCommon "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" @@ -14,8 +15,8 @@ import ( type Config struct { packerCommon.PackerConfig `mapstructure:",squash"` - packerCommon.HTTPConfig `mapstructure:",squash"` - packerCommon.CDConfig `mapstructure:",squash"` + commonsteps.HTTPConfig `mapstructure:",squash"` + commonsteps.CDConfig `mapstructure:",squash"` common.ConnectConfig `mapstructure:",squash"` CreateConfig `mapstructure:",squash"` @@ -23,7 +24,7 @@ type Config struct { common.HardwareConfig `mapstructure:",squash"` common.ConfigParamsConfig `mapstructure:",squash"` - packerCommon.ISOConfig `mapstructure:",squash"` + commonsteps.ISOConfig `mapstructure:",squash"` common.CDRomConfig `mapstructure:",squash"` common.RemoveCDRomConfig `mapstructure:",squash"` diff --git a/builder/vsphere/iso/config.hcl2spec.go b/builder/vsphere/iso/config.hcl2spec.go index 41061b95a..f55cff6d6 100644 --- a/builder/vsphere/iso/config.hcl2spec.go +++ b/builder/vsphere/iso/config.hcl2spec.go @@ -69,7 +69,6 @@ type FlatConfig struct { CdromType *string `mapstructure:"cdrom_type" cty:"cdrom_type" hcl:"cdrom_type"` ISOPaths []string `mapstructure:"iso_paths" cty:"iso_paths" hcl:"iso_paths"` RemoveCdrom *bool `mapstructure:"remove_cdrom" cty:"remove_cdrom" hcl:"remove_cdrom"` - FloppyIMGPath *string `mapstructure:"floppy_img_path" cty:"floppy_img_path" hcl:"floppy_img_path"` FloppyFiles []string `mapstructure:"floppy_files" cty:"floppy_files" hcl:"floppy_files"` FloppyDirectories []string `mapstructure:"floppy_dirs" cty:"floppy_dirs" hcl:"floppy_dirs"` FloppyLabel *string `mapstructure:"floppy_label" cty:"floppy_label" hcl:"floppy_label"` @@ -210,7 +209,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "cdrom_type": &hcldec.AttrSpec{Name: "cdrom_type", Type: cty.String, Required: false}, "iso_paths": &hcldec.AttrSpec{Name: "iso_paths", Type: cty.List(cty.String), Required: false}, "remove_cdrom": &hcldec.AttrSpec{Name: "remove_cdrom", Type: cty.Bool, Required: false}, - "floppy_img_path": &hcldec.AttrSpec{Name: "floppy_img_path", Type: cty.String, Required: false}, "floppy_files": &hcldec.AttrSpec{Name: "floppy_files", Type: cty.List(cty.String), Required: false}, "floppy_dirs": &hcldec.AttrSpec{Name: "floppy_dirs", Type: cty.List(cty.String), Required: false}, "floppy_label": &hcldec.AttrSpec{Name: "floppy_label", Type: cty.String, Required: false}, diff --git a/builder/yandex/builder.go b/builder/yandex/builder.go index dec8446a8..450386233 100644 --- a/builder/yandex/builder.go +++ b/builder/yandex/builder.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" @@ -83,8 +83,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack Host: commHost, SSHConfig: b.config.Communicator.SSHConfigFunc(), }, - &common.StepProvision{}, - &common.StepCleanupTempKeys{ + &commonsteps.StepProvision{}, + &commonsteps.StepCleanupTempKeys{ Comm: &b.config.Communicator, }, &StepTeardownInstance{}, @@ -94,7 +94,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack } // Run the steps - b.runner = common.NewRunner(steps, b.config.PackerConfig, ui) + b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui) b.runner.Run(ctx, state) // Report any errors diff --git a/common/bootcommand/config.go b/common/bootcommand/config.go index ad5e8b700..79c14d3d5 100644 --- a/common/bootcommand/config.go +++ b/common/bootcommand/config.go @@ -10,6 +10,15 @@ import ( "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) +// PackerKeyEnv is used to specify the key interval (delay) between keystrokes +// sent to the VM, typically in boot commands. This is to prevent host CPU +// utilization from causing key presses to be skipped or repeated incorrectly. +const PackerKeyEnv = "PACKER_KEY_INTERVAL" + +// PackerKeyDefault 100ms is appropriate for shared build infrastructure while a +// shorter delay (e.g. 10ms) can be used on a workstation. See PackerKeyEnv. +const PackerKeyDefault = 100 * time.Millisecond + // The boot configuration is very important: `boot_command` specifies the keys // to type when the virtual machine is first booted in order to start the OS // installer. This command is typed after boot_wait, which gives the virtual diff --git a/common/bootcommand/pc_xt_driver.go b/common/bootcommand/pc_xt_driver.go index 2a3dcb746..93ab9f21f 100644 --- a/common/bootcommand/pc_xt_driver.go +++ b/common/bootcommand/pc_xt_driver.go @@ -8,8 +8,6 @@ import ( "time" "unicode" "unicode/utf8" - - "github.com/hashicorp/packer/common" ) // SendCodeFunc will be called to send codes to the VM @@ -41,8 +39,8 @@ func (sc *scancode) makeBreak() []string { func NewPCXTDriver(send SendCodeFunc, chunkSize int, interval time.Duration) *pcXTDriver { // We delay (default 100ms) between each input event to allow for CPU or // network latency. See PackerKeyEnv for tuning. - keyInterval := common.PackerKeyDefault - if delay, err := time.ParseDuration(os.Getenv(common.PackerKeyEnv)); err == nil { + keyInterval := PackerKeyDefault + if delay, err := time.ParseDuration(os.Getenv(PackerKeyEnv)); err == nil { keyInterval = delay } // Override interval based on builder-specific override diff --git a/common/bootcommand/usb_driver.go b/common/bootcommand/usb_driver.go index 519c28525..c79c5a312 100644 --- a/common/bootcommand/usb_driver.go +++ b/common/bootcommand/usb_driver.go @@ -8,7 +8,6 @@ import ( "time" "unicode" - "github.com/hashicorp/packer/common" "golang.org/x/mobile/event/key" ) @@ -25,8 +24,8 @@ type usbDriver struct { func NewUSBDriver(send SendUsbScanCodes, interval time.Duration) *usbDriver { // We delay (default 100ms) between each key event to allow for CPU or // network latency. See PackerKeyEnv for tuning. - keyInterval := common.PackerKeyDefault - if delay, err := time.ParseDuration(os.Getenv(common.PackerKeyEnv)); err == nil { + keyInterval := PackerKeyDefault + if delay, err := time.ParseDuration(os.Getenv(PackerKeyEnv)); err == nil { keyInterval = delay } // override interval based on builder-specific override. diff --git a/common/bootcommand/vnc_driver.go b/common/bootcommand/vnc_driver.go index 027bcffca..f1b98ae8d 100644 --- a/common/bootcommand/vnc_driver.go +++ b/common/bootcommand/vnc_driver.go @@ -7,8 +7,6 @@ import ( "strings" "time" "unicode" - - "github.com/hashicorp/packer/common" ) const KeyLeftShift uint32 = 0xFFE1 @@ -28,8 +26,8 @@ type vncDriver struct { func NewVNCDriver(c VNCKeyEvent, interval time.Duration) *vncDriver { // We delay (default 100ms) between each key event to allow for CPU or // network latency. See PackerKeyEnv for tuning. - keyInterval := common.PackerKeyDefault - if delay, err := time.ParseDuration(os.Getenv(common.PackerKeyEnv)); err == nil { + keyInterval := PackerKeyDefault + if delay, err := time.ParseDuration(os.Getenv(PackerKeyEnv)); err == nil { keyInterval = delay } // override interval based on builder-specific override. diff --git a/common/chroot/step_chroot_provision.go b/common/chroot/step_chroot_provision.go index 5ab7182eb..e18dae77d 100644 --- a/common/chroot/step_chroot_provision.go +++ b/common/chroot/step_chroot_provision.go @@ -5,6 +5,7 @@ import ( "log" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" ) @@ -26,7 +27,7 @@ func (s *StepChrootProvision) Run(ctx context.Context, state multistep.StateBag) } // Loads hook data from builder's state, if it has been set. - hookData := common.PopulateProvisionHookData(state) + hookData := commonsteps.PopulateProvisionHookData(state) // Update state generated_data with complete hookData // to make them accessible by post-processors diff --git a/common/extra_iso_config.go b/common/commonsteps/extra_iso_config.go similarity index 99% rename from common/extra_iso_config.go rename to common/commonsteps/extra_iso_config.go index 5f4707c27..749a59bf7 100644 --- a/common/extra_iso_config.go +++ b/common/commonsteps/extra_iso_config.go @@ -1,6 +1,6 @@ //go:generate struct-markdown -package common +package commonsteps import ( "fmt" diff --git a/common/extra_iso_config_test.go b/common/commonsteps/extra_iso_config_test.go similarity index 99% rename from common/extra_iso_config_test.go rename to common/commonsteps/extra_iso_config_test.go index bcc555976..70b87057f 100644 --- a/common/extra_iso_config_test.go +++ b/common/commonsteps/extra_iso_config_test.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "testing" diff --git a/common/floppy_config.go b/common/commonsteps/floppy_config.go similarity index 99% rename from common/floppy_config.go rename to common/commonsteps/floppy_config.go index 175d36f73..71685e23c 100644 --- a/common/floppy_config.go +++ b/common/commonsteps/floppy_config.go @@ -1,6 +1,6 @@ //go:generate struct-markdown -package common +package commonsteps import ( "fmt" diff --git a/common/floppy_config_test.go b/common/commonsteps/floppy_config_test.go similarity index 98% rename from common/floppy_config_test.go rename to common/commonsteps/floppy_config_test.go index ee9c742ff..235652e24 100644 --- a/common/floppy_config_test.go +++ b/common/commonsteps/floppy_config_test.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "testing" diff --git a/common/http_config.go b/common/commonsteps/http_config.go similarity index 99% rename from common/http_config.go rename to common/commonsteps/http_config.go index 0cb176eb4..6939c43ec 100644 --- a/common/http_config.go +++ b/common/commonsteps/http_config.go @@ -1,6 +1,6 @@ //go:generate struct-markdown -package common +package commonsteps import ( "errors" diff --git a/common/http_config_test.go b/common/commonsteps/http_config_test.go similarity index 97% rename from common/http_config_test.go rename to common/commonsteps/http_config_test.go index 02b800845..add5c9304 100644 --- a/common/http_config_test.go +++ b/common/commonsteps/http_config_test.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "testing" diff --git a/common/iso_config.go b/common/commonsteps/iso_config.go similarity index 99% rename from common/iso_config.go rename to common/commonsteps/iso_config.go index 14addecd1..5034939a0 100644 --- a/common/iso_config.go +++ b/common/commonsteps/iso_config.go @@ -1,6 +1,6 @@ //go:generate struct-markdown -package common +package commonsteps import ( "context" diff --git a/common/iso_config_test.go b/common/commonsteps/iso_config_test.go similarity index 99% rename from common/iso_config_test.go rename to common/commonsteps/iso_config_test.go index 502195d52..cdf97aa6f 100644 --- a/common/iso_config_test.go +++ b/common/commonsteps/iso_config_test.go @@ -1,6 +1,6 @@ // +build !windows -package common +package commonsteps import ( "io" diff --git a/common/multistep_debug.go b/common/commonsteps/multistep_debug.go similarity index 98% rename from common/multistep_debug.go rename to common/commonsteps/multistep_debug.go index 2d1a58291..9ef48f4d4 100644 --- a/common/multistep_debug.go +++ b/common/commonsteps/multistep_debug.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "fmt" diff --git a/common/multistep_runner.go b/common/commonsteps/multistep_runner.go similarity index 91% rename from common/multistep_runner.go rename to common/commonsteps/multistep_runner.go index 7dd614562..5c7508203 100644 --- a/common/multistep_runner.go +++ b/common/commonsteps/multistep_runner.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "context" @@ -8,11 +8,12 @@ import ( "strings" "time" + "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" ) -func newRunner(steps []multistep.Step, config PackerConfig, ui packer.Ui) (multistep.Runner, multistep.DebugPauseFn) { +func newRunner(steps []multistep.Step, config common.PackerConfig, ui packer.Ui) (multistep.Runner, multistep.DebugPauseFn) { switch config.PackerOnError { case "", "cleanup": case "abort": @@ -47,7 +48,7 @@ func newRunner(steps []multistep.Step, config PackerConfig, ui packer.Ui) (multi // NewRunner returns a multistep.Runner that runs steps augmented with support // for -debug and -on-error command line arguments. -func NewRunner(steps []multistep.Step, config PackerConfig, ui packer.Ui) multistep.Runner { +func NewRunner(steps []multistep.Step, config common.PackerConfig, ui packer.Ui) multistep.Runner { runner, _ := newRunner(steps, config, ui) return runner } @@ -56,7 +57,7 @@ func NewRunner(steps []multistep.Step, config PackerConfig, ui packer.Ui) multis // with support for -debug and -on-error command line arguments. With -debug it // puts the multistep.DebugPauseFn that will pause execution between steps into // the state under the key "pauseFn". -func NewRunnerWithPauseFn(steps []multistep.Step, config PackerConfig, ui packer.Ui, state multistep.StateBag) multistep.Runner { +func NewRunnerWithPauseFn(steps []multistep.Step, config common.PackerConfig, ui packer.Ui, state multistep.StateBag) multistep.Runner { runner, pauseFn := newRunner(steps, config, ui) if pauseFn != nil { state.Put("pauseFn", pauseFn) diff --git a/common/step_cleanup_temp_keys.go b/common/commonsteps/step_cleanup_temp_keys.go similarity index 99% rename from common/step_cleanup_temp_keys.go rename to common/commonsteps/step_cleanup_temp_keys.go index a6235a91d..aa1c7c4f8 100644 --- a/common/step_cleanup_temp_keys.go +++ b/common/commonsteps/step_cleanup_temp_keys.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "context" diff --git a/common/step_create_cdrom.go b/common/commonsteps/step_create_cdrom.go similarity index 99% rename from common/step_create_cdrom.go rename to common/commonsteps/step_create_cdrom.go index 0f1c5664d..5cecbcbb7 100644 --- a/common/step_create_cdrom.go +++ b/common/commonsteps/step_create_cdrom.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "context" diff --git a/common/step_create_cdrom_test.go b/common/commonsteps/step_create_cdrom_test.go similarity index 99% rename from common/step_create_cdrom_test.go rename to common/commonsteps/step_create_cdrom_test.go index bdcc83535..cfdf05404 100644 --- a/common/step_create_cdrom_test.go +++ b/common/commonsteps/step_create_cdrom_test.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "bytes" diff --git a/common/step_create_floppy.go b/common/commonsteps/step_create_floppy.go similarity index 99% rename from common/step_create_floppy.go rename to common/commonsteps/step_create_floppy.go index 128a0e78b..418df6fbf 100644 --- a/common/step_create_floppy.go +++ b/common/commonsteps/step_create_floppy.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "context" diff --git a/common/step_create_floppy_test.go b/common/commonsteps/step_create_floppy_test.go similarity index 99% rename from common/step_create_floppy_test.go rename to common/commonsteps/step_create_floppy_test.go index e2680acdb..78bc135d7 100644 --- a/common/step_create_floppy_test.go +++ b/common/commonsteps/step_create_floppy_test.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "bytes" diff --git a/common/step_download.go b/common/commonsteps/step_download.go similarity index 99% rename from common/step_download.go rename to common/commonsteps/step_download.go index f2f0ca177..b23585b37 100644 --- a/common/step_download.go +++ b/common/commonsteps/step_download.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "context" diff --git a/common/step_download_test.go b/common/commonsteps/step_download_test.go similarity index 99% rename from common/step_download_test.go rename to common/commonsteps/step_download_test.go index 26cd026e9..b6c7870c2 100644 --- a/common/step_download_test.go +++ b/common/commonsteps/step_download_test.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "bytes" diff --git a/common/step_http_server.go b/common/commonsteps/step_http_server.go similarity index 98% rename from common/step_http_server.go rename to common/commonsteps/step_http_server.go index c63e51dcd..df0673774 100644 --- a/common/step_http_server.go +++ b/common/commonsteps/step_http_server.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "context" diff --git a/common/step_output_dir.go b/common/commonsteps/step_output_dir.go similarity index 98% rename from common/step_output_dir.go rename to common/commonsteps/step_output_dir.go index 4f68b80c2..2dbdda596 100644 --- a/common/step_output_dir.go +++ b/common/commonsteps/step_output_dir.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "context" diff --git a/common/step_output_dir_test.go b/common/commonsteps/step_output_dir_test.go similarity index 99% rename from common/step_output_dir_test.go rename to common/commonsteps/step_output_dir_test.go index 7a5f58d95..cf658e8a1 100644 --- a/common/step_output_dir_test.go +++ b/common/commonsteps/step_output_dir_test.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "bytes" diff --git a/common/step_provision.go b/common/commonsteps/step_provision.go similarity index 99% rename from common/step_provision.go rename to common/commonsteps/step_provision.go index 2326649b9..1ec20e365 100644 --- a/common/step_provision.go +++ b/common/commonsteps/step_provision.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "context" diff --git a/common/step_provision_test.go b/common/commonsteps/step_provision_test.go similarity index 99% rename from common/step_provision_test.go rename to common/commonsteps/step_provision_test.go index 33a971e13..ddca131fe 100644 --- a/common/step_provision_test.go +++ b/common/commonsteps/step_provision_test.go @@ -1,4 +1,4 @@ -package common +package commonsteps import ( "fmt" diff --git a/common/config.go b/common/config.go deleted file mode 100644 index 8094e05e5..000000000 --- a/common/config.go +++ /dev/null @@ -1,14 +0,0 @@ -package common - -import ( - "time" -) - -// PackerKeyEnv is used to specify the key interval (delay) between keystrokes -// sent to the VM, typically in boot commands. This is to prevent host CPU -// utilization from causing key presses to be skipped or repeated incorrectly. -const PackerKeyEnv = "PACKER_KEY_INTERVAL" - -// PackerKeyDefault 100ms is appropriate for shared build infrastructure while a -// shorter delay (e.g. 10ms) can be used on a workstation. See PackerKeyEnv. -const PackerKeyDefault = 100 * time.Millisecond diff --git a/common/shell-local/run.go b/common/shell-local/run.go index 85ade3696..cb3a47f83 100644 --- a/common/shell-local/run.go +++ b/common/shell-local/run.go @@ -11,7 +11,7 @@ import ( "sort" "strings" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" @@ -181,15 +181,15 @@ func createFlattenedEnvVars(config *Config) (string, error) { // expose ip address variables httpAddr := config.generatedData["PackerHTTPAddr"] - if httpAddr != nil && httpAddr != common.HttpAddrNotImplemented { + if httpAddr != nil && httpAddr != commonsteps.HttpAddrNotImplemented { envVars["PACKER_HTTP_ADDR"] = httpAddr.(string) } httpIP := config.generatedData["PackerHTTPIP"] - if httpIP != nil && httpIP != common.HttpIPNotImplemented { + if httpIP != nil && httpIP != commonsteps.HttpIPNotImplemented { envVars["PACKER_HTTP_IP"] = httpIP.(string) } httpPort := config.generatedData["PackerHTTPPort"] - if httpPort != nil && httpPort != common.HttpPortNotImplemented { + if httpPort != nil && httpPort != commonsteps.HttpPortNotImplemented { envVars["PACKER_HTTP_PORT"] = httpPort.(string) } diff --git a/go.mod b/go.mod index a89a5bc24..352ad70ee 100644 --- a/go.mod +++ b/go.mod @@ -94,6 +94,7 @@ require ( github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/go-testing-interface v1.0.3 // indirect github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed + github.com/mitchellh/gox v1.0.1 // indirect github.com/mitchellh/iochan v1.0.0 github.com/mitchellh/mapstructure v1.2.3 github.com/mitchellh/panicwrap v1.0.0 @@ -133,11 +134,11 @@ require ( github.com/zclconf/go-cty-yaml v1.0.1 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 golang.org/x/mobile v0.0.0-20191130191448-5c0e7e404af8 - golang.org/x/net v0.0.0-20200904194848-62affa334b73 + golang.org/x/net v0.0.0-20201021035429-f5854403a974 golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 - golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 - golang.org/x/sys v0.0.0-20200918174421-af09f7315aff - golang.org/x/tools v0.0.0-20200918232735-d647fc253266 + golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 + golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f + golang.org/x/tools v0.0.0-20201111133315-69daaf961d65 google.golang.org/api v0.32.0 google.golang.org/genproto v0.0.0-20200918140846-d0d605568037 // indirect google.golang.org/grpc v1.32.0 diff --git a/go.sum b/go.sum index 8a908afec..bbf61b351 100644 --- a/go.sum +++ b/go.sum @@ -376,6 +376,7 @@ github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E= @@ -510,6 +511,8 @@ github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZX github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/gox v1.0.1 h1:x0jD3dcHk9a9xPSDN6YEL4xL6Qz0dvNYm8yZqui5chI= +github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4= github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -753,6 +756,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA= golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -771,6 +776,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03i golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -815,6 +822,8 @@ golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200918174421-af09f7315aff h1:1CPUrky56AcgSpxz/KfgzQWzfG09u5YOL8MvPYBlrL8= golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -875,6 +884,8 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20200915173823-2db8f0ff891c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20200918232735-d647fc253266 h1:k7tVuG0g1JwmD3Jh8oAl1vQ1C3jb4Hi/dUl1wWDBJpQ= golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201111133315-69daaf961d65 h1:cuDLV0fZoIC/Oj72hGUKPhXR2AvbvJoQKPmSeE5nH4Q= +golang.org/x/tools v0.0.0-20201111133315-69daaf961d65/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/post-processor/docker-push/post-processor.go b/post-processor/docker-push/post-processor.go index ba264d418..4c90fb25f 100644 --- a/post-processor/docker-push/post-processor.go +++ b/post-processor/docker-push/post-processor.go @@ -5,6 +5,7 @@ package dockerpush import ( "context" "fmt" + "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/docker" "github.com/hashicorp/packer/common" diff --git a/post-processor/googlecompute-export/post-processor.go b/post-processor/googlecompute-export/post-processor.go index d24018617..c0ef8aa05 100644 --- a/post-processor/googlecompute-export/post-processor.go +++ b/post-processor/googlecompute-export/post-processor.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/googlecompute" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -224,7 +225,7 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact } // Run the steps. - p.runner = common.NewRunner(steps, p.config.PackerConfig, ui) + p.runner = commonsteps.NewRunner(steps, p.config.PackerConfig, ui) p.runner.Run(ctx, state) result := &Artifact{paths: p.config.Paths} diff --git a/post-processor/vagrant-cloud/post-processor.go b/post-processor/vagrant-cloud/post-processor.go index 487fde5b1..5e4f9798e 100644 --- a/post-processor/vagrant-cloud/post-processor.go +++ b/post-processor/vagrant-cloud/post-processor.go @@ -20,6 +20,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -195,7 +196,7 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact steps = append(steps, new(stepReleaseVersion)) // Run the steps - p.runner = common.NewRunner(steps, p.config.PackerConfig, ui) + p.runner = commonsteps.NewRunner(steps, p.config.PackerConfig, ui) p.runner.Run(ctx, state) // If there was an error, return that diff --git a/post-processor/vsphere-template/post-processor.go b/post-processor/vsphere-template/post-processor.go index 3d3675cd8..4986500eb 100644 --- a/post-processor/vsphere-template/post-processor.go +++ b/post-processor/vsphere-template/post-processor.go @@ -10,17 +10,17 @@ import ( "strings" "time" + "github.com/hashicorp/hcl/v2/hcldec" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" vsphere "github.com/hashicorp/packer/builder/vsphere/common" - vspherepost "github.com/hashicorp/packer/post-processor/vsphere" - - "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" + vspherepost "github.com/hashicorp/packer/post-processor/vsphere" "github.com/vmware/govmomi" ) @@ -144,7 +144,7 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact NewStepCreateSnapshot(artifact, p), NewStepMarkAsTemplate(artifact, p), } - runner := common.NewRunnerWithPauseFn(steps, p.config.PackerConfig, ui, state) + runner := commonsteps.NewRunnerWithPauseFn(steps, p.config.PackerConfig, ui, state) runner.Run(ctx, state) if rawErr, ok := state.GetOk("error"); ok { return nil, false, false, rawErr.(error) diff --git a/post-processor/yandex-export/post-processor.go b/post-processor/yandex-export/post-processor.go index 40f8639fa..38741484c 100644 --- a/post-processor/yandex-export/post-processor.go +++ b/post-processor/yandex-export/post-processor.go @@ -14,6 +14,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/yandex" "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" @@ -217,7 +218,7 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact } // Run the steps. - p.runner = common.NewRunner(steps, p.config.PackerConfig, ui) + p.runner = commonsteps.NewRunner(steps, p.config.PackerConfig, ui) p.runner.Run(ctx, state) if rawErr, ok := state.GetOk("error"); ok { return nil, false, false, rawErr.(error) diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go index 27dee7bbb..0f09d7c19 100644 --- a/provisioner/ansible/provisioner.go +++ b/provisioner/ansible/provisioner.go @@ -32,6 +32,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/adapter" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" @@ -739,7 +740,7 @@ func (p *Provisioner) createCmdArgs(httpAddr, inventory, playbook, privKeyFile s args = append(args, "-e", fmt.Sprintf("packer_builder_type=%s", p.config.PackerBuilderType)) // expose packer_http_addr extra variable - if httpAddr != common.HttpAddrNotImplemented { + if httpAddr != commonsteps.HttpAddrNotImplemented { args = append(args, "-e", fmt.Sprintf("packer_http_addr=%s", httpAddr)) } diff --git a/provisioner/ansible/provisioner_test.go b/provisioner/ansible/provisioner_test.go index a98fae8a4..bce35b227 100644 --- a/provisioner/ansible/provisioner_test.go +++ b/provisioner/ansible/provisioner_test.go @@ -14,7 +14,6 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/common" confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/stretchr/testify/assert" @@ -475,9 +474,9 @@ func basicGenData(input map[string]interface{}) map[string]interface{} { "SSHPrivateKey": "asdf", "SSHAgentAuth": false, "User": "PartyPacker", - "PackerHTTPAddr": common.HttpAddrNotImplemented, - "PackerHTTPIP": common.HttpIPNotImplemented, - "PackerHTTPPort": common.HttpPortNotImplemented, + "PackerHTTPAddr": commonsteps.HttpAddrNotImplemented, + "PackerHTTPIP": commonsteps.HttpIPNotImplemented, + "PackerHTTPPort": commonsteps.HttpPortNotImplemented, } if input == nil { return gd @@ -510,7 +509,7 @@ func TestCreateCmdArgs(t *testing.T) { generatedData: basicGenData(nil), ExtraArguments: []string{"-e", "hello-world"}, AnsibleEnvVars: []string{"ENV_1=pancakes", "ENV_2=bananas"}, - callArgs: []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"}, + callArgs: []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"}, ExpectedArgs: []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "-e", "ansible_ssh_private_key_file=/path/to/privkey.pem", "--ssh-extra-args", "'-o IdentitiesOnly=yes'", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"}, ExpectedEnvVars: []string{"ENV_1=pancakes", "ENV_2=bananas"}, }, @@ -522,7 +521,7 @@ func TestCreateCmdArgs(t *testing.T) { ExtraArguments: []string{"-e", "hello-world"}, AnsibleSSHExtraArgs: []string{"-o IdentitiesOnly=no"}, AnsibleEnvVars: []string{"ENV_1=pancakes", "ENV_2=bananas"}, - callArgs: []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"}, + callArgs: []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"}, ExpectedArgs: []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "--ssh-extra-args", "'-o IdentitiesOnly=no'", "-e", "ansible_ssh_private_key_file=/path/to/privkey.pem", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"}, ExpectedEnvVars: []string{"ENV_1=pancakes", "ENV_2=bananas"}, }, @@ -532,7 +531,7 @@ func TestCreateCmdArgs(t *testing.T) { UseProxy: confighelper.TriTrue, generatedData: basicGenData(nil), ExtraArguments: []string{"-e", "hello-world"}, - callArgs: []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"}, + callArgs: []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"}, ExpectedArgs: []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "-e", "ansible_ssh_private_key_file=/path/to/privkey.pem", "--ssh-extra-args", "'-o IdentitiesOnly=yes'", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"}, ExpectedEnvVars: []string{}, }, @@ -545,7 +544,7 @@ func TestCreateCmdArgs(t *testing.T) { }), ExtraArguments: []string{"-e", "hello-world"}, AnsibleEnvVars: []string{"ENV_1=pancakes", "ENV_2=bananas"}, - callArgs: []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""}, + callArgs: []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""}, ExpectedArgs: []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"}, ExpectedEnvVars: []string{"ENV_1=pancakes", "ENV_2=bananas"}, }, @@ -584,7 +583,7 @@ func TestCreateCmdArgs(t *testing.T) { }), ExtraArguments: []string{"-e", "hello-world"}, AnsibleEnvVars: []string{"ENV_1=pancakes", "ENV_2=bananas"}, - callArgs: []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""}, + callArgs: []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""}, ExpectedArgs: []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"}, ExpectedEnvVars: []string{"ENV_1=pancakes", "ENV_2=bananas"}, }, @@ -637,7 +636,7 @@ func TestCreateCmdArgs(t *testing.T) { UseProxy: confighelper.TriTrue, generatedData: basicGenData(nil), ExtraArguments: []string{"-e", "hello-world"}, - callArgs: []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"}, + callArgs: []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"}, ExpectedArgs: []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "-e", "ansible_ssh_private_key_file=/path/to/privkey.pem", "--ssh-extra-args", "'-o IdentitiesOnly=yes'", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"}, ExpectedEnvVars: []string{}, }, @@ -648,7 +647,7 @@ func TestCreateCmdArgs(t *testing.T) { generatedData: basicGenData(nil), AnsibleSSHExtraArgs: []string{"-o IdentitiesOnly=no"}, ExtraArguments: []string{"-e", "hello-world"}, - callArgs: []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"}, + callArgs: []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"}, ExpectedArgs: []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "-e", "ansible_ssh_private_key_file=/path/to/privkey.pem", "--ssh-extra-args", "'-o IdentitiesOnly=no'", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"}, ExpectedEnvVars: []string{}, }, @@ -656,7 +655,7 @@ func TestCreateCmdArgs(t *testing.T) { TestName: "Use SSH Agent", UseProxy: confighelper.TriTrue, generatedData: basicGenData(nil), - callArgs: []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""}, + callArgs: []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""}, ExpectedArgs: []string{"-e", "packer_builder_type=fakebuilder", "-i", "/var/inventory", "test-playbook.yml"}, ExpectedEnvVars: []string{}, }, @@ -664,7 +663,7 @@ func TestCreateCmdArgs(t *testing.T) { // No builder name. This shouldn't cause an error, it just shouldn't be set. HCL, yo. TestName: "No builder name. This shouldn't cause an error, it just shouldn't be set. HCL, yo.", generatedData: basicGenData(nil), - callArgs: []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""}, + callArgs: []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""}, ExpectedArgs: []string{"-e", "packer_builder_type=fakebuilder", "-i", "/var/inventory", "test-playbook.yml"}, ExpectedEnvVars: []string{}, }, diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go index 639314b96..714f11271 100644 --- a/provisioner/powershell/provisioner.go +++ b/provisioner/powershell/provisioner.go @@ -17,7 +17,7 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/common/shell" @@ -407,15 +407,15 @@ func (p *Provisioner) createFlattenedEnvVars(elevated bool) (flattened string) { // expose ip address variables httpAddr := p.generatedData["PackerHTTPAddr"] - if httpAddr != nil && httpAddr != common.HttpAddrNotImplemented { + if httpAddr != nil && httpAddr != commonsteps.HttpAddrNotImplemented { envVars["PACKER_HTTP_ADDR"] = httpAddr.(string) } httpIP := p.generatedData["PackerHTTPIP"] - if httpIP != nil && httpIP != common.HttpIPNotImplemented { + if httpIP != nil && httpIP != commonsteps.HttpIPNotImplemented { envVars["PACKER_HTTP_IP"] = httpIP.(string) } httpPort := p.generatedData["PackerHTTPPort"] - if httpPort != nil && httpPort != common.HttpPortNotImplemented { + if httpPort != nil && httpPort != commonsteps.HttpPortNotImplemented { envVars["PACKER_HTTP_PORT"] = httpPort.(string) } diff --git a/provisioner/powershell/provisioner_test.go b/provisioner/powershell/provisioner_test.go index 4def2785c..fcacd7919 100644 --- a/provisioner/powershell/provisioner_test.go +++ b/provisioner/powershell/provisioner_test.go @@ -11,7 +11,6 @@ import ( "testing" "time" - "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/packer" "github.com/stretchr/testify/assert" ) @@ -856,8 +855,8 @@ func testConfigWithSkipClean() map[string]interface{} { func generatedData() map[string]interface{} { return map[string]interface{}{ - "PackerHTTPAddr": common.HttpAddrNotImplemented, - "PackerHTTPIP": common.HttpIPNotImplemented, - "PackerHTTPPort": common.HttpPortNotImplemented, + "PackerHTTPAddr": commonsteps.HttpAddrNotImplemented, + "PackerHTTPIP": commonsteps.HttpIPNotImplemented, + "PackerHTTPPort": commonsteps.HttpPortNotImplemented, } } diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go index aec7dc021..7b6fdd918 100644 --- a/provisioner/shell/provisioner.go +++ b/provisioner/shell/provisioner.go @@ -18,7 +18,7 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/common/shell" "github.com/hashicorp/packer/helper/config" @@ -418,15 +418,15 @@ func (p *Provisioner) escapeEnvVars() ([]string, map[string]string) { // expose ip address variables httpAddr := p.generatedData["PackerHTTPAddr"] - if httpAddr != nil && httpAddr != common.HttpAddrNotImplemented { + if httpAddr != nil && httpAddr != commonsteps.HttpAddrNotImplemented { envVars["PACKER_HTTP_ADDR"] = httpAddr.(string) } httpIP := p.generatedData["PackerHTTPIP"] - if httpIP != nil && httpIP != common.HttpIPNotImplemented { + if httpIP != nil && httpIP != commonsteps.HttpIPNotImplemented { envVars["PACKER_HTTP_IP"] = httpIP.(string) } httpPort := p.generatedData["PackerHTTPPort"] - if httpPort != nil && httpPort != common.HttpPortNotImplemented { + if httpPort != nil && httpPort != commonsteps.HttpPortNotImplemented { envVars["PACKER_HTTP_PORT"] = httpPort.(string) } diff --git a/provisioner/shell/provisioner_test.go b/provisioner/shell/provisioner_test.go index e4e05e699..e59130ef7 100644 --- a/provisioner/shell/provisioner_test.go +++ b/provisioner/shell/provisioner_test.go @@ -7,7 +7,6 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/packer" ) @@ -563,8 +562,8 @@ func TestProvisionerRemotePathDefaultsSuccessfully(t *testing.T) { func generatedData() map[string]interface{} { return map[string]interface{}{ - "PackerHTTPAddr": common.HttpAddrNotImplemented, - "PackerHTTPIP": common.HttpIPNotImplemented, - "PackerHTTPPort": common.HttpPortNotImplemented, + "PackerHTTPAddr": commonsteps.HttpAddrNotImplemented, + "PackerHTTPIP": commonsteps.HttpIPNotImplemented, + "PackerHTTPPort": commonsteps.HttpPortNotImplemented, } } diff --git a/provisioner/windows-shell/provisioner.go b/provisioner/windows-shell/provisioner.go index 7654154d3..36b6c0512 100644 --- a/provisioner/windows-shell/provisioner.go +++ b/provisioner/windows-shell/provisioner.go @@ -16,7 +16,7 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/common/shell" "github.com/hashicorp/packer/helper/config" @@ -241,15 +241,15 @@ func (p *Provisioner) createFlattenedEnvVars() (flattened string) { // expose ip address variables httpAddr := p.generatedData["PackerHTTPAddr"] - if httpAddr != nil && httpAddr != common.HttpAddrNotImplemented { + if httpAddr != nil && httpAddr != commonsteps.HttpAddrNotImplemented { envVars["PACKER_HTTP_ADDR"] = httpAddr.(string) } httpIP := p.generatedData["PackerHTTPIP"] - if httpIP != nil && httpIP != common.HttpIPNotImplemented { + if httpIP != nil && httpIP != commonsteps.HttpIPNotImplemented { envVars["PACKER_HTTP_IP"] = httpIP.(string) } httpPort := p.generatedData["PackerHTTPPort"] - if httpPort != nil && httpPort != common.HttpPortNotImplemented { + if httpPort != nil && httpPort != commonsteps.HttpPortNotImplemented { envVars["PACKER_HTTP_PORT"] = httpPort.(string) } diff --git a/provisioner/windows-shell/provisioner_test.go b/provisioner/windows-shell/provisioner_test.go index 4fb65ac3f..af1b45a4d 100644 --- a/provisioner/windows-shell/provisioner_test.go +++ b/provisioner/windows-shell/provisioner_test.go @@ -9,7 +9,6 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/packer" ) @@ -433,8 +432,8 @@ func TestCancel(t *testing.T) { } func generatedData() map[string]interface{} { return map[string]interface{}{ - "PackerHTTPAddr": common.HttpAddrNotImplemented, - "PackerHTTPIP": common.HttpIPNotImplemented, - "PackerHTTPPort": common.HttpPortNotImplemented, + "PackerHTTPAddr": commonsteps.HttpAddrNotImplemented, + "PackerHTTPIP": commonsteps.HttpIPNotImplemented, + "PackerHTTPPort": commonsteps.HttpPortNotImplemented, } } diff --git a/vendor/github.com/1and1/oneandone-cloudserver-sdk-go/errors.go b/vendor/github.com/1and1/oneandone-cloudserver-sdk-go/errors.go index 08cc9c250..62e8170c1 100644 --- a/vendor/github.com/1and1/oneandone-cloudserver-sdk-go/errors.go +++ b/vendor/github.com/1and1/oneandone-cloudserver-sdk-go/errors.go @@ -5,8 +5,8 @@ import ( ) type errorResponse struct { - Type string `json:"type"` - Message string `json:"message"` + Type string `json:"type"` + Message string `json:"message"` } type apiError struct { diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_group.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_group.go index 001ddadb6..e0a1b2fb9 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_group.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_group.go @@ -12,17 +12,17 @@ package server type AccessControlGroup struct { // 접근제어그룹설정번호 -AccessControlGroupConfigurationNo *string `json:"accessControlGroupConfigurationNo,omitempty"` + AccessControlGroupConfigurationNo *string `json:"accessControlGroupConfigurationNo,omitempty"` // 접근제어그룹명 -AccessControlGroupName *string `json:"accessControlGroupName,omitempty"` + AccessControlGroupName *string `json:"accessControlGroupName,omitempty"` // 접근제어그룹설명 -AccessControlGroupDescription *string `json:"accessControlGroupDescription,omitempty"` + AccessControlGroupDescription *string `json:"accessControlGroupDescription,omitempty"` // 디폴트그룹여부 -IsDefaultGroup *bool `json:"isDefaultGroup,omitempty"` + IsDefaultGroup *bool `json:"isDefaultGroup,omitempty"` // 생성일자 -CreateDate *string `json:"createDate,omitempty"` + CreateDate *string `json:"createDate,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_rule.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_rule.go index ec2eb27e0..ee225cf52 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_rule.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_rule.go @@ -12,23 +12,23 @@ package server type AccessControlRule struct { // 접근제어RULE설정번호 -AccessControlRuleConfigurationNo *string `json:"accessControlRuleConfigurationNo,omitempty"` + AccessControlRuleConfigurationNo *string `json:"accessControlRuleConfigurationNo,omitempty"` // 프로토콜구분 -ProtocolType *CommonCode `json:"protocolType,omitempty"` + ProtocolType *CommonCode `json:"protocolType,omitempty"` // 소스IP -SourceIp *string `json:"sourceIp,omitempty"` + SourceIp *string `json:"sourceIp,omitempty"` // 소스접근제어그룹번호 -SourceAccessControlRuleConfigurationNo *string `json:"sourceAccessControlRuleConfigurationNo,omitempty"` + SourceAccessControlRuleConfigurationNo *string `json:"sourceAccessControlRuleConfigurationNo,omitempty"` // 소스접근제어그룹이름 -SourceAccessControlRuleName *string `json:"sourceAccessControlRuleName,omitempty"` + SourceAccessControlRuleName *string `json:"sourceAccessControlRuleName,omitempty"` // 목적지포트 -DestinationPort *string `json:"destinationPort,omitempty"` + DestinationPort *string `json:"destinationPort,omitempty"` // 접근제어RULE설명 -AccessControlRuleDescription *string `json:"accessControlRuleDescription,omitempty"` + AccessControlRuleDescription *string `json:"accessControlRuleDescription,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_request.go index 07e6540aa..68e3cc515 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_request.go @@ -12,11 +12,11 @@ package server type AddNasVolumeAccessControlRequest struct { // NAS볼륨인스턴스번호 -NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` + NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` // 서버인스턴스번호리스트 -ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` + ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` // 커스텀IP리스트 -CustomIpList []*string `json:"customIpList,omitempty"` + CustomIpList []*string `json:"customIpList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_response.go index e1e0ff73f..7a9ff15b7 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_response.go @@ -10,14 +10,13 @@ package server type AddNasVolumeAccessControlResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` + NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_request.go index 6f737fb7b..dd1f38704 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_request.go @@ -12,8 +12,8 @@ package server type AddPortForwardingRulesRequest struct { // 포트포워딩설정번호 -PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo"` + PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo"` // 포트포워딩RULE리스트 -PortForwardingRuleList []*PortForwardingRuleParameter `json:"portForwardingRuleList"` + PortForwardingRuleList []*PortForwardingRuleParameter `json:"portForwardingRuleList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_response.go index 13d3eeb8e..a7ba004e6 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_response.go @@ -10,26 +10,25 @@ package server type AddPortForwardingRulesResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` - -ReturnMessage *string `json:"returnMessage,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` // 포트포워딩설정번호 -PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo,omitempty"` + PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo,omitempty"` // 포트포워딩공인IP -PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` + PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` // ZONE -Zone *Zone `json:"zone,omitempty"` + Zone *Zone `json:"zone,omitempty"` // 인터넷회선구분 -InternetLineType *CommonCode `json:"internetLineType,omitempty"` + InternetLineType *CommonCode `json:"internetLineType,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -PortForwardingRuleList []*PortForwardingRule `json:"portForwardingRuleList,omitempty"` + PortForwardingRuleList []*PortForwardingRule `json:"portForwardingRuleList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_client.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_client.go index 45924823c..7ba923d8b 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_client.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_client.go @@ -326,7 +326,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e if f.Kind() == reflect.Ptr { switch f.Type().String() { case "*string": - result += fmt.Sprintf("&%s=%s", key, url.QueryEscape(ncloud.StringValue(f.Interface().(*string)))) + result += fmt.Sprintf("&%s=%s", key, url.QueryEscape(ncloud.StringValue(f.Interface().(*string)))) case "*bool": result += fmt.Sprintf("&%s=%t", key, ncloud.BoolValue(f.Interface().(*bool))) case "*int": @@ -352,7 +352,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e switch subItem.Type().String() { case "*string": - result += fmt.Sprintf("&%s.%d.%s=%s", key, i+1, subKey, url.QueryEscape(ncloud.StringValue(subItem.Interface().(*string)))) + result += fmt.Sprintf("&%s.%d.%s=%s", key, i+1, subKey, url.QueryEscape(ncloud.StringValue(subItem.Interface().(*string)))) case "*bool": result += fmt.Sprintf("&%s.%d.%s=%t", key, i+1, subKey, ncloud.BoolValue(subItem.Interface().(*bool))) case "*int": @@ -368,7 +368,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e } else { switch item.Type().String() { case "*string": - result += fmt.Sprintf("&%s.%d=%s", key, i+1, url.QueryEscape(*item.Interface().(*string))) + result += fmt.Sprintf("&%s.%d=%s", key, i+1, url.QueryEscape(*item.Interface().(*string))) case "*bool": result += fmt.Sprintf("&%s.%d.%s=%t", key, i+1, ncloud.BoolValue(item.Interface().(*bool))) case "*int": diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_response.go index 923b00b44..fdae16c3d 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_response.go @@ -15,15 +15,15 @@ import ( type APIResponse struct { *http.Response `json:"-"` - Message string `json:"message,omitempty"` + Message string `json:"message,omitempty"` // Operation is the name of the swagger operation. - Operation string `json:"operation,omitempty"` + Operation string `json:"operation,omitempty"` // RequestURL is the request URL. This value is always available, even if the // embedded *http.Response is nil. - RequestURL string `json:"url,omitempty"` + RequestURL string `json:"url,omitempty"` // Method is the HTTP method used for the request. This value is always // available, even if the embedded *http.Response is nil. - Method string `json:"method,omitempty"` + Method string `json:"method,omitempty"` // Payload holds the contents of the response body (which may be nil or empty). // This is provided here as the raw response.Body() reader will have already // been drained. diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_request.go index 473ff97ce..c505179f8 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_request.go @@ -12,8 +12,8 @@ package server type AssociatePublicIpWithServerInstanceRequest struct { // 공인IP인스턴스번호 -PublicIpInstanceNo *string `json:"publicIpInstanceNo"` + PublicIpInstanceNo *string `json:"publicIpInstanceNo"` // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo"` + ServerInstanceNo *string `json:"serverInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_response.go index 3f4dfb459..01fc32d05 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_response.go @@ -10,14 +10,13 @@ package server type AssociatePublicIpWithServerInstanceResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` + PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_request.go index 003eb9f14..303b30552 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_request.go @@ -12,8 +12,8 @@ package server type AttachBlockStorageInstanceRequest struct { // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo"` + ServerInstanceNo *string `json:"serverInstanceNo"` // 블록스토리지인스턴스번호 -BlockStorageInstanceNo *string `json:"blockStorageInstanceNo"` + BlockStorageInstanceNo *string `json:"blockStorageInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_response.go index 3d278fde4..4193b3cbc 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_response.go @@ -10,14 +10,13 @@ package server type AttachBlockStorageInstanceResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` + BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_request.go index e92c035ae..58d416234 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_request.go @@ -12,8 +12,8 @@ package server type AttachNetworkInterfaceRequest struct { // Network Interface번호 -NetworkInterfaceNo *string `json:"networkInterfaceNo"` + NetworkInterfaceNo *string `json:"networkInterfaceNo"` // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo"` + ServerInstanceNo *string `json:"serverInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_response.go index 9b0609313..6554ad11a 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_response.go @@ -10,10 +10,9 @@ package server type AttachNetworkInterfaceResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` - -ReturnMessage *string `json:"returnMessage,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_instance.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_instance.go index 9f0eeb912..4a0af3c24 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_instance.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_instance.go @@ -12,57 +12,57 @@ package server type BlockStorageInstance struct { // 블록스토리지인스턴스번호 -BlockStorageInstanceNo *string `json:"blockStorageInstanceNo,omitempty"` + BlockStorageInstanceNo *string `json:"blockStorageInstanceNo,omitempty"` // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` + ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` // 서버명 -ServerName *string `json:"serverName,omitempty"` + ServerName *string `json:"serverName,omitempty"` // 블록스토리지구분 -BlockStorageType *CommonCode `json:"blockStorageType,omitempty"` + BlockStorageType *CommonCode `json:"blockStorageType,omitempty"` // 블록스토리지명 -BlockStorageName *string `json:"blockStorageName,omitempty"` + BlockStorageName *string `json:"blockStorageName,omitempty"` // 블록스토리지사이즈 -BlockStorageSize *int64 `json:"blockStorageSize,omitempty"` + BlockStorageSize *int64 `json:"blockStorageSize,omitempty"` // 디바이스명 -DeviceName *string `json:"deviceName,omitempty"` + DeviceName *string `json:"deviceName,omitempty"` // 회원서버이미지번호 -MemberServerImageNo *string `json:"memberServerImageNo,omitempty"` + MemberServerImageNo *string `json:"memberServerImageNo,omitempty"` // 블록스토리지상품코드 -BlockStorageProductCode *string `json:"blockStorageProductCode,omitempty"` + BlockStorageProductCode *string `json:"blockStorageProductCode,omitempty"` // 블록스토리지인스턴스상태 -BlockStorageInstanceStatus *CommonCode `json:"blockStorageInstanceStatus,omitempty"` + BlockStorageInstanceStatus *CommonCode `json:"blockStorageInstanceStatus,omitempty"` // 블록스토리지인스턴스OP -BlockStorageInstanceOperation *CommonCode `json:"blockStorageInstanceOperation,omitempty"` + BlockStorageInstanceOperation *CommonCode `json:"blockStorageInstanceOperation,omitempty"` // 블록스토리지인스턴스상태명 -BlockStorageInstanceStatusName *string `json:"blockStorageInstanceStatusName,omitempty"` + BlockStorageInstanceStatusName *string `json:"blockStorageInstanceStatusName,omitempty"` // 생성일시 -CreateDate *string `json:"createDate,omitempty"` + CreateDate *string `json:"createDate,omitempty"` // 블록스토리지인스턴스설명 -BlockStorageInstanceDescription *string `json:"blockStorageInstanceDescription,omitempty"` + BlockStorageInstanceDescription *string `json:"blockStorageInstanceDescription,omitempty"` // 디스크유형 -DiskType *CommonCode `json:"diskType,omitempty"` + DiskType *CommonCode `json:"diskType,omitempty"` // 디스크상세유형 -DiskDetailType *CommonCode `json:"diskDetailType,omitempty"` + DiskDetailType *CommonCode `json:"diskDetailType,omitempty"` // 최대 IOPS -MaxIopsThroughput *int32 `json:"maxIopsThroughput,omitempty"` + MaxIopsThroughput *int32 `json:"maxIopsThroughput,omitempty"` -Region *Region `json:"region,omitempty"` + Region *Region `json:"region,omitempty"` -Zone *Zone `json:"zone,omitempty"` + Zone *Zone `json:"zone,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_snapshot_instance.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_snapshot_instance.go index a9295d496..da7cd155a 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_snapshot_instance.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_snapshot_instance.go @@ -12,37 +12,37 @@ package server type BlockStorageSnapshotInstance struct { // 블록스토리지스냅샷인스턴스번호 -BlockStorageSnapshotInstanceNo *string `json:"blockStorageSnapshotInstanceNo,omitempty"` + BlockStorageSnapshotInstanceNo *string `json:"blockStorageSnapshotInstanceNo,omitempty"` // 블록스토리지스냅샷명 -BlockStorageSnapshotName *string `json:"blockStorageSnapshotName,omitempty"` + BlockStorageSnapshotName *string `json:"blockStorageSnapshotName,omitempty"` // 블록스토지리볼륨사이즈 -BlockStorageSnapshotVolumeSize *int64 `json:"blockStorageSnapshotVolumeSize,omitempty"` + BlockStorageSnapshotVolumeSize *int64 `json:"blockStorageSnapshotVolumeSize,omitempty"` // 원본블록스토리지인스턴스번호 -OriginalBlockStorageInstanceNo *string `json:"originalBlockStorageInstanceNo,omitempty"` + OriginalBlockStorageInstanceNo *string `json:"originalBlockStorageInstanceNo,omitempty"` // 원본블록스토리지명 -OriginalBlockStorageName *string `json:"originalBlockStorageName,omitempty"` + OriginalBlockStorageName *string `json:"originalBlockStorageName,omitempty"` // 블록스토리지스냅샷인스턴스상태 -BlockStorageSnapshotInstanceStatus *CommonCode `json:"blockStorageSnapshotInstanceStatus,omitempty"` + BlockStorageSnapshotInstanceStatus *CommonCode `json:"blockStorageSnapshotInstanceStatus,omitempty"` // 블록스토리지스냅샷인스턴스OP -BlockStorageSnapshotInstanceOperation *CommonCode `json:"blockStorageSnapshotInstanceOperation,omitempty"` + BlockStorageSnapshotInstanceOperation *CommonCode `json:"blockStorageSnapshotInstanceOperation,omitempty"` -BlockStorageSnapshotInstanceStatusName *string `json:"blockStorageSnapshotInstanceStatusName,omitempty"` + BlockStorageSnapshotInstanceStatusName *string `json:"blockStorageSnapshotInstanceStatusName,omitempty"` // 생성일시 -CreateDate *string `json:"createDate,omitempty"` + CreateDate *string `json:"createDate,omitempty"` // 블록스토리지스냅샷인스턴스설명 -BlockStorageSnapshotInstanceDescription *string `json:"blockStorageSnapshotInstanceDescription,omitempty"` + BlockStorageSnapshotInstanceDescription *string `json:"blockStorageSnapshotInstanceDescription,omitempty"` // 서버이미지상품코드 -ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` + ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` // OS정보 -OsInformation *string `json:"osInformation,omitempty"` + OsInformation *string `json:"osInformation,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_request.go index e950be26c..fbdee3124 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_request.go @@ -12,8 +12,8 @@ package server type ChangeNasVolumeSizeRequest struct { // NAS볼륨인스턴스번호 -NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` + NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` // NAS볼륨사이즈 -VolumeSize *int32 `json:"volumeSize"` + VolumeSize *int32 `json:"volumeSize"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_response.go index 8ed5df3a0..8b657ffc1 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_response.go @@ -10,14 +10,13 @@ package server type ChangeNasVolumeSizeResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` + NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_request.go index 8e8dba077..c638d6303 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_request.go @@ -12,8 +12,8 @@ package server type ChangeServerInstanceSpecRequest struct { // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo"` + ServerInstanceNo *string `json:"serverInstanceNo"` // 서버상품코드 -ServerProductCode *string `json:"serverProductCode"` + ServerProductCode *string `json:"serverProductCode"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_response.go index 6d650f1a1..c6f1bac01 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_response.go @@ -10,14 +10,13 @@ package server type ChangeServerInstanceSpecResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` + ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/common_code.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/common_code.go index 10fbd3438..7f5395831 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/common_code.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/common_code.go @@ -12,8 +12,8 @@ package server type CommonCode struct { // 코드 -Code *string `json:"code,omitempty"` + Code *string `json:"code,omitempty"` // 코드명 -CodeName *string `json:"codeName,omitempty"` + CodeName *string `json:"codeName,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_request.go index ab88a441e..e14ca48ad 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_request.go @@ -12,17 +12,17 @@ package server type CreateBlockStorageInstanceRequest struct { // 블럭스토리지명 -BlockStorageName *string `json:"blockStorageName,omitempty"` + BlockStorageName *string `json:"blockStorageName,omitempty"` // 블럭스토리지사이즈 -BlockStorageSize *int64 `json:"blockStorageSize"` + BlockStorageSize *int64 `json:"blockStorageSize"` // 블럭스토리지설명 -BlockStorageDescription *string `json:"blockStorageDescription,omitempty"` + BlockStorageDescription *string `json:"blockStorageDescription,omitempty"` // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo"` + ServerInstanceNo *string `json:"serverInstanceNo"` // 디스크상세유형코드 -DiskDetailTypeCode *string `json:"diskDetailTypeCode,omitempty"` + DiskDetailTypeCode *string `json:"diskDetailTypeCode,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_response.go index d6c3e2995..c70a4dec7 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_response.go @@ -10,14 +10,13 @@ package server type CreateBlockStorageInstanceResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` + BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_request.go index 670825e6c..254410abd 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_request.go @@ -12,11 +12,11 @@ package server type CreateBlockStorageSnapshotInstanceRequest struct { // 블록스토리지인스턴스번호 -BlockStorageInstanceNo *string `json:"blockStorageInstanceNo"` + BlockStorageInstanceNo *string `json:"blockStorageInstanceNo"` // 블록스토리지스냅샷이름 -BlockStorageSnapshotName *string `json:"blockStorageSnapshotName,omitempty"` + BlockStorageSnapshotName *string `json:"blockStorageSnapshotName,omitempty"` // 블록스토리지스냅샷설명 -BlockStorageSnapshotDescription *string `json:"blockStorageSnapshotDescription,omitempty"` + BlockStorageSnapshotDescription *string `json:"blockStorageSnapshotDescription,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_response.go index c14fc00fc..ae6717bfc 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_response.go @@ -10,14 +10,13 @@ package server type CreateBlockStorageSnapshotInstanceResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -BlockStorageSnapshotInstanceList []*BlockStorageSnapshotInstance `json:"blockStorageSnapshotInstanceList,omitempty"` + BlockStorageSnapshotInstanceList []*BlockStorageSnapshotInstance `json:"blockStorageSnapshotInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_request.go index 202eef78f..58b9a02a5 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_request.go @@ -12,8 +12,8 @@ package server type CreateInstanceTagsRequest struct { // 인스턴스번호리스트 -InstanceNoList []*string `json:"instanceNoList"` + InstanceNoList []*string `json:"instanceNoList"` // 인스턴스태그리스트 -InstanceTagList []*InstanceTagParameter `json:"instanceTagList"` + InstanceTagList []*InstanceTagParameter `json:"instanceTagList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_response.go index 3ff1e5e23..f2cc37c69 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_response.go @@ -10,14 +10,13 @@ package server type CreateInstanceTagsResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -InstanceTagList []*InstanceTag `json:"instanceTagList,omitempty"` + InstanceTagList []*InstanceTag `json:"instanceTagList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_request.go index 306387ed8..256d93cf9 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_request.go @@ -12,5 +12,5 @@ package server type CreateLoginKeyRequest struct { // 키명 -KeyName *string `json:"keyName"` + KeyName *string `json:"keyName"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_response.go index 7f24b48ab..41dfbc490 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_response.go @@ -10,12 +10,11 @@ package server type CreateLoginKeyResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` - -PrivateKey *string `json:"privateKey,omitempty"` + PrivateKey *string `json:"privateKey,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_request.go index 86699e939..f67f1e46c 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_request.go @@ -12,11 +12,11 @@ package server type CreateMemberServerImageRequest struct { // 회원서버이미지설명 -MemberServerImageDescription *string `json:"memberServerImageDescription,omitempty"` + MemberServerImageDescription *string `json:"memberServerImageDescription,omitempty"` // 회원서버이미지명 -MemberServerImageName *string `json:"memberServerImageName,omitempty"` + MemberServerImageName *string `json:"memberServerImageName,omitempty"` // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo"` + ServerInstanceNo *string `json:"serverInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_response.go index eceaa0ca2..c7ad6806c 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_response.go @@ -10,14 +10,13 @@ package server type CreateMemberServerImageResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -MemberServerImageList []*MemberServerImage `json:"memberServerImageList,omitempty"` + MemberServerImageList []*MemberServerImage `json:"memberServerImageList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_request.go index c67f389a3..c542a8e58 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_request.go @@ -12,32 +12,32 @@ package server type CreateNasVolumeInstanceRequest struct { // 볼륨이름 -VolumeName *string `json:"volumeName"` + VolumeName *string `json:"volumeName"` // NAS볼륨사이즈 -VolumeSize *int32 `json:"volumeSize"` + VolumeSize *int32 `json:"volumeSize"` // 볼륨할당프로토콜유형코드 -VolumeAllotmentProtocolTypeCode *string `json:"volumeAllotmentProtocolTypeCode"` + VolumeAllotmentProtocolTypeCode *string `json:"volumeAllotmentProtocolTypeCode"` // 서버인스턴스번호리스트 -ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` + ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` // 커스텀IP리스트 -CustomIpList []*string `json:"customIpList,omitempty"` + CustomIpList []*string `json:"customIpList,omitempty"` // CIFS유저이름 -CifsUserName *string `json:"cifsUserName,omitempty"` + CifsUserName *string `json:"cifsUserName,omitempty"` // CIFS유저비밀번호 -CifsUserPassword *string `json:"cifsUserPassword,omitempty"` + CifsUserPassword *string `json:"cifsUserPassword,omitempty"` // NAS볼륨설명 -NasVolumeDescription *string `json:"nasVolumeDescription,omitempty"` + NasVolumeDescription *string `json:"nasVolumeDescription,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 -ZoneNo *string `json:"zoneNo,omitempty"` + ZoneNo *string `json:"zoneNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_response.go index abce946fc..0e979e7c9 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_response.go @@ -10,14 +10,13 @@ package server type CreateNasVolumeInstanceResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` + NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_request.go index d3bc1b367..ce1ebc906 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_request.go @@ -12,23 +12,23 @@ package server type CreateNetworkInterfaceRequest struct { // Private Subnet인스턴스번호 -PrivateSubnetInstanceNo *string `json:"privateSubnetInstanceNo"` + PrivateSubnetInstanceNo *string `json:"privateSubnetInstanceNo"` // Network Interface이름 -NetworkInterfaceName *string `json:"networkInterfaceName"` + NetworkInterfaceName *string `json:"networkInterfaceName"` // Network Interface IP -NetworkInterfaceIp *string `json:"networkInterfaceIp"` + NetworkInterfaceIp *string `json:"networkInterfaceIp"` // Network Interface설명 -NetworkInterfaceDescription *string `json:"networkInterfaceDescription,omitempty"` + NetworkInterfaceDescription *string `json:"networkInterfaceDescription,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 -ZoneNo *string `json:"zoneNo,omitempty"` + ZoneNo *string `json:"zoneNo,omitempty"` // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` + ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_response.go index 8a6eb49e0..c7f71aeb0 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_response.go @@ -10,10 +10,9 @@ package server type CreateNetworkInterfaceResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` - -ReturnMessage *string `json:"returnMessage,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_request.go index c0a6114ce..2cfb19585 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_request.go @@ -12,17 +12,17 @@ package server type CreatePublicIpInstanceRequest struct { // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` + ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` // 공인IP설명 -PublicIpDescription *string `json:"publicIpDescription,omitempty"` + PublicIpDescription *string `json:"publicIpDescription,omitempty"` // 인터넷라인구분코드 -InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` + InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 -ZoneNo *string `json:"zoneNo,omitempty"` + ZoneNo *string `json:"zoneNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_response.go index 29d511c42..d21cc60d9 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_response.go @@ -10,14 +10,13 @@ package server type CreatePublicIpInstanceResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` + PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_request.go index fdcbdbb1e..aa7dbc1b0 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_request.go @@ -12,50 +12,50 @@ package server type CreateServerInstancesRequest struct { // 서버이미지상품코드 -ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` + ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` // 서버상품코드 -ServerProductCode *string `json:"serverProductCode,omitempty"` + ServerProductCode *string `json:"serverProductCode,omitempty"` // 회원서버이미지번호 -MemberServerImageNo *string `json:"memberServerImageNo,omitempty"` + MemberServerImageNo *string `json:"memberServerImageNo,omitempty"` // 서버명 -ServerName *string `json:"serverName,omitempty"` + ServerName *string `json:"serverName,omitempty"` // 서버설명 -ServerDescription *string `json:"serverDescription,omitempty"` + ServerDescription *string `json:"serverDescription,omitempty"` // 로그인키명 -LoginKeyName *string `json:"loginKeyName,omitempty"` + LoginKeyName *string `json:"loginKeyName,omitempty"` // 반납보호여부 -IsProtectServerTermination *bool `json:"isProtectServerTermination,omitempty"` + IsProtectServerTermination *bool `json:"isProtectServerTermination,omitempty"` // 서버생성갯수 -ServerCreateCount *int32 `json:"serverCreateCount,omitempty"` + ServerCreateCount *int32 `json:"serverCreateCount,omitempty"` // 서버생성시작번호 -ServerCreateStartNo *int32 `json:"serverCreateStartNo,omitempty"` + ServerCreateStartNo *int32 `json:"serverCreateStartNo,omitempty"` // 인터넷라인구분코드 -InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` + InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 요금제구분코드 -FeeSystemTypeCode *string `json:"feeSystemTypeCode,omitempty"` + FeeSystemTypeCode *string `json:"feeSystemTypeCode,omitempty"` // 사용자데이터 -UserData *string `json:"userData,omitempty"` + UserData *string `json:"userData,omitempty"` // ZONE번호 -ZoneNo *string `json:"zoneNo,omitempty"` + ZoneNo *string `json:"zoneNo,omitempty"` // ACG설정번호리스트 -AccessControlGroupConfigurationNoList []*string `json:"accessControlGroupConfigurationNoList,omitempty"` + AccessControlGroupConfigurationNoList []*string `json:"accessControlGroupConfigurationNoList,omitempty"` // RAID구분이름 -RaidTypeName *string `json:"raidTypeName,omitempty"` + RaidTypeName *string `json:"raidTypeName,omitempty"` // 인스턴스태그리스트 -InstanceTagList []*InstanceTagParameter `json:"instanceTagList,omitempty"` + InstanceTagList []*InstanceTagParameter `json:"instanceTagList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_response.go index 70e700062..024bac03e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_response.go @@ -10,14 +10,13 @@ package server type CreateServerInstancesResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` + ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_request.go index bd0840bf5..a13eedb97 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_request.go @@ -12,5 +12,5 @@ package server type DeleteBlockStorageInstancesRequest struct { // 블록스토리지인스턴스번호리스트 -BlockStorageInstanceNoList []*string `json:"blockStorageInstanceNoList"` + BlockStorageInstanceNoList []*string `json:"blockStorageInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_response.go index 04b779821..5edfc667f 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_response.go @@ -10,14 +10,13 @@ package server type DeleteBlockStorageInstancesResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` + BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_request.go index 20099c3d9..90838c6e1 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_request.go @@ -12,5 +12,5 @@ package server type DeleteBlockStorageSnapshotInstancesRequest struct { // 블록스토리지스냅샷인스턴스번호리스트 -BlockStorageSnapshotInstanceNoList []*string `json:"blockStorageSnapshotInstanceNoList"` + BlockStorageSnapshotInstanceNoList []*string `json:"blockStorageSnapshotInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_response.go index acf19b1e7..bb3b47430 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_response.go @@ -10,14 +10,13 @@ package server type DeleteBlockStorageSnapshotInstancesResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -BlockStorageSnapshotInstanceList []*BlockStorageSnapshotInstance `json:"blockStorageSnapshotInstanceList,omitempty"` + BlockStorageSnapshotInstanceList []*BlockStorageSnapshotInstance `json:"blockStorageSnapshotInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_request.go index 1f3e52b7e..59203d0b3 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_request.go @@ -12,8 +12,8 @@ package server type DeleteInstanceTagsRequest struct { // 인스턴스번호리스트 -InstanceNoList []*string `json:"instanceNoList"` + InstanceNoList []*string `json:"instanceNoList"` // 인스턴스태그리스트 -InstanceTagList []*InstanceTagParameter `json:"instanceTagList,omitempty"` + InstanceTagList []*InstanceTagParameter `json:"instanceTagList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_response.go index 9acaa4618..0fc4c5947 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_response.go @@ -10,12 +10,11 @@ package server type DeleteInstanceTagsResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` - -TotalRows *int32 `json:"totalRows,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_request.go index 7f7c6a037..e2d00fe8f 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_request.go @@ -12,5 +12,5 @@ package server type DeleteLoginKeyRequest struct { // 키명 -KeyName *string `json:"keyName"` + KeyName *string `json:"keyName"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_response.go index 4bbf72c90..290bc222d 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_response.go @@ -10,10 +10,9 @@ package server type DeleteLoginKeyResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` - -ReturnMessage *string `json:"returnMessage,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_request.go index ca250875e..c3d9d79e3 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_request.go @@ -12,5 +12,5 @@ package server type DeleteMemberServerImagesRequest struct { // 회원서버이미지번호리스트 -MemberServerImageNoList []*string `json:"memberServerImageNoList"` + MemberServerImageNoList []*string `json:"memberServerImageNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_response.go index 3d80d546e..18d57875e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_response.go @@ -10,14 +10,13 @@ package server type DeleteMemberServerImagesResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -MemberServerImageList []*MemberServerImage `json:"memberServerImageList,omitempty"` + MemberServerImageList []*MemberServerImage `json:"memberServerImageList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_request.go index a511394f1..ad500078a 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_request.go @@ -12,5 +12,5 @@ package server type DeleteNasVolumeInstanceRequest struct { // NAS볼륨인스턴스번호 -NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` + NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_response.go index 43913e6d9..aab2b51d7 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_response.go @@ -10,14 +10,13 @@ package server type DeleteNasVolumeInstanceResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` + NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_request.go index cc80eaeac..9649eaf1b 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_request.go @@ -12,5 +12,5 @@ package server type DeleteNetworkInterfaceRequest struct { // Network Interface번호 -NetworkInterfaceNo *string `json:"networkInterfaceNo"` + NetworkInterfaceNo *string `json:"networkInterfaceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_response.go index 958f49635..05ffa6715 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_response.go @@ -10,10 +10,9 @@ package server type DeleteNetworkInterfaceResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` - -ReturnMessage *string `json:"returnMessage,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_request.go index aa71def5c..0d8aa1494 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_request.go @@ -12,8 +12,8 @@ package server type DeletePortForwardingRulesRequest struct { // 포트포워딩설정번호 -PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo"` + PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo"` // 포트포워딩RULE리스트 -PortForwardingRuleList []*PortForwardingRuleParameter `json:"portForwardingRuleList"` + PortForwardingRuleList []*PortForwardingRuleParameter `json:"portForwardingRuleList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_response.go index 1e2ccf90c..40224e94f 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_response.go @@ -12,18 +12,18 @@ package server type DeletePortForwardingRulesResponse struct { // 포트포워딩설정번호 -PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo,omitempty"` + PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo,omitempty"` // 포트포워딩공인IP -PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` + PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` // ZONE -Zone *Zone `json:"zone,omitempty"` + Zone *Zone `json:"zone,omitempty"` // 인터넷회선구분 -InternetLineType *CommonCode `json:"internetLineType,omitempty"` + InternetLineType *CommonCode `json:"internetLineType,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -PortForwardingRuleList []*PortForwardingRule `json:"portForwardingRuleList,omitempty"` + PortForwardingRuleList []*PortForwardingRule `json:"portForwardingRuleList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_request.go index 712da61c5..eb3a5d163 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_request.go @@ -12,5 +12,5 @@ package server type DeletePublicIpInstancesRequest struct { // 공인IP인스턴스번호리스트 -PublicIpInstanceNoList []*string `json:"publicIpInstanceNoList"` + PublicIpInstanceNoList []*string `json:"publicIpInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_response.go index 0ee8e3b4e..ce5cb8989 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_response.go @@ -10,14 +10,13 @@ package server type DeletePublicIpInstancesResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` + PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_request.go index 2c85b7156..9883d2800 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_request.go @@ -12,5 +12,5 @@ package server type DetachBlockStorageInstancesRequest struct { // 블록스토리지인스턴스번호리스트 -BlockStorageInstanceNoList []*string `json:"blockStorageInstanceNoList"` + BlockStorageInstanceNoList []*string `json:"blockStorageInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_response.go index 4f3740a4d..b7bdc4de1 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_response.go @@ -10,14 +10,13 @@ package server type DetachBlockStorageInstancesResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` + BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_request.go index 112180724..148b7c741 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_request.go @@ -12,8 +12,8 @@ package server type DetachNetworkInterfaceRequest struct { // Network Interface번호 -NetworkInterfaceNo *string `json:"networkInterfaceNo"` + NetworkInterfaceNo *string `json:"networkInterfaceNo"` // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo"` + ServerInstanceNo *string `json:"serverInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_response.go index 4a0187266..e7e0ab8d1 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_response.go @@ -10,10 +10,9 @@ package server type DetachNetworkInterfaceResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` - -ReturnMessage *string `json:"returnMessage,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_request.go index 585c72822..43f20a285 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_request.go @@ -12,5 +12,5 @@ package server type DisassociatePublicIpFromServerInstanceRequest struct { // 공인IP인스턴스번호 -PublicIpInstanceNo *string `json:"publicIpInstanceNo"` + PublicIpInstanceNo *string `json:"publicIpInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_response.go index 42ba25f6a..9b77cd57f 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_response.go @@ -10,14 +10,13 @@ package server type DisassociatePublicIpFromServerInstanceResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` + PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_request.go index aab8176c1..83e77ca5a 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_request.go @@ -12,17 +12,17 @@ package server type GetAccessControlGroupListRequest struct { // 접근제어그룹설정번호리스트 -AccessControlGroupConfigurationNoList []*string `json:"accessControlGroupConfigurationNoList,omitempty"` + AccessControlGroupConfigurationNoList []*string `json:"accessControlGroupConfigurationNoList,omitempty"` // 디폴트여부 -IsDefault *bool `json:"isDefault,omitempty"` + IsDefault *bool `json:"isDefault,omitempty"` // 접근제어그룹명 -AccessControlGroupName *string `json:"accessControlGroupName,omitempty"` + AccessControlGroupName *string `json:"accessControlGroupName,omitempty"` // 페이지번호 -PageNo *int32 `json:"pageNo,omitempty"` + PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 -PageSize *int32 `json:"pageSize,omitempty"` + PageSize *int32 `json:"pageSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_response.go index 5f56c9f9f..5e0038ba2 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_response.go @@ -10,14 +10,13 @@ package server type GetAccessControlGroupListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -AccessControlGroupList []*AccessControlGroup `json:"accessControlGroupList,omitempty"` + AccessControlGroupList []*AccessControlGroup `json:"accessControlGroupList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_request.go index f48d17c21..9793efe9d 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_request.go @@ -12,5 +12,5 @@ package server type GetAccessControlGroupServerInstanceListRequest struct { // 접근제어그룹설정번호 -AccessControlGroupConfigurationNo *string `json:"accessControlGroupConfigurationNo"` + AccessControlGroupConfigurationNo *string `json:"accessControlGroupConfigurationNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_response.go index 385e9aa8f..5dd6afbe8 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_response.go @@ -10,14 +10,13 @@ package server type GetAccessControlGroupServerInstanceListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` + ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_request.go index 263ce55ab..e7f45f653 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_request.go @@ -12,5 +12,5 @@ package server type GetAccessControlRuleListRequest struct { // 접근제어그룹설정번호 -AccessControlGroupConfigurationNo *string `json:"accessControlGroupConfigurationNo"` + AccessControlGroupConfigurationNo *string `json:"accessControlGroupConfigurationNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_response.go index 875964d6c..b15d84e96 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_response.go @@ -10,14 +10,13 @@ package server type GetAccessControlRuleListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -AccessControlRuleList []*AccessControlRule `json:"accessControlRuleList,omitempty"` + AccessControlRuleList []*AccessControlRule `json:"accessControlRuleList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_request.go index 3feceb7f8..11ac8f6e0 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_request.go @@ -12,44 +12,44 @@ package server type GetBlockStorageInstanceListRequest struct { // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` + ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` // 블록스토리지인스턴스번호리스트 -BlockStorageInstanceNoList []*string `json:"blockStorageInstanceNoList,omitempty"` + BlockStorageInstanceNoList []*string `json:"blockStorageInstanceNoList,omitempty"` // 검색할필터명 -SearchFilterName *string `json:"searchFilterName,omitempty"` + SearchFilterName *string `json:"searchFilterName,omitempty"` // 검색할필터값 -SearchFilterValue *string `json:"searchFilterValue,omitempty"` + SearchFilterValue *string `json:"searchFilterValue,omitempty"` // 블록스토리지구분코드리스트 -BlockStorageTypeCodeList []*string `json:"blockStorageTypeCodeList,omitempty"` + BlockStorageTypeCodeList []*string `json:"blockStorageTypeCodeList,omitempty"` // 페이지번호 -PageNo *int32 `json:"pageNo,omitempty"` + PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 -PageSize *int32 `json:"pageSize,omitempty"` + PageSize *int32 `json:"pageSize,omitempty"` // 블록스토리지인스턴스상태코드 -BlockStorageInstanceStatusCode *string `json:"blockStorageInstanceStatusCode,omitempty"` + BlockStorageInstanceStatusCode *string `json:"blockStorageInstanceStatusCode,omitempty"` // 디스크유형코드 -DiskTypeCode *string `json:"diskTypeCode,omitempty"` + DiskTypeCode *string `json:"diskTypeCode,omitempty"` // 디스크유형상세코드 -DiskDetailTypeCode *string `json:"diskDetailTypeCode,omitempty"` + DiskDetailTypeCode *string `json:"diskDetailTypeCode,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 -ZoneNo *string `json:"zoneNo,omitempty"` + ZoneNo *string `json:"zoneNo,omitempty"` // 소팅대상 -SortedBy *string `json:"sortedBy,omitempty"` + SortedBy *string `json:"sortedBy,omitempty"` // 소팅순서 -SortingOrder *string `json:"sortingOrder,omitempty"` + SortingOrder *string `json:"sortingOrder,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_response.go index 036130b29..33916064c 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_response.go @@ -10,14 +10,13 @@ package server type GetBlockStorageInstanceListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` + BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_request.go index 3a8a86e69..624ab17c7 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_request.go @@ -12,17 +12,17 @@ package server type GetBlockStorageSnapshotInstanceListRequest struct { // 블록스토리지스냅샷인스턴스번호리스트 -BlockStorageSnapshotInstanceNoList []*string `json:"blockStorageSnapshotInstanceNoList,omitempty"` + BlockStorageSnapshotInstanceNoList []*string `json:"blockStorageSnapshotInstanceNoList,omitempty"` // 원본블록스토리지인스턴스번호리스트 -OriginalBlockStorageInstanceNoList []*string `json:"originalBlockStorageInstanceNoList,omitempty"` + OriginalBlockStorageInstanceNoList []*string `json:"originalBlockStorageInstanceNoList,omitempty"` // 페이지번호 -PageNo *int32 `json:"pageNo,omitempty"` + PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 -PageSize *int32 `json:"pageSize,omitempty"` + PageSize *int32 `json:"pageSize,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_response.go index bbe5eec69..2f7defe91 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_response.go @@ -10,14 +10,13 @@ package server type GetBlockStorageSnapshotInstanceListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -BlockStorageSnapshotInstanceList []*BlockStorageSnapshotInstance `json:"blockStorageSnapshotInstanceList,omitempty"` + BlockStorageSnapshotInstanceList []*BlockStorageSnapshotInstance `json:"blockStorageSnapshotInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_request.go index b9d53df0c..948be4e6a 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_request.go @@ -12,17 +12,17 @@ package server type GetInstanceTagListRequest struct { // 인스턴스번호리스트 -InstanceNoList []*string `json:"instanceNoList,omitempty"` + InstanceNoList []*string `json:"instanceNoList,omitempty"` // 태그키리스트 -TagKeyList []*string `json:"tagKeyList,omitempty"` + TagKeyList []*string `json:"tagKeyList,omitempty"` // 태그값리스트 -TagValueList []*string `json:"tagValueList,omitempty"` + TagValueList []*string `json:"tagValueList,omitempty"` // 페이지번호 -PageNo *int32 `json:"pageNo,omitempty"` + PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 -PageSize *int32 `json:"pageSize,omitempty"` + PageSize *int32 `json:"pageSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_response.go index a3bcd8af0..1666349cf 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_response.go @@ -10,14 +10,13 @@ package server type GetInstanceTagListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -InstanceTagList []*InstanceTag `json:"instanceTagList,omitempty"` + InstanceTagList []*InstanceTag `json:"instanceTagList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_request.go index cff138262..e691472c9 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_request.go @@ -12,11 +12,11 @@ package server type GetLoginKeyListRequest struct { // 키명 -KeyName *string `json:"keyName,omitempty"` + KeyName *string `json:"keyName,omitempty"` // 페이지번호 -PageNo *int32 `json:"pageNo,omitempty"` + PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 -PageSize *int32 `json:"pageSize,omitempty"` + PageSize *int32 `json:"pageSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_response.go index c7c15ff06..701f33f2d 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_response.go @@ -10,14 +10,13 @@ package server type GetLoginKeyListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -LoginKeyList []*LoginKey `json:"loginKeyList,omitempty"` + LoginKeyList []*LoginKey `json:"loginKeyList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_request.go index 8326a6510..2bc80b4c5 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_request.go @@ -12,23 +12,23 @@ package server type GetMemberServerImageListRequest struct { // 회원서버이미지번호리스트 -MemberServerImageNoList []*string `json:"memberServerImageNoList,omitempty"` + MemberServerImageNoList []*string `json:"memberServerImageNoList,omitempty"` // 플랫폼타입코드리스트 -PlatformTypeCodeList []*string `json:"platformTypeCodeList,omitempty"` + PlatformTypeCodeList []*string `json:"platformTypeCodeList,omitempty"` // 페이지번호 -PageNo *int32 `json:"pageNo,omitempty"` + PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 -PageSize *int32 `json:"pageSize,omitempty"` + PageSize *int32 `json:"pageSize,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // 소팅대상 -SortedBy *string `json:"sortedBy,omitempty"` + SortedBy *string `json:"sortedBy,omitempty"` // 소팅순서 -SortingOrder *string `json:"sortingOrder,omitempty"` + SortingOrder *string `json:"sortingOrder,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_response.go index 45db49c22..89ab05c37 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_response.go @@ -10,14 +10,13 @@ package server type GetMemberServerImageListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -MemberServerImageList []*MemberServerImage `json:"memberServerImageList,omitempty"` + MemberServerImageList []*MemberServerImage `json:"memberServerImageList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_request.go index a6ad887dc..6c6d2fb72 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_request.go @@ -12,20 +12,20 @@ package server type GetNasVolumeInstanceListRequest struct { // 볼륨할당프로토콜유형코드 -VolumeAllotmentProtocolTypeCode *string `json:"volumeAllotmentProtocolTypeCode,omitempty"` + VolumeAllotmentProtocolTypeCode *string `json:"volumeAllotmentProtocolTypeCode,omitempty"` // 이벤트설정여부 -IsEventConfiguration *bool `json:"isEventConfiguration,omitempty"` + IsEventConfiguration *bool `json:"isEventConfiguration,omitempty"` // 스냅샷볼륨설정여부 -IsSnapshotConfiguration *bool `json:"isSnapshotConfiguration,omitempty"` + IsSnapshotConfiguration *bool `json:"isSnapshotConfiguration,omitempty"` // NAS볼륨인스턴스번호리스트 -NasVolumeInstanceNoList []*string `json:"nasVolumeInstanceNoList,omitempty"` + NasVolumeInstanceNoList []*string `json:"nasVolumeInstanceNoList,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 -ZoneNo *string `json:"zoneNo,omitempty"` + ZoneNo *string `json:"zoneNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_response.go index 300e2309d..7951eac34 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_response.go @@ -10,14 +10,13 @@ package server type GetNasVolumeInstanceListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` + NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_request.go index e66d5df33..6739f8773 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_request.go @@ -12,14 +12,14 @@ package server type GetNasVolumeInstanceRatingListRequest struct { // 측정종료시간 -EndTime *string `json:"endTime"` + EndTime *string `json:"endTime"` // 측정간격 -Interval *string `json:"interval"` + Interval *string `json:"interval"` // NAS볼륨인스턴스번호 -NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` + NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` // 측정시작시간 -StartTime *string `json:"startTime"` + StartTime *string `json:"startTime"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_response.go index b339fbf51..48c786b55 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_response.go @@ -10,14 +10,13 @@ package server type GetNasVolumeInstanceRatingListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -NasVolumeInstanceRatingList []*NasVolumeInstanceRating `json:"nasVolumeInstanceRatingList,omitempty"` + NasVolumeInstanceRatingList []*NasVolumeInstanceRating `json:"nasVolumeInstanceRatingList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_request.go index 242a129d8..beba52157 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_request.go @@ -12,14 +12,14 @@ package server type GetNetworkInterfaceListRequest struct { // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 -ZoneNo *string `json:"zoneNo,omitempty"` + ZoneNo *string `json:"zoneNo,omitempty"` // 페이지번호 -PageNo *int32 `json:"pageNo,omitempty"` + PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 -PageSize *int32 `json:"pageSize,omitempty"` + PageSize *int32 `json:"pageSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_response.go index c86fd9770..b33c46442 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_response.go @@ -10,14 +10,13 @@ package server type GetNetworkInterfaceListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -NetworkInterfaceList []*NetworkInterface `json:"networkInterfaceList,omitempty"` + NetworkInterfaceList []*NetworkInterface `json:"networkInterfaceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_request.go index 4be87bf18..c4cf22d74 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_request.go @@ -12,11 +12,11 @@ package server type GetPortForwardingRuleListRequest struct { // 인터넷라인구분코드 -InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` + InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 -ZoneNo *string `json:"zoneNo,omitempty"` + ZoneNo *string `json:"zoneNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_response.go index bc4da3c51..57ff43c09 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_response.go @@ -12,18 +12,18 @@ package server type GetPortForwardingRuleListResponse struct { // 포트포워딩설정번호 -PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo,omitempty"` + PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo,omitempty"` // 포트포워딩공인IP -PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` + PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` // ZONE객체 -Zone *Zone `json:"zone,omitempty"` + Zone *Zone `json:"zone,omitempty"` // 인터넷라인구분 -InternetLineType *CommonCode `json:"internetLineType,omitempty"` + InternetLineType *CommonCode `json:"internetLineType,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -PortForwardingRuleList []*PortForwardingRule `json:"portForwardingRuleList,omitempty"` + PortForwardingRuleList []*PortForwardingRule `json:"portForwardingRuleList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_request.go index c684987ad..6b2d6fa1b 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_request.go @@ -12,11 +12,11 @@ package server type GetPrivateSubnetInstanceListRequest struct { // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // 페이지번호 -PageNo *int32 `json:"pageNo,omitempty"` + PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 -PageSize *int32 `json:"pageSize,omitempty"` + PageSize *int32 `json:"pageSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_response.go index c791e7eee..59777f1d9 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_response.go @@ -10,14 +10,13 @@ package server type GetPrivateSubnetInstanceListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -PrivateSubnetInstanceList []*PrivateSubnetInstance `json:"privateSubnetInstanceList,omitempty"` + PrivateSubnetInstanceList []*PrivateSubnetInstance `json:"privateSubnetInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_request.go index 75e5f99e2..0b16fdd5e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_request.go @@ -12,38 +12,38 @@ package server type GetPublicIpInstanceListRequest struct { // 할당여부 -IsAssociated *bool `json:"isAssociated,omitempty"` + IsAssociated *bool `json:"isAssociated,omitempty"` // 공인IP인스턴스번호리스트 -PublicIpInstanceNoList []*string `json:"publicIpInstanceNoList,omitempty"` + PublicIpInstanceNoList []*string `json:"publicIpInstanceNoList,omitempty"` // 공인IP리스트 -PublicIpList []*string `json:"publicIpList,omitempty"` + PublicIpList []*string `json:"publicIpList,omitempty"` // 검색할필터명 -SearchFilterName *string `json:"searchFilterName,omitempty"` + SearchFilterName *string `json:"searchFilterName,omitempty"` // 검색할필터값 -SearchFilterValue *string `json:"searchFilterValue,omitempty"` + SearchFilterValue *string `json:"searchFilterValue,omitempty"` // 인터넷라인구분코드 -InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` + InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 -ZoneNo *string `json:"zoneNo,omitempty"` + ZoneNo *string `json:"zoneNo,omitempty"` // 페이지번호 -PageNo *int32 `json:"pageNo,omitempty"` + PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 -PageSize *int32 `json:"pageSize,omitempty"` + PageSize *int32 `json:"pageSize,omitempty"` // 소팅대상 -SortedBy *string `json:"sortedBy,omitempty"` + SortedBy *string `json:"sortedBy,omitempty"` // 소팅순서 -SortingOrder *string `json:"sortingOrder,omitempty"` + SortingOrder *string `json:"sortingOrder,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_response.go index d8dde079b..7188847b2 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_response.go @@ -10,14 +10,13 @@ package server type GetPublicIpInstanceListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` + PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_request.go index 44afcd41f..fa44f590d 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_request.go @@ -12,11 +12,11 @@ package server type GetPublicIpTargetServerInstanceListRequest struct { // 인터넷라인구분코드 -InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` + InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 -ZoneNo *string `json:"zoneNo,omitempty"` + ZoneNo *string `json:"zoneNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_response.go index c9f38cf07..1b1a72eea 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_response.go @@ -10,14 +10,13 @@ package server type GetPublicIpTargetServerInstanceListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` + ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_raid_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_raid_list_response.go index 6104a15a9..225191845 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_raid_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_raid_list_response.go @@ -10,14 +10,13 @@ package server type GetRaidListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -RaidList []*Raid `json:"raidList,omitempty"` + RaidList []*Raid `json:"raidList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_region_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_region_list_response.go index e8989df66..2a81b8b84 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_region_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_region_list_response.go @@ -10,14 +10,13 @@ package server type GetRegionListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -RegionList []*Region `json:"regionList,omitempty"` + RegionList []*Region `json:"regionList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_request.go index b10c6eebc..ff6e62ef1 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_request.go @@ -12,8 +12,8 @@ package server type GetRootPasswordRequest struct { // 개인키 -PrivateKey *string `json:"privateKey,omitempty"` + PrivateKey *string `json:"privateKey,omitempty"` // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo"` + ServerInstanceNo *string `json:"serverInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_response.go index fafeb8368..e6a1d0c76 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_response.go @@ -10,14 +10,13 @@ package server type GetRootPasswordResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -RootPassword *string `json:"rootPassword,omitempty"` + RootPassword *string `json:"rootPassword,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_request.go index fbab8e083..a3fcd1f64 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_request.go @@ -12,20 +12,20 @@ package server type GetServerImageProductListRequest struct { // 제외할상품코드 -ExclusionProductCode *string `json:"exclusionProductCode,omitempty"` + ExclusionProductCode *string `json:"exclusionProductCode,omitempty"` // 조회할상품코드 -ProductCode *string `json:"productCode,omitempty"` + ProductCode *string `json:"productCode,omitempty"` // 플랫폼유형코드리스트 -PlatformTypeCodeList []*string `json:"platformTypeCodeList,omitempty"` + PlatformTypeCodeList []*string `json:"platformTypeCodeList,omitempty"` // 블록스토리지사이즈 -BlockStorageSize *int32 `json:"blockStorageSize,omitempty"` + BlockStorageSize *int32 `json:"blockStorageSize,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // 인프라자원상세구분코드 -InfraResourceDetailTypeCode *string `json:"infraResourceDetailTypeCode,omitempty"` + InfraResourceDetailTypeCode *string `json:"infraResourceDetailTypeCode,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_response.go index ef7bf85fe..840e3c453 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_response.go @@ -10,14 +10,13 @@ package server type GetServerImageProductListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + ProductList []*Product `json:"productList,omitempty"` -ProductList []*Product `json:"productList,omitempty"` - -TotalRows *int32 `json:"totalRows,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_request.go index f7d8d5feb..94b0856e5 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_request.go @@ -12,50 +12,50 @@ package server type GetServerInstanceListRequest struct { // 서버인스턴스번호리스트 -ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` + ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` // 검색필터명 -SearchFilterName *string `json:"searchFilterName,omitempty"` + SearchFilterName *string `json:"searchFilterName,omitempty"` // 검색필터값 -SearchFilterValue *string `json:"searchFilterValue,omitempty"` + SearchFilterValue *string `json:"searchFilterValue,omitempty"` // 페이지번호 -PageNo *int32 `json:"pageNo,omitempty"` + PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 -PageSize *int32 `json:"pageSize,omitempty"` + PageSize *int32 `json:"pageSize,omitempty"` // 서버인스턴스상태코드 -ServerInstanceStatusCode *string `json:"serverInstanceStatusCode,omitempty"` + ServerInstanceStatusCode *string `json:"serverInstanceStatusCode,omitempty"` // 인터넷라인구분코드 -InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` + InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // zone번호 -ZoneNo *string `json:"zoneNo,omitempty"` + ZoneNo *string `json:"zoneNo,omitempty"` // 서버디스크유형코드 -BaseBlockStorageDiskTypeCode *string `json:"baseBlockStorageDiskTypeCode,omitempty"` + BaseBlockStorageDiskTypeCode *string `json:"baseBlockStorageDiskTypeCode,omitempty"` // 서버디스크상세유형코드 -BaseBlockStorageDiskDetailTypeCode *string `json:"baseBlockStorageDiskDetailTypeCode,omitempty"` + BaseBlockStorageDiskDetailTypeCode *string `json:"baseBlockStorageDiskDetailTypeCode,omitempty"` // 소팅대상 -SortedBy *string `json:"sortedBy,omitempty"` + SortedBy *string `json:"sortedBy,omitempty"` // 소팅순서 -SortingOrder *string `json:"sortingOrder,omitempty"` + SortingOrder *string `json:"sortingOrder,omitempty"` // 서비인스턴스구분코드리스트 -ServerInstanceTypeCodeList []*string `json:"serverInstanceTypeCodeList,omitempty"` + ServerInstanceTypeCodeList []*string `json:"serverInstanceTypeCodeList,omitempty"` // 태그키리스트 -TagKeyList []*string `json:"tagKeyList,omitempty"` + TagKeyList []*string `json:"tagKeyList,omitempty"` // 태그값리스트 -TagValueList []*string `json:"tagValueList,omitempty"` + TagValueList []*string `json:"tagValueList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_response.go index 549c95c3e..a9ffe6073 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_response.go @@ -10,14 +10,13 @@ package server type GetServerInstanceListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` + ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_request.go index e0f1e3dfa..26d45c06f 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_request.go @@ -12,20 +12,20 @@ package server type GetServerProductListRequest struct { // 제외할상품코드 -ExclusionProductCode *string `json:"exclusionProductCode,omitempty"` + ExclusionProductCode *string `json:"exclusionProductCode,omitempty"` // 인터넷라인구분코드 -InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` + InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 조회할상품코드 -ProductCode *string `json:"productCode,omitempty"` + ProductCode *string `json:"productCode,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` // 서버이미지상품코드 -ServerImageProductCode *string `json:"serverImageProductCode"` + ServerImageProductCode *string `json:"serverImageProductCode"` // ZONE번호 -ZoneNo *string `json:"zoneNo,omitempty"` + ZoneNo *string `json:"zoneNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_response.go index 296ff6684..138faa19e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_response.go @@ -10,14 +10,13 @@ package server type GetServerProductListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + ProductList []*Product `json:"productList,omitempty"` -ProductList []*Product `json:"productList,omitempty"` - -TotalRows *int32 `json:"totalRows,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_request.go index 31cb23bde..5bab50cc4 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_request.go @@ -12,5 +12,5 @@ package server type GetZoneListRequest struct { // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_response.go index 8c77fc482..40e089eed 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_response.go @@ -10,12 +10,11 @@ package server type GetZoneListResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` - -ZoneList []*Zone `json:"zoneList,omitempty"` + ZoneList []*Zone `json:"zoneList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_request.go index b2fc8b39d..e581a6635 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_request.go @@ -12,8 +12,8 @@ package server type ImportLoginKeyRequest struct { // 키명 -KeyName *string `json:"keyName"` + KeyName *string `json:"keyName"` // 공개키 -PublicKey *string `json:"publicKey"` + PublicKey *string `json:"publicKey"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_response.go index 2d03cbe2e..bf7c8c20c 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_response.go @@ -10,14 +10,13 @@ package server type ImportLoginKeyResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -LoginKeyList []*LoginKey `json:"loginKeyList,omitempty"` + LoginKeyList []*LoginKey `json:"loginKeyList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag.go index cb9dfde4d..01f16b48d 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag.go @@ -12,14 +12,14 @@ package server type InstanceTag struct { // 인스턴스번호 -InstanceNo *string `json:"instanceNo,omitempty"` + InstanceNo *string `json:"instanceNo,omitempty"` // 인스턴스유형 -InstanceType *CommonCode `json:"instanceType,omitempty"` + InstanceType *CommonCode `json:"instanceType,omitempty"` // 태그키 -TagKey *string `json:"tagKey,omitempty"` + TagKey *string `json:"tagKey,omitempty"` // 태그값 -TagValue *string `json:"tagValue,omitempty"` + TagValue *string `json:"tagValue,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag_parameter.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag_parameter.go index e4207dc67..e1fab028f 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag_parameter.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag_parameter.go @@ -12,8 +12,8 @@ package server type InstanceTagParameter struct { // 태그키 -TagKey *string `json:"tagKey,omitempty"` + TagKey *string `json:"tagKey,omitempty"` // 태그값 -TagValue *string `json:"tagValue,omitempty"` + TagValue *string `json:"tagValue,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/login_key.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/login_key.go index 0262bd8e9..fee1016b9 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/login_key.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/login_key.go @@ -12,11 +12,11 @@ package server type LoginKey struct { // 핑거프린트 -Fingerprint *string `json:"fingerprint,omitempty"` + Fingerprint *string `json:"fingerprint,omitempty"` // 키명 -KeyName *string `json:"keyName,omitempty"` + KeyName *string `json:"keyName,omitempty"` // 생성일자 -CreateDate *string `json:"createDate,omitempty"` + CreateDate *string `json:"createDate,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/member_server_image.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/member_server_image.go index 1bf825d26..4fc3e1aa3 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/member_server_image.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/member_server_image.go @@ -12,59 +12,59 @@ package server type MemberServerImage struct { // 회원서버이미지번호 -MemberServerImageNo *string `json:"memberServerImageNo,omitempty"` + MemberServerImageNo *string `json:"memberServerImageNo,omitempty"` // 회원서버이미지명 -MemberServerImageName *string `json:"memberServerImageName,omitempty"` + MemberServerImageName *string `json:"memberServerImageName,omitempty"` // 회원서버이미지설명 -MemberServerImageDescription *string `json:"memberServerImageDescription,omitempty"` + MemberServerImageDescription *string `json:"memberServerImageDescription,omitempty"` // 원본서버인스턴스번호 -OriginalServerInstanceNo *string `json:"originalServerInstanceNo,omitempty"` + OriginalServerInstanceNo *string `json:"originalServerInstanceNo,omitempty"` // 원본서버상품코드 -OriginalServerProductCode *string `json:"originalServerProductCode,omitempty"` + OriginalServerProductCode *string `json:"originalServerProductCode,omitempty"` // 원본서버명 -OriginalServerName *string `json:"originalServerName,omitempty"` + OriginalServerName *string `json:"originalServerName,omitempty"` // 원본서버기본블록스토리지디스크유형 -OriginalBaseBlockStorageDiskType *CommonCode `json:"originalBaseBlockStorageDiskType,omitempty"` + OriginalBaseBlockStorageDiskType *CommonCode `json:"originalBaseBlockStorageDiskType,omitempty"` // 원본서버이미지상품코드 -OriginalServerImageProductCode *string `json:"originalServerImageProductCode,omitempty"` + OriginalServerImageProductCode *string `json:"originalServerImageProductCode,omitempty"` // 원본OS정보 -OriginalOsInformation *string `json:"originalOsInformation,omitempty"` + OriginalOsInformation *string `json:"originalOsInformation,omitempty"` // 원본서버이미지명 -OriginalServerImageName *string `json:"originalServerImageName,omitempty"` + OriginalServerImageName *string `json:"originalServerImageName,omitempty"` // 원본서버이미지상태명 -MemberServerImageStatusName *string `json:"memberServerImageStatusName,omitempty"` + MemberServerImageStatusName *string `json:"memberServerImageStatusName,omitempty"` // 원본서버이미지상태 -MemberServerImageStatus *CommonCode `json:"memberServerImageStatus,omitempty"` + MemberServerImageStatus *CommonCode `json:"memberServerImageStatus,omitempty"` // 원본서버이미지OP -MemberServerImageOperation *CommonCode `json:"memberServerImageOperation,omitempty"` + MemberServerImageOperation *CommonCode `json:"memberServerImageOperation,omitempty"` // 회원서버이미지플랫폼구분 -MemberServerImagePlatformType *CommonCode `json:"memberServerImagePlatformType,omitempty"` + MemberServerImagePlatformType *CommonCode `json:"memberServerImagePlatformType,omitempty"` // 리전 -Region *Region `json:"region,omitempty"` + Region *Region `json:"region,omitempty"` // ZONE -Zone *Zone `json:"zone,omitempty"` + Zone *Zone `json:"zone,omitempty"` // 생성일시 -CreateDate *string `json:"createDate,omitempty"` + CreateDate *string `json:"createDate,omitempty"` // 회원서버이미지블록스토리지인스턴스총 개수 -MemberServerImageBlockStorageTotalRows *int32 `json:"memberServerImageBlockStorageTotalRows,omitempty"` + MemberServerImageBlockStorageTotalRows *int32 `json:"memberServerImageBlockStorageTotalRows,omitempty"` // 회원서버이미지총사이즈 -MemberServerImageBlockStorageTotalSize *int64 `json:"memberServerImageBlockStorageTotalSize,omitempty"` + MemberServerImageBlockStorageTotalSize *int64 `json:"memberServerImageBlockStorageTotalSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance.go index 354bea756..104fcbe47 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance.go @@ -12,77 +12,77 @@ package server type NasVolumeInstance struct { // NAS볼륨인스턴스번호 -NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo,omitempty"` + NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo,omitempty"` // NAS볼륨인스턴스상태 -NasVolumeInstanceStatus *CommonCode `json:"nasVolumeInstanceStatus,omitempty"` + NasVolumeInstanceStatus *CommonCode `json:"nasVolumeInstanceStatus,omitempty"` // NAS볼륨인스턴스OP -NasVolumeInstanceOperation *CommonCode `json:"nasVolumeInstanceOperation,omitempty"` + NasVolumeInstanceOperation *CommonCode `json:"nasVolumeInstanceOperation,omitempty"` // 볼륨인스턴스상태명 -NasVolumeInstanceStatusName *string `json:"nasVolumeInstanceStatusName,omitempty"` + NasVolumeInstanceStatusName *string `json:"nasVolumeInstanceStatusName,omitempty"` // 생성일시 -CreateDate *string `json:"createDate,omitempty"` + CreateDate *string `json:"createDate,omitempty"` // NAS볼륨인스턴스설명 -NasVolumeInstanceDescription *string `json:"nasVolumeInstanceDescription,omitempty"` + NasVolumeInstanceDescription *string `json:"nasVolumeInstanceDescription,omitempty"` // 마운트정보 -MountInformation *string `json:"mountInformation,omitempty"` + MountInformation *string `json:"mountInformation,omitempty"` // 볼륨할당프로토콜구분 -VolumeAllotmentProtocolType *CommonCode `json:"volumeAllotmentProtocolType,omitempty"` + VolumeAllotmentProtocolType *CommonCode `json:"volumeAllotmentProtocolType,omitempty"` // 볼륨명 -VolumeName *string `json:"volumeName,omitempty"` + VolumeName *string `json:"volumeName,omitempty"` // 볼륨총사이즈 -VolumeTotalSize *int64 `json:"volumeTotalSize,omitempty"` + VolumeTotalSize *int64 `json:"volumeTotalSize,omitempty"` // 볼륨사이즈 -VolumeSize *int64 `json:"volumeSize,omitempty"` + VolumeSize *int64 `json:"volumeSize,omitempty"` // 볼륨사용사이즈 -VolumeUseSize *int64 `json:"volumeUseSize,omitempty"` + VolumeUseSize *int64 `json:"volumeUseSize,omitempty"` // 볼륨사용비율 -VolumeUseRatio *float32 `json:"volumeUseRatio,omitempty"` + VolumeUseRatio *float32 `json:"volumeUseRatio,omitempty"` // 스냅샷볼륨설정비율 -SnapshotVolumeConfigurationRatio *float32 `json:"snapshotVolumeConfigurationRatio,omitempty"` + SnapshotVolumeConfigurationRatio *float32 `json:"snapshotVolumeConfigurationRatio,omitempty"` // 스냅샷볼륨설정기간구분 -SnapshotVolumeConfigPeriodType *CommonCode `json:"snapshotVolumeConfigPeriodType,omitempty"` + SnapshotVolumeConfigPeriodType *CommonCode `json:"snapshotVolumeConfigPeriodType,omitempty"` // 스냅샷볼륨설정시간 -SnapshotVolumeConfigTime *int32 `json:"snapshotVolumeConfigTime,omitempty"` + SnapshotVolumeConfigTime *int32 `json:"snapshotVolumeConfigTime,omitempty"` // 스냅샷사이즈 -SnapshotVolumeSize *int64 `json:"snapshotVolumeSize,omitempty"` + SnapshotVolumeSize *int64 `json:"snapshotVolumeSize,omitempty"` // 스냅사용사이즈 -SnapshotVolumeUseSize *int64 `json:"snapshotVolumeUseSize,omitempty"` + SnapshotVolumeUseSize *int64 `json:"snapshotVolumeUseSize,omitempty"` // 스냅샷사용비율 -SnapshotVolumeUseRatio *float32 `json:"snapshotVolumeUseRatio,omitempty"` + SnapshotVolumeUseRatio *float32 `json:"snapshotVolumeUseRatio,omitempty"` // 스냅샷설정여부 -IsSnapshotConfiguration *bool `json:"isSnapshotConfiguration,omitempty"` + IsSnapshotConfiguration *bool `json:"isSnapshotConfiguration,omitempty"` // 이벤트설정여부 -IsEventConfiguration *bool `json:"isEventConfiguration,omitempty"` + IsEventConfiguration *bool `json:"isEventConfiguration,omitempty"` // 리전 -Region *Region `json:"region,omitempty"` + Region *Region `json:"region,omitempty"` // ZONE -Zone *Zone `json:"zone,omitempty"` + Zone *Zone `json:"zone,omitempty"` // NAS볼륨커스텀IP리스트 -NasVolumeInstanceCustomIpList []*NasVolumeInstanceCustomIp `json:"nasVolumeInstanceCustomIpList,omitempty"` + NasVolumeInstanceCustomIpList []*NasVolumeInstanceCustomIp `json:"nasVolumeInstanceCustomIpList,omitempty"` // NAS볼륨서버인스턴스리스트 -NasVolumeServerInstanceList []*ServerInstance `json:"nasVolumeServerInstanceList,omitempty"` + NasVolumeServerInstanceList []*ServerInstance `json:"nasVolumeServerInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_custom_ip.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_custom_ip.go index 02bf19927..86c7bc697 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_custom_ip.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_custom_ip.go @@ -12,5 +12,5 @@ package server type NasVolumeInstanceCustomIp struct { // 커스텀IP -CustomIp *string `json:"customIp,omitempty"` + CustomIp *string `json:"customIp,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_rating.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_rating.go index 73a3c89a4..0314b553b 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_rating.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_rating.go @@ -12,65 +12,65 @@ package server type NasVolumeInstanceRating struct { // 측정시간 -RatingTime *string `json:"ratingTime,omitempty"` + RatingTime *string `json:"ratingTime,omitempty"` // 볼륨사이즈 -VolumeSize *int64 `json:"volumeSize,omitempty"` + VolumeSize *int64 `json:"volumeSize,omitempty"` // 볼륨사용사이즈 -VolumeUseSize *int64 `json:"volumeUseSize,omitempty"` + VolumeUseSize *int64 `json:"volumeUseSize,omitempty"` // 볼륨사용비율 -VolumeUseRatio *float32 `json:"volumeUseRatio,omitempty"` + VolumeUseRatio *float32 `json:"volumeUseRatio,omitempty"` // 평균볼륨사이즈 -AverageVolumeSize *int64 `json:"averageVolumeSize,omitempty"` + AverageVolumeSize *int64 `json:"averageVolumeSize,omitempty"` // 평균볼륨사용사이즈 -AverageVolumeUseSize *int64 `json:"averageVolumeUseSize,omitempty"` + AverageVolumeUseSize *int64 `json:"averageVolumeUseSize,omitempty"` // 평균볼륨사용비율 -AverageVolumeUseRatio *float32 `json:"averageVolumeUseRatio,omitempty"` + AverageVolumeUseRatio *float32 `json:"averageVolumeUseRatio,omitempty"` // 최대볼륨사용사이즈 -MaxVolumeUseSize *int64 `json:"maxVolumeUseSize,omitempty"` + MaxVolumeUseSize *int64 `json:"maxVolumeUseSize,omitempty"` // 최대볼륨사용비율 -MaxVolumeUseRatio *float32 `json:"maxVolumeUseRatio,omitempty"` + MaxVolumeUseRatio *float32 `json:"maxVolumeUseRatio,omitempty"` // 최소볼륨사용사이즈 -MinVolumeUseSize *int64 `json:"minVolumeUseSize,omitempty"` + MinVolumeUseSize *int64 `json:"minVolumeUseSize,omitempty"` // 최소볼륨사용비율 -MinVolumeUseRatio *float32 `json:"minVolumeUseRatio,omitempty"` + MinVolumeUseRatio *float32 `json:"minVolumeUseRatio,omitempty"` // 스냅샷볼륨사이즈 -SnapshotVolumeSize *int64 `json:"snapshotVolumeSize,omitempty"` + SnapshotVolumeSize *int64 `json:"snapshotVolumeSize,omitempty"` // 스냅샷볼륨사용사이즈 -SnapshotVolumeUseSize *int64 `json:"snapshotVolumeUseSize,omitempty"` + SnapshotVolumeUseSize *int64 `json:"snapshotVolumeUseSize,omitempty"` // 스냅샷볼륨사용비율 -SnapshotVolumeUseRatio *float32 `json:"snapshotVolumeUseRatio,omitempty"` + SnapshotVolumeUseRatio *float32 `json:"snapshotVolumeUseRatio,omitempty"` // 평균스냅샷볼륨사이즈 -SnapshotAverageVolumeSize *int64 `json:"snapshotAverageVolumeSize,omitempty"` + SnapshotAverageVolumeSize *int64 `json:"snapshotAverageVolumeSize,omitempty"` // 평균스냅샷볼륨사용사이즈 -SnapshotAverageVolumeUseSize *int64 `json:"snapshotAverageVolumeUseSize,omitempty"` + SnapshotAverageVolumeUseSize *int64 `json:"snapshotAverageVolumeUseSize,omitempty"` // 평균스냅샷볼륨사용비율 -SnapshotAverageVolumeUseRatio *float32 `json:"snapshotAverageVolumeUseRatio,omitempty"` + SnapshotAverageVolumeUseRatio *float32 `json:"snapshotAverageVolumeUseRatio,omitempty"` // 최대스냅샷볼륨사용사이즈 -SnapshotMaxVolumeUseSize *int64 `json:"snapshotMaxVolumeUseSize,omitempty"` + SnapshotMaxVolumeUseSize *int64 `json:"snapshotMaxVolumeUseSize,omitempty"` // 최대스냅샷볼륨사용비율 -SnapshotMaxVolumeUseRatio *float32 `json:"snapshotMaxVolumeUseRatio,omitempty"` + SnapshotMaxVolumeUseRatio *float32 `json:"snapshotMaxVolumeUseRatio,omitempty"` // 최소스냅샷볼륨사용사이즈 -SnapshotMinVolumeUseSize *int64 `json:"snapshotMinVolumeUseSize,omitempty"` + SnapshotMinVolumeUseSize *int64 `json:"snapshotMinVolumeUseSize,omitempty"` // 최소스냅샷볼륨사용비율 -SnapshotMinVolumeUseRatio *float32 `json:"snapshotMinVolumeUseRatio,omitempty"` + SnapshotMinVolumeUseRatio *float32 `json:"snapshotMinVolumeUseRatio,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/network_interface.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/network_interface.go index 5ec529080..1687e5b73 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/network_interface.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/network_interface.go @@ -12,26 +12,26 @@ package server type NetworkInterface struct { // Network Interface번호 -NetworkInterfaceNo *string `json:"networkInterfaceNo,omitempty"` + NetworkInterfaceNo *string `json:"networkInterfaceNo,omitempty"` // Network Interface이름 -NetworkInterfaceName *string `json:"networkInterfaceName,omitempty"` + NetworkInterfaceName *string `json:"networkInterfaceName,omitempty"` // Network Interface IP -NetworkInterfaceIp *string `json:"networkInterfaceIp,omitempty"` + NetworkInterfaceIp *string `json:"networkInterfaceIp,omitempty"` // Network Interface 설명 -NetworkInterfaceDescription *string `json:"networkInterfaceDescription,omitempty"` + NetworkInterfaceDescription *string `json:"networkInterfaceDescription,omitempty"` // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` + ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` // 상태코드 -StatusCode *string `json:"statusCode,omitempty"` + StatusCode *string `json:"statusCode,omitempty"` // 리전 -Region *Region `json:"region,omitempty"` + Region *Region `json:"region,omitempty"` // ZONE -Zone *Zone `json:"zone,omitempty"` + Zone *Zone `json:"zone,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule.go index 429f16310..7906b34b8 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule.go @@ -12,11 +12,11 @@ package server type PortForwardingRule struct { // 포트포워딩외부포트 -PortForwardingExternalPort *int32 `json:"portForwardingExternalPort,omitempty"` + PortForwardingExternalPort *int32 `json:"portForwardingExternalPort,omitempty"` // 포트포워딩내부포트 -PortForwardingInternalPort *int32 `json:"portForwardingInternalPort,omitempty"` + PortForwardingInternalPort *int32 `json:"portForwardingInternalPort,omitempty"` // 서버인스턴스 -ServerInstance *ServerInstance `json:"serverInstance,omitempty"` + ServerInstance *ServerInstance `json:"serverInstance,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule_parameter.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule_parameter.go index ebd3c05d8..307657123 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule_parameter.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule_parameter.go @@ -12,11 +12,11 @@ package server type PortForwardingRuleParameter struct { // 포트포워딩외부포트 -PortForwardingExternalPort *int32 `json:"portForwardingExternalPort"` + PortForwardingExternalPort *int32 `json:"portForwardingExternalPort"` // 포트포워딩내부포트 -PortForwardingInternalPort *int32 `json:"portForwardingInternalPort"` + PortForwardingInternalPort *int32 `json:"portForwardingInternalPort"` // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo"` + ServerInstanceNo *string `json:"serverInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/private_subnet_instance.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/private_subnet_instance.go index 176bd706b..66bc292aa 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/private_subnet_instance.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/private_subnet_instance.go @@ -12,29 +12,29 @@ package server type PrivateSubnetInstance struct { // Private Subnet인스턴스번호 -PrivateSubnetInstanceNo *string `json:"privateSubnetInstanceNo,omitempty"` + PrivateSubnetInstanceNo *string `json:"privateSubnetInstanceNo,omitempty"` // 서브넷 -Subnet *string `json:"subnet,omitempty"` + Subnet *string `json:"subnet,omitempty"` // Private Subnet설명 -PrivateSubnetDescription *string `json:"privateSubnetDescription,omitempty"` + PrivateSubnetDescription *string `json:"privateSubnetDescription,omitempty"` // 생성일시 -CreateDate *string `json:"createDate,omitempty"` + CreateDate *string `json:"createDate,omitempty"` // Private Subnet인스턴스상태 -PrivateSubnetInstanceStatus *CommonCode `json:"privateSubnetInstanceStatus,omitempty"` + PrivateSubnetInstanceStatus *CommonCode `json:"privateSubnetInstanceStatus,omitempty"` // Private Subnet OP -PrivateSubnetInstanceOperation *CommonCode `json:"privateSubnetInstanceOperation,omitempty"` + PrivateSubnetInstanceOperation *CommonCode `json:"privateSubnetInstanceOperation,omitempty"` // Private Subnet상태이름 -PrivateSubnetInstanceStatusName *string `json:"privateSubnetInstanceStatusName,omitempty"` + PrivateSubnetInstanceStatusName *string `json:"privateSubnetInstanceStatusName,omitempty"` // 리전 -Region *Region `json:"region,omitempty"` + Region *Region `json:"region,omitempty"` // ZONE -Zone *Zone `json:"zone,omitempty"` + Zone *Zone `json:"zone,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/product.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/product.go index 312d086fd..dacd4e44d 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/product.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/product.go @@ -12,44 +12,44 @@ package server type Product struct { // 상품코드 -ProductCode *string `json:"productCode,omitempty"` + ProductCode *string `json:"productCode,omitempty"` // 상품명 -ProductName *string `json:"productName,omitempty"` + ProductName *string `json:"productName,omitempty"` // 상품유형 -ProductType *CommonCode `json:"productType,omitempty"` + ProductType *CommonCode `json:"productType,omitempty"` // 상품설명 -ProductDescription *string `json:"productDescription,omitempty"` + ProductDescription *string `json:"productDescription,omitempty"` // 인프라자원구분 -InfraResourceType *CommonCode `json:"infraResourceType,omitempty"` + InfraResourceType *CommonCode `json:"infraResourceType,omitempty"` // 인프라자원상세구분 -InfraResourceDetailType *CommonCode `json:"infraResourceDetailType,omitempty"` + InfraResourceDetailType *CommonCode `json:"infraResourceDetailType,omitempty"` // CPU수 -CpuCount *int32 `json:"cpuCount,omitempty"` + CpuCount *int32 `json:"cpuCount,omitempty"` // 메모리사이즈 -MemorySize *int64 `json:"memorySize,omitempty"` + MemorySize *int64 `json:"memorySize,omitempty"` // 기본블록스토리지사이즈 -BaseBlockStorageSize *int64 `json:"baseBlockStorageSize,omitempty"` + BaseBlockStorageSize *int64 `json:"baseBlockStorageSize,omitempty"` // 플랫폼구분 -PlatformType *CommonCode `json:"platformType,omitempty"` + PlatformType *CommonCode `json:"platformType,omitempty"` // OS정보 -OsInformation *string `json:"osInformation,omitempty"` + OsInformation *string `json:"osInformation,omitempty"` // 디스크유형 -DiskType *CommonCode `json:"diskType,omitempty"` + DiskType *CommonCode `json:"diskType,omitempty"` // DB유형코드 -DbKindCode *string `json:"dbKindCode,omitempty"` + DbKindCode *string `json:"dbKindCode,omitempty"` // 추가블록스토리지사이즈 -AddBlockStorageSize *int64 `json:"addBlockStorageSize,omitempty"` + AddBlockStorageSize *int64 `json:"addBlockStorageSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/public_ip_instance.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/public_ip_instance.go index de3fe4239..affd66672 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/public_ip_instance.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/public_ip_instance.go @@ -12,38 +12,38 @@ package server type PublicIpInstance struct { // 공인IP인스턴스번호 -PublicIpInstanceNo *string `json:"publicIpInstanceNo,omitempty"` + PublicIpInstanceNo *string `json:"publicIpInstanceNo,omitempty"` // 공인IP -PublicIp *string `json:"publicIp,omitempty"` + PublicIp *string `json:"publicIp,omitempty"` // 공인IP설명 -PublicIpDescription *string `json:"publicIpDescription,omitempty"` + PublicIpDescription *string `json:"publicIpDescription,omitempty"` // 생성일시 -CreateDate *string `json:"createDate,omitempty"` + CreateDate *string `json:"createDate,omitempty"` // 인터넷라인구분 -InternetLineType *CommonCode `json:"internetLineType,omitempty"` + InternetLineType *CommonCode `json:"internetLineType,omitempty"` // 공인IP인스턴스상태명 -PublicIpInstanceStatusName *string `json:"publicIpInstanceStatusName,omitempty"` + PublicIpInstanceStatusName *string `json:"publicIpInstanceStatusName,omitempty"` // 공인IP인스턴스상태 -PublicIpInstanceStatus *CommonCode `json:"publicIpInstanceStatus,omitempty"` + PublicIpInstanceStatus *CommonCode `json:"publicIpInstanceStatus,omitempty"` // 공인IP인스턴스OP -PublicIpInstanceOperation *CommonCode `json:"publicIpInstanceOperation,omitempty"` + PublicIpInstanceOperation *CommonCode `json:"publicIpInstanceOperation,omitempty"` // 공인IP종류구분 -PublicIpKindType *CommonCode `json:"publicIpKindType,omitempty"` + PublicIpKindType *CommonCode `json:"publicIpKindType,omitempty"` // 공인IP할당된서버인스턴스 -ServerInstanceAssociatedWithPublicIp *ServerInstance `json:"serverInstanceAssociatedWithPublicIp,omitempty"` + ServerInstanceAssociatedWithPublicIp *ServerInstance `json:"serverInstanceAssociatedWithPublicIp,omitempty"` // 리전 -Region *Region `json:"region,omitempty"` + Region *Region `json:"region,omitempty"` // ZONE -Zone *Zone `json:"zone,omitempty"` + Zone *Zone `json:"zone,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/raid.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/raid.go index 511f46bdb..a5afed30a 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/raid.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/raid.go @@ -12,8 +12,8 @@ package server type Raid struct { // RAID구분이름 -RaidTypeName *string `json:"raidTypeName,omitempty"` + RaidTypeName *string `json:"raidTypeName,omitempty"` // RAID이름 -RaidName *string `json:"raidName,omitempty"` + RaidName *string `json:"raidName,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_request.go index b52489d01..6f2a724b5 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_request.go @@ -12,5 +12,5 @@ package server type RebootServerInstancesRequest struct { // 서버인스턴스번호리스트 -ServerInstanceNoList []*string `json:"serverInstanceNoList"` + ServerInstanceNoList []*string `json:"serverInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_response.go index a21cdb8a4..95f45c014 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_response.go @@ -10,14 +10,13 @@ package server type RebootServerInstancesResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` + ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_request.go index b8baf6722..0333ce1ff 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_request.go @@ -12,17 +12,17 @@ package server type RecreateServerInstanceRequest struct { // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` + ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` // 서버인스턴스이름 -ServerInstanceName *string `json:"serverInstanceName,omitempty"` + ServerInstanceName *string `json:"serverInstanceName,omitempty"` // 서버이미지상품코드 -ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` + ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` // 사용자데이터 -UserData *string `json:"userData,omitempty"` + UserData *string `json:"userData,omitempty"` // 인스턴스태그리스트 -InstanceTagList []*InstanceTagParameter `json:"instanceTagList,omitempty"` + InstanceTagList []*InstanceTagParameter `json:"instanceTagList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_response.go index 3b1160706..76d10ec17 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_response.go @@ -10,14 +10,13 @@ package server type RecreateServerInstanceResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` + ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/region.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/region.go index 2aa755c5e..60d923ca0 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/region.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/region.go @@ -10,10 +10,9 @@ package server type Region struct { + RegionNo *string `json:"regionNo,omitempty"` -RegionNo *string `json:"regionNo,omitempty"` + RegionCode *string `json:"regionCode,omitempty"` -RegionCode *string `json:"regionCode,omitempty"` - -RegionName *string `json:"regionName,omitempty"` + RegionName *string `json:"regionName,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_request.go index 8077e0953..9a7cfbbe6 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_request.go @@ -12,11 +12,11 @@ package server type RemoveNasVolumeAccessControlRequest struct { // NAS볼륨인스턴스번호 -NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` + NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` // 서버인스턴스번호리스트 -ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` + ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` // 커스텀IP리스트 -CustomIpList []*string `json:"customIpList,omitempty"` + CustomIpList []*string `json:"customIpList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_response.go index adbfcef80..08e0b88d9 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_response.go @@ -10,14 +10,13 @@ package server type RemoveNasVolumeAccessControlResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` + NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/server_instance.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/server_instance.go index 318b37418..beb697d89 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/server_instance.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/server_instance.go @@ -12,98 +12,98 @@ package server type ServerInstance struct { // 서버인스턴스번호 -ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` + ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` // 서버명 -ServerName *string `json:"serverName,omitempty"` + ServerName *string `json:"serverName,omitempty"` // 서버설명 -ServerDescription *string `json:"serverDescription,omitempty"` + ServerDescription *string `json:"serverDescription,omitempty"` // CPU수 -CpuCount *int32 `json:"cpuCount,omitempty"` + CpuCount *int32 `json:"cpuCount,omitempty"` // 메모리사이즈 -MemorySize *int64 `json:"memorySize,omitempty"` + MemorySize *int64 `json:"memorySize,omitempty"` // 기본블럭스토리지사이즈 -BaseBlockStorageSize *int64 `json:"baseBlockStorageSize,omitempty"` + BaseBlockStorageSize *int64 `json:"baseBlockStorageSize,omitempty"` // 플랫폼구분 -PlatformType *CommonCode `json:"platformType,omitempty"` + PlatformType *CommonCode `json:"platformType,omitempty"` // 로그인키명 -LoginKeyName *string `json:"loginKeyName,omitempty"` + LoginKeyName *string `json:"loginKeyName,omitempty"` // 유료모니터링여부 -IsFeeChargingMonitoring *bool `json:"isFeeChargingMonitoring,omitempty"` + IsFeeChargingMonitoring *bool `json:"isFeeChargingMonitoring,omitempty"` // 공인IP -PublicIp *string `json:"publicIp,omitempty"` + PublicIp *string `json:"publicIp,omitempty"` // 사설IP -PrivateIp *string `json:"privateIp,omitempty"` + PrivateIp *string `json:"privateIp,omitempty"` // 서버이미지명 -ServerImageName *string `json:"serverImageName,omitempty"` + ServerImageName *string `json:"serverImageName,omitempty"` // 서버인스턴스상태 -ServerInstanceStatus *CommonCode `json:"serverInstanceStatus,omitempty"` + ServerInstanceStatus *CommonCode `json:"serverInstanceStatus,omitempty"` // 서버인스턴스OP -ServerInstanceOperation *CommonCode `json:"serverInstanceOperation,omitempty"` + ServerInstanceOperation *CommonCode `json:"serverInstanceOperation,omitempty"` // 서버인스턴스상태명 -ServerInstanceStatusName *string `json:"serverInstanceStatusName,omitempty"` + ServerInstanceStatusName *string `json:"serverInstanceStatusName,omitempty"` // 생성일자 -CreateDate *string `json:"createDate,omitempty"` + CreateDate *string `json:"createDate,omitempty"` // UPTIME -Uptime *string `json:"uptime,omitempty"` + Uptime *string `json:"uptime,omitempty"` // 서버이미지상품코드 -ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` + ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` // 서버상품코드 -ServerProductCode *string `json:"serverProductCode,omitempty"` + ServerProductCode *string `json:"serverProductCode,omitempty"` // 반납보호여부 -IsProtectServerTermination *bool `json:"isProtectServerTermination,omitempty"` + IsProtectServerTermination *bool `json:"isProtectServerTermination,omitempty"` // portForwarding 공인 Ip -PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` + PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` // portForwarding 외부 포트 -PortForwardingExternalPort *int32 `json:"portForwardingExternalPort,omitempty"` + PortForwardingExternalPort *int32 `json:"portForwardingExternalPort,omitempty"` // portForwarding 내부 포트 -PortForwardingInternalPort *int32 `json:"portForwardingInternalPort,omitempty"` + PortForwardingInternalPort *int32 `json:"portForwardingInternalPort,omitempty"` // Zone -Zone *Zone `json:"zone,omitempty"` + Zone *Zone `json:"zone,omitempty"` // 리전 -Region *Region `json:"region,omitempty"` + Region *Region `json:"region,omitempty"` // 기본블록스토리지디스크유형 -BaseBlockStorageDiskType *CommonCode `json:"baseBlockStorageDiskType,omitempty"` + BaseBlockStorageDiskType *CommonCode `json:"baseBlockStorageDiskType,omitempty"` // 기본블록스토리지디스크상세유형 -BaseBlockStroageDiskDetailType *CommonCode `json:"baseBlockStroageDiskDetailType,omitempty"` + BaseBlockStroageDiskDetailType *CommonCode `json:"baseBlockStroageDiskDetailType,omitempty"` // 인터넷라인구분 -InternetLineType *CommonCode `json:"internetLineType,omitempty"` + InternetLineType *CommonCode `json:"internetLineType,omitempty"` // 서버인스턴스구분 -ServerInstanceType *CommonCode `json:"serverInstanceType,omitempty"` + ServerInstanceType *CommonCode `json:"serverInstanceType,omitempty"` // 사용자데이타 -UserData *string `json:"userData,omitempty"` + UserData *string `json:"userData,omitempty"` // ACG리스트 -AccessControlGroupList []*AccessControlGroup `json:"accessControlGroupList,omitempty"` + AccessControlGroupList []*AccessControlGroup `json:"accessControlGroupList,omitempty"` // 인스턴스태그리스트 -InstanceTagList []*InstanceTag `json:"instanceTagList,omitempty"` + InstanceTagList []*InstanceTag `json:"instanceTagList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_request.go index fdf5e2771..ff27c19ee 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_request.go @@ -12,11 +12,11 @@ package server type SetNasVolumeAccessControlRequest struct { // NAS볼륨인스턴스번호 -NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` + NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` // 서버인스턴스번호리스트 -ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` + ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` // 커스텀IP리스트 -CustomIpList []*string `json:"customIpList,omitempty"` + CustomIpList []*string `json:"customIpList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_response.go index c3ccd6d82..8d2d84dd5 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_response.go @@ -10,14 +10,13 @@ package server type SetNasVolumeAccessControlResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` + NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_request.go index 1db9d3a03..7b6483d94 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_request.go @@ -12,5 +12,5 @@ package server type StartServerInstancesRequest struct { // 서버인스턴스번호리스트 -ServerInstanceNoList []*string `json:"serverInstanceNoList"` + ServerInstanceNoList []*string `json:"serverInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_response.go index 01e2e4c83..79d6476e3 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_response.go @@ -10,14 +10,13 @@ package server type StartServerInstancesResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` + ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_request.go index 55d28540f..217adcfa1 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_request.go @@ -12,5 +12,5 @@ package server type StopServerInstancesRequest struct { // 서버인스턴스번호리스트 -ServerInstanceNoList []*string `json:"serverInstanceNoList"` + ServerInstanceNoList []*string `json:"serverInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_response.go index 8a3a02a66..18063efd8 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_response.go @@ -10,14 +10,13 @@ package server type StopServerInstancesResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` + ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_request.go index 0b8112c2b..2b5428aa5 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_request.go @@ -12,5 +12,5 @@ package server type TerminateServerInstancesRequest struct { // 서버인스턴스번호리스트 -ServerInstanceNoList []*string `json:"serverInstanceNoList"` + ServerInstanceNoList []*string `json:"serverInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_response.go index e626df1e1..5c40698e1 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_response.go @@ -10,14 +10,13 @@ package server type TerminateServerInstancesResponse struct { + RequestId *string `json:"requestId,omitempty"` -RequestId *string `json:"requestId,omitempty"` + ReturnCode *string `json:"returnCode,omitempty"` -ReturnCode *string `json:"returnCode,omitempty"` + ReturnMessage *string `json:"returnMessage,omitempty"` -ReturnMessage *string `json:"returnMessage,omitempty"` + TotalRows *int32 `json:"totalRows,omitempty"` -TotalRows *int32 `json:"totalRows,omitempty"` - -ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` + ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/v2_api.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/v2_api.go index f023b2236..bc6aaa072 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/v2_api.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/v2_api.go @@ -10,13 +10,13 @@ package server import ( + "bytes" "encoding/base64" "encoding/json" "io/ioutil" "net/url" "reflect" "strings" - "bytes" "golang.org/x/net/context" ) @@ -28,18 +28,17 @@ var ( type V2ApiService service - -/* V2ApiService - NAS볼륨인스턴스접근제어추가 - @param addNasVolumeAccessControlRequest addNasVolumeAccessControlRequest - @return *AddNasVolumeAccessControlResponse*/ +/* V2ApiService +NAS볼륨인스턴스접근제어추가 +@param addNasVolumeAccessControlRequest addNasVolumeAccessControlRequest +@return *AddNasVolumeAccessControlResponse*/ func (a *V2ApiService) AddNasVolumeAccessControl(addNasVolumeAccessControlRequest *AddNasVolumeAccessControlRequest) (*AddNasVolumeAccessControlResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload AddNasVolumeAccessControlResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload AddNasVolumeAccessControlResponse ) // create path and map variables @@ -49,9 +48,8 @@ func (a *V2ApiService) AddNasVolumeAccessControl(addNasVolumeAccessControlReques localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -60,8 +58,7 @@ func (a *V2ApiService) AddNasVolumeAccessControl(addNasVolumeAccessControlReques } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -99,21 +96,20 @@ func (a *V2ApiService) AddNasVolumeAccessControl(addNasVolumeAccessControlReques } } - return &successPayload, err } -/* V2ApiService - 포트포워딩Rule추가 - @param addPortForwardingRulesRequest addPortForwardingRulesRequest - @return *AddPortForwardingRulesResponse*/ +/* V2ApiService +포트포워딩Rule추가 +@param addPortForwardingRulesRequest addPortForwardingRulesRequest +@return *AddPortForwardingRulesResponse*/ func (a *V2ApiService) AddPortForwardingRules(addPortForwardingRulesRequest *AddPortForwardingRulesRequest) (*AddPortForwardingRulesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload AddPortForwardingRulesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload AddPortForwardingRulesResponse ) // create path and map variables @@ -123,9 +119,8 @@ func (a *V2ApiService) AddPortForwardingRules(addPortForwardingRulesRequest *Add localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -134,8 +129,7 @@ func (a *V2ApiService) AddPortForwardingRules(addPortForwardingRulesRequest *Add } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -173,21 +167,20 @@ func (a *V2ApiService) AddPortForwardingRules(addPortForwardingRulesRequest *Add } } - return &successPayload, err } -/* V2ApiService - 공인IP를서버인스턴스에할당 - @param associatePublicIpWithServerInstanceRequest associatePublicIpWithServerInstanceRequest - @return *AssociatePublicIpWithServerInstanceResponse*/ +/* V2ApiService +공인IP를서버인스턴스에할당 +@param associatePublicIpWithServerInstanceRequest associatePublicIpWithServerInstanceRequest +@return *AssociatePublicIpWithServerInstanceResponse*/ func (a *V2ApiService) AssociatePublicIpWithServerInstance(associatePublicIpWithServerInstanceRequest *AssociatePublicIpWithServerInstanceRequest) (*AssociatePublicIpWithServerInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload AssociatePublicIpWithServerInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload AssociatePublicIpWithServerInstanceResponse ) // create path and map variables @@ -197,9 +190,8 @@ func (a *V2ApiService) AssociatePublicIpWithServerInstance(associatePublicIpWith localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -208,8 +200,7 @@ func (a *V2ApiService) AssociatePublicIpWithServerInstance(associatePublicIpWith } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -247,21 +238,20 @@ func (a *V2ApiService) AssociatePublicIpWithServerInstance(associatePublicIpWith } } - return &successPayload, err } -/* V2ApiService - 블록스토리지인스턴스할당 - @param attachBlockStorageInstanceRequest attachBlockStorageInstanceRequest - @return *AttachBlockStorageInstanceResponse*/ +/* V2ApiService +블록스토리지인스턴스할당 +@param attachBlockStorageInstanceRequest attachBlockStorageInstanceRequest +@return *AttachBlockStorageInstanceResponse*/ func (a *V2ApiService) AttachBlockStorageInstance(attachBlockStorageInstanceRequest *AttachBlockStorageInstanceRequest) (*AttachBlockStorageInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload AttachBlockStorageInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload AttachBlockStorageInstanceResponse ) // create path and map variables @@ -271,9 +261,8 @@ func (a *V2ApiService) AttachBlockStorageInstance(attachBlockStorageInstanceRequ localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -282,8 +271,7 @@ func (a *V2ApiService) AttachBlockStorageInstance(attachBlockStorageInstanceRequ } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -321,21 +309,20 @@ func (a *V2ApiService) AttachBlockStorageInstance(attachBlockStorageInstanceRequ } } - return &successPayload, err } -/* V2ApiService - Network Interface Attach - @param attachNetworkInterfaceRequest attachNetworkInterfaceRequest - @return *AttachNetworkInterfaceResponse*/ +/* V2ApiService +Network Interface Attach +@param attachNetworkInterfaceRequest attachNetworkInterfaceRequest +@return *AttachNetworkInterfaceResponse*/ func (a *V2ApiService) AttachNetworkInterface(attachNetworkInterfaceRequest *AttachNetworkInterfaceRequest) (*AttachNetworkInterfaceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload AttachNetworkInterfaceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload AttachNetworkInterfaceResponse ) // create path and map variables @@ -345,9 +332,8 @@ func (a *V2ApiService) AttachNetworkInterface(attachNetworkInterfaceRequest *Att localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -356,8 +342,7 @@ func (a *V2ApiService) AttachNetworkInterface(attachNetworkInterfaceRequest *Att } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -395,21 +380,20 @@ func (a *V2ApiService) AttachNetworkInterface(attachNetworkInterfaceRequest *Att } } - return &successPayload, err } -/* V2ApiService - NAS볼륨사이즈변경 - @param changeNasVolumeSizeRequest changeNasVolumeSizeRequest - @return *ChangeNasVolumeSizeResponse*/ +/* V2ApiService +NAS볼륨사이즈변경 +@param changeNasVolumeSizeRequest changeNasVolumeSizeRequest +@return *ChangeNasVolumeSizeResponse*/ func (a *V2ApiService) ChangeNasVolumeSize(changeNasVolumeSizeRequest *ChangeNasVolumeSizeRequest) (*ChangeNasVolumeSizeResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload ChangeNasVolumeSizeResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload ChangeNasVolumeSizeResponse ) // create path and map variables @@ -419,9 +403,8 @@ func (a *V2ApiService) ChangeNasVolumeSize(changeNasVolumeSizeRequest *ChangeNas localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -430,8 +413,7 @@ func (a *V2ApiService) ChangeNasVolumeSize(changeNasVolumeSizeRequest *ChangeNas } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -469,21 +451,20 @@ func (a *V2ApiService) ChangeNasVolumeSize(changeNasVolumeSizeRequest *ChangeNas } } - return &successPayload, err } -/* V2ApiService - 서버인스턴스스팩변경 - @param changeServerInstanceSpecRequest changeServerInstanceSpecRequest - @return *ChangeServerInstanceSpecResponse*/ +/* V2ApiService +서버인스턴스스팩변경 +@param changeServerInstanceSpecRequest changeServerInstanceSpecRequest +@return *ChangeServerInstanceSpecResponse*/ func (a *V2ApiService) ChangeServerInstanceSpec(changeServerInstanceSpecRequest *ChangeServerInstanceSpecRequest) (*ChangeServerInstanceSpecResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload ChangeServerInstanceSpecResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload ChangeServerInstanceSpecResponse ) // create path and map variables @@ -493,9 +474,8 @@ func (a *V2ApiService) ChangeServerInstanceSpec(changeServerInstanceSpecRequest localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -504,8 +484,7 @@ func (a *V2ApiService) ChangeServerInstanceSpec(changeServerInstanceSpecRequest } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -543,21 +522,20 @@ func (a *V2ApiService) ChangeServerInstanceSpec(changeServerInstanceSpecRequest } } - return &successPayload, err } -/* V2ApiService - 블록스토리지인스턴스생성 - @param createBlockStorageInstanceRequest createBlockStorageInstanceRequest - @return *CreateBlockStorageInstanceResponse*/ +/* V2ApiService +블록스토리지인스턴스생성 +@param createBlockStorageInstanceRequest createBlockStorageInstanceRequest +@return *CreateBlockStorageInstanceResponse*/ func (a *V2ApiService) CreateBlockStorageInstance(createBlockStorageInstanceRequest *CreateBlockStorageInstanceRequest) (*CreateBlockStorageInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateBlockStorageInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateBlockStorageInstanceResponse ) // create path and map variables @@ -567,9 +545,8 @@ func (a *V2ApiService) CreateBlockStorageInstance(createBlockStorageInstanceRequ localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -578,8 +555,7 @@ func (a *V2ApiService) CreateBlockStorageInstance(createBlockStorageInstanceRequ } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -617,21 +593,20 @@ func (a *V2ApiService) CreateBlockStorageInstance(createBlockStorageInstanceRequ } } - return &successPayload, err } -/* V2ApiService - 블록스토리지스냅샷인스턴스생성 - @param createBlockStorageSnapshotInstanceRequest createBlockStorageSnapshotInstanceRequest - @return *CreateBlockStorageSnapshotInstanceResponse*/ +/* V2ApiService +블록스토리지스냅샷인스턴스생성 +@param createBlockStorageSnapshotInstanceRequest createBlockStorageSnapshotInstanceRequest +@return *CreateBlockStorageSnapshotInstanceResponse*/ func (a *V2ApiService) CreateBlockStorageSnapshotInstance(createBlockStorageSnapshotInstanceRequest *CreateBlockStorageSnapshotInstanceRequest) (*CreateBlockStorageSnapshotInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateBlockStorageSnapshotInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateBlockStorageSnapshotInstanceResponse ) // create path and map variables @@ -641,9 +616,8 @@ func (a *V2ApiService) CreateBlockStorageSnapshotInstance(createBlockStorageSnap localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -652,8 +626,7 @@ func (a *V2ApiService) CreateBlockStorageSnapshotInstance(createBlockStorageSnap } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -691,21 +664,20 @@ func (a *V2ApiService) CreateBlockStorageSnapshotInstance(createBlockStorageSnap } } - return &successPayload, err } -/* V2ApiService - 인스턴스태그생성 - @param createInstanceTagsRequest createInstanceTagsRequest - @return *CreateInstanceTagsResponse*/ +/* V2ApiService +인스턴스태그생성 +@param createInstanceTagsRequest createInstanceTagsRequest +@return *CreateInstanceTagsResponse*/ func (a *V2ApiService) CreateInstanceTags(createInstanceTagsRequest *CreateInstanceTagsRequest) (*CreateInstanceTagsResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateInstanceTagsResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateInstanceTagsResponse ) // create path and map variables @@ -715,9 +687,8 @@ func (a *V2ApiService) CreateInstanceTags(createInstanceTagsRequest *CreateInsta localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -726,8 +697,7 @@ func (a *V2ApiService) CreateInstanceTags(createInstanceTagsRequest *CreateInsta } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -765,21 +735,20 @@ func (a *V2ApiService) CreateInstanceTags(createInstanceTagsRequest *CreateInsta } } - return &successPayload, err } -/* V2ApiService - 로그인키생성 - @param createLoginKeyRequest createLoginKeyRequest - @return *CreateLoginKeyResponse*/ +/* V2ApiService +로그인키생성 +@param createLoginKeyRequest createLoginKeyRequest +@return *CreateLoginKeyResponse*/ func (a *V2ApiService) CreateLoginKey(createLoginKeyRequest *CreateLoginKeyRequest) (*CreateLoginKeyResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateLoginKeyResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateLoginKeyResponse ) // create path and map variables @@ -789,9 +758,8 @@ func (a *V2ApiService) CreateLoginKey(createLoginKeyRequest *CreateLoginKeyReque localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -800,8 +768,7 @@ func (a *V2ApiService) CreateLoginKey(createLoginKeyRequest *CreateLoginKeyReque } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -839,21 +806,20 @@ func (a *V2ApiService) CreateLoginKey(createLoginKeyRequest *CreateLoginKeyReque } } - return &successPayload, err } -/* V2ApiService - 회원서버이미지생성 - @param createMemberServerImageRequest createMemberServerImageRequest - @return *CreateMemberServerImageResponse*/ +/* V2ApiService +회원서버이미지생성 +@param createMemberServerImageRequest createMemberServerImageRequest +@return *CreateMemberServerImageResponse*/ func (a *V2ApiService) CreateMemberServerImage(createMemberServerImageRequest *CreateMemberServerImageRequest) (*CreateMemberServerImageResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateMemberServerImageResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateMemberServerImageResponse ) // create path and map variables @@ -863,9 +829,8 @@ func (a *V2ApiService) CreateMemberServerImage(createMemberServerImageRequest *C localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -874,8 +839,7 @@ func (a *V2ApiService) CreateMemberServerImage(createMemberServerImageRequest *C } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -913,21 +877,20 @@ func (a *V2ApiService) CreateMemberServerImage(createMemberServerImageRequest *C } } - return &successPayload, err } -/* V2ApiService - NAS볼륨인스턴스생성 - @param createNasVolumeInstanceRequest createNasVolumeInstanceRequest - @return *CreateNasVolumeInstanceResponse*/ +/* V2ApiService +NAS볼륨인스턴스생성 +@param createNasVolumeInstanceRequest createNasVolumeInstanceRequest +@return *CreateNasVolumeInstanceResponse*/ func (a *V2ApiService) CreateNasVolumeInstance(createNasVolumeInstanceRequest *CreateNasVolumeInstanceRequest) (*CreateNasVolumeInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateNasVolumeInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateNasVolumeInstanceResponse ) // create path and map variables @@ -937,9 +900,8 @@ func (a *V2ApiService) CreateNasVolumeInstance(createNasVolumeInstanceRequest *C localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -948,8 +910,7 @@ func (a *V2ApiService) CreateNasVolumeInstance(createNasVolumeInstanceRequest *C } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -987,21 +948,20 @@ func (a *V2ApiService) CreateNasVolumeInstance(createNasVolumeInstanceRequest *C } } - return &successPayload, err } -/* V2ApiService - Network Interface 생성 - @param createNetworkInterfaceRequest createNetworkInterfaceRequest - @return *CreateNetworkInterfaceResponse*/ +/* V2ApiService +Network Interface 생성 +@param createNetworkInterfaceRequest createNetworkInterfaceRequest +@return *CreateNetworkInterfaceResponse*/ func (a *V2ApiService) CreateNetworkInterface(createNetworkInterfaceRequest *CreateNetworkInterfaceRequest) (*CreateNetworkInterfaceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateNetworkInterfaceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateNetworkInterfaceResponse ) // create path and map variables @@ -1011,9 +971,8 @@ func (a *V2ApiService) CreateNetworkInterface(createNetworkInterfaceRequest *Cre localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1022,8 +981,7 @@ func (a *V2ApiService) CreateNetworkInterface(createNetworkInterfaceRequest *Cre } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1061,21 +1019,20 @@ func (a *V2ApiService) CreateNetworkInterface(createNetworkInterfaceRequest *Cre } } - return &successPayload, err } -/* V2ApiService - 공인IP인스턴스생성 - @param createPublicIpInstanceRequest createPublicIpInstanceRequest - @return *CreatePublicIpInstanceResponse*/ +/* V2ApiService +공인IP인스턴스생성 +@param createPublicIpInstanceRequest createPublicIpInstanceRequest +@return *CreatePublicIpInstanceResponse*/ func (a *V2ApiService) CreatePublicIpInstance(createPublicIpInstanceRequest *CreatePublicIpInstanceRequest) (*CreatePublicIpInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreatePublicIpInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreatePublicIpInstanceResponse ) // create path and map variables @@ -1085,9 +1042,8 @@ func (a *V2ApiService) CreatePublicIpInstance(createPublicIpInstanceRequest *Cre localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1096,8 +1052,7 @@ func (a *V2ApiService) CreatePublicIpInstance(createPublicIpInstanceRequest *Cre } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1135,21 +1090,20 @@ func (a *V2ApiService) CreatePublicIpInstance(createPublicIpInstanceRequest *Cre } } - return &successPayload, err } -/* V2ApiService - 서버인스턴스생성 - @param createServerInstancesRequest createServerInstancesRequest - @return *CreateServerInstancesResponse*/ +/* V2ApiService +서버인스턴스생성 +@param createServerInstancesRequest createServerInstancesRequest +@return *CreateServerInstancesResponse*/ func (a *V2ApiService) CreateServerInstances(createServerInstancesRequest *CreateServerInstancesRequest) (*CreateServerInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateServerInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateServerInstancesResponse ) // create path and map variables @@ -1159,9 +1113,8 @@ func (a *V2ApiService) CreateServerInstances(createServerInstancesRequest *Creat localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1170,8 +1123,7 @@ func (a *V2ApiService) CreateServerInstances(createServerInstancesRequest *Creat } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1209,21 +1161,20 @@ func (a *V2ApiService) CreateServerInstances(createServerInstancesRequest *Creat } } - return &successPayload, err } -/* V2ApiService - 블록스토리지인스턴스삭제 - @param deleteBlockStorageInstancesRequest deleteBlockStorageInstancesRequest - @return *DeleteBlockStorageInstancesResponse*/ +/* V2ApiService +블록스토리지인스턴스삭제 +@param deleteBlockStorageInstancesRequest deleteBlockStorageInstancesRequest +@return *DeleteBlockStorageInstancesResponse*/ func (a *V2ApiService) DeleteBlockStorageInstances(deleteBlockStorageInstancesRequest *DeleteBlockStorageInstancesRequest) (*DeleteBlockStorageInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteBlockStorageInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteBlockStorageInstancesResponse ) // create path and map variables @@ -1233,9 +1184,8 @@ func (a *V2ApiService) DeleteBlockStorageInstances(deleteBlockStorageInstancesRe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1244,8 +1194,7 @@ func (a *V2ApiService) DeleteBlockStorageInstances(deleteBlockStorageInstancesRe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1283,21 +1232,20 @@ func (a *V2ApiService) DeleteBlockStorageInstances(deleteBlockStorageInstancesRe } } - return &successPayload, err } -/* V2ApiService - 블록스토리지스냅샷인스턴스삭제 - @param deleteBlockStorageSnapshotInstancesRequest deleteBlockStorageSnapshotInstancesRequest - @return *DeleteBlockStorageSnapshotInstancesResponse*/ +/* V2ApiService +블록스토리지스냅샷인스턴스삭제 +@param deleteBlockStorageSnapshotInstancesRequest deleteBlockStorageSnapshotInstancesRequest +@return *DeleteBlockStorageSnapshotInstancesResponse*/ func (a *V2ApiService) DeleteBlockStorageSnapshotInstances(deleteBlockStorageSnapshotInstancesRequest *DeleteBlockStorageSnapshotInstancesRequest) (*DeleteBlockStorageSnapshotInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteBlockStorageSnapshotInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteBlockStorageSnapshotInstancesResponse ) // create path and map variables @@ -1307,9 +1255,8 @@ func (a *V2ApiService) DeleteBlockStorageSnapshotInstances(deleteBlockStorageSna localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1318,8 +1265,7 @@ func (a *V2ApiService) DeleteBlockStorageSnapshotInstances(deleteBlockStorageSna } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1357,21 +1303,20 @@ func (a *V2ApiService) DeleteBlockStorageSnapshotInstances(deleteBlockStorageSna } } - return &successPayload, err } -/* V2ApiService - 인스턴스태그삭제 - @param deleteInstanceTagsRequest deleteInstanceTagsRequest - @return *DeleteInstanceTagsResponse*/ +/* V2ApiService +인스턴스태그삭제 +@param deleteInstanceTagsRequest deleteInstanceTagsRequest +@return *DeleteInstanceTagsResponse*/ func (a *V2ApiService) DeleteInstanceTags(deleteInstanceTagsRequest *DeleteInstanceTagsRequest) (*DeleteInstanceTagsResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteInstanceTagsResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteInstanceTagsResponse ) // create path and map variables @@ -1381,9 +1326,8 @@ func (a *V2ApiService) DeleteInstanceTags(deleteInstanceTagsRequest *DeleteInsta localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1392,8 +1336,7 @@ func (a *V2ApiService) DeleteInstanceTags(deleteInstanceTagsRequest *DeleteInsta } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1431,21 +1374,20 @@ func (a *V2ApiService) DeleteInstanceTags(deleteInstanceTagsRequest *DeleteInsta } } - return &successPayload, err } -/* V2ApiService - 로그인키삭제 - @param deleteLoginKeyRequest deleteLoginKeyRequest - @return *DeleteLoginKeyResponse*/ +/* V2ApiService +로그인키삭제 +@param deleteLoginKeyRequest deleteLoginKeyRequest +@return *DeleteLoginKeyResponse*/ func (a *V2ApiService) DeleteLoginKey(deleteLoginKeyRequest *DeleteLoginKeyRequest) (*DeleteLoginKeyResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteLoginKeyResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteLoginKeyResponse ) // create path and map variables @@ -1455,9 +1397,8 @@ func (a *V2ApiService) DeleteLoginKey(deleteLoginKeyRequest *DeleteLoginKeyReque localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1466,8 +1407,7 @@ func (a *V2ApiService) DeleteLoginKey(deleteLoginKeyRequest *DeleteLoginKeyReque } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1505,21 +1445,20 @@ func (a *V2ApiService) DeleteLoginKey(deleteLoginKeyRequest *DeleteLoginKeyReque } } - return &successPayload, err } -/* V2ApiService - 회원서버이미지삭제 - @param deleteMemberServerImagesRequest deleteMemberServerImagesRequest - @return *DeleteMemberServerImagesResponse*/ +/* V2ApiService +회원서버이미지삭제 +@param deleteMemberServerImagesRequest deleteMemberServerImagesRequest +@return *DeleteMemberServerImagesResponse*/ func (a *V2ApiService) DeleteMemberServerImages(deleteMemberServerImagesRequest *DeleteMemberServerImagesRequest) (*DeleteMemberServerImagesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteMemberServerImagesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteMemberServerImagesResponse ) // create path and map variables @@ -1529,9 +1468,8 @@ func (a *V2ApiService) DeleteMemberServerImages(deleteMemberServerImagesRequest localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1540,8 +1478,7 @@ func (a *V2ApiService) DeleteMemberServerImages(deleteMemberServerImagesRequest } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1579,21 +1516,20 @@ func (a *V2ApiService) DeleteMemberServerImages(deleteMemberServerImagesRequest } } - return &successPayload, err } -/* V2ApiService - NAS볼륨인스턴스삭제 - @param deleteNasVolumeInstanceRequest deleteNasVolumeInstanceRequest - @return *DeleteNasVolumeInstanceResponse*/ +/* V2ApiService +NAS볼륨인스턴스삭제 +@param deleteNasVolumeInstanceRequest deleteNasVolumeInstanceRequest +@return *DeleteNasVolumeInstanceResponse*/ func (a *V2ApiService) DeleteNasVolumeInstance(deleteNasVolumeInstanceRequest *DeleteNasVolumeInstanceRequest) (*DeleteNasVolumeInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteNasVolumeInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteNasVolumeInstanceResponse ) // create path and map variables @@ -1603,9 +1539,8 @@ func (a *V2ApiService) DeleteNasVolumeInstance(deleteNasVolumeInstanceRequest *D localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1614,8 +1549,7 @@ func (a *V2ApiService) DeleteNasVolumeInstance(deleteNasVolumeInstanceRequest *D } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1653,21 +1587,20 @@ func (a *V2ApiService) DeleteNasVolumeInstance(deleteNasVolumeInstanceRequest *D } } - return &successPayload, err } -/* V2ApiService - Network Interface 삭제 - @param deleteNetworkInterfaceRequest deleteNetworkInterfaceRequest - @return *DeleteNetworkInterfaceResponse*/ +/* V2ApiService +Network Interface 삭제 +@param deleteNetworkInterfaceRequest deleteNetworkInterfaceRequest +@return *DeleteNetworkInterfaceResponse*/ func (a *V2ApiService) DeleteNetworkInterface(deleteNetworkInterfaceRequest *DeleteNetworkInterfaceRequest) (*DeleteNetworkInterfaceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteNetworkInterfaceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteNetworkInterfaceResponse ) // create path and map variables @@ -1677,9 +1610,8 @@ func (a *V2ApiService) DeleteNetworkInterface(deleteNetworkInterfaceRequest *Del localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1688,8 +1620,7 @@ func (a *V2ApiService) DeleteNetworkInterface(deleteNetworkInterfaceRequest *Del } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1727,21 +1658,20 @@ func (a *V2ApiService) DeleteNetworkInterface(deleteNetworkInterfaceRequest *Del } } - return &successPayload, err } -/* V2ApiService - 포트포워딩Rule삭제 - @param deletePortForwardingRulesRequest deletePortForwardingRulesRequest - @return *DeletePortForwardingRulesResponse*/ +/* V2ApiService +포트포워딩Rule삭제 +@param deletePortForwardingRulesRequest deletePortForwardingRulesRequest +@return *DeletePortForwardingRulesResponse*/ func (a *V2ApiService) DeletePortForwardingRules(deletePortForwardingRulesRequest *DeletePortForwardingRulesRequest) (*DeletePortForwardingRulesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeletePortForwardingRulesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeletePortForwardingRulesResponse ) // create path and map variables @@ -1751,9 +1681,8 @@ func (a *V2ApiService) DeletePortForwardingRules(deletePortForwardingRulesReques localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1762,8 +1691,7 @@ func (a *V2ApiService) DeletePortForwardingRules(deletePortForwardingRulesReques } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1801,21 +1729,20 @@ func (a *V2ApiService) DeletePortForwardingRules(deletePortForwardingRulesReques } } - return &successPayload, err } -/* V2ApiService - 공인IP인스턴스삭제 - @param deletePublicIpInstancesRequest deletePublicIpInstancesRequest - @return *DeletePublicIpInstancesResponse*/ +/* V2ApiService +공인IP인스턴스삭제 +@param deletePublicIpInstancesRequest deletePublicIpInstancesRequest +@return *DeletePublicIpInstancesResponse*/ func (a *V2ApiService) DeletePublicIpInstances(deletePublicIpInstancesRequest *DeletePublicIpInstancesRequest) (*DeletePublicIpInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeletePublicIpInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeletePublicIpInstancesResponse ) // create path and map variables @@ -1825,9 +1752,8 @@ func (a *V2ApiService) DeletePublicIpInstances(deletePublicIpInstancesRequest *D localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1836,8 +1762,7 @@ func (a *V2ApiService) DeletePublicIpInstances(deletePublicIpInstancesRequest *D } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1875,21 +1800,20 @@ func (a *V2ApiService) DeletePublicIpInstances(deletePublicIpInstancesRequest *D } } - return &successPayload, err } -/* V2ApiService - 블록스토리지인스턴스할당해제 - @param detachBlockStorageInstancesRequest detachBlockStorageInstancesRequest - @return *DetachBlockStorageInstancesResponse*/ +/* V2ApiService +블록스토리지인스턴스할당해제 +@param detachBlockStorageInstancesRequest detachBlockStorageInstancesRequest +@return *DetachBlockStorageInstancesResponse*/ func (a *V2ApiService) DetachBlockStorageInstances(detachBlockStorageInstancesRequest *DetachBlockStorageInstancesRequest) (*DetachBlockStorageInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DetachBlockStorageInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DetachBlockStorageInstancesResponse ) // create path and map variables @@ -1899,9 +1823,8 @@ func (a *V2ApiService) DetachBlockStorageInstances(detachBlockStorageInstancesRe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1910,8 +1833,7 @@ func (a *V2ApiService) DetachBlockStorageInstances(detachBlockStorageInstancesRe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1949,21 +1871,20 @@ func (a *V2ApiService) DetachBlockStorageInstances(detachBlockStorageInstancesRe } } - return &successPayload, err } -/* V2ApiService - Network Interface Detach - @param detachNetworkInterfaceRequest detachNetworkInterfaceRequest - @return *DetachNetworkInterfaceResponse*/ +/* V2ApiService +Network Interface Detach +@param detachNetworkInterfaceRequest detachNetworkInterfaceRequest +@return *DetachNetworkInterfaceResponse*/ func (a *V2ApiService) DetachNetworkInterface(detachNetworkInterfaceRequest *DetachNetworkInterfaceRequest) (*DetachNetworkInterfaceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DetachNetworkInterfaceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DetachNetworkInterfaceResponse ) // create path and map variables @@ -1973,9 +1894,8 @@ func (a *V2ApiService) DetachNetworkInterface(detachNetworkInterfaceRequest *Det localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1984,8 +1904,7 @@ func (a *V2ApiService) DetachNetworkInterface(detachNetworkInterfaceRequest *Det } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2023,21 +1942,20 @@ func (a *V2ApiService) DetachNetworkInterface(detachNetworkInterfaceRequest *Det } } - return &successPayload, err } -/* V2ApiService - 공인IP를서버인스턴스에할당해제 - @param disassociatePublicIpFromServerInstanceRequest disassociatePublicIpFromServerInstanceRequest - @return *DisassociatePublicIpFromServerInstanceResponse*/ +/* V2ApiService +공인IP를서버인스턴스에할당해제 +@param disassociatePublicIpFromServerInstanceRequest disassociatePublicIpFromServerInstanceRequest +@return *DisassociatePublicIpFromServerInstanceResponse*/ func (a *V2ApiService) DisassociatePublicIpFromServerInstance(disassociatePublicIpFromServerInstanceRequest *DisassociatePublicIpFromServerInstanceRequest) (*DisassociatePublicIpFromServerInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DisassociatePublicIpFromServerInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DisassociatePublicIpFromServerInstanceResponse ) // create path and map variables @@ -2047,9 +1965,8 @@ func (a *V2ApiService) DisassociatePublicIpFromServerInstance(disassociatePublic localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2058,8 +1975,7 @@ func (a *V2ApiService) DisassociatePublicIpFromServerInstance(disassociatePublic } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2097,21 +2013,20 @@ func (a *V2ApiService) DisassociatePublicIpFromServerInstance(disassociatePublic } } - return &successPayload, err } -/* V2ApiService - 접근제어그룹리스트조회 - @param getAccessControlGroupListRequest getAccessControlGroupListRequest - @return *GetAccessControlGroupListResponse*/ +/* V2ApiService +접근제어그룹리스트조회 +@param getAccessControlGroupListRequest getAccessControlGroupListRequest +@return *GetAccessControlGroupListResponse*/ func (a *V2ApiService) GetAccessControlGroupList(getAccessControlGroupListRequest *GetAccessControlGroupListRequest) (*GetAccessControlGroupListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetAccessControlGroupListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetAccessControlGroupListResponse ) // create path and map variables @@ -2121,9 +2036,8 @@ func (a *V2ApiService) GetAccessControlGroupList(getAccessControlGroupListReques localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2132,8 +2046,7 @@ func (a *V2ApiService) GetAccessControlGroupList(getAccessControlGroupListReques } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2171,21 +2084,20 @@ func (a *V2ApiService) GetAccessControlGroupList(getAccessControlGroupListReques } } - return &successPayload, err } -/* V2ApiService - 접근제어그룹적용된서버인스턴스리스트조회 - @param getAccessControlGroupServerInstanceListRequest getAccessControlGroupServerInstanceListRequest - @return *GetAccessControlGroupServerInstanceListResponse*/ +/* V2ApiService +접근제어그룹적용된서버인스턴스리스트조회 +@param getAccessControlGroupServerInstanceListRequest getAccessControlGroupServerInstanceListRequest +@return *GetAccessControlGroupServerInstanceListResponse*/ func (a *V2ApiService) GetAccessControlGroupServerInstanceList(getAccessControlGroupServerInstanceListRequest *GetAccessControlGroupServerInstanceListRequest) (*GetAccessControlGroupServerInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetAccessControlGroupServerInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetAccessControlGroupServerInstanceListResponse ) // create path and map variables @@ -2195,9 +2107,8 @@ func (a *V2ApiService) GetAccessControlGroupServerInstanceList(getAccessControlG localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2206,8 +2117,7 @@ func (a *V2ApiService) GetAccessControlGroupServerInstanceList(getAccessControlG } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2245,21 +2155,20 @@ func (a *V2ApiService) GetAccessControlGroupServerInstanceList(getAccessControlG } } - return &successPayload, err } -/* V2ApiService - 접근제어규칙리스트조회 - @param getAccessControlRuleListRequest getAccessControlRuleListRequest - @return *GetAccessControlRuleListResponse*/ +/* V2ApiService +접근제어규칙리스트조회 +@param getAccessControlRuleListRequest getAccessControlRuleListRequest +@return *GetAccessControlRuleListResponse*/ func (a *V2ApiService) GetAccessControlRuleList(getAccessControlRuleListRequest *GetAccessControlRuleListRequest) (*GetAccessControlRuleListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetAccessControlRuleListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetAccessControlRuleListResponse ) // create path and map variables @@ -2269,9 +2178,8 @@ func (a *V2ApiService) GetAccessControlRuleList(getAccessControlRuleListRequest localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2280,8 +2188,7 @@ func (a *V2ApiService) GetAccessControlRuleList(getAccessControlRuleListRequest } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2319,21 +2226,20 @@ func (a *V2ApiService) GetAccessControlRuleList(getAccessControlRuleListRequest } } - return &successPayload, err } -/* V2ApiService - 블록스토리지인스턴스리스트조회 - @param getBlockStorageInstanceListRequest getBlockStorageInstanceListRequest - @return *GetBlockStorageInstanceListResponse*/ +/* V2ApiService +블록스토리지인스턴스리스트조회 +@param getBlockStorageInstanceListRequest getBlockStorageInstanceListRequest +@return *GetBlockStorageInstanceListResponse*/ func (a *V2ApiService) GetBlockStorageInstanceList(getBlockStorageInstanceListRequest *GetBlockStorageInstanceListRequest) (*GetBlockStorageInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetBlockStorageInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetBlockStorageInstanceListResponse ) // create path and map variables @@ -2343,9 +2249,8 @@ func (a *V2ApiService) GetBlockStorageInstanceList(getBlockStorageInstanceListRe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2354,8 +2259,7 @@ func (a *V2ApiService) GetBlockStorageInstanceList(getBlockStorageInstanceListRe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2393,21 +2297,20 @@ func (a *V2ApiService) GetBlockStorageInstanceList(getBlockStorageInstanceListRe } } - return &successPayload, err } -/* V2ApiService - 블록스토리지스냅샷인스턴스리스트조회 - @param getBlockStorageSnapshotInstanceListRequest getBlockStorageSnapshotInstanceListRequest - @return *GetBlockStorageSnapshotInstanceListResponse*/ +/* V2ApiService +블록스토리지스냅샷인스턴스리스트조회 +@param getBlockStorageSnapshotInstanceListRequest getBlockStorageSnapshotInstanceListRequest +@return *GetBlockStorageSnapshotInstanceListResponse*/ func (a *V2ApiService) GetBlockStorageSnapshotInstanceList(getBlockStorageSnapshotInstanceListRequest *GetBlockStorageSnapshotInstanceListRequest) (*GetBlockStorageSnapshotInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetBlockStorageSnapshotInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetBlockStorageSnapshotInstanceListResponse ) // create path and map variables @@ -2417,9 +2320,8 @@ func (a *V2ApiService) GetBlockStorageSnapshotInstanceList(getBlockStorageSnapsh localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2428,8 +2330,7 @@ func (a *V2ApiService) GetBlockStorageSnapshotInstanceList(getBlockStorageSnapsh } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2467,21 +2368,20 @@ func (a *V2ApiService) GetBlockStorageSnapshotInstanceList(getBlockStorageSnapsh } } - return &successPayload, err } -/* V2ApiService - 인스턴스태그리스트조회 - @param getInstanceTagListRequest getInstanceTagListRequest - @return *GetInstanceTagListResponse*/ +/* V2ApiService +인스턴스태그리스트조회 +@param getInstanceTagListRequest getInstanceTagListRequest +@return *GetInstanceTagListResponse*/ func (a *V2ApiService) GetInstanceTagList(getInstanceTagListRequest *GetInstanceTagListRequest) (*GetInstanceTagListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetInstanceTagListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetInstanceTagListResponse ) // create path and map variables @@ -2491,9 +2391,8 @@ func (a *V2ApiService) GetInstanceTagList(getInstanceTagListRequest *GetInstance localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2502,8 +2401,7 @@ func (a *V2ApiService) GetInstanceTagList(getInstanceTagListRequest *GetInstance } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2541,21 +2439,20 @@ func (a *V2ApiService) GetInstanceTagList(getInstanceTagListRequest *GetInstance } } - return &successPayload, err } -/* V2ApiService - 로그인키리스트조회 - @param getLoginKeyListRequest getLoginKeyListRequest - @return *GetLoginKeyListResponse*/ +/* V2ApiService +로그인키리스트조회 +@param getLoginKeyListRequest getLoginKeyListRequest +@return *GetLoginKeyListResponse*/ func (a *V2ApiService) GetLoginKeyList(getLoginKeyListRequest *GetLoginKeyListRequest) (*GetLoginKeyListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetLoginKeyListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetLoginKeyListResponse ) // create path and map variables @@ -2565,9 +2462,8 @@ func (a *V2ApiService) GetLoginKeyList(getLoginKeyListRequest *GetLoginKeyListRe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2576,8 +2472,7 @@ func (a *V2ApiService) GetLoginKeyList(getLoginKeyListRequest *GetLoginKeyListRe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2615,21 +2510,20 @@ func (a *V2ApiService) GetLoginKeyList(getLoginKeyListRequest *GetLoginKeyListRe } } - return &successPayload, err } -/* V2ApiService - 회원서버이미지리스트조회 - @param getMemberServerImageListRequest getMemberServerImageListRequest - @return *GetMemberServerImageListResponse*/ +/* V2ApiService +회원서버이미지리스트조회 +@param getMemberServerImageListRequest getMemberServerImageListRequest +@return *GetMemberServerImageListResponse*/ func (a *V2ApiService) GetMemberServerImageList(getMemberServerImageListRequest *GetMemberServerImageListRequest) (*GetMemberServerImageListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetMemberServerImageListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetMemberServerImageListResponse ) // create path and map variables @@ -2639,9 +2533,8 @@ func (a *V2ApiService) GetMemberServerImageList(getMemberServerImageListRequest localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2650,8 +2543,7 @@ func (a *V2ApiService) GetMemberServerImageList(getMemberServerImageListRequest } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2689,21 +2581,20 @@ func (a *V2ApiService) GetMemberServerImageList(getMemberServerImageListRequest } } - return &successPayload, err } -/* V2ApiService - NAS볼륨인스턴스리스트조회 - @param getNasVolumeInstanceListRequest getNasVolumeInstanceListRequest - @return *GetNasVolumeInstanceListResponse*/ +/* V2ApiService +NAS볼륨인스턴스리스트조회 +@param getNasVolumeInstanceListRequest getNasVolumeInstanceListRequest +@return *GetNasVolumeInstanceListResponse*/ func (a *V2ApiService) GetNasVolumeInstanceList(getNasVolumeInstanceListRequest *GetNasVolumeInstanceListRequest) (*GetNasVolumeInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetNasVolumeInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetNasVolumeInstanceListResponse ) // create path and map variables @@ -2713,9 +2604,8 @@ func (a *V2ApiService) GetNasVolumeInstanceList(getNasVolumeInstanceListRequest localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2724,8 +2614,7 @@ func (a *V2ApiService) GetNasVolumeInstanceList(getNasVolumeInstanceListRequest } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2763,21 +2652,20 @@ func (a *V2ApiService) GetNasVolumeInstanceList(getNasVolumeInstanceListRequest } } - return &successPayload, err } -/* V2ApiService - NAS볼륨인스턴스측정리스트조회 - @param getNasVolumeInstanceRatingListRequest getNasVolumeInstanceRatingListRequest - @return *GetNasVolumeInstanceRatingListResponse*/ +/* V2ApiService +NAS볼륨인스턴스측정리스트조회 +@param getNasVolumeInstanceRatingListRequest getNasVolumeInstanceRatingListRequest +@return *GetNasVolumeInstanceRatingListResponse*/ func (a *V2ApiService) GetNasVolumeInstanceRatingList(getNasVolumeInstanceRatingListRequest *GetNasVolumeInstanceRatingListRequest) (*GetNasVolumeInstanceRatingListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetNasVolumeInstanceRatingListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetNasVolumeInstanceRatingListResponse ) // create path and map variables @@ -2787,9 +2675,8 @@ func (a *V2ApiService) GetNasVolumeInstanceRatingList(getNasVolumeInstanceRating localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2798,8 +2685,7 @@ func (a *V2ApiService) GetNasVolumeInstanceRatingList(getNasVolumeInstanceRating } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2837,21 +2723,20 @@ func (a *V2ApiService) GetNasVolumeInstanceRatingList(getNasVolumeInstanceRating } } - return &successPayload, err } -/* V2ApiService - Network Interface 리스트조회 - @param getNetworkInterfaceListRequest getNetworkInterfaceListRequest - @return *GetNetworkInterfaceListResponse*/ +/* V2ApiService +Network Interface 리스트조회 +@param getNetworkInterfaceListRequest getNetworkInterfaceListRequest +@return *GetNetworkInterfaceListResponse*/ func (a *V2ApiService) GetNetworkInterfaceList(getNetworkInterfaceListRequest *GetNetworkInterfaceListRequest) (*GetNetworkInterfaceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetNetworkInterfaceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetNetworkInterfaceListResponse ) // create path and map variables @@ -2861,9 +2746,8 @@ func (a *V2ApiService) GetNetworkInterfaceList(getNetworkInterfaceListRequest *G localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2872,8 +2756,7 @@ func (a *V2ApiService) GetNetworkInterfaceList(getNetworkInterfaceListRequest *G } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2911,21 +2794,20 @@ func (a *V2ApiService) GetNetworkInterfaceList(getNetworkInterfaceListRequest *G } } - return &successPayload, err } -/* V2ApiService - 포트포워딩Rule리스트조회 - @param getPortForwardingRuleListRequest getPortForwardingRuleListRequest - @return *GetPortForwardingRuleListResponse*/ +/* V2ApiService +포트포워딩Rule리스트조회 +@param getPortForwardingRuleListRequest getPortForwardingRuleListRequest +@return *GetPortForwardingRuleListResponse*/ func (a *V2ApiService) GetPortForwardingRuleList(getPortForwardingRuleListRequest *GetPortForwardingRuleListRequest) (*GetPortForwardingRuleListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetPortForwardingRuleListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetPortForwardingRuleListResponse ) // create path and map variables @@ -2935,9 +2817,8 @@ func (a *V2ApiService) GetPortForwardingRuleList(getPortForwardingRuleListReques localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2946,8 +2827,7 @@ func (a *V2ApiService) GetPortForwardingRuleList(getPortForwardingRuleListReques } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2985,21 +2865,20 @@ func (a *V2ApiService) GetPortForwardingRuleList(getPortForwardingRuleListReques } } - return &successPayload, err } -/* V2ApiService - Private Subnet 인스턴스리스트조회 - @param getPrivateSubnetInstanceListRequest getPrivateSubnetInstanceListRequest - @return *GetPrivateSubnetInstanceListResponse*/ +/* V2ApiService +Private Subnet 인스턴스리스트조회 +@param getPrivateSubnetInstanceListRequest getPrivateSubnetInstanceListRequest +@return *GetPrivateSubnetInstanceListResponse*/ func (a *V2ApiService) GetPrivateSubnetInstanceList(getPrivateSubnetInstanceListRequest *GetPrivateSubnetInstanceListRequest) (*GetPrivateSubnetInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetPrivateSubnetInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetPrivateSubnetInstanceListResponse ) // create path and map variables @@ -3009,9 +2888,8 @@ func (a *V2ApiService) GetPrivateSubnetInstanceList(getPrivateSubnetInstanceList localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3020,8 +2898,7 @@ func (a *V2ApiService) GetPrivateSubnetInstanceList(getPrivateSubnetInstanceList } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3059,21 +2936,20 @@ func (a *V2ApiService) GetPrivateSubnetInstanceList(getPrivateSubnetInstanceList } } - return &successPayload, err } -/* V2ApiService - 공인IP인스턴스리스트조회 - @param getPublicIpInstanceListRequest getPublicIpInstanceListRequest - @return *GetPublicIpInstanceListResponse*/ +/* V2ApiService +공인IP인스턴스리스트조회 +@param getPublicIpInstanceListRequest getPublicIpInstanceListRequest +@return *GetPublicIpInstanceListResponse*/ func (a *V2ApiService) GetPublicIpInstanceList(getPublicIpInstanceListRequest *GetPublicIpInstanceListRequest) (*GetPublicIpInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetPublicIpInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetPublicIpInstanceListResponse ) // create path and map variables @@ -3083,9 +2959,8 @@ func (a *V2ApiService) GetPublicIpInstanceList(getPublicIpInstanceListRequest *G localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3094,8 +2969,7 @@ func (a *V2ApiService) GetPublicIpInstanceList(getPublicIpInstanceListRequest *G } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3133,21 +3007,20 @@ func (a *V2ApiService) GetPublicIpInstanceList(getPublicIpInstanceListRequest *G } } - return &successPayload, err } -/* V2ApiService - 공인IP할당(가능)서버인스턴스리스트조회 - @param getPublicIpTargetServerInstanceListRequest getPublicIpTargetServerInstanceListRequest - @return *GetPublicIpTargetServerInstanceListResponse*/ +/* V2ApiService +공인IP할당(가능)서버인스턴스리스트조회 +@param getPublicIpTargetServerInstanceListRequest getPublicIpTargetServerInstanceListRequest +@return *GetPublicIpTargetServerInstanceListResponse*/ func (a *V2ApiService) GetPublicIpTargetServerInstanceList(getPublicIpTargetServerInstanceListRequest *GetPublicIpTargetServerInstanceListRequest) (*GetPublicIpTargetServerInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetPublicIpTargetServerInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetPublicIpTargetServerInstanceListResponse ) // create path and map variables @@ -3157,9 +3030,8 @@ func (a *V2ApiService) GetPublicIpTargetServerInstanceList(getPublicIpTargetServ localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3168,8 +3040,7 @@ func (a *V2ApiService) GetPublicIpTargetServerInstanceList(getPublicIpTargetServ } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3207,21 +3078,20 @@ func (a *V2ApiService) GetPublicIpTargetServerInstanceList(getPublicIpTargetServ } } - return &successPayload, err } -/* V2ApiService - RAID리스트조회 - @param getRaidListRequest getRaidListRequest - @return *GetRaidListResponse*/ +/* V2ApiService +RAID리스트조회 +@param getRaidListRequest getRaidListRequest +@return *GetRaidListResponse*/ func (a *V2ApiService) GetRaidList(getRaidListRequest *GetRaidListRequest) (*GetRaidListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetRaidListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetRaidListResponse ) // create path and map variables @@ -3231,9 +3101,8 @@ func (a *V2ApiService) GetRaidList(getRaidListRequest *GetRaidListRequest) (*Get localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3242,8 +3111,7 @@ func (a *V2ApiService) GetRaidList(getRaidListRequest *GetRaidListRequest) (*Get } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3281,21 +3149,20 @@ func (a *V2ApiService) GetRaidList(getRaidListRequest *GetRaidListRequest) (*Get } } - return &successPayload, err } -/* V2ApiService - REGION리스트조회 - @param getRegionListRequest getRegionListRequest - @return *GetRegionListResponse*/ +/* V2ApiService +REGION리스트조회 +@param getRegionListRequest getRegionListRequest +@return *GetRegionListResponse*/ func (a *V2ApiService) GetRegionList(getRegionListRequest *GetRegionListRequest) (*GetRegionListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetRegionListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetRegionListResponse ) // create path and map variables @@ -3305,9 +3172,8 @@ func (a *V2ApiService) GetRegionList(getRegionListRequest *GetRegionListRequest) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3316,8 +3182,7 @@ func (a *V2ApiService) GetRegionList(getRegionListRequest *GetRegionListRequest) } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3355,21 +3220,20 @@ func (a *V2ApiService) GetRegionList(getRegionListRequest *GetRegionListRequest) } } - return &successPayload, err } -/* V2ApiService - 루트패스워드조회 - @param getRootPasswordRequest getRootPasswordRequest - @return *GetRootPasswordResponse*/ +/* V2ApiService +루트패스워드조회 +@param getRootPasswordRequest getRootPasswordRequest +@return *GetRootPasswordResponse*/ func (a *V2ApiService) GetRootPassword(getRootPasswordRequest *GetRootPasswordRequest) (*GetRootPasswordResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetRootPasswordResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetRootPasswordResponse ) // create path and map variables @@ -3379,9 +3243,8 @@ func (a *V2ApiService) GetRootPassword(getRootPasswordRequest *GetRootPasswordRe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3390,8 +3253,7 @@ func (a *V2ApiService) GetRootPassword(getRootPasswordRequest *GetRootPasswordRe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3429,21 +3291,20 @@ func (a *V2ApiService) GetRootPassword(getRootPasswordRequest *GetRootPasswordRe } } - return &successPayload, err } -/* V2ApiService - 서버이미지상품리스트조회 - @param getServerImageProductListRequest getServerImageProductListRequest - @return *GetServerImageProductListResponse*/ +/* V2ApiService +서버이미지상품리스트조회 +@param getServerImageProductListRequest getServerImageProductListRequest +@return *GetServerImageProductListResponse*/ func (a *V2ApiService) GetServerImageProductList(getServerImageProductListRequest *GetServerImageProductListRequest) (*GetServerImageProductListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetServerImageProductListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetServerImageProductListResponse ) // create path and map variables @@ -3453,9 +3314,8 @@ func (a *V2ApiService) GetServerImageProductList(getServerImageProductListReques localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3464,8 +3324,7 @@ func (a *V2ApiService) GetServerImageProductList(getServerImageProductListReques } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3503,21 +3362,20 @@ func (a *V2ApiService) GetServerImageProductList(getServerImageProductListReques } } - return &successPayload, err } -/* V2ApiService - 서버인스턴스리스트조회 - @param getServerInstanceListRequest getServerInstanceListRequest - @return *GetServerInstanceListResponse*/ +/* V2ApiService +서버인스턴스리스트조회 +@param getServerInstanceListRequest getServerInstanceListRequest +@return *GetServerInstanceListResponse*/ func (a *V2ApiService) GetServerInstanceList(getServerInstanceListRequest *GetServerInstanceListRequest) (*GetServerInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetServerInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetServerInstanceListResponse ) // create path and map variables @@ -3527,9 +3385,8 @@ func (a *V2ApiService) GetServerInstanceList(getServerInstanceListRequest *GetSe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3538,8 +3395,7 @@ func (a *V2ApiService) GetServerInstanceList(getServerInstanceListRequest *GetSe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3577,21 +3433,20 @@ func (a *V2ApiService) GetServerInstanceList(getServerInstanceListRequest *GetSe } } - return &successPayload, err } -/* V2ApiService - 서버상품리스트조회 - @param getServerProductListRequest getServerProductListRequest - @return *GetServerProductListResponse*/ +/* V2ApiService +서버상품리스트조회 +@param getServerProductListRequest getServerProductListRequest +@return *GetServerProductListResponse*/ func (a *V2ApiService) GetServerProductList(getServerProductListRequest *GetServerProductListRequest) (*GetServerProductListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetServerProductListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetServerProductListResponse ) // create path and map variables @@ -3601,9 +3456,8 @@ func (a *V2ApiService) GetServerProductList(getServerProductListRequest *GetServ localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3612,8 +3466,7 @@ func (a *V2ApiService) GetServerProductList(getServerProductListRequest *GetServ } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3651,21 +3504,20 @@ func (a *V2ApiService) GetServerProductList(getServerProductListRequest *GetServ } } - return &successPayload, err } -/* V2ApiService - ZONE리스트조회 - @param getZoneListRequest getZoneListRequest - @return *GetZoneListResponse*/ +/* V2ApiService +ZONE리스트조회 +@param getZoneListRequest getZoneListRequest +@return *GetZoneListResponse*/ func (a *V2ApiService) GetZoneList(getZoneListRequest *GetZoneListRequest) (*GetZoneListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetZoneListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetZoneListResponse ) // create path and map variables @@ -3675,9 +3527,8 @@ func (a *V2ApiService) GetZoneList(getZoneListRequest *GetZoneListRequest) (*Get localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3686,8 +3537,7 @@ func (a *V2ApiService) GetZoneList(getZoneListRequest *GetZoneListRequest) (*Get } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3725,21 +3575,20 @@ func (a *V2ApiService) GetZoneList(getZoneListRequest *GetZoneListRequest) (*Get } } - return &successPayload, err } -/* V2ApiService - 로그인키IMPORT - @param importLoginKeyRequest importLoginKeyRequest - @return *ImportLoginKeyResponse*/ +/* V2ApiService +로그인키IMPORT +@param importLoginKeyRequest importLoginKeyRequest +@return *ImportLoginKeyResponse*/ func (a *V2ApiService) ImportLoginKey(importLoginKeyRequest *ImportLoginKeyRequest) (*ImportLoginKeyResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload ImportLoginKeyResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload ImportLoginKeyResponse ) // create path and map variables @@ -3749,9 +3598,8 @@ func (a *V2ApiService) ImportLoginKey(importLoginKeyRequest *ImportLoginKeyReque localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3760,8 +3608,7 @@ func (a *V2ApiService) ImportLoginKey(importLoginKeyRequest *ImportLoginKeyReque } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3799,21 +3646,20 @@ func (a *V2ApiService) ImportLoginKey(importLoginKeyRequest *ImportLoginKeyReque } } - return &successPayload, err } -/* V2ApiService - 서버인스턴스재시작 - @param rebootServerInstancesRequest rebootServerInstancesRequest - @return *RebootServerInstancesResponse*/ +/* V2ApiService +서버인스턴스재시작 +@param rebootServerInstancesRequest rebootServerInstancesRequest +@return *RebootServerInstancesResponse*/ func (a *V2ApiService) RebootServerInstances(rebootServerInstancesRequest *RebootServerInstancesRequest) (*RebootServerInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload RebootServerInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload RebootServerInstancesResponse ) // create path and map variables @@ -3823,9 +3669,8 @@ func (a *V2ApiService) RebootServerInstances(rebootServerInstancesRequest *Reboo localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3834,8 +3679,7 @@ func (a *V2ApiService) RebootServerInstances(rebootServerInstancesRequest *Reboo } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3873,21 +3717,20 @@ func (a *V2ApiService) RebootServerInstances(rebootServerInstancesRequest *Reboo } } - return &successPayload, err } -/* V2ApiService - 서버인스턴스재생성 - @param recreateServerInstanceRequest recreateServerInstanceRequest - @return *RecreateServerInstanceResponse*/ +/* V2ApiService +서버인스턴스재생성 +@param recreateServerInstanceRequest recreateServerInstanceRequest +@return *RecreateServerInstanceResponse*/ func (a *V2ApiService) RecreateServerInstance(recreateServerInstanceRequest *RecreateServerInstanceRequest) (*RecreateServerInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload RecreateServerInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload RecreateServerInstanceResponse ) // create path and map variables @@ -3897,9 +3740,8 @@ func (a *V2ApiService) RecreateServerInstance(recreateServerInstanceRequest *Rec localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3908,8 +3750,7 @@ func (a *V2ApiService) RecreateServerInstance(recreateServerInstanceRequest *Rec } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3947,21 +3788,20 @@ func (a *V2ApiService) RecreateServerInstance(recreateServerInstanceRequest *Rec } } - return &successPayload, err } -/* V2ApiService - NAS볼륨인스턴스접근제어제거 - @param removeNasVolumeAccessControlRequest removeNasVolumeAccessControlRequest - @return *RemoveNasVolumeAccessControlResponse*/ +/* V2ApiService +NAS볼륨인스턴스접근제어제거 +@param removeNasVolumeAccessControlRequest removeNasVolumeAccessControlRequest +@return *RemoveNasVolumeAccessControlResponse*/ func (a *V2ApiService) RemoveNasVolumeAccessControl(removeNasVolumeAccessControlRequest *RemoveNasVolumeAccessControlRequest) (*RemoveNasVolumeAccessControlResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload RemoveNasVolumeAccessControlResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload RemoveNasVolumeAccessControlResponse ) // create path and map variables @@ -3971,9 +3811,8 @@ func (a *V2ApiService) RemoveNasVolumeAccessControl(removeNasVolumeAccessControl localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3982,8 +3821,7 @@ func (a *V2ApiService) RemoveNasVolumeAccessControl(removeNasVolumeAccessControl } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4021,21 +3859,20 @@ func (a *V2ApiService) RemoveNasVolumeAccessControl(removeNasVolumeAccessControl } } - return &successPayload, err } -/* V2ApiService - NAS볼륨인스턴스접근제어설정 - @param setNasVolumeAccessControlRequest setNasVolumeAccessControlRequest - @return *SetNasVolumeAccessControlResponse*/ +/* V2ApiService +NAS볼륨인스턴스접근제어설정 +@param setNasVolumeAccessControlRequest setNasVolumeAccessControlRequest +@return *SetNasVolumeAccessControlResponse*/ func (a *V2ApiService) SetNasVolumeAccessControl(setNasVolumeAccessControlRequest *SetNasVolumeAccessControlRequest) (*SetNasVolumeAccessControlResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload SetNasVolumeAccessControlResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload SetNasVolumeAccessControlResponse ) // create path and map variables @@ -4045,9 +3882,8 @@ func (a *V2ApiService) SetNasVolumeAccessControl(setNasVolumeAccessControlReques localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -4056,8 +3892,7 @@ func (a *V2ApiService) SetNasVolumeAccessControl(setNasVolumeAccessControlReques } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4095,21 +3930,20 @@ func (a *V2ApiService) SetNasVolumeAccessControl(setNasVolumeAccessControlReques } } - return &successPayload, err } -/* V2ApiService - 서버인스턴스시작 - @param startServerInstancesRequest startServerInstancesRequest - @return *StartServerInstancesResponse*/ +/* V2ApiService +서버인스턴스시작 +@param startServerInstancesRequest startServerInstancesRequest +@return *StartServerInstancesResponse*/ func (a *V2ApiService) StartServerInstances(startServerInstancesRequest *StartServerInstancesRequest) (*StartServerInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload StartServerInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload StartServerInstancesResponse ) // create path and map variables @@ -4119,9 +3953,8 @@ func (a *V2ApiService) StartServerInstances(startServerInstancesRequest *StartSe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -4130,8 +3963,7 @@ func (a *V2ApiService) StartServerInstances(startServerInstancesRequest *StartSe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4169,21 +4001,20 @@ func (a *V2ApiService) StartServerInstances(startServerInstancesRequest *StartSe } } - return &successPayload, err } -/* V2ApiService - 서버인스턴스종료 - @param stopServerInstancesRequest stopServerInstancesRequest - @return *StopServerInstancesResponse*/ +/* V2ApiService +서버인스턴스종료 +@param stopServerInstancesRequest stopServerInstancesRequest +@return *StopServerInstancesResponse*/ func (a *V2ApiService) StopServerInstances(stopServerInstancesRequest *StopServerInstancesRequest) (*StopServerInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload StopServerInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload StopServerInstancesResponse ) // create path and map variables @@ -4193,9 +4024,8 @@ func (a *V2ApiService) StopServerInstances(stopServerInstancesRequest *StopServe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -4204,8 +4034,7 @@ func (a *V2ApiService) StopServerInstances(stopServerInstancesRequest *StopServe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4243,21 +4072,20 @@ func (a *V2ApiService) StopServerInstances(stopServerInstancesRequest *StopServe } } - return &successPayload, err } -/* V2ApiService - 서버인스턴스반납 - @param terminateServerInstancesRequest terminateServerInstancesRequest - @return *TerminateServerInstancesResponse*/ +/* V2ApiService +서버인스턴스반납 +@param terminateServerInstancesRequest terminateServerInstancesRequest +@return *TerminateServerInstancesResponse*/ func (a *V2ApiService) TerminateServerInstances(terminateServerInstancesRequest *TerminateServerInstancesRequest) (*TerminateServerInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload TerminateServerInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload TerminateServerInstancesResponse ) // create path and map variables @@ -4267,9 +4095,8 @@ func (a *V2ApiService) TerminateServerInstances(terminateServerInstancesRequest localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - // to determine the Content-Type header - localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } + localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -4278,8 +4105,7 @@ func (a *V2ApiService) TerminateServerInstances(terminateServerInstancesRequest } // to determine the Accept header - localVarHttpHeaderAccepts := []string{ - } + localVarHttpHeaderAccepts := []string{} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4317,7 +4143,5 @@ func (a *V2ApiService) TerminateServerInstances(terminateServerInstancesRequest } } - return &successPayload, err } - diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/zone.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/zone.go index c954015aa..c264bc159 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/zone.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/zone.go @@ -12,17 +12,17 @@ package server type Zone struct { // 존(Zone)번호 -ZoneNo *string `json:"zoneNo,omitempty"` + ZoneNo *string `json:"zoneNo,omitempty"` // 존(Zone)명 -ZoneName *string `json:"zoneName,omitempty"` + ZoneName *string `json:"zoneName,omitempty"` // 존(Zone) 코드 -ZoneCode *string `json:"zoneCode,omitempty"` + ZoneCode *string `json:"zoneCode,omitempty"` // 존(Zone)설명 -ZoneDescription *string `json:"zoneDescription,omitempty"` + ZoneDescription *string `json:"zoneDescription,omitempty"` // 리전번호 -RegionNo *string `json:"regionNo,omitempty"` + RegionNo *string `json:"regionNo,omitempty"` } diff --git a/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/endpoints/endpoints_config.go b/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/endpoints/endpoints_config.go index 60adf7d45..06b491fa8 100644 --- a/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/endpoints/endpoints_config.go +++ b/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/endpoints/endpoints_config.go @@ -1,4 +1,3 @@ - package endpoints import ( @@ -7,7 +6,7 @@ import ( "sync" ) -const endpointsJson =`{ +const endpointsJson = `{ "products": [ { "code": "ecs", @@ -1656,6 +1655,7 @@ const endpointsJson =`{ } ] }` + var initOnce sync.Once var data interface{} diff --git a/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses/response.go b/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses/response.go index dd6ae5b4c..1da9cb262 100644 --- a/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses/response.go +++ b/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses/response.go @@ -41,6 +41,7 @@ var debug utils.Debug func init() { debug = utils.Init("sdk") } + // Unmarshal object from http response body to target Response func Unmarshal(response AcsResponse, httpResponse *http.Response, format string) (err error) { err = response.parseFromHttpResponse(httpResponse) diff --git a/vendor/github.com/aliyun/aliyun-oss-go-sdk/oss/type.go b/vendor/github.com/aliyun/aliyun-oss-go-sdk/oss/type.go index b60564538..489836513 100644 --- a/vendor/github.com/aliyun/aliyun-oss-go-sdk/oss/type.go +++ b/vendor/github.com/aliyun/aliyun-oss-go-sdk/oss/type.go @@ -190,8 +190,8 @@ type GetBucketCORSResult CORSXML // GetBucketInfoResult GetBucketInfo请求返回结果 type GetBucketInfoResult struct { - XMLName xml.Name `xml:"BucketInfo"` - BucketInfo BucketInfo `xml:"Bucket"` + XMLName xml.Name `xml:"BucketInfo"` + BucketInfo BucketInfo `xml:"Bucket"` } // BucketInfo Bucket信息 @@ -200,7 +200,7 @@ type BucketInfo struct { Name string `xml:"Name"` // Bucket名称 Location string `xml:"Location"` // Bucket所在的数据中心 CreationDate time.Time `xml:"CreationDate"` // Bucket创建时间 - ExtranetEndpoint string `xml:"ExtranetEndpoint"` // Bucket访问的外网域名 + ExtranetEndpoint string `xml:"ExtranetEndpoint"` // Bucket访问的外网域名 IntranetEndpoint string `xml:"IntranetEndpoint"` // Bucket访问的内网域名 ACL string `xml:"AccessControlList>Grant"` // Bucket权限 Owner Owner `xml:"Owner"` // Bucket拥有者信息 diff --git a/vendor/github.com/chzyer/readline/runebuf.go b/vendor/github.com/chzyer/readline/runebuf.go index 81d2da50c..d95df1e36 100644 --- a/vendor/github.com/chzyer/readline/runebuf.go +++ b/vendor/github.com/chzyer/readline/runebuf.go @@ -35,7 +35,7 @@ type RuneBuffer struct { sync.Mutex } -func (r* RuneBuffer) pushKill(text []rune) { +func (r *RuneBuffer) pushKill(text []rune) { r.lastKill = append([]rune{}, text...) } @@ -221,7 +221,7 @@ func (r *RuneBuffer) DeleteWord() { } for i := init + 1; i < len(r.buf); i++ { if !IsWordBreak(r.buf[i]) && IsWordBreak(r.buf[i-1]) { - r.pushKill(r.buf[r.idx:i-1]) + r.pushKill(r.buf[r.idx : i-1]) r.Refresh(func() { r.buf = append(r.buf[:r.idx], r.buf[i-1:]...) }) @@ -350,7 +350,7 @@ func (r *RuneBuffer) Yank() { return } r.Refresh(func() { - buf := make([]rune, 0, len(r.buf) + len(r.lastKill)) + buf := make([]rune, 0, len(r.buf)+len(r.lastKill)) buf = append(buf, r.buf[:r.idx]...) buf = append(buf, r.lastKill...) buf = append(buf, r.buf[r.idx:]...) diff --git a/vendor/github.com/digitalocean/go-libvirt/internal/constants/constants.gen.go b/vendor/github.com/digitalocean/go-libvirt/internal/constants/constants.gen.go index 7224cdc1c..002aa1280 100644 --- a/vendor/github.com/digitalocean/go-libvirt/internal/constants/constants.gen.go +++ b/vendor/github.com/digitalocean/go-libvirt/internal/constants/constants.gen.go @@ -867,7 +867,6 @@ const ( // ProcDomainSetIothreadParams is libvirt's REMOTE_PROC_DOMAIN_SET_IOTHREAD_PARAMS ProcDomainSetIothreadParams = 402 - // From consts: // StringMax is libvirt's REMOTE_STRING_MAX StringMax = 4194304 diff --git a/vendor/github.com/digitalocean/go-libvirt/libvirt.gen.go b/vendor/github.com/digitalocean/go-libvirt/libvirt.gen.go index eb51f2817..85e8d9928 100644 --- a/vendor/github.com/digitalocean/go-libvirt/libvirt.gen.go +++ b/vendor/github.com/digitalocean/go-libvirt/libvirt.gen.go @@ -34,7 +34,7 @@ const ( VirUUIDBuflen = 16 ) -type typedParamDecoder struct {} +type typedParamDecoder struct{} // Decode decodes a TypedParam. These are part of the libvirt spec, and not xdr // proper. TypedParams contain a name, which is called Field for some reason, @@ -111,22 +111,31 @@ func (typedParamDecoder) decodeTypedParamValue(d *xdr.Decoder) (*TypedParamValue // // OptString is libvirt's remote_string type OptString []string + // UUID is libvirt's remote_uuid type UUID [VirUUIDBuflen]byte + // OptDomain is libvirt's remote_domain type OptDomain []Domain + // OptNetwork is libvirt's remote_network type OptNetwork []Network + // OptNwfilter is libvirt's remote_nwfilter type OptNwfilter []Nwfilter + // OptNwfilterBinding is libvirt's remote_nwfilter_binding type OptNwfilterBinding []NwfilterBinding + // OptStoragePool is libvirt's remote_storage_pool type OptStoragePool []StoragePool + // OptStorageVol is libvirt's remote_storage_vol type OptStorageVol []StorageVol + // OptNodeDevice is libvirt's remote_node_device type OptNodeDevice []NodeDevice + // OptSecret is libvirt's remote_secret type OptSecret []Secret @@ -135,6 +144,7 @@ type OptSecret []Secret // // AuthType is libvirt's remote_auth_type type AuthType int32 + // Procedure is libvirt's remote_procedure type Procedure int32 @@ -145,7 +155,7 @@ type Procedure int32 type Domain struct { Name string UUID UUID - ID int32 + ID int32 } // Network is libvirt's remote_nonnull_network @@ -162,14 +172,14 @@ type Nwfilter struct { // NwfilterBinding is libvirt's remote_nonnull_nwfilter_binding type NwfilterBinding struct { - Portdev string + Portdev string Filtername string } // Interface is libvirt's remote_nonnull_interface type Interface struct { Name string - Mac string + Mac string } // StoragePool is libvirt's remote_nonnull_storage_pool @@ -182,7 +192,7 @@ type StoragePool struct { type StorageVol struct { Pool string Name string - Key string + Key string } // NodeDevice is libvirt's remote_nonnull_node_device @@ -192,38 +202,38 @@ type NodeDevice struct { // Secret is libvirt's remote_nonnull_secret type Secret struct { - UUID UUID + UUID UUID UsageType int32 - UsageID string + UsageID string } // DomainSnapshot is libvirt's remote_nonnull_domain_snapshot type DomainSnapshot struct { Name string - Dom Domain + Dom Domain } // Error is libvirt's remote_error type Error struct { - Code int32 + Code int32 OptDomain int32 - Message OptString - Level int32 - Dom OptDomain - Str1 OptString - Str2 OptString - Str3 OptString - Int1 int32 - Int2 int32 - Net OptNetwork + Message OptString + Level int32 + Dom OptDomain + Str1 OptString + Str2 OptString + Str3 OptString + Int1 int32 + Int2 int32 + Net OptNetwork } // VcpuInfo is libvirt's remote_vcpu_info type VcpuInfo struct { - Number uint32 - State int32 + Number uint32 + State int32 CPUTime uint64 - CPU int32 + CPU int32 } // TypedParam is libvirt's remote_typed_param @@ -246,13 +256,13 @@ type NodeGetMemoryStats struct { // DomainDiskError is libvirt's remote_domain_disk_error type DomainDiskError struct { - Disk string + Disk string Error int32 } // ConnectOpenArgs is libvirt's remote_connect_open_args type ConnectOpenArgs struct { - Name OptString + Name OptString Flags ConnectFlags } @@ -313,13 +323,13 @@ type ConnectGetMaxVcpusRet struct { // NodeGetInfoRet is libvirt's remote_node_get_info_ret type NodeGetInfoRet struct { - Model [32]int8 - Memory uint64 - Cpus int32 - Mhz int32 - Nodes int32 + Model [32]int8 + Memory uint64 + Cpus int32 + Mhz int32 + Nodes int32 Sockets int32 - Cores int32 + Cores int32 Threads int32 } @@ -331,10 +341,10 @@ type ConnectGetCapabilitiesRet struct { // ConnectGetDomainCapabilitiesArgs is libvirt's remote_connect_get_domain_capabilities_args type ConnectGetDomainCapabilitiesArgs struct { Emulatorbin OptString - Arch OptString - Machine OptString - Virttype OptString - Flags uint32 + Arch OptString + Machine OptString + Virttype OptString + Flags uint32 } // ConnectGetDomainCapabilitiesRet is libvirt's remote_connect_get_domain_capabilities_ret @@ -344,14 +354,14 @@ type ConnectGetDomainCapabilitiesRet struct { // NodeGetCPUStatsArgs is libvirt's remote_node_get_cpu_stats_args type NodeGetCPUStatsArgs struct { - CPUNum int32 + CPUNum int32 Nparams int32 - Flags uint32 + Flags uint32 } // NodeGetCPUStatsRet is libvirt's remote_node_get_cpu_stats_ret type NodeGetCPUStatsRet struct { - Params []NodeGetCPUStats + Params []NodeGetCPUStats Nparams int32 } @@ -359,19 +369,19 @@ type NodeGetCPUStatsRet struct { type NodeGetMemoryStatsArgs struct { Nparams int32 CellNum int32 - Flags uint32 + Flags uint32 } // NodeGetMemoryStatsRet is libvirt's remote_node_get_memory_stats_ret type NodeGetMemoryStatsRet struct { - Params []NodeGetMemoryStats + Params []NodeGetMemoryStats Nparams int32 } // NodeGetCellsFreeMemoryArgs is libvirt's remote_node_get_cells_free_memory_args type NodeGetCellsFreeMemoryArgs struct { StartCell int32 - Maxcells int32 + Maxcells int32 } // NodeGetCellsFreeMemoryRet is libvirt's remote_node_get_cells_free_memory_ret @@ -391,13 +401,13 @@ type DomainGetSchedulerTypeArgs struct { // DomainGetSchedulerTypeRet is libvirt's remote_domain_get_scheduler_type_ret type DomainGetSchedulerTypeRet struct { - Type string + Type string Nparams int32 } // DomainGetSchedulerParametersArgs is libvirt's remote_domain_get_scheduler_parameters_args type DomainGetSchedulerParametersArgs struct { - Dom Domain + Dom Domain Nparams int32 } @@ -408,9 +418,9 @@ type DomainGetSchedulerParametersRet struct { // DomainGetSchedulerParametersFlagsArgs is libvirt's remote_domain_get_scheduler_parameters_flags_args type DomainGetSchedulerParametersFlagsArgs struct { - Dom Domain + Dom Domain Nparams int32 - Flags uint32 + Flags uint32 } // DomainGetSchedulerParametersFlagsRet is libvirt's remote_domain_get_scheduler_parameters_flags_ret @@ -420,95 +430,95 @@ type DomainGetSchedulerParametersFlagsRet struct { // DomainSetSchedulerParametersArgs is libvirt's remote_domain_set_scheduler_parameters_args type DomainSetSchedulerParametersArgs struct { - Dom Domain + Dom Domain Params []TypedParam } // DomainSetSchedulerParametersFlagsArgs is libvirt's remote_domain_set_scheduler_parameters_flags_args type DomainSetSchedulerParametersFlagsArgs struct { - Dom Domain + Dom Domain Params []TypedParam - Flags uint32 + Flags uint32 } // DomainSetBlkioParametersArgs is libvirt's remote_domain_set_blkio_parameters_args type DomainSetBlkioParametersArgs struct { - Dom Domain + Dom Domain Params []TypedParam - Flags uint32 + Flags uint32 } // DomainGetBlkioParametersArgs is libvirt's remote_domain_get_blkio_parameters_args type DomainGetBlkioParametersArgs struct { - Dom Domain + Dom Domain Nparams int32 - Flags uint32 + Flags uint32 } // DomainGetBlkioParametersRet is libvirt's remote_domain_get_blkio_parameters_ret type DomainGetBlkioParametersRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainSetMemoryParametersArgs is libvirt's remote_domain_set_memory_parameters_args type DomainSetMemoryParametersArgs struct { - Dom Domain + Dom Domain Params []TypedParam - Flags uint32 + Flags uint32 } // DomainGetMemoryParametersArgs is libvirt's remote_domain_get_memory_parameters_args type DomainGetMemoryParametersArgs struct { - Dom Domain + Dom Domain Nparams int32 - Flags uint32 + Flags uint32 } // DomainGetMemoryParametersRet is libvirt's remote_domain_get_memory_parameters_ret type DomainGetMemoryParametersRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainBlockResizeArgs is libvirt's remote_domain_block_resize_args type DomainBlockResizeArgs struct { - Dom Domain - Disk string - Size uint64 + Dom Domain + Disk string + Size uint64 Flags DomainBlockResizeFlags } // DomainSetNumaParametersArgs is libvirt's remote_domain_set_numa_parameters_args type DomainSetNumaParametersArgs struct { - Dom Domain + Dom Domain Params []TypedParam - Flags uint32 + Flags uint32 } // DomainGetNumaParametersArgs is libvirt's remote_domain_get_numa_parameters_args type DomainGetNumaParametersArgs struct { - Dom Domain + Dom Domain Nparams int32 - Flags uint32 + Flags uint32 } // DomainGetNumaParametersRet is libvirt's remote_domain_get_numa_parameters_ret type DomainGetNumaParametersRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainSetPerfEventsArgs is libvirt's remote_domain_set_perf_events_args type DomainSetPerfEventsArgs struct { - Dom Domain + Dom Domain Params []TypedParam - Flags DomainModificationImpact + Flags DomainModificationImpact } // DomainGetPerfEventsArgs is libvirt's remote_domain_get_perf_events_args type DomainGetPerfEventsArgs struct { - Dom Domain + Dom Domain Flags DomainModificationImpact } @@ -519,78 +529,78 @@ type DomainGetPerfEventsRet struct { // DomainBlockStatsArgs is libvirt's remote_domain_block_stats_args type DomainBlockStatsArgs struct { - Dom Domain + Dom Domain Path string } // DomainBlockStatsRet is libvirt's remote_domain_block_stats_ret type DomainBlockStatsRet struct { - RdReq int64 + RdReq int64 RdBytes int64 - WrReq int64 + WrReq int64 WrBytes int64 - Errs int64 + Errs int64 } // DomainBlockStatsFlagsArgs is libvirt's remote_domain_block_stats_flags_args type DomainBlockStatsFlagsArgs struct { - Dom Domain - Path string + Dom Domain + Path string Nparams int32 - Flags uint32 + Flags uint32 } // DomainBlockStatsFlagsRet is libvirt's remote_domain_block_stats_flags_ret type DomainBlockStatsFlagsRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainInterfaceStatsArgs is libvirt's remote_domain_interface_stats_args type DomainInterfaceStatsArgs struct { - Dom Domain + Dom Domain Device string } // DomainInterfaceStatsRet is libvirt's remote_domain_interface_stats_ret type DomainInterfaceStatsRet struct { - RxBytes int64 + RxBytes int64 RxPackets int64 - RxErrs int64 - RxDrop int64 - TxBytes int64 + RxErrs int64 + RxDrop int64 + TxBytes int64 TxPackets int64 - TxErrs int64 - TxDrop int64 + TxErrs int64 + TxDrop int64 } // DomainSetInterfaceParametersArgs is libvirt's remote_domain_set_interface_parameters_args type DomainSetInterfaceParametersArgs struct { - Dom Domain + Dom Domain Device string Params []TypedParam - Flags uint32 + Flags uint32 } // DomainGetInterfaceParametersArgs is libvirt's remote_domain_get_interface_parameters_args type DomainGetInterfaceParametersArgs struct { - Dom Domain - Device string + Dom Domain + Device string Nparams int32 - Flags DomainModificationImpact + Flags DomainModificationImpact } // DomainGetInterfaceParametersRet is libvirt's remote_domain_get_interface_parameters_ret type DomainGetInterfaceParametersRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainMemoryStatsArgs is libvirt's remote_domain_memory_stats_args type DomainMemoryStatsArgs struct { - Dom Domain + Dom Domain MaxStats uint32 - Flags uint32 + Flags uint32 } // DomainMemoryStat is libvirt's remote_domain_memory_stat @@ -606,11 +616,11 @@ type DomainMemoryStatsRet struct { // DomainBlockPeekArgs is libvirt's remote_domain_block_peek_args type DomainBlockPeekArgs struct { - Dom Domain - Path string + Dom Domain + Path string Offset uint64 - Size uint32 - Flags uint32 + Size uint32 + Flags uint32 } // DomainBlockPeekRet is libvirt's remote_domain_block_peek_ret @@ -620,10 +630,10 @@ type DomainBlockPeekRet struct { // DomainMemoryPeekArgs is libvirt's remote_domain_memory_peek_args type DomainMemoryPeekArgs struct { - Dom Domain + Dom Domain Offset uint64 - Size uint32 - Flags DomainMemoryFlags + Size uint32 + Flags DomainMemoryFlags } // DomainMemoryPeekRet is libvirt's remote_domain_memory_peek_ret @@ -633,16 +643,16 @@ type DomainMemoryPeekRet struct { // DomainGetBlockInfoArgs is libvirt's remote_domain_get_block_info_args type DomainGetBlockInfoArgs struct { - Dom Domain - Path string + Dom Domain + Path string Flags uint32 } // DomainGetBlockInfoRet is libvirt's remote_domain_get_block_info_ret type DomainGetBlockInfoRet struct { Allocation uint64 - Capacity uint64 - Physical uint64 + Capacity uint64 + Physical uint64 } // ConnectListDomainsArgs is libvirt's remote_connect_list_domains_args @@ -663,7 +673,7 @@ type ConnectNumOfDomainsRet struct { // DomainCreateXMLArgs is libvirt's remote_domain_create_xml_args type DomainCreateXMLArgs struct { XMLDesc string - Flags DomainCreateFlags + Flags DomainCreateFlags } // DomainCreateXMLRet is libvirt's remote_domain_create_xml_ret @@ -674,7 +684,7 @@ type DomainCreateXMLRet struct { // DomainCreateXMLWithFilesArgs is libvirt's remote_domain_create_xml_with_files_args type DomainCreateXMLWithFilesArgs struct { XMLDesc string - Flags DomainCreateFlags + Flags DomainCreateFlags } // DomainCreateXMLWithFilesRet is libvirt's remote_domain_create_xml_with_files_ret @@ -724,15 +734,15 @@ type DomainResumeArgs struct { // DomainPmSuspendForDurationArgs is libvirt's remote_domain_pm_suspend_for_duration_args type DomainPmSuspendForDurationArgs struct { - Dom Domain - Target uint32 + Dom Domain + Target uint32 Duration uint64 - Flags uint32 + Flags uint32 } // DomainPmWakeupArgs is libvirt's remote_domain_pm_wakeup_args type DomainPmWakeupArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -743,13 +753,13 @@ type DomainShutdownArgs struct { // DomainRebootArgs is libvirt's remote_domain_reboot_args type DomainRebootArgs struct { - Dom Domain + Dom Domain Flags DomainRebootFlagValues } // DomainResetArgs is libvirt's remote_domain_reset_args type DomainResetArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -760,7 +770,7 @@ type DomainDestroyArgs struct { // DomainDestroyFlagsArgs is libvirt's remote_domain_destroy_flags_args type DomainDestroyFlagsArgs struct { - Dom Domain + Dom Domain Flags DomainDestroyFlagsValues } @@ -786,28 +796,28 @@ type DomainGetMaxMemoryRet struct { // DomainSetMaxMemoryArgs is libvirt's remote_domain_set_max_memory_args type DomainSetMaxMemoryArgs struct { - Dom Domain + Dom Domain Memory uint64 } // DomainSetMemoryArgs is libvirt's remote_domain_set_memory_args type DomainSetMemoryArgs struct { - Dom Domain + Dom Domain Memory uint64 } // DomainSetMemoryFlagsArgs is libvirt's remote_domain_set_memory_flags_args type DomainSetMemoryFlagsArgs struct { - Dom Domain + Dom Domain Memory uint64 - Flags uint32 + Flags uint32 } // DomainSetMemoryStatsPeriodArgs is libvirt's remote_domain_set_memory_stats_period_args type DomainSetMemoryStatsPeriodArgs struct { - Dom Domain + Dom Domain Period int32 - Flags DomainMemoryModFlags + Flags DomainMemoryModFlags } // DomainGetInfoArgs is libvirt's remote_domain_get_info_args @@ -817,24 +827,24 @@ type DomainGetInfoArgs struct { // DomainGetInfoRet is libvirt's remote_domain_get_info_ret type DomainGetInfoRet struct { - State uint8 - MaxMem uint64 - Memory uint64 + State uint8 + MaxMem uint64 + Memory uint64 NrVirtCPU uint16 - CPUTime uint64 + CPUTime uint64 } // DomainSaveArgs is libvirt's remote_domain_save_args type DomainSaveArgs struct { Dom Domain - To string + To string } // DomainSaveFlagsArgs is libvirt's remote_domain_save_flags_args type DomainSaveFlagsArgs struct { - Dom Domain - To string - Dxml OptString + Dom Domain + To string + Dxml OptString Flags uint32 } @@ -845,14 +855,14 @@ type DomainRestoreArgs struct { // DomainRestoreFlagsArgs is libvirt's remote_domain_restore_flags_args type DomainRestoreFlagsArgs struct { - From string - Dxml OptString + From string + Dxml OptString Flags uint32 } // DomainSaveImageGetXMLDescArgs is libvirt's remote_domain_save_image_get_xml_desc_args type DomainSaveImageGetXMLDescArgs struct { - File string + File string Flags uint32 } @@ -863,31 +873,31 @@ type DomainSaveImageGetXMLDescRet struct { // DomainSaveImageDefineXMLArgs is libvirt's remote_domain_save_image_define_xml_args type DomainSaveImageDefineXMLArgs struct { - File string - Dxml string + File string + Dxml string Flags uint32 } // DomainCoreDumpArgs is libvirt's remote_domain_core_dump_args type DomainCoreDumpArgs struct { - Dom Domain - To string + Dom Domain + To string Flags DomainCoreDumpFlags } // DomainCoreDumpWithFormatArgs is libvirt's remote_domain_core_dump_with_format_args type DomainCoreDumpWithFormatArgs struct { - Dom Domain - To string + Dom Domain + To string Dumpformat uint32 - Flags DomainCoreDumpFlags + Flags DomainCoreDumpFlags } // DomainScreenshotArgs is libvirt's remote_domain_screenshot_args type DomainScreenshotArgs struct { - Dom Domain + Dom Domain Screen uint32 - Flags uint32 + Flags uint32 } // DomainScreenshotRet is libvirt's remote_domain_screenshot_ret @@ -897,7 +907,7 @@ type DomainScreenshotRet struct { // DomainGetXMLDescArgs is libvirt's remote_domain_get_xml_desc_args type DomainGetXMLDescArgs struct { - Dom Domain + Dom Domain Flags DomainXMLFlags } @@ -908,9 +918,9 @@ type DomainGetXMLDescRet struct { // DomainMigratePrepareArgs is libvirt's remote_domain_migrate_prepare_args type DomainMigratePrepareArgs struct { - UriIn OptString - Flags uint64 - Dname OptString + UriIn OptString + Flags uint64 + Dname OptString Resource uint64 } @@ -922,20 +932,20 @@ type DomainMigratePrepareRet struct { // DomainMigratePerformArgs is libvirt's remote_domain_migrate_perform_args type DomainMigratePerformArgs struct { - Dom Domain - Cookie []byte - Uri string - Flags uint64 - Dname OptString + Dom Domain + Cookie []byte + Uri string + Flags uint64 + Dname OptString Resource uint64 } // DomainMigrateFinishArgs is libvirt's remote_domain_migrate_finish_args type DomainMigrateFinishArgs struct { - Dname string + Dname string Cookie []byte - Uri string - Flags uint64 + Uri string + Flags uint64 } // DomainMigrateFinishRet is libvirt's remote_domain_migrate_finish_ret @@ -945,11 +955,11 @@ type DomainMigrateFinishRet struct { // DomainMigratePrepare2Args is libvirt's remote_domain_migrate_prepare2_args type DomainMigratePrepare2Args struct { - UriIn OptString - Flags uint64 - Dname OptString + UriIn OptString + Flags uint64 + Dname OptString Resource uint64 - DomXML string + DomXML string } // DomainMigratePrepare2Ret is libvirt's remote_domain_migrate_prepare2_ret @@ -960,10 +970,10 @@ type DomainMigratePrepare2Ret struct { // DomainMigrateFinish2Args is libvirt's remote_domain_migrate_finish2_args type DomainMigrateFinish2Args struct { - Dname string - Cookie []byte - Uri string - Flags uint64 + Dname string + Cookie []byte + Uri string + Flags uint64 Retcode int32 } @@ -994,7 +1004,7 @@ type DomainCreateArgs struct { // DomainCreateWithFlagsArgs is libvirt's remote_domain_create_with_flags_args type DomainCreateWithFlagsArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -1005,7 +1015,7 @@ type DomainCreateWithFlagsRet struct { // DomainCreateWithFilesArgs is libvirt's remote_domain_create_with_files_args type DomainCreateWithFilesArgs struct { - Dom Domain + Dom Domain Flags DomainCreateFlags } @@ -1026,7 +1036,7 @@ type DomainDefineXMLRet struct { // DomainDefineXMLFlagsArgs is libvirt's remote_domain_define_xml_flags_args type DomainDefineXMLFlagsArgs struct { - XML string + XML string Flags DomainDefineFlags } @@ -1042,49 +1052,49 @@ type DomainUndefineArgs struct { // DomainUndefineFlagsArgs is libvirt's remote_domain_undefine_flags_args type DomainUndefineFlagsArgs struct { - Dom Domain + Dom Domain Flags DomainUndefineFlagsValues } // DomainInjectNmiArgs is libvirt's remote_domain_inject_nmi_args type DomainInjectNmiArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainSendKeyArgs is libvirt's remote_domain_send_key_args type DomainSendKeyArgs struct { - Dom Domain - Codeset uint32 + Dom Domain + Codeset uint32 Holdtime uint32 Keycodes []uint32 - Flags uint32 + Flags uint32 } // DomainSendProcessSignalArgs is libvirt's remote_domain_send_process_signal_args type DomainSendProcessSignalArgs struct { - Dom Domain + Dom Domain PidValue int64 - Signum uint32 - Flags uint32 + Signum uint32 + Flags uint32 } // DomainSetVcpusArgs is libvirt's remote_domain_set_vcpus_args type DomainSetVcpusArgs struct { - Dom Domain + Dom Domain Nvcpus uint32 } // DomainSetVcpusFlagsArgs is libvirt's remote_domain_set_vcpus_flags_args type DomainSetVcpusFlagsArgs struct { - Dom Domain + Dom Domain Nvcpus uint32 - Flags uint32 + Flags uint32 } // DomainGetVcpusFlagsArgs is libvirt's remote_domain_get_vcpus_flags_args type DomainGetVcpusFlagsArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -1095,63 +1105,63 @@ type DomainGetVcpusFlagsRet struct { // DomainPinVcpuArgs is libvirt's remote_domain_pin_vcpu_args type DomainPinVcpuArgs struct { - Dom Domain - Vcpu uint32 + Dom Domain + Vcpu uint32 Cpumap []byte } // DomainPinVcpuFlagsArgs is libvirt's remote_domain_pin_vcpu_flags_args type DomainPinVcpuFlagsArgs struct { - Dom Domain - Vcpu uint32 + Dom Domain + Vcpu uint32 Cpumap []byte - Flags uint32 + Flags uint32 } // DomainGetVcpuPinInfoArgs is libvirt's remote_domain_get_vcpu_pin_info_args type DomainGetVcpuPinInfoArgs struct { - Dom Domain + Dom Domain Ncpumaps int32 - Maplen int32 - Flags uint32 + Maplen int32 + Flags uint32 } // DomainGetVcpuPinInfoRet is libvirt's remote_domain_get_vcpu_pin_info_ret type DomainGetVcpuPinInfoRet struct { Cpumaps []byte - Num int32 + Num int32 } // DomainPinEmulatorArgs is libvirt's remote_domain_pin_emulator_args type DomainPinEmulatorArgs struct { - Dom Domain + Dom Domain Cpumap []byte - Flags DomainModificationImpact + Flags DomainModificationImpact } // DomainGetEmulatorPinInfoArgs is libvirt's remote_domain_get_emulator_pin_info_args type DomainGetEmulatorPinInfoArgs struct { - Dom Domain + Dom Domain Maplen int32 - Flags DomainModificationImpact + Flags DomainModificationImpact } // DomainGetEmulatorPinInfoRet is libvirt's remote_domain_get_emulator_pin_info_ret type DomainGetEmulatorPinInfoRet struct { Cpumaps []byte - Ret int32 + Ret int32 } // DomainGetVcpusArgs is libvirt's remote_domain_get_vcpus_args type DomainGetVcpusArgs struct { - Dom Domain + Dom Domain Maxinfo int32 - Maplen int32 + Maplen int32 } // DomainGetVcpusRet is libvirt's remote_domain_get_vcpus_ret type DomainGetVcpusRet struct { - Info []VcpuInfo + Info []VcpuInfo Cpumaps []byte } @@ -1168,49 +1178,49 @@ type DomainGetMaxVcpusRet struct { // DomainIothreadInfo is libvirt's remote_domain_iothread_info type DomainIothreadInfo struct { IothreadID uint32 - Cpumap []byte + Cpumap []byte } // DomainGetIothreadInfoArgs is libvirt's remote_domain_get_iothread_info_args type DomainGetIothreadInfoArgs struct { - Dom Domain + Dom Domain Flags DomainModificationImpact } // DomainGetIothreadInfoRet is libvirt's remote_domain_get_iothread_info_ret type DomainGetIothreadInfoRet struct { Info []DomainIothreadInfo - Ret uint32 + Ret uint32 } // DomainPinIothreadArgs is libvirt's remote_domain_pin_iothread_args type DomainPinIothreadArgs struct { - Dom Domain + Dom Domain IothreadsID uint32 - Cpumap []byte - Flags DomainModificationImpact + Cpumap []byte + Flags DomainModificationImpact } // DomainAddIothreadArgs is libvirt's remote_domain_add_iothread_args type DomainAddIothreadArgs struct { - Dom Domain + Dom Domain IothreadID uint32 - Flags DomainModificationImpact + Flags DomainModificationImpact } // DomainDelIothreadArgs is libvirt's remote_domain_del_iothread_args type DomainDelIothreadArgs struct { - Dom Domain + Dom Domain IothreadID uint32 - Flags DomainModificationImpact + Flags DomainModificationImpact } // DomainSetIothreadParamsArgs is libvirt's remote_domain_set_iothread_params_args type DomainSetIothreadParamsArgs struct { - Dom Domain + Dom Domain IothreadID uint32 - Params []TypedParam - Flags uint32 + Params []TypedParam + Flags uint32 } // DomainGetSecurityLabelArgs is libvirt's remote_domain_get_security_label_args @@ -1220,7 +1230,7 @@ type DomainGetSecurityLabelArgs struct { // DomainGetSecurityLabelRet is libvirt's remote_domain_get_security_label_ret type DomainGetSecurityLabelRet struct { - Label []int8 + Label []int8 Enforcing int32 } @@ -1232,13 +1242,13 @@ type DomainGetSecurityLabelListArgs struct { // DomainGetSecurityLabelListRet is libvirt's remote_domain_get_security_label_list_ret type DomainGetSecurityLabelListRet struct { Labels []DomainGetSecurityLabelRet - Ret int32 + Ret int32 } // NodeGetSecurityModelRet is libvirt's remote_node_get_security_model_ret type NodeGetSecurityModelRet struct { Model []int8 - Doi []int8 + Doi []int8 } // DomainAttachDeviceArgs is libvirt's remote_domain_attach_device_args @@ -1249,8 +1259,8 @@ type DomainAttachDeviceArgs struct { // DomainAttachDeviceFlagsArgs is libvirt's remote_domain_attach_device_flags_args type DomainAttachDeviceFlagsArgs struct { - Dom Domain - XML string + Dom Domain + XML string Flags uint32 } @@ -1262,21 +1272,21 @@ type DomainDetachDeviceArgs struct { // DomainDetachDeviceFlagsArgs is libvirt's remote_domain_detach_device_flags_args type DomainDetachDeviceFlagsArgs struct { - Dom Domain - XML string + Dom Domain + XML string Flags uint32 } // DomainUpdateDeviceFlagsArgs is libvirt's remote_domain_update_device_flags_args type DomainUpdateDeviceFlagsArgs struct { - Dom Domain - XML string + Dom Domain + XML string Flags DomainDeviceModifyFlags } // DomainDetachDeviceAliasArgs is libvirt's remote_domain_detach_device_alias_args type DomainDetachDeviceAliasArgs struct { - Dom Domain + Dom Domain Alias string Flags uint32 } @@ -1293,25 +1303,25 @@ type DomainGetAutostartRet struct { // DomainSetAutostartArgs is libvirt's remote_domain_set_autostart_args type DomainSetAutostartArgs struct { - Dom Domain + Dom Domain Autostart int32 } // DomainSetMetadataArgs is libvirt's remote_domain_set_metadata_args type DomainSetMetadataArgs struct { - Dom Domain - Type int32 + Dom Domain + Type int32 Metadata OptString - Key OptString - Uri OptString - Flags DomainModificationImpact + Key OptString + Uri OptString + Flags DomainModificationImpact } // DomainGetMetadataArgs is libvirt's remote_domain_get_metadata_args type DomainGetMetadataArgs struct { - Dom Domain - Type int32 - Uri OptString + Dom Domain + Type int32 + Uri OptString Flags DomainModificationImpact } @@ -1322,111 +1332,111 @@ type DomainGetMetadataRet struct { // DomainBlockJobAbortArgs is libvirt's remote_domain_block_job_abort_args type DomainBlockJobAbortArgs struct { - Dom Domain - Path string + Dom Domain + Path string Flags DomainBlockJobAbortFlags } // DomainGetBlockJobInfoArgs is libvirt's remote_domain_get_block_job_info_args type DomainGetBlockJobInfoArgs struct { - Dom Domain - Path string + Dom Domain + Path string Flags uint32 } // DomainGetBlockJobInfoRet is libvirt's remote_domain_get_block_job_info_ret type DomainGetBlockJobInfoRet struct { - Found int32 - Type int32 + Found int32 + Type int32 Bandwidth uint64 - Cur uint64 - End uint64 + Cur uint64 + End uint64 } // DomainBlockJobSetSpeedArgs is libvirt's remote_domain_block_job_set_speed_args type DomainBlockJobSetSpeedArgs struct { - Dom Domain - Path string + Dom Domain + Path string Bandwidth uint64 - Flags DomainBlockJobSetSpeedFlags + Flags DomainBlockJobSetSpeedFlags } // DomainBlockPullArgs is libvirt's remote_domain_block_pull_args type DomainBlockPullArgs struct { - Dom Domain - Path string + Dom Domain + Path string Bandwidth uint64 - Flags DomainBlockPullFlags + Flags DomainBlockPullFlags } // DomainBlockRebaseArgs is libvirt's remote_domain_block_rebase_args type DomainBlockRebaseArgs struct { - Dom Domain - Path string - Base OptString + Dom Domain + Path string + Base OptString Bandwidth uint64 - Flags DomainBlockRebaseFlags + Flags DomainBlockRebaseFlags } // DomainBlockCopyArgs is libvirt's remote_domain_block_copy_args type DomainBlockCopyArgs struct { - Dom Domain - Path string + Dom Domain + Path string Destxml string - Params []TypedParam - Flags DomainBlockCopyFlags + Params []TypedParam + Flags DomainBlockCopyFlags } // DomainBlockCommitArgs is libvirt's remote_domain_block_commit_args type DomainBlockCommitArgs struct { - Dom Domain - Disk string - Base OptString - Top OptString + Dom Domain + Disk string + Base OptString + Top OptString Bandwidth uint64 - Flags DomainBlockCommitFlags + Flags DomainBlockCommitFlags } // DomainSetBlockIOTuneArgs is libvirt's remote_domain_set_block_io_tune_args type DomainSetBlockIOTuneArgs struct { - Dom Domain - Disk string + Dom Domain + Disk string Params []TypedParam - Flags uint32 + Flags uint32 } // DomainGetBlockIOTuneArgs is libvirt's remote_domain_get_block_io_tune_args type DomainGetBlockIOTuneArgs struct { - Dom Domain - Disk OptString + Dom Domain + Disk OptString Nparams int32 - Flags uint32 + Flags uint32 } // DomainGetBlockIOTuneRet is libvirt's remote_domain_get_block_io_tune_ret type DomainGetBlockIOTuneRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainGetCPUStatsArgs is libvirt's remote_domain_get_cpu_stats_args type DomainGetCPUStatsArgs struct { - Dom Domain - Nparams uint32 + Dom Domain + Nparams uint32 StartCPU int32 - Ncpus uint32 - Flags TypedParameterFlags + Ncpus uint32 + Flags TypedParameterFlags } // DomainGetCPUStatsRet is libvirt's remote_domain_get_cpu_stats_ret type DomainGetCPUStatsRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainGetHostnameArgs is libvirt's remote_domain_get_hostname_args type DomainGetHostnameArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -1512,12 +1522,12 @@ type NetworkUndefineArgs struct { // NetworkUpdateArgs is libvirt's remote_network_update_args type NetworkUpdateArgs struct { - Net Network - Command uint32 - Section uint32 + Net Network + Command uint32 + Section uint32 ParentIndex int32 - XML string - Flags NetworkUpdateFlags + XML string + Flags NetworkUpdateFlags } // NetworkCreateArgs is libvirt's remote_network_create_args @@ -1532,7 +1542,7 @@ type NetworkDestroyArgs struct { // NetworkGetXMLDescArgs is libvirt's remote_network_get_xml_desc_args type NetworkGetXMLDescArgs struct { - Net Network + Net Network Flags uint32 } @@ -1563,7 +1573,7 @@ type NetworkGetAutostartRet struct { // NetworkSetAutostartArgs is libvirt's remote_network_set_autostart_args type NetworkSetAutostartArgs struct { - Net Network + Net Network Autostart int32 } @@ -1620,7 +1630,7 @@ type NwfilterUndefineArgs struct { // NwfilterGetXMLDescArgs is libvirt's remote_nwfilter_get_xml_desc_args type NwfilterGetXMLDescArgs struct { OptNwfilter Nwfilter - Flags uint32 + Flags uint32 } // NwfilterGetXMLDescRet is libvirt's remote_nwfilter_get_xml_desc_ret @@ -1691,7 +1701,7 @@ type InterfaceGetXMLDescRet struct { // InterfaceDefineXMLArgs is libvirt's remote_interface_define_xml_args type InterfaceDefineXMLArgs struct { - XML string + XML string Flags uint32 } @@ -1745,28 +1755,28 @@ type AuthSaslInitRet struct { // AuthSaslStartArgs is libvirt's remote_auth_sasl_start_args type AuthSaslStartArgs struct { Mech string - Nil int32 + Nil int32 Data []int8 } // AuthSaslStartRet is libvirt's remote_auth_sasl_start_ret type AuthSaslStartRet struct { Complete int32 - Nil int32 - Data []int8 + Nil int32 + Data []int8 } // AuthSaslStepArgs is libvirt's remote_auth_sasl_step_args type AuthSaslStepArgs struct { - Nil int32 + Nil int32 Data []int8 } // AuthSaslStepRet is libvirt's remote_auth_sasl_step_ret type AuthSaslStepRet struct { Complete int32 - Nil int32 - Data []int8 + Nil int32 + Data []int8 } // AuthPolkitRet is libvirt's remote_auth_polkit_ret @@ -1806,9 +1816,9 @@ type ConnectListDefinedStoragePoolsRet struct { // ConnectFindStoragePoolSourcesArgs is libvirt's remote_connect_find_storage_pool_sources_args type ConnectFindStoragePoolSourcesArgs struct { - Type string + Type string SrcSpec OptString - Flags uint32 + Flags uint32 } // ConnectFindStoragePoolSourcesRet is libvirt's remote_connect_find_storage_pool_sources_ret @@ -1858,7 +1868,7 @@ type StoragePoolLookupByTargetPathRet struct { // StoragePoolCreateXMLArgs is libvirt's remote_storage_pool_create_xml_args type StoragePoolCreateXMLArgs struct { - XML string + XML string Flags StoragePoolCreateFlags } @@ -1869,7 +1879,7 @@ type StoragePoolCreateXMLRet struct { // StoragePoolDefineXMLArgs is libvirt's remote_storage_pool_define_xml_args type StoragePoolDefineXMLArgs struct { - XML string + XML string Flags uint32 } @@ -1880,7 +1890,7 @@ type StoragePoolDefineXMLRet struct { // StoragePoolBuildArgs is libvirt's remote_storage_pool_build_args type StoragePoolBuildArgs struct { - Pool StoragePool + Pool StoragePool Flags StoragePoolBuildFlags } @@ -1891,7 +1901,7 @@ type StoragePoolUndefineArgs struct { // StoragePoolCreateArgs is libvirt's remote_storage_pool_create_args type StoragePoolCreateArgs struct { - Pool StoragePool + Pool StoragePool Flags StoragePoolCreateFlags } @@ -1902,19 +1912,19 @@ type StoragePoolDestroyArgs struct { // StoragePoolDeleteArgs is libvirt's remote_storage_pool_delete_args type StoragePoolDeleteArgs struct { - Pool StoragePool + Pool StoragePool Flags StoragePoolDeleteFlags } // StoragePoolRefreshArgs is libvirt's remote_storage_pool_refresh_args type StoragePoolRefreshArgs struct { - Pool StoragePool + Pool StoragePool Flags uint32 } // StoragePoolGetXMLDescArgs is libvirt's remote_storage_pool_get_xml_desc_args type StoragePoolGetXMLDescArgs struct { - Pool StoragePool + Pool StoragePool Flags StorageXMLFlags } @@ -1930,10 +1940,10 @@ type StoragePoolGetInfoArgs struct { // StoragePoolGetInfoRet is libvirt's remote_storage_pool_get_info_ret type StoragePoolGetInfoRet struct { - State uint8 - Capacity uint64 + State uint8 + Capacity uint64 Allocation uint64 - Available uint64 + Available uint64 } // StoragePoolGetAutostartArgs is libvirt's remote_storage_pool_get_autostart_args @@ -1948,7 +1958,7 @@ type StoragePoolGetAutostartRet struct { // StoragePoolSetAutostartArgs is libvirt's remote_storage_pool_set_autostart_args type StoragePoolSetAutostartArgs struct { - Pool StoragePool + Pool StoragePool Autostart int32 } @@ -1964,7 +1974,7 @@ type StoragePoolNumOfVolumesRet struct { // StoragePoolListVolumesArgs is libvirt's remote_storage_pool_list_volumes_args type StoragePoolListVolumesArgs struct { - Pool StoragePool + Pool StoragePool Maxnames int32 } @@ -2006,8 +2016,8 @@ type StorageVolLookupByPathRet struct { // StorageVolCreateXMLArgs is libvirt's remote_storage_vol_create_xml_args type StorageVolCreateXMLArgs struct { - Pool StoragePool - XML string + Pool StoragePool + XML string Flags StorageVolCreateFlags } @@ -2018,10 +2028,10 @@ type StorageVolCreateXMLRet struct { // StorageVolCreateXMLFromArgs is libvirt's remote_storage_vol_create_xml_from_args type StorageVolCreateXMLFromArgs struct { - Pool StoragePool - XML string + Pool StoragePool + XML string Clonevol StorageVol - Flags StorageVolCreateFlags + Flags StorageVolCreateFlags } // StorageVolCreateXMLFromRet is libvirt's remote_storage_vol_create_xml_from_ret @@ -2031,26 +2041,26 @@ type StorageVolCreateXMLFromRet struct { // StorageVolDeleteArgs is libvirt's remote_storage_vol_delete_args type StorageVolDeleteArgs struct { - Vol StorageVol + Vol StorageVol Flags StorageVolDeleteFlags } // StorageVolWipeArgs is libvirt's remote_storage_vol_wipe_args type StorageVolWipeArgs struct { - Vol StorageVol + Vol StorageVol Flags uint32 } // StorageVolWipePatternArgs is libvirt's remote_storage_vol_wipe_pattern_args type StorageVolWipePatternArgs struct { - Vol StorageVol + Vol StorageVol Algorithm uint32 - Flags uint32 + Flags uint32 } // StorageVolGetXMLDescArgs is libvirt's remote_storage_vol_get_xml_desc_args type StorageVolGetXMLDescArgs struct { - Vol StorageVol + Vol StorageVol Flags uint32 } @@ -2066,21 +2076,21 @@ type StorageVolGetInfoArgs struct { // StorageVolGetInfoRet is libvirt's remote_storage_vol_get_info_ret type StorageVolGetInfoRet struct { - Type int8 - Capacity uint64 + Type int8 + Capacity uint64 Allocation uint64 } // StorageVolGetInfoFlagsArgs is libvirt's remote_storage_vol_get_info_flags_args type StorageVolGetInfoFlagsArgs struct { - Vol StorageVol + Vol StorageVol Flags uint32 } // StorageVolGetInfoFlagsRet is libvirt's remote_storage_vol_get_info_flags_ret type StorageVolGetInfoFlagsRet struct { - Type int8 - Capacity uint64 + Type int8 + Capacity uint64 Allocation uint64 } @@ -2096,14 +2106,14 @@ type StorageVolGetPathRet struct { // StorageVolResizeArgs is libvirt's remote_storage_vol_resize_args type StorageVolResizeArgs struct { - Vol StorageVol + Vol StorageVol Capacity uint64 - Flags StorageVolResizeFlags + Flags StorageVolResizeFlags } // NodeNumOfDevicesArgs is libvirt's remote_node_num_of_devices_args type NodeNumOfDevicesArgs struct { - Cap OptString + Cap OptString Flags uint32 } @@ -2114,9 +2124,9 @@ type NodeNumOfDevicesRet struct { // NodeListDevicesArgs is libvirt's remote_node_list_devices_args type NodeListDevicesArgs struct { - Cap OptString + Cap OptString Maxnames int32 - Flags uint32 + Flags uint32 } // NodeListDevicesRet is libvirt's remote_node_list_devices_ret @@ -2136,8 +2146,8 @@ type NodeDeviceLookupByNameRet struct { // NodeDeviceLookupScsiHostByWwnArgs is libvirt's remote_node_device_lookup_scsi_host_by_wwn_args type NodeDeviceLookupScsiHostByWwnArgs struct { - Wwnn string - Wwpn string + Wwnn string + Wwpn string Flags uint32 } @@ -2148,7 +2158,7 @@ type NodeDeviceLookupScsiHostByWwnRet struct { // NodeDeviceGetXMLDescArgs is libvirt's remote_node_device_get_xml_desc_args type NodeDeviceGetXMLDescArgs struct { - Name string + Name string Flags uint32 } @@ -2179,7 +2189,7 @@ type NodeDeviceNumOfCapsRet struct { // NodeDeviceListCapsArgs is libvirt's remote_node_device_list_caps_args type NodeDeviceListCapsArgs struct { - Name string + Name string Maxnames int32 } @@ -2195,9 +2205,9 @@ type NodeDeviceDettachArgs struct { // NodeDeviceDetachFlagsArgs is libvirt's remote_node_device_detach_flags_args type NodeDeviceDetachFlagsArgs struct { - Name string + Name string DriverName OptString - Flags uint32 + Flags uint32 } // NodeDeviceReAttachArgs is libvirt's remote_node_device_re_attach_args @@ -2213,7 +2223,7 @@ type NodeDeviceResetArgs struct { // NodeDeviceCreateXMLArgs is libvirt's remote_node_device_create_xml_args type NodeDeviceCreateXMLArgs struct { XMLDesc string - Flags uint32 + Flags uint32 } // NodeDeviceCreateXMLRet is libvirt's remote_node_device_create_xml_ret @@ -2238,22 +2248,22 @@ type ConnectDomainEventDeregisterRet struct { // DomainEventLifecycleMsg is libvirt's remote_domain_event_lifecycle_msg type DomainEventLifecycleMsg struct { - Dom Domain - Event int32 + Dom Domain + Event int32 Detail int32 } // DomainEventCallbackLifecycleMsg is libvirt's remote_domain_event_callback_lifecycle_msg type DomainEventCallbackLifecycleMsg struct { CallbackID int32 - Msg DomainEventLifecycleMsg + Msg DomainEventLifecycleMsg } // ConnectDomainXMLFromNativeArgs is libvirt's remote_connect_domain_xml_from_native_args type ConnectDomainXMLFromNativeArgs struct { NativeFormat string NativeConfig string - Flags uint32 + Flags uint32 } // ConnectDomainXMLFromNativeRet is libvirt's remote_connect_domain_xml_from_native_ret @@ -2264,8 +2274,8 @@ type ConnectDomainXMLFromNativeRet struct { // ConnectDomainXMLToNativeArgs is libvirt's remote_connect_domain_xml_to_native_args type ConnectDomainXMLToNativeArgs struct { NativeFormat string - DomainXML string - Flags uint32 + DomainXML string + Flags uint32 } // ConnectDomainXMLToNativeRet is libvirt's remote_connect_domain_xml_to_native_ret @@ -2300,7 +2310,7 @@ type SecretLookupByUUIDRet struct { // SecretDefineXMLArgs is libvirt's remote_secret_define_xml_args type SecretDefineXMLArgs struct { - XML string + XML string Flags uint32 } @@ -2312,7 +2322,7 @@ type SecretDefineXMLRet struct { // SecretGetXMLDescArgs is libvirt's remote_secret_get_xml_desc_args type SecretGetXMLDescArgs struct { OptSecret Secret - Flags uint32 + Flags uint32 } // SecretGetXMLDescRet is libvirt's remote_secret_get_xml_desc_ret @@ -2323,14 +2333,14 @@ type SecretGetXMLDescRet struct { // SecretSetValueArgs is libvirt's remote_secret_set_value_args type SecretSetValueArgs struct { OptSecret Secret - Value []byte - Flags uint32 + Value []byte + Flags uint32 } // SecretGetValueArgs is libvirt's remote_secret_get_value_args type SecretGetValueArgs struct { OptSecret Secret - Flags uint32 + Flags uint32 } // SecretGetValueRet is libvirt's remote_secret_get_value_ret @@ -2346,7 +2356,7 @@ type SecretUndefineArgs struct { // SecretLookupByUsageArgs is libvirt's remote_secret_lookup_by_usage_args type SecretLookupByUsageArgs struct { UsageType int32 - UsageID string + UsageID string } // SecretLookupByUsageRet is libvirt's remote_secret_lookup_by_usage_ret @@ -2356,10 +2366,10 @@ type SecretLookupByUsageRet struct { // DomainMigratePrepareTunnelArgs is libvirt's remote_domain_migrate_prepare_tunnel_args type DomainMigratePrepareTunnelArgs struct { - Flags uint64 - Dname OptString + Flags uint64 + Dname OptString Resource uint64 - DomXML string + DomXML string } // ConnectIsSecureRet is libvirt's remote_connect_is_secure_ret @@ -2449,7 +2459,7 @@ type InterfaceIsActiveRet struct { // ConnectCompareCPUArgs is libvirt's remote_connect_compare_cpu_args type ConnectCompareCPUArgs struct { - XML string + XML string Flags ConnectCompareCPUFlags } @@ -2461,7 +2471,7 @@ type ConnectCompareCPURet struct { // ConnectBaselineCPUArgs is libvirt's remote_connect_baseline_cpu_args type ConnectBaselineCPUArgs struct { XMLCPUs []string - Flags ConnectBaselineCPUFlags + Flags ConnectBaselineCPUFlags } // ConnectBaselineCPURet is libvirt's remote_connect_baseline_cpu_ret @@ -2476,29 +2486,29 @@ type DomainGetJobInfoArgs struct { // DomainGetJobInfoRet is libvirt's remote_domain_get_job_info_ret type DomainGetJobInfoRet struct { - Type int32 - TimeElapsed uint64 + Type int32 + TimeElapsed uint64 TimeRemaining uint64 - DataTotal uint64 + DataTotal uint64 DataProcessed uint64 DataRemaining uint64 - MemTotal uint64 - MemProcessed uint64 - MemRemaining uint64 - FileTotal uint64 + MemTotal uint64 + MemProcessed uint64 + MemRemaining uint64 + FileTotal uint64 FileProcessed uint64 FileRemaining uint64 } // DomainGetJobStatsArgs is libvirt's remote_domain_get_job_stats_args type DomainGetJobStatsArgs struct { - Dom Domain + Dom Domain Flags DomainGetJobStatsFlags } // DomainGetJobStatsRet is libvirt's remote_domain_get_job_stats_ret type DomainGetJobStatsRet struct { - Type int32 + Type int32 Params []TypedParam } @@ -2509,7 +2519,7 @@ type DomainAbortJobArgs struct { // DomainMigrateGetMaxDowntimeArgs is libvirt's remote_domain_migrate_get_max_downtime_args type DomainMigrateGetMaxDowntimeArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2520,14 +2530,14 @@ type DomainMigrateGetMaxDowntimeRet struct { // DomainMigrateSetMaxDowntimeArgs is libvirt's remote_domain_migrate_set_max_downtime_args type DomainMigrateSetMaxDowntimeArgs struct { - Dom Domain + Dom Domain Downtime uint64 - Flags uint32 + Flags uint32 } // DomainMigrateGetCompressionCacheArgs is libvirt's remote_domain_migrate_get_compression_cache_args type DomainMigrateGetCompressionCacheArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2538,21 +2548,21 @@ type DomainMigrateGetCompressionCacheRet struct { // DomainMigrateSetCompressionCacheArgs is libvirt's remote_domain_migrate_set_compression_cache_args type DomainMigrateSetCompressionCacheArgs struct { - Dom Domain + Dom Domain CacheSize uint64 - Flags uint32 + Flags uint32 } // DomainMigrateSetMaxSpeedArgs is libvirt's remote_domain_migrate_set_max_speed_args type DomainMigrateSetMaxSpeedArgs struct { - Dom Domain + Dom Domain Bandwidth uint64 - Flags uint32 + Flags uint32 } // DomainMigrateGetMaxSpeedArgs is libvirt's remote_domain_migrate_get_max_speed_args type DomainMigrateGetMaxSpeedArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2574,7 +2584,7 @@ type ConnectDomainEventDeregisterAnyArgs struct { // ConnectDomainEventCallbackRegisterAnyArgs is libvirt's remote_connect_domain_event_callback_register_any_args type ConnectDomainEventCallbackRegisterAnyArgs struct { EventID int32 - Dom OptDomain + Dom OptDomain } // ConnectDomainEventCallbackRegisterAnyRet is libvirt's remote_connect_domain_event_callback_register_any_ret @@ -2595,66 +2605,66 @@ type DomainEventRebootMsg struct { // DomainEventCallbackRebootMsg is libvirt's remote_domain_event_callback_reboot_msg type DomainEventCallbackRebootMsg struct { CallbackID int32 - Msg DomainEventRebootMsg + Msg DomainEventRebootMsg } // DomainEventRtcChangeMsg is libvirt's remote_domain_event_rtc_change_msg type DomainEventRtcChangeMsg struct { - Dom Domain + Dom Domain Offset int64 } // DomainEventCallbackRtcChangeMsg is libvirt's remote_domain_event_callback_rtc_change_msg type DomainEventCallbackRtcChangeMsg struct { CallbackID int32 - Msg DomainEventRtcChangeMsg + Msg DomainEventRtcChangeMsg } // DomainEventWatchdogMsg is libvirt's remote_domain_event_watchdog_msg type DomainEventWatchdogMsg struct { - Dom Domain + Dom Domain Action int32 } // DomainEventCallbackWatchdogMsg is libvirt's remote_domain_event_callback_watchdog_msg type DomainEventCallbackWatchdogMsg struct { CallbackID int32 - Msg DomainEventWatchdogMsg + Msg DomainEventWatchdogMsg } // DomainEventIOErrorMsg is libvirt's remote_domain_event_io_error_msg type DomainEventIOErrorMsg struct { - Dom Domain - SrcPath string + Dom Domain + SrcPath string DevAlias string - Action int32 + Action int32 } // DomainEventCallbackIOErrorMsg is libvirt's remote_domain_event_callback_io_error_msg type DomainEventCallbackIOErrorMsg struct { CallbackID int32 - Msg DomainEventIOErrorMsg + Msg DomainEventIOErrorMsg } // DomainEventIOErrorReasonMsg is libvirt's remote_domain_event_io_error_reason_msg type DomainEventIOErrorReasonMsg struct { - Dom Domain - SrcPath string + Dom Domain + SrcPath string DevAlias string - Action int32 - Reason string + Action int32 + Reason string } // DomainEventCallbackIOErrorReasonMsg is libvirt's remote_domain_event_callback_io_error_reason_msg type DomainEventCallbackIOErrorReasonMsg struct { CallbackID int32 - Msg DomainEventIOErrorReasonMsg + Msg DomainEventIOErrorReasonMsg } // DomainEventGraphicsAddress is libvirt's remote_domain_event_graphics_address type DomainEventGraphicsAddress struct { - Family int32 - Node string + Family int32 + Node string Service string } @@ -2666,60 +2676,60 @@ type DomainEventGraphicsIdentity struct { // DomainEventGraphicsMsg is libvirt's remote_domain_event_graphics_msg type DomainEventGraphicsMsg struct { - Dom Domain - Phase int32 - Local DomainEventGraphicsAddress - Remote DomainEventGraphicsAddress + Dom Domain + Phase int32 + Local DomainEventGraphicsAddress + Remote DomainEventGraphicsAddress AuthScheme string - Subject []DomainEventGraphicsIdentity + Subject []DomainEventGraphicsIdentity } // DomainEventCallbackGraphicsMsg is libvirt's remote_domain_event_callback_graphics_msg type DomainEventCallbackGraphicsMsg struct { CallbackID int32 - Msg DomainEventGraphicsMsg + Msg DomainEventGraphicsMsg } // DomainEventBlockJobMsg is libvirt's remote_domain_event_block_job_msg type DomainEventBlockJobMsg struct { - Dom Domain - Path string - Type int32 + Dom Domain + Path string + Type int32 Status int32 } // DomainEventCallbackBlockJobMsg is libvirt's remote_domain_event_callback_block_job_msg type DomainEventCallbackBlockJobMsg struct { CallbackID int32 - Msg DomainEventBlockJobMsg + Msg DomainEventBlockJobMsg } // DomainEventDiskChangeMsg is libvirt's remote_domain_event_disk_change_msg type DomainEventDiskChangeMsg struct { - Dom Domain + Dom Domain OldSrcPath OptString NewSrcPath OptString - DevAlias string - Reason int32 + DevAlias string + Reason int32 } // DomainEventCallbackDiskChangeMsg is libvirt's remote_domain_event_callback_disk_change_msg type DomainEventCallbackDiskChangeMsg struct { CallbackID int32 - Msg DomainEventDiskChangeMsg + Msg DomainEventDiskChangeMsg } // DomainEventTrayChangeMsg is libvirt's remote_domain_event_tray_change_msg type DomainEventTrayChangeMsg struct { - Dom Domain + Dom Domain DevAlias string - Reason int32 + Reason int32 } // DomainEventCallbackTrayChangeMsg is libvirt's remote_domain_event_callback_tray_change_msg type DomainEventCallbackTrayChangeMsg struct { CallbackID int32 - Msg DomainEventTrayChangeMsg + Msg DomainEventTrayChangeMsg } // DomainEventPmwakeupMsg is libvirt's remote_domain_event_pmwakeup_msg @@ -2730,8 +2740,8 @@ type DomainEventPmwakeupMsg struct { // DomainEventCallbackPmwakeupMsg is libvirt's remote_domain_event_callback_pmwakeup_msg type DomainEventCallbackPmwakeupMsg struct { CallbackID int32 - Reason int32 - Msg DomainEventPmwakeupMsg + Reason int32 + Msg DomainEventPmwakeupMsg } // DomainEventPmsuspendMsg is libvirt's remote_domain_event_pmsuspend_msg @@ -2742,20 +2752,20 @@ type DomainEventPmsuspendMsg struct { // DomainEventCallbackPmsuspendMsg is libvirt's remote_domain_event_callback_pmsuspend_msg type DomainEventCallbackPmsuspendMsg struct { CallbackID int32 - Reason int32 - Msg DomainEventPmsuspendMsg + Reason int32 + Msg DomainEventPmsuspendMsg } // DomainEventBalloonChangeMsg is libvirt's remote_domain_event_balloon_change_msg type DomainEventBalloonChangeMsg struct { - Dom Domain + Dom Domain Actual uint64 } // DomainEventCallbackBalloonChangeMsg is libvirt's remote_domain_event_callback_balloon_change_msg type DomainEventCallbackBalloonChangeMsg struct { CallbackID int32 - Msg DomainEventBalloonChangeMsg + Msg DomainEventBalloonChangeMsg } // DomainEventPmsuspendDiskMsg is libvirt's remote_domain_event_pmsuspend_disk_msg @@ -2766,19 +2776,19 @@ type DomainEventPmsuspendDiskMsg struct { // DomainEventCallbackPmsuspendDiskMsg is libvirt's remote_domain_event_callback_pmsuspend_disk_msg type DomainEventCallbackPmsuspendDiskMsg struct { CallbackID int32 - Reason int32 - Msg DomainEventPmsuspendDiskMsg + Reason int32 + Msg DomainEventPmsuspendDiskMsg } // DomainManagedSaveArgs is libvirt's remote_domain_managed_save_args type DomainManagedSaveArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainHasManagedSaveImageArgs is libvirt's remote_domain_has_managed_save_image_args type DomainHasManagedSaveImageArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2789,13 +2799,13 @@ type DomainHasManagedSaveImageRet struct { // DomainManagedSaveRemoveArgs is libvirt's remote_domain_managed_save_remove_args type DomainManagedSaveRemoveArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainManagedSaveGetXMLDescArgs is libvirt's remote_domain_managed_save_get_xml_desc_args type DomainManagedSaveGetXMLDescArgs struct { - Dom Domain + Dom Domain Flags DomainXMLFlags } @@ -2806,16 +2816,16 @@ type DomainManagedSaveGetXMLDescRet struct { // DomainManagedSaveDefineXMLArgs is libvirt's remote_domain_managed_save_define_xml_args type DomainManagedSaveDefineXMLArgs struct { - Dom Domain - Dxml OptString + Dom Domain + Dxml OptString Flags DomainSaveRestoreFlags } // DomainSnapshotCreateXMLArgs is libvirt's remote_domain_snapshot_create_xml_args type DomainSnapshotCreateXMLArgs struct { - Dom Domain + Dom Domain XMLDesc string - Flags uint32 + Flags uint32 } // DomainSnapshotCreateXMLRet is libvirt's remote_domain_snapshot_create_xml_ret @@ -2825,7 +2835,7 @@ type DomainSnapshotCreateXMLRet struct { // DomainSnapshotGetXMLDescArgs is libvirt's remote_domain_snapshot_get_xml_desc_args type DomainSnapshotGetXMLDescArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags uint32 } @@ -2836,7 +2846,7 @@ type DomainSnapshotGetXMLDescRet struct { // DomainSnapshotNumArgs is libvirt's remote_domain_snapshot_num_args type DomainSnapshotNumArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2847,9 +2857,9 @@ type DomainSnapshotNumRet struct { // DomainSnapshotListNamesArgs is libvirt's remote_domain_snapshot_list_names_args type DomainSnapshotListNamesArgs struct { - Dom Domain + Dom Domain Maxnames int32 - Flags uint32 + Flags uint32 } // DomainSnapshotListNamesRet is libvirt's remote_domain_snapshot_list_names_ret @@ -2859,20 +2869,20 @@ type DomainSnapshotListNamesRet struct { // DomainListAllSnapshotsArgs is libvirt's remote_domain_list_all_snapshots_args type DomainListAllSnapshotsArgs struct { - Dom Domain + Dom Domain NeedResults int32 - Flags uint32 + Flags uint32 } // DomainListAllSnapshotsRet is libvirt's remote_domain_list_all_snapshots_ret type DomainListAllSnapshotsRet struct { Snapshots []DomainSnapshot - Ret int32 + Ret int32 } // DomainSnapshotNumChildrenArgs is libvirt's remote_domain_snapshot_num_children_args type DomainSnapshotNumChildrenArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags uint32 } @@ -2883,9 +2893,9 @@ type DomainSnapshotNumChildrenRet struct { // DomainSnapshotListChildrenNamesArgs is libvirt's remote_domain_snapshot_list_children_names_args type DomainSnapshotListChildrenNamesArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Maxnames int32 - Flags uint32 + Flags uint32 } // DomainSnapshotListChildrenNamesRet is libvirt's remote_domain_snapshot_list_children_names_ret @@ -2895,21 +2905,21 @@ type DomainSnapshotListChildrenNamesRet struct { // DomainSnapshotListAllChildrenArgs is libvirt's remote_domain_snapshot_list_all_children_args type DomainSnapshotListAllChildrenArgs struct { - Snapshot DomainSnapshot + Snapshot DomainSnapshot NeedResults int32 - Flags uint32 + Flags uint32 } // DomainSnapshotListAllChildrenRet is libvirt's remote_domain_snapshot_list_all_children_ret type DomainSnapshotListAllChildrenRet struct { Snapshots []DomainSnapshot - Ret int32 + Ret int32 } // DomainSnapshotLookupByNameArgs is libvirt's remote_domain_snapshot_lookup_by_name_args type DomainSnapshotLookupByNameArgs struct { - Dom Domain - Name string + Dom Domain + Name string Flags uint32 } @@ -2920,7 +2930,7 @@ type DomainSnapshotLookupByNameRet struct { // DomainHasCurrentSnapshotArgs is libvirt's remote_domain_has_current_snapshot_args type DomainHasCurrentSnapshotArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2931,7 +2941,7 @@ type DomainHasCurrentSnapshotRet struct { // DomainSnapshotGetParentArgs is libvirt's remote_domain_snapshot_get_parent_args type DomainSnapshotGetParentArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags uint32 } @@ -2942,7 +2952,7 @@ type DomainSnapshotGetParentRet struct { // DomainSnapshotCurrentArgs is libvirt's remote_domain_snapshot_current_args type DomainSnapshotCurrentArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2953,7 +2963,7 @@ type DomainSnapshotCurrentRet struct { // DomainSnapshotIsCurrentArgs is libvirt's remote_domain_snapshot_is_current_args type DomainSnapshotIsCurrentArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags uint32 } @@ -2964,7 +2974,7 @@ type DomainSnapshotIsCurrentRet struct { // DomainSnapshotHasMetadataArgs is libvirt's remote_domain_snapshot_has_metadata_args type DomainSnapshotHasMetadataArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags uint32 } @@ -2975,96 +2985,96 @@ type DomainSnapshotHasMetadataRet struct { // DomainRevertToSnapshotArgs is libvirt's remote_domain_revert_to_snapshot_args type DomainRevertToSnapshotArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags uint32 } // DomainSnapshotDeleteArgs is libvirt's remote_domain_snapshot_delete_args type DomainSnapshotDeleteArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags DomainSnapshotDeleteFlags } // DomainOpenConsoleArgs is libvirt's remote_domain_open_console_args type DomainOpenConsoleArgs struct { - Dom Domain + Dom Domain DevName OptString - Flags uint32 + Flags uint32 } // DomainOpenChannelArgs is libvirt's remote_domain_open_channel_args type DomainOpenChannelArgs struct { - Dom Domain - Name OptString + Dom Domain + Name OptString Flags DomainChannelFlags } // StorageVolUploadArgs is libvirt's remote_storage_vol_upload_args type StorageVolUploadArgs struct { - Vol StorageVol + Vol StorageVol Offset uint64 Length uint64 - Flags StorageVolUploadFlags + Flags StorageVolUploadFlags } // StorageVolDownloadArgs is libvirt's remote_storage_vol_download_args type StorageVolDownloadArgs struct { - Vol StorageVol + Vol StorageVol Offset uint64 Length uint64 - Flags StorageVolDownloadFlags + Flags StorageVolDownloadFlags } // DomainGetStateArgs is libvirt's remote_domain_get_state_args type DomainGetStateArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainGetStateRet is libvirt's remote_domain_get_state_ret type DomainGetStateRet struct { - State int32 + State int32 Reason int32 } // DomainMigrateBegin3Args is libvirt's remote_domain_migrate_begin3_args type DomainMigrateBegin3Args struct { - Dom Domain - Xmlin OptString - Flags uint64 - Dname OptString + Dom Domain + Xmlin OptString + Flags uint64 + Dname OptString Resource uint64 } // DomainMigrateBegin3Ret is libvirt's remote_domain_migrate_begin3_ret type DomainMigrateBegin3Ret struct { CookieOut []byte - XML string + XML string } // DomainMigratePrepare3Args is libvirt's remote_domain_migrate_prepare3_args type DomainMigratePrepare3Args struct { CookieIn []byte - UriIn OptString - Flags uint64 - Dname OptString + UriIn OptString + Flags uint64 + Dname OptString Resource uint64 - DomXML string + DomXML string } // DomainMigratePrepare3Ret is libvirt's remote_domain_migrate_prepare3_ret type DomainMigratePrepare3Ret struct { CookieOut []byte - UriOut OptString + UriOut OptString } // DomainMigratePrepareTunnel3Args is libvirt's remote_domain_migrate_prepare_tunnel3_args type DomainMigratePrepareTunnel3Args struct { CookieIn []byte - Flags uint64 - Dname OptString + Flags uint64 + Dname OptString Resource uint64 - DomXML string + DomXML string } // DomainMigratePrepareTunnel3Ret is libvirt's remote_domain_migrate_prepare_tunnel3_ret @@ -3074,13 +3084,13 @@ type DomainMigratePrepareTunnel3Ret struct { // DomainMigratePerform3Args is libvirt's remote_domain_migrate_perform3_args type DomainMigratePerform3Args struct { - Dom Domain - Xmlin OptString + Dom Domain + Xmlin OptString CookieIn []byte Dconnuri OptString - Uri OptString - Flags uint64 - Dname OptString + Uri OptString + Flags uint64 + Dname OptString Resource uint64 } @@ -3091,25 +3101,25 @@ type DomainMigratePerform3Ret struct { // DomainMigrateFinish3Args is libvirt's remote_domain_migrate_finish3_args type DomainMigrateFinish3Args struct { - Dname string - CookieIn []byte - Dconnuri OptString - Uri OptString - Flags uint64 + Dname string + CookieIn []byte + Dconnuri OptString + Uri OptString + Flags uint64 Cancelled int32 } // DomainMigrateFinish3Ret is libvirt's remote_domain_migrate_finish3_ret type DomainMigrateFinish3Ret struct { - Dom Domain + Dom Domain CookieOut []byte } // DomainMigrateConfirm3Args is libvirt's remote_domain_migrate_confirm3_args type DomainMigrateConfirm3Args struct { - Dom Domain - CookieIn []byte - Flags uint64 + Dom Domain + CookieIn []byte + Flags uint64 Cancelled int32 } @@ -3121,250 +3131,250 @@ type DomainEventControlErrorMsg struct { // DomainEventCallbackControlErrorMsg is libvirt's remote_domain_event_callback_control_error_msg type DomainEventCallbackControlErrorMsg struct { CallbackID int32 - Msg DomainEventControlErrorMsg + Msg DomainEventControlErrorMsg } // DomainGetControlInfoArgs is libvirt's remote_domain_get_control_info_args type DomainGetControlInfoArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainGetControlInfoRet is libvirt's remote_domain_get_control_info_ret type DomainGetControlInfoRet struct { - State uint32 - Details uint32 + State uint32 + Details uint32 StateTime uint64 } // DomainOpenGraphicsArgs is libvirt's remote_domain_open_graphics_args type DomainOpenGraphicsArgs struct { - Dom Domain - Idx uint32 + Dom Domain + Idx uint32 Flags DomainOpenGraphicsFlags } // DomainOpenGraphicsFdArgs is libvirt's remote_domain_open_graphics_fd_args type DomainOpenGraphicsFdArgs struct { - Dom Domain - Idx uint32 + Dom Domain + Idx uint32 Flags DomainOpenGraphicsFlags } // NodeSuspendForDurationArgs is libvirt's remote_node_suspend_for_duration_args type NodeSuspendForDurationArgs struct { - Target uint32 + Target uint32 Duration uint64 - Flags uint32 + Flags uint32 } // DomainShutdownFlagsArgs is libvirt's remote_domain_shutdown_flags_args type DomainShutdownFlagsArgs struct { - Dom Domain + Dom Domain Flags DomainShutdownFlagValues } // DomainGetDiskErrorsArgs is libvirt's remote_domain_get_disk_errors_args type DomainGetDiskErrorsArgs struct { - Dom Domain + Dom Domain Maxerrors uint32 - Flags uint32 + Flags uint32 } // DomainGetDiskErrorsRet is libvirt's remote_domain_get_disk_errors_ret type DomainGetDiskErrorsRet struct { - Errors []DomainDiskError + Errors []DomainDiskError Nerrors int32 } // ConnectListAllDomainsArgs is libvirt's remote_connect_list_all_domains_args type ConnectListAllDomainsArgs struct { NeedResults int32 - Flags ConnectListAllDomainsFlags + Flags ConnectListAllDomainsFlags } // ConnectListAllDomainsRet is libvirt's remote_connect_list_all_domains_ret type ConnectListAllDomainsRet struct { Domains []Domain - Ret uint32 + Ret uint32 } // ConnectListAllStoragePoolsArgs is libvirt's remote_connect_list_all_storage_pools_args type ConnectListAllStoragePoolsArgs struct { NeedResults int32 - Flags ConnectListAllStoragePoolsFlags + Flags ConnectListAllStoragePoolsFlags } // ConnectListAllStoragePoolsRet is libvirt's remote_connect_list_all_storage_pools_ret type ConnectListAllStoragePoolsRet struct { Pools []StoragePool - Ret uint32 + Ret uint32 } // StoragePoolListAllVolumesArgs is libvirt's remote_storage_pool_list_all_volumes_args type StoragePoolListAllVolumesArgs struct { - Pool StoragePool + Pool StoragePool NeedResults int32 - Flags uint32 + Flags uint32 } // StoragePoolListAllVolumesRet is libvirt's remote_storage_pool_list_all_volumes_ret type StoragePoolListAllVolumesRet struct { Vols []StorageVol - Ret uint32 + Ret uint32 } // ConnectListAllNetworksArgs is libvirt's remote_connect_list_all_networks_args type ConnectListAllNetworksArgs struct { NeedResults int32 - Flags ConnectListAllNetworksFlags + Flags ConnectListAllNetworksFlags } // ConnectListAllNetworksRet is libvirt's remote_connect_list_all_networks_ret type ConnectListAllNetworksRet struct { Nets []Network - Ret uint32 + Ret uint32 } // ConnectListAllInterfacesArgs is libvirt's remote_connect_list_all_interfaces_args type ConnectListAllInterfacesArgs struct { NeedResults int32 - Flags ConnectListAllInterfacesFlags + Flags ConnectListAllInterfacesFlags } // ConnectListAllInterfacesRet is libvirt's remote_connect_list_all_interfaces_ret type ConnectListAllInterfacesRet struct { Ifaces []Interface - Ret uint32 + Ret uint32 } // ConnectListAllNodeDevicesArgs is libvirt's remote_connect_list_all_node_devices_args type ConnectListAllNodeDevicesArgs struct { NeedResults int32 - Flags uint32 + Flags uint32 } // ConnectListAllNodeDevicesRet is libvirt's remote_connect_list_all_node_devices_ret type ConnectListAllNodeDevicesRet struct { Devices []NodeDevice - Ret uint32 + Ret uint32 } // ConnectListAllNwfiltersArgs is libvirt's remote_connect_list_all_nwfilters_args type ConnectListAllNwfiltersArgs struct { NeedResults int32 - Flags uint32 + Flags uint32 } // ConnectListAllNwfiltersRet is libvirt's remote_connect_list_all_nwfilters_ret type ConnectListAllNwfiltersRet struct { Filters []Nwfilter - Ret uint32 + Ret uint32 } // ConnectListAllSecretsArgs is libvirt's remote_connect_list_all_secrets_args type ConnectListAllSecretsArgs struct { NeedResults int32 - Flags ConnectListAllSecretsFlags + Flags ConnectListAllSecretsFlags } // ConnectListAllSecretsRet is libvirt's remote_connect_list_all_secrets_ret type ConnectListAllSecretsRet struct { Secrets []Secret - Ret uint32 + Ret uint32 } // NodeSetMemoryParametersArgs is libvirt's remote_node_set_memory_parameters_args type NodeSetMemoryParametersArgs struct { Params []TypedParam - Flags uint32 + Flags uint32 } // NodeGetMemoryParametersArgs is libvirt's remote_node_get_memory_parameters_args type NodeGetMemoryParametersArgs struct { Nparams int32 - Flags uint32 + Flags uint32 } // NodeGetMemoryParametersRet is libvirt's remote_node_get_memory_parameters_ret type NodeGetMemoryParametersRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // NodeGetCPUMapArgs is libvirt's remote_node_get_cpu_map_args type NodeGetCPUMapArgs struct { - NeedMap int32 + NeedMap int32 NeedOnline int32 - Flags uint32 + Flags uint32 } // NodeGetCPUMapRet is libvirt's remote_node_get_cpu_map_ret type NodeGetCPUMapRet struct { Cpumap []byte Online uint32 - Ret int32 + Ret int32 } // DomainFstrimArgs is libvirt's remote_domain_fstrim_args type DomainFstrimArgs struct { - Dom Domain + Dom Domain MountPoint OptString - Minimum uint64 - Flags uint32 + Minimum uint64 + Flags uint32 } // DomainGetTimeArgs is libvirt's remote_domain_get_time_args type DomainGetTimeArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainGetTimeRet is libvirt's remote_domain_get_time_ret type DomainGetTimeRet struct { - Seconds int64 + Seconds int64 Nseconds uint32 } // DomainSetTimeArgs is libvirt's remote_domain_set_time_args type DomainSetTimeArgs struct { - Dom Domain - Seconds int64 + Dom Domain + Seconds int64 Nseconds uint32 - Flags DomainSetTimeFlags + Flags DomainSetTimeFlags } // DomainMigrateBegin3ParamsArgs is libvirt's remote_domain_migrate_begin3_params_args type DomainMigrateBegin3ParamsArgs struct { - Dom Domain + Dom Domain Params []TypedParam - Flags uint32 + Flags uint32 } // DomainMigrateBegin3ParamsRet is libvirt's remote_domain_migrate_begin3_params_ret type DomainMigrateBegin3ParamsRet struct { CookieOut []byte - XML string + XML string } // DomainMigratePrepare3ParamsArgs is libvirt's remote_domain_migrate_prepare3_params_args type DomainMigratePrepare3ParamsArgs struct { - Params []TypedParam + Params []TypedParam CookieIn []byte - Flags uint32 + Flags uint32 } // DomainMigratePrepare3ParamsRet is libvirt's remote_domain_migrate_prepare3_params_ret type DomainMigratePrepare3ParamsRet struct { CookieOut []byte - UriOut OptString + UriOut OptString } // DomainMigratePrepareTunnel3ParamsArgs is libvirt's remote_domain_migrate_prepare_tunnel3_params_args type DomainMigratePrepareTunnel3ParamsArgs struct { - Params []TypedParam + Params []TypedParam CookieIn []byte - Flags uint32 + Flags uint32 } // DomainMigratePrepareTunnel3ParamsRet is libvirt's remote_domain_migrate_prepare_tunnel3_params_ret @@ -3374,11 +3384,11 @@ type DomainMigratePrepareTunnel3ParamsRet struct { // DomainMigratePerform3ParamsArgs is libvirt's remote_domain_migrate_perform3_params_args type DomainMigratePerform3ParamsArgs struct { - Dom Domain + Dom Domain Dconnuri OptString - Params []TypedParam + Params []TypedParam CookieIn []byte - Flags DomainMigrateFlags + Flags DomainMigrateFlags } // DomainMigratePerform3ParamsRet is libvirt's remote_domain_migrate_perform3_params_ret @@ -3388,70 +3398,70 @@ type DomainMigratePerform3ParamsRet struct { // DomainMigrateFinish3ParamsArgs is libvirt's remote_domain_migrate_finish3_params_args type DomainMigrateFinish3ParamsArgs struct { - Params []TypedParam - CookieIn []byte - Flags uint32 + Params []TypedParam + CookieIn []byte + Flags uint32 Cancelled int32 } // DomainMigrateFinish3ParamsRet is libvirt's remote_domain_migrate_finish3_params_ret type DomainMigrateFinish3ParamsRet struct { - Dom Domain + Dom Domain CookieOut []byte } // DomainMigrateConfirm3ParamsArgs is libvirt's remote_domain_migrate_confirm3_params_args type DomainMigrateConfirm3ParamsArgs struct { - Dom Domain - Params []TypedParam - CookieIn []byte - Flags uint32 + Dom Domain + Params []TypedParam + CookieIn []byte + Flags uint32 Cancelled int32 } // DomainEventDeviceRemovedMsg is libvirt's remote_domain_event_device_removed_msg type DomainEventDeviceRemovedMsg struct { - Dom Domain + Dom Domain DevAlias string } // DomainEventCallbackDeviceRemovedMsg is libvirt's remote_domain_event_callback_device_removed_msg type DomainEventCallbackDeviceRemovedMsg struct { CallbackID int32 - Msg DomainEventDeviceRemovedMsg + Msg DomainEventDeviceRemovedMsg } // DomainEventBlockJob2Msg is libvirt's remote_domain_event_block_job_2_msg type DomainEventBlockJob2Msg struct { CallbackID int32 - Dom Domain - Dst string - Type int32 - Status int32 + Dom Domain + Dst string + Type int32 + Status int32 } // DomainEventBlockThresholdMsg is libvirt's remote_domain_event_block_threshold_msg type DomainEventBlockThresholdMsg struct { CallbackID int32 - Dom Domain - Dev string - Path OptString - Threshold uint64 - Excess uint64 + Dom Domain + Dev string + Path OptString + Threshold uint64 + Excess uint64 } // DomainEventCallbackTunableMsg is libvirt's remote_domain_event_callback_tunable_msg type DomainEventCallbackTunableMsg struct { CallbackID int32 - Dom Domain - Params []TypedParam + Dom Domain + Params []TypedParam } // DomainEventCallbackDeviceAddedMsg is libvirt's remote_domain_event_callback_device_added_msg type DomainEventCallbackDeviceAddedMsg struct { CallbackID int32 - Dom Domain - DevAlias string + Dom Domain + DevAlias string } // ConnectEventConnectionClosedMsg is libvirt's remote_connect_event_connection_closed_msg @@ -3461,21 +3471,21 @@ type ConnectEventConnectionClosedMsg struct { // ConnectGetCPUModelNamesArgs is libvirt's remote_connect_get_cpu_model_names_args type ConnectGetCPUModelNamesArgs struct { - Arch string + Arch string NeedResults int32 - Flags uint32 + Flags uint32 } // ConnectGetCPUModelNamesRet is libvirt's remote_connect_get_cpu_model_names_ret type ConnectGetCPUModelNamesRet struct { Models []string - Ret int32 + Ret int32 } // ConnectNetworkEventRegisterAnyArgs is libvirt's remote_connect_network_event_register_any_args type ConnectNetworkEventRegisterAnyArgs struct { EventID int32 - Net OptNetwork + Net OptNetwork } // ConnectNetworkEventRegisterAnyRet is libvirt's remote_connect_network_event_register_any_ret @@ -3491,15 +3501,15 @@ type ConnectNetworkEventDeregisterAnyArgs struct { // NetworkEventLifecycleMsg is libvirt's remote_network_event_lifecycle_msg type NetworkEventLifecycleMsg struct { CallbackID int32 - Net Network - Event int32 - Detail int32 + Net Network + Event int32 + Detail int32 } // ConnectStoragePoolEventRegisterAnyArgs is libvirt's remote_connect_storage_pool_event_register_any_args type ConnectStoragePoolEventRegisterAnyArgs struct { EventID int32 - Pool OptStoragePool + Pool OptStoragePool } // ConnectStoragePoolEventRegisterAnyRet is libvirt's remote_connect_storage_pool_event_register_any_ret @@ -3515,21 +3525,21 @@ type ConnectStoragePoolEventDeregisterAnyArgs struct { // StoragePoolEventLifecycleMsg is libvirt's remote_storage_pool_event_lifecycle_msg type StoragePoolEventLifecycleMsg struct { CallbackID int32 - Pool StoragePool - Event int32 - Detail int32 + Pool StoragePool + Event int32 + Detail int32 } // StoragePoolEventRefreshMsg is libvirt's remote_storage_pool_event_refresh_msg type StoragePoolEventRefreshMsg struct { CallbackID int32 - Pool StoragePool + Pool StoragePool } // ConnectNodeDeviceEventRegisterAnyArgs is libvirt's remote_connect_node_device_event_register_any_args type ConnectNodeDeviceEventRegisterAnyArgs struct { EventID int32 - Dev OptNodeDevice + Dev OptNodeDevice } // ConnectNodeDeviceEventRegisterAnyRet is libvirt's remote_connect_node_device_event_register_any_ret @@ -3545,22 +3555,22 @@ type ConnectNodeDeviceEventDeregisterAnyArgs struct { // NodeDeviceEventLifecycleMsg is libvirt's remote_node_device_event_lifecycle_msg type NodeDeviceEventLifecycleMsg struct { CallbackID int32 - Dev NodeDevice - Event int32 - Detail int32 + Dev NodeDevice + Event int32 + Detail int32 } // NodeDeviceEventUpdateMsg is libvirt's remote_node_device_event_update_msg type NodeDeviceEventUpdateMsg struct { CallbackID int32 - Dev NodeDevice + Dev NodeDevice } // DomainFsfreezeArgs is libvirt's remote_domain_fsfreeze_args type DomainFsfreezeArgs struct { - Dom Domain + Dom Domain Mountpoints []string - Flags uint32 + Flags uint32 } // DomainFsfreezeRet is libvirt's remote_domain_fsfreeze_ret @@ -3570,9 +3580,9 @@ type DomainFsfreezeRet struct { // DomainFsthawArgs is libvirt's remote_domain_fsthaw_args type DomainFsthawArgs struct { - Dom Domain + Dom Domain Mountpoints []string - Flags uint32 + Flags uint32 } // DomainFsthawRet is libvirt's remote_domain_fsthaw_ret @@ -3582,10 +3592,10 @@ type DomainFsthawRet struct { // NodeGetFreePagesArgs is libvirt's remote_node_get_free_pages_args type NodeGetFreePagesArgs struct { - Pages []uint32 + Pages []uint32 StartCell int32 CellCount uint32 - Flags uint32 + Flags uint32 } // NodeGetFreePagesRet is libvirt's remote_node_get_free_pages_ret @@ -3595,11 +3605,11 @@ type NodeGetFreePagesRet struct { // NodeAllocPagesArgs is libvirt's remote_node_alloc_pages_args type NodeAllocPagesArgs struct { - PageSizes []uint32 + PageSizes []uint32 PageCounts []uint64 - StartCell int32 - CellCount uint32 - Flags NodeAllocPagesFlags + StartCell int32 + CellCount uint32 + Flags NodeAllocPagesFlags } // NodeAllocPagesRet is libvirt's remote_node_alloc_pages_ret @@ -3609,40 +3619,40 @@ type NodeAllocPagesRet struct { // NetworkDhcpLease is libvirt's remote_network_dhcp_lease type NetworkDhcpLease struct { - Iface string + Iface string Expirytime int64 - Type int32 - Mac OptString - Iaid OptString - Ipaddr string - Prefix uint32 - Hostname OptString - Clientid OptString + Type int32 + Mac OptString + Iaid OptString + Ipaddr string + Prefix uint32 + Hostname OptString + Clientid OptString } // NetworkGetDhcpLeasesArgs is libvirt's remote_network_get_dhcp_leases_args type NetworkGetDhcpLeasesArgs struct { - Net Network - Mac OptString + Net Network + Mac OptString NeedResults int32 - Flags uint32 + Flags uint32 } // NetworkGetDhcpLeasesRet is libvirt's remote_network_get_dhcp_leases_ret type NetworkGetDhcpLeasesRet struct { Leases []NetworkDhcpLease - Ret uint32 + Ret uint32 } // DomainStatsRecord is libvirt's remote_domain_stats_record type DomainStatsRecord struct { - Dom Domain + Dom Domain Params []TypedParam } // ConnectGetAllDomainStatsArgs is libvirt's remote_connect_get_all_domain_stats_args type ConnectGetAllDomainStatsArgs struct { - Doms []Domain + Doms []Domain Stats uint32 Flags ConnectGetAllDomainStatsFlags } @@ -3650,9 +3660,9 @@ type ConnectGetAllDomainStatsArgs struct { // DomainEventCallbackAgentLifecycleMsg is libvirt's remote_domain_event_callback_agent_lifecycle_msg type DomainEventCallbackAgentLifecycleMsg struct { CallbackID int32 - Dom Domain - State int32 - Reason int32 + Dom Domain + State int32 + Reason int32 } // ConnectGetAllDomainStatsRet is libvirt's remote_connect_get_all_domain_stats_ret @@ -3663,42 +3673,42 @@ type ConnectGetAllDomainStatsRet struct { // DomainFsinfo is libvirt's remote_domain_fsinfo type DomainFsinfo struct { Mountpoint string - Name string - Fstype string + Name string + Fstype string DevAliases []string } // DomainGetFsinfoArgs is libvirt's remote_domain_get_fsinfo_args type DomainGetFsinfoArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainGetFsinfoRet is libvirt's remote_domain_get_fsinfo_ret type DomainGetFsinfoRet struct { Info []DomainFsinfo - Ret uint32 + Ret uint32 } // DomainIPAddr is libvirt's remote_domain_ip_addr type DomainIPAddr struct { - Type int32 - Addr string + Type int32 + Addr string Prefix uint32 } // DomainInterface is libvirt's remote_domain_interface type DomainInterface struct { - Name string + Name string Hwaddr OptString - Addrs []DomainIPAddr + Addrs []DomainIPAddr } // DomainInterfaceAddressesArgs is libvirt's remote_domain_interface_addresses_args type DomainInterfaceAddressesArgs struct { - Dom Domain + Dom Domain Source uint32 - Flags uint32 + Flags uint32 } // DomainInterfaceAddressesRet is libvirt's remote_domain_interface_addresses_ret @@ -3708,17 +3718,17 @@ type DomainInterfaceAddressesRet struct { // DomainSetUserPasswordArgs is libvirt's remote_domain_set_user_password_args type DomainSetUserPasswordArgs struct { - Dom Domain - User OptString + Dom Domain + User OptString Password OptString - Flags DomainSetUserPasswordFlags + Flags DomainSetUserPasswordFlags } // DomainRenameArgs is libvirt's remote_domain_rename_args type DomainRenameArgs struct { - Dom Domain + Dom Domain NewName OptString - Flags uint32 + Flags uint32 } // DomainRenameRet is libvirt's remote_domain_rename_ret @@ -3729,33 +3739,33 @@ type DomainRenameRet struct { // DomainEventCallbackMigrationIterationMsg is libvirt's remote_domain_event_callback_migration_iteration_msg type DomainEventCallbackMigrationIterationMsg struct { CallbackID int32 - Dom Domain - Iteration int32 + Dom Domain + Iteration int32 } // DomainEventCallbackJobCompletedMsg is libvirt's remote_domain_event_callback_job_completed_msg type DomainEventCallbackJobCompletedMsg struct { CallbackID int32 - Dom Domain - Params []TypedParam + Dom Domain + Params []TypedParam } // DomainMigrateStartPostCopyArgs is libvirt's remote_domain_migrate_start_post_copy_args type DomainMigrateStartPostCopyArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainEventCallbackDeviceRemovalFailedMsg is libvirt's remote_domain_event_callback_device_removal_failed_msg type DomainEventCallbackDeviceRemovalFailedMsg struct { CallbackID int32 - Dom Domain - DevAlias string + Dom Domain + DevAlias string } // DomainGetGuestVcpusArgs is libvirt's remote_domain_get_guest_vcpus_args type DomainGetGuestVcpusArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -3766,31 +3776,31 @@ type DomainGetGuestVcpusRet struct { // DomainSetGuestVcpusArgs is libvirt's remote_domain_set_guest_vcpus_args type DomainSetGuestVcpusArgs struct { - Dom Domain + Dom Domain Cpumap string - State int32 - Flags uint32 + State int32 + Flags uint32 } // DomainSetVcpuArgs is libvirt's remote_domain_set_vcpu_args type DomainSetVcpuArgs struct { - Dom Domain + Dom Domain Cpumap string - State int32 - Flags DomainModificationImpact + State int32 + Flags DomainModificationImpact } // DomainEventCallbackMetadataChangeMsg is libvirt's remote_domain_event_callback_metadata_change_msg type DomainEventCallbackMetadataChangeMsg struct { CallbackID int32 - Dom Domain - Type int32 - Nsuri OptString + Dom Domain + Type int32 + Nsuri OptString } // ConnectSecretEventRegisterAnyArgs is libvirt's remote_connect_secret_event_register_any_args type ConnectSecretEventRegisterAnyArgs struct { - EventID int32 + EventID int32 OptSecret OptSecret } @@ -3807,41 +3817,41 @@ type ConnectSecretEventDeregisterAnyArgs struct { // SecretEventLifecycleMsg is libvirt's remote_secret_event_lifecycle_msg type SecretEventLifecycleMsg struct { CallbackID int32 - OptSecret Secret - Event int32 - Detail int32 + OptSecret Secret + Event int32 + Detail int32 } // SecretEventValueChangedMsg is libvirt's remote_secret_event_value_changed_msg type SecretEventValueChangedMsg struct { CallbackID int32 - OptSecret Secret + OptSecret Secret } // DomainSetBlockThresholdArgs is libvirt's remote_domain_set_block_threshold_args type DomainSetBlockThresholdArgs struct { - Dom Domain - Dev string + Dom Domain + Dev string Threshold uint64 - Flags uint32 + Flags uint32 } // DomainSetLifecycleActionArgs is libvirt's remote_domain_set_lifecycle_action_args type DomainSetLifecycleActionArgs struct { - Dom Domain - Type uint32 + Dom Domain + Type uint32 Action uint32 - Flags DomainModificationImpact + Flags DomainModificationImpact } // ConnectCompareHypervisorCPUArgs is libvirt's remote_connect_compare_hypervisor_cpu_args type ConnectCompareHypervisorCPUArgs struct { Emulator OptString - Arch OptString - Machine OptString + Arch OptString + Machine OptString Virttype OptString - XMLCPU string - Flags uint32 + XMLCPU string + Flags uint32 } // ConnectCompareHypervisorCPURet is libvirt's remote_connect_compare_hypervisor_cpu_ret @@ -3852,11 +3862,11 @@ type ConnectCompareHypervisorCPURet struct { // ConnectBaselineHypervisorCPUArgs is libvirt's remote_connect_baseline_hypervisor_cpu_args type ConnectBaselineHypervisorCPUArgs struct { Emulator OptString - Arch OptString - Machine OptString + Arch OptString + Machine OptString Virttype OptString - XMLCPUs []string - Flags uint32 + XMLCPUs []string + Flags uint32 } // ConnectBaselineHypervisorCPURet is libvirt's remote_connect_baseline_hypervisor_cpu_ret @@ -3867,18 +3877,18 @@ type ConnectBaselineHypervisorCPURet struct { // NodeGetSevInfoArgs is libvirt's remote_node_get_sev_info_args type NodeGetSevInfoArgs struct { Nparams int32 - Flags uint32 + Flags uint32 } // NodeGetSevInfoRet is libvirt's remote_node_get_sev_info_ret type NodeGetSevInfoRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainGetLaunchSecurityInfoArgs is libvirt's remote_domain_get_launch_security_info_args type DomainGetLaunchSecurityInfoArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -3899,7 +3909,7 @@ type NwfilterBindingLookupByPortDevRet struct { // NwfilterBindingCreateXMLArgs is libvirt's remote_nwfilter_binding_create_xml_args type NwfilterBindingCreateXMLArgs struct { - XML string + XML string Flags uint32 } @@ -3916,7 +3926,7 @@ type NwfilterBindingDeleteArgs struct { // NwfilterBindingGetXMLDescArgs is libvirt's remote_nwfilter_binding_get_xml_desc_args type NwfilterBindingGetXMLDescArgs struct { OptNwfilter NwfilterBinding - Flags uint32 + Flags uint32 } // NwfilterBindingGetXMLDescRet is libvirt's remote_nwfilter_binding_get_xml_desc_ret @@ -3927,17 +3937,15 @@ type NwfilterBindingGetXMLDescRet struct { // ConnectListAllNwfilterBindingsArgs is libvirt's remote_connect_list_all_nwfilter_bindings_args type ConnectListAllNwfilterBindingsArgs struct { NeedResults int32 - Flags uint32 + Flags uint32 } // ConnectListAllNwfilterBindingsRet is libvirt's remote_connect_list_all_nwfilter_bindings_ret type ConnectListAllNwfilterBindingsRet struct { Bindings []NwfilterBinding - Ret uint32 + Ret uint32 } - - // TypedParamValue is a discriminated union. type TypedParamValue struct { D uint32 @@ -3986,13 +3994,12 @@ func NewTypedParamValueString(v string) *TypedParamValue { return &TypedParamValue{D: 7, I: v} } - // ConnectOpen is the go wrapper for REMOTE_PROC_CONNECT_OPEN. func (l *Libvirt) ConnectOpen(Name OptString, Flags ConnectFlags) (err error) { var buf []byte - args := ConnectOpenArgs { - Name: Name, + args := ConnectOpenArgs{ + Name: Name, Flags: Flags, } @@ -4001,7 +4008,6 @@ func (l *Libvirt) ConnectOpen(Name OptString, Flags ConnectFlags) (err error) { return } - _, err = l.requestStream(1, constants.Program, buf, nil, nil) if err != nil { return @@ -4014,7 +4020,6 @@ func (l *Libvirt) ConnectOpen(Name OptString, Flags ConnectFlags) (err error) { func (l *Libvirt) ConnectClose() (err error) { var buf []byte - _, err = l.requestStream(2, constants.Program, buf, nil, nil) if err != nil { return @@ -4075,7 +4080,7 @@ func (l *Libvirt) ConnectGetVersion() (rHvVer uint64, err error) { func (l *Libvirt) ConnectGetMaxVcpus(Type OptString) (rMaxVcpus int32, err error) { var buf []byte - args := ConnectGetMaxVcpusArgs { + args := ConnectGetMaxVcpusArgs{ Type: Type, } @@ -4191,7 +4196,7 @@ func (l *Libvirt) ConnectGetCapabilities() (rCapabilities string, err error) { func (l *Libvirt) DomainAttachDevice(Dom Domain, XML string) (err error) { var buf []byte - args := DomainAttachDeviceArgs { + args := DomainAttachDeviceArgs{ Dom: Dom, XML: XML, } @@ -4201,7 +4206,6 @@ func (l *Libvirt) DomainAttachDevice(Dom Domain, XML string) (err error) { return } - _, err = l.requestStream(8, constants.Program, buf, nil, nil) if err != nil { return @@ -4214,7 +4218,7 @@ func (l *Libvirt) DomainAttachDevice(Dom Domain, XML string) (err error) { func (l *Libvirt) DomainCreate(Dom Domain) (err error) { var buf []byte - args := DomainCreateArgs { + args := DomainCreateArgs{ Dom: Dom, } @@ -4223,7 +4227,6 @@ func (l *Libvirt) DomainCreate(Dom Domain) (err error) { return } - _, err = l.requestStream(9, constants.Program, buf, nil, nil) if err != nil { return @@ -4236,9 +4239,9 @@ func (l *Libvirt) DomainCreate(Dom Domain) (err error) { func (l *Libvirt) DomainCreateXML(XMLDesc string, Flags DomainCreateFlags) (rDom Domain, err error) { var buf []byte - args := DomainCreateXMLArgs { + args := DomainCreateXMLArgs{ XMLDesc: XMLDesc, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -4270,7 +4273,7 @@ func (l *Libvirt) DomainCreateXML(XMLDesc string, Flags DomainCreateFlags) (rDom func (l *Libvirt) DomainDefineXML(XML string) (rDom Domain, err error) { var buf []byte - args := DomainDefineXMLArgs { + args := DomainDefineXMLArgs{ XML: XML, } @@ -4303,7 +4306,7 @@ func (l *Libvirt) DomainDefineXML(XML string) (rDom Domain, err error) { func (l *Libvirt) DomainDestroy(Dom Domain) (err error) { var buf []byte - args := DomainDestroyArgs { + args := DomainDestroyArgs{ Dom: Dom, } @@ -4312,7 +4315,6 @@ func (l *Libvirt) DomainDestroy(Dom Domain) (err error) { return } - _, err = l.requestStream(12, constants.Program, buf, nil, nil) if err != nil { return @@ -4325,7 +4327,7 @@ func (l *Libvirt) DomainDestroy(Dom Domain) (err error) { func (l *Libvirt) DomainDetachDevice(Dom Domain, XML string) (err error) { var buf []byte - args := DomainDetachDeviceArgs { + args := DomainDetachDeviceArgs{ Dom: Dom, XML: XML, } @@ -4335,7 +4337,6 @@ func (l *Libvirt) DomainDetachDevice(Dom Domain, XML string) (err error) { return } - _, err = l.requestStream(13, constants.Program, buf, nil, nil) if err != nil { return @@ -4348,8 +4349,8 @@ func (l *Libvirt) DomainDetachDevice(Dom Domain, XML string) (err error) { func (l *Libvirt) DomainGetXMLDesc(Dom Domain, Flags DomainXMLFlags) (rXML string, err error) { var buf []byte - args := DomainGetXMLDescArgs { - Dom: Dom, + args := DomainGetXMLDescArgs{ + Dom: Dom, Flags: Flags, } @@ -4382,7 +4383,7 @@ func (l *Libvirt) DomainGetXMLDesc(Dom Domain, Flags DomainXMLFlags) (rXML strin func (l *Libvirt) DomainGetAutostart(Dom Domain) (rAutostart int32, err error) { var buf []byte - args := DomainGetAutostartArgs { + args := DomainGetAutostartArgs{ Dom: Dom, } @@ -4415,7 +4416,7 @@ func (l *Libvirt) DomainGetAutostart(Dom Domain) (rAutostart int32, err error) { func (l *Libvirt) DomainGetInfo(Dom Domain) (rState uint8, rMaxMem uint64, rMemory uint64, rNrVirtCPU uint16, rCPUTime uint64, err error) { var buf []byte - args := DomainGetInfoArgs { + args := DomainGetInfoArgs{ Dom: Dom, } @@ -4468,7 +4469,7 @@ func (l *Libvirt) DomainGetInfo(Dom Domain) (rState uint8, rMaxMem uint64, rMemo func (l *Libvirt) DomainGetMaxMemory(Dom Domain) (rMemory uint64, err error) { var buf []byte - args := DomainGetMaxMemoryArgs { + args := DomainGetMaxMemoryArgs{ Dom: Dom, } @@ -4501,7 +4502,7 @@ func (l *Libvirt) DomainGetMaxMemory(Dom Domain) (rMemory uint64, err error) { func (l *Libvirt) DomainGetMaxVcpus(Dom Domain) (rNum int32, err error) { var buf []byte - args := DomainGetMaxVcpusArgs { + args := DomainGetMaxVcpusArgs{ Dom: Dom, } @@ -4534,7 +4535,7 @@ func (l *Libvirt) DomainGetMaxVcpus(Dom Domain) (rNum int32, err error) { func (l *Libvirt) DomainGetOsType(Dom Domain) (rType string, err error) { var buf []byte - args := DomainGetOsTypeArgs { + args := DomainGetOsTypeArgs{ Dom: Dom, } @@ -4567,10 +4568,10 @@ func (l *Libvirt) DomainGetOsType(Dom Domain) (rType string, err error) { func (l *Libvirt) DomainGetVcpus(Dom Domain, Maxinfo int32, Maplen int32) (rInfo []VcpuInfo, rCpumaps []byte, err error) { var buf []byte - args := DomainGetVcpusArgs { - Dom: Dom, + args := DomainGetVcpusArgs{ + Dom: Dom, Maxinfo: Maxinfo, - Maplen: Maplen, + Maplen: Maplen, } buf, err = encode(&args) @@ -4607,7 +4608,7 @@ func (l *Libvirt) DomainGetVcpus(Dom Domain, Maxinfo int32, Maplen int32) (rInfo func (l *Libvirt) ConnectListDefinedDomains(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListDefinedDomainsArgs { + args := ConnectListDefinedDomainsArgs{ Maxnames: Maxnames, } @@ -4640,7 +4641,7 @@ func (l *Libvirt) ConnectListDefinedDomains(Maxnames int32) (rNames []string, er func (l *Libvirt) DomainLookupByID(ID int32) (rDom Domain, err error) { var buf []byte - args := DomainLookupByIDArgs { + args := DomainLookupByIDArgs{ ID: ID, } @@ -4673,7 +4674,7 @@ func (l *Libvirt) DomainLookupByID(ID int32) (rDom Domain, err error) { func (l *Libvirt) DomainLookupByName(Name string) (rDom Domain, err error) { var buf []byte - args := DomainLookupByNameArgs { + args := DomainLookupByNameArgs{ Name: Name, } @@ -4706,7 +4707,7 @@ func (l *Libvirt) DomainLookupByName(Name string) (rDom Domain, err error) { func (l *Libvirt) DomainLookupByUUID(UUID UUID) (rDom Domain, err error) { var buf []byte - args := DomainLookupByUUIDArgs { + args := DomainLookupByUUIDArgs{ UUID: UUID, } @@ -4763,9 +4764,9 @@ func (l *Libvirt) ConnectNumOfDefinedDomains() (rNum int32, err error) { func (l *Libvirt) DomainPinVcpu(Dom Domain, Vcpu uint32, Cpumap []byte) (err error) { var buf []byte - args := DomainPinVcpuArgs { - Dom: Dom, - Vcpu: Vcpu, + args := DomainPinVcpuArgs{ + Dom: Dom, + Vcpu: Vcpu, Cpumap: Cpumap, } @@ -4774,7 +4775,6 @@ func (l *Libvirt) DomainPinVcpu(Dom Domain, Vcpu uint32, Cpumap []byte) (err err return } - _, err = l.requestStream(26, constants.Program, buf, nil, nil) if err != nil { return @@ -4787,8 +4787,8 @@ func (l *Libvirt) DomainPinVcpu(Dom Domain, Vcpu uint32, Cpumap []byte) (err err func (l *Libvirt) DomainReboot(Dom Domain, Flags DomainRebootFlagValues) (err error) { var buf []byte - args := DomainRebootArgs { - Dom: Dom, + args := DomainRebootArgs{ + Dom: Dom, Flags: Flags, } @@ -4797,7 +4797,6 @@ func (l *Libvirt) DomainReboot(Dom Domain, Flags DomainRebootFlagValues) (err er return } - _, err = l.requestStream(27, constants.Program, buf, nil, nil) if err != nil { return @@ -4810,7 +4809,7 @@ func (l *Libvirt) DomainReboot(Dom Domain, Flags DomainRebootFlagValues) (err er func (l *Libvirt) DomainResume(Dom Domain) (err error) { var buf []byte - args := DomainResumeArgs { + args := DomainResumeArgs{ Dom: Dom, } @@ -4819,7 +4818,6 @@ func (l *Libvirt) DomainResume(Dom Domain) (err error) { return } - _, err = l.requestStream(28, constants.Program, buf, nil, nil) if err != nil { return @@ -4832,8 +4830,8 @@ func (l *Libvirt) DomainResume(Dom Domain) (err error) { func (l *Libvirt) DomainSetAutostart(Dom Domain, Autostart int32) (err error) { var buf []byte - args := DomainSetAutostartArgs { - Dom: Dom, + args := DomainSetAutostartArgs{ + Dom: Dom, Autostart: Autostart, } @@ -4842,7 +4840,6 @@ func (l *Libvirt) DomainSetAutostart(Dom Domain, Autostart int32) (err error) { return } - _, err = l.requestStream(29, constants.Program, buf, nil, nil) if err != nil { return @@ -4855,8 +4852,8 @@ func (l *Libvirt) DomainSetAutostart(Dom Domain, Autostart int32) (err error) { func (l *Libvirt) DomainSetMaxMemory(Dom Domain, Memory uint64) (err error) { var buf []byte - args := DomainSetMaxMemoryArgs { - Dom: Dom, + args := DomainSetMaxMemoryArgs{ + Dom: Dom, Memory: Memory, } @@ -4865,7 +4862,6 @@ func (l *Libvirt) DomainSetMaxMemory(Dom Domain, Memory uint64) (err error) { return } - _, err = l.requestStream(30, constants.Program, buf, nil, nil) if err != nil { return @@ -4878,8 +4874,8 @@ func (l *Libvirt) DomainSetMaxMemory(Dom Domain, Memory uint64) (err error) { func (l *Libvirt) DomainSetMemory(Dom Domain, Memory uint64) (err error) { var buf []byte - args := DomainSetMemoryArgs { - Dom: Dom, + args := DomainSetMemoryArgs{ + Dom: Dom, Memory: Memory, } @@ -4888,7 +4884,6 @@ func (l *Libvirt) DomainSetMemory(Dom Domain, Memory uint64) (err error) { return } - _, err = l.requestStream(31, constants.Program, buf, nil, nil) if err != nil { return @@ -4901,8 +4896,8 @@ func (l *Libvirt) DomainSetMemory(Dom Domain, Memory uint64) (err error) { func (l *Libvirt) DomainSetVcpus(Dom Domain, Nvcpus uint32) (err error) { var buf []byte - args := DomainSetVcpusArgs { - Dom: Dom, + args := DomainSetVcpusArgs{ + Dom: Dom, Nvcpus: Nvcpus, } @@ -4911,7 +4906,6 @@ func (l *Libvirt) DomainSetVcpus(Dom Domain, Nvcpus uint32) (err error) { return } - _, err = l.requestStream(32, constants.Program, buf, nil, nil) if err != nil { return @@ -4924,7 +4918,7 @@ func (l *Libvirt) DomainSetVcpus(Dom Domain, Nvcpus uint32) (err error) { func (l *Libvirt) DomainShutdown(Dom Domain) (err error) { var buf []byte - args := DomainShutdownArgs { + args := DomainShutdownArgs{ Dom: Dom, } @@ -4933,7 +4927,6 @@ func (l *Libvirt) DomainShutdown(Dom Domain) (err error) { return } - _, err = l.requestStream(33, constants.Program, buf, nil, nil) if err != nil { return @@ -4946,7 +4939,7 @@ func (l *Libvirt) DomainShutdown(Dom Domain) (err error) { func (l *Libvirt) DomainSuspend(Dom Domain) (err error) { var buf []byte - args := DomainSuspendArgs { + args := DomainSuspendArgs{ Dom: Dom, } @@ -4955,7 +4948,6 @@ func (l *Libvirt) DomainSuspend(Dom Domain) (err error) { return } - _, err = l.requestStream(34, constants.Program, buf, nil, nil) if err != nil { return @@ -4968,7 +4960,7 @@ func (l *Libvirt) DomainSuspend(Dom Domain) (err error) { func (l *Libvirt) DomainUndefine(Dom Domain) (err error) { var buf []byte - args := DomainUndefineArgs { + args := DomainUndefineArgs{ Dom: Dom, } @@ -4977,7 +4969,6 @@ func (l *Libvirt) DomainUndefine(Dom Domain) (err error) { return } - _, err = l.requestStream(35, constants.Program, buf, nil, nil) if err != nil { return @@ -4990,7 +4981,7 @@ func (l *Libvirt) DomainUndefine(Dom Domain) (err error) { func (l *Libvirt) ConnectListDefinedNetworks(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListDefinedNetworksArgs { + args := ConnectListDefinedNetworksArgs{ Maxnames: Maxnames, } @@ -5023,7 +5014,7 @@ func (l *Libvirt) ConnectListDefinedNetworks(Maxnames int32) (rNames []string, e func (l *Libvirt) ConnectListDomains(Maxids int32) (rIds []int32, err error) { var buf []byte - args := ConnectListDomainsArgs { + args := ConnectListDomainsArgs{ Maxids: Maxids, } @@ -5056,7 +5047,7 @@ func (l *Libvirt) ConnectListDomains(Maxids int32) (rIds []int32, err error) { func (l *Libvirt) ConnectListNetworks(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListNetworksArgs { + args := ConnectListNetworksArgs{ Maxnames: Maxnames, } @@ -5089,7 +5080,7 @@ func (l *Libvirt) ConnectListNetworks(Maxnames int32) (rNames []string, err erro func (l *Libvirt) NetworkCreate(Net Network) (err error) { var buf []byte - args := NetworkCreateArgs { + args := NetworkCreateArgs{ Net: Net, } @@ -5098,7 +5089,6 @@ func (l *Libvirt) NetworkCreate(Net Network) (err error) { return } - _, err = l.requestStream(39, constants.Program, buf, nil, nil) if err != nil { return @@ -5111,7 +5101,7 @@ func (l *Libvirt) NetworkCreate(Net Network) (err error) { func (l *Libvirt) NetworkCreateXML(XML string) (rNet Network, err error) { var buf []byte - args := NetworkCreateXMLArgs { + args := NetworkCreateXMLArgs{ XML: XML, } @@ -5144,7 +5134,7 @@ func (l *Libvirt) NetworkCreateXML(XML string) (rNet Network, err error) { func (l *Libvirt) NetworkDefineXML(XML string) (rNet Network, err error) { var buf []byte - args := NetworkDefineXMLArgs { + args := NetworkDefineXMLArgs{ XML: XML, } @@ -5177,7 +5167,7 @@ func (l *Libvirt) NetworkDefineXML(XML string) (rNet Network, err error) { func (l *Libvirt) NetworkDestroy(Net Network) (err error) { var buf []byte - args := NetworkDestroyArgs { + args := NetworkDestroyArgs{ Net: Net, } @@ -5186,7 +5176,6 @@ func (l *Libvirt) NetworkDestroy(Net Network) (err error) { return } - _, err = l.requestStream(42, constants.Program, buf, nil, nil) if err != nil { return @@ -5199,8 +5188,8 @@ func (l *Libvirt) NetworkDestroy(Net Network) (err error) { func (l *Libvirt) NetworkGetXMLDesc(Net Network, Flags uint32) (rXML string, err error) { var buf []byte - args := NetworkGetXMLDescArgs { - Net: Net, + args := NetworkGetXMLDescArgs{ + Net: Net, Flags: Flags, } @@ -5233,7 +5222,7 @@ func (l *Libvirt) NetworkGetXMLDesc(Net Network, Flags uint32) (rXML string, err func (l *Libvirt) NetworkGetAutostart(Net Network) (rAutostart int32, err error) { var buf []byte - args := NetworkGetAutostartArgs { + args := NetworkGetAutostartArgs{ Net: Net, } @@ -5266,7 +5255,7 @@ func (l *Libvirt) NetworkGetAutostart(Net Network) (rAutostart int32, err error) func (l *Libvirt) NetworkGetBridgeName(Net Network) (rName string, err error) { var buf []byte - args := NetworkGetBridgeNameArgs { + args := NetworkGetBridgeNameArgs{ Net: Net, } @@ -5299,7 +5288,7 @@ func (l *Libvirt) NetworkGetBridgeName(Net Network) (rName string, err error) { func (l *Libvirt) NetworkLookupByName(Name string) (rNet Network, err error) { var buf []byte - args := NetworkLookupByNameArgs { + args := NetworkLookupByNameArgs{ Name: Name, } @@ -5332,7 +5321,7 @@ func (l *Libvirt) NetworkLookupByName(Name string) (rNet Network, err error) { func (l *Libvirt) NetworkLookupByUUID(UUID UUID) (rNet Network, err error) { var buf []byte - args := NetworkLookupByUUIDArgs { + args := NetworkLookupByUUIDArgs{ UUID: UUID, } @@ -5365,8 +5354,8 @@ func (l *Libvirt) NetworkLookupByUUID(UUID UUID) (rNet Network, err error) { func (l *Libvirt) NetworkSetAutostart(Net Network, Autostart int32) (err error) { var buf []byte - args := NetworkSetAutostartArgs { - Net: Net, + args := NetworkSetAutostartArgs{ + Net: Net, Autostart: Autostart, } @@ -5375,7 +5364,6 @@ func (l *Libvirt) NetworkSetAutostart(Net Network, Autostart int32) (err error) return } - _, err = l.requestStream(48, constants.Program, buf, nil, nil) if err != nil { return @@ -5388,7 +5376,7 @@ func (l *Libvirt) NetworkSetAutostart(Net Network, Autostart int32) (err error) func (l *Libvirt) NetworkUndefine(Net Network) (err error) { var buf []byte - args := NetworkUndefineArgs { + args := NetworkUndefineArgs{ Net: Net, } @@ -5397,7 +5385,6 @@ func (l *Libvirt) NetworkUndefine(Net Network) (err error) { return } - _, err = l.requestStream(49, constants.Program, buf, nil, nil) if err != nil { return @@ -5482,9 +5469,9 @@ func (l *Libvirt) ConnectNumOfNetworks() (rNum int32, err error) { func (l *Libvirt) DomainCoreDump(Dom Domain, To string, Flags DomainCoreDumpFlags) (err error) { var buf []byte - args := DomainCoreDumpArgs { - Dom: Dom, - To: To, + args := DomainCoreDumpArgs{ + Dom: Dom, + To: To, Flags: Flags, } @@ -5493,7 +5480,6 @@ func (l *Libvirt) DomainCoreDump(Dom Domain, To string, Flags DomainCoreDumpFlag return } - _, err = l.requestStream(53, constants.Program, buf, nil, nil) if err != nil { return @@ -5506,7 +5492,7 @@ func (l *Libvirt) DomainCoreDump(Dom Domain, To string, Flags DomainCoreDumpFlag func (l *Libvirt) DomainRestore(From string) (err error) { var buf []byte - args := DomainRestoreArgs { + args := DomainRestoreArgs{ From: From, } @@ -5515,7 +5501,6 @@ func (l *Libvirt) DomainRestore(From string) (err error) { return } - _, err = l.requestStream(54, constants.Program, buf, nil, nil) if err != nil { return @@ -5528,9 +5513,9 @@ func (l *Libvirt) DomainRestore(From string) (err error) { func (l *Libvirt) DomainSave(Dom Domain, To string) (err error) { var buf []byte - args := DomainSaveArgs { + args := DomainSaveArgs{ Dom: Dom, - To: To, + To: To, } buf, err = encode(&args) @@ -5538,7 +5523,6 @@ func (l *Libvirt) DomainSave(Dom Domain, To string) (err error) { return } - _, err = l.requestStream(55, constants.Program, buf, nil, nil) if err != nil { return @@ -5551,7 +5535,7 @@ func (l *Libvirt) DomainSave(Dom Domain, To string) (err error) { func (l *Libvirt) DomainGetSchedulerType(Dom Domain) (rType string, rNparams int32, err error) { var buf []byte - args := DomainGetSchedulerTypeArgs { + args := DomainGetSchedulerTypeArgs{ Dom: Dom, } @@ -5589,8 +5573,8 @@ func (l *Libvirt) DomainGetSchedulerType(Dom Domain) (rType string, rNparams int func (l *Libvirt) DomainGetSchedulerParameters(Dom Domain, Nparams int32) (rParams []TypedParam, err error) { var buf []byte - args := DomainGetSchedulerParametersArgs { - Dom: Dom, + args := DomainGetSchedulerParametersArgs{ + Dom: Dom, Nparams: Nparams, } @@ -5623,8 +5607,8 @@ func (l *Libvirt) DomainGetSchedulerParameters(Dom Domain, Nparams int32) (rPara func (l *Libvirt) DomainSetSchedulerParameters(Dom Domain, Params []TypedParam) (err error) { var buf []byte - args := DomainSetSchedulerParametersArgs { - Dom: Dom, + args := DomainSetSchedulerParametersArgs{ + Dom: Dom, Params: Params, } @@ -5633,7 +5617,6 @@ func (l *Libvirt) DomainSetSchedulerParameters(Dom Domain, Params []TypedParam) return } - _, err = l.requestStream(58, constants.Program, buf, nil, nil) if err != nil { return @@ -5670,7 +5653,7 @@ func (l *Libvirt) ConnectGetHostname() (rHostname string, err error) { func (l *Libvirt) ConnectSupportsFeature(Feature int32) (rSupported int32, err error) { var buf []byte - args := ConnectSupportsFeatureArgs { + args := ConnectSupportsFeatureArgs{ Feature: Feature, } @@ -5703,10 +5686,10 @@ func (l *Libvirt) ConnectSupportsFeature(Feature int32) (rSupported int32, err e func (l *Libvirt) DomainMigratePrepare(UriIn OptString, Flags uint64, Dname OptString, Resource uint64) (rCookie []byte, rUriOut OptString, err error) { var buf []byte - args := DomainMigratePrepareArgs { - UriIn: UriIn, - Flags: Flags, - Dname: Dname, + args := DomainMigratePrepareArgs{ + UriIn: UriIn, + Flags: Flags, + Dname: Dname, Resource: Resource, } @@ -5744,12 +5727,12 @@ func (l *Libvirt) DomainMigratePrepare(UriIn OptString, Flags uint64, Dname OptS func (l *Libvirt) DomainMigratePerform(Dom Domain, Cookie []byte, Uri string, Flags uint64, Dname OptString, Resource uint64) (err error) { var buf []byte - args := DomainMigratePerformArgs { - Dom: Dom, - Cookie: Cookie, - Uri: Uri, - Flags: Flags, - Dname: Dname, + args := DomainMigratePerformArgs{ + Dom: Dom, + Cookie: Cookie, + Uri: Uri, + Flags: Flags, + Dname: Dname, Resource: Resource, } @@ -5758,7 +5741,6 @@ func (l *Libvirt) DomainMigratePerform(Dom Domain, Cookie []byte, Uri string, Fl return } - _, err = l.requestStream(62, constants.Program, buf, nil, nil) if err != nil { return @@ -5771,11 +5753,11 @@ func (l *Libvirt) DomainMigratePerform(Dom Domain, Cookie []byte, Uri string, Fl func (l *Libvirt) DomainMigrateFinish(Dname string, Cookie []byte, Uri string, Flags uint64) (rDdom Domain, err error) { var buf []byte - args := DomainMigrateFinishArgs { - Dname: Dname, + args := DomainMigrateFinishArgs{ + Dname: Dname, Cookie: Cookie, - Uri: Uri, - Flags: Flags, + Uri: Uri, + Flags: Flags, } buf, err = encode(&args) @@ -5807,8 +5789,8 @@ func (l *Libvirt) DomainMigrateFinish(Dname string, Cookie []byte, Uri string, F func (l *Libvirt) DomainBlockStats(Dom Domain, Path string) (rRdReq int64, rRdBytes int64, rWrReq int64, rWrBytes int64, rErrs int64, err error) { var buf []byte - args := DomainBlockStatsArgs { - Dom: Dom, + args := DomainBlockStatsArgs{ + Dom: Dom, Path: Path, } @@ -5861,8 +5843,8 @@ func (l *Libvirt) DomainBlockStats(Dom Domain, Path string) (rRdReq int64, rRdBy func (l *Libvirt) DomainInterfaceStats(Dom Domain, Device string) (rRxBytes int64, rRxPackets int64, rRxErrs int64, rRxDrop int64, rTxBytes int64, rTxPackets int64, rTxErrs int64, rTxDrop int64, err error) { var buf []byte - args := DomainInterfaceStatsArgs { - Dom: Dom, + args := DomainInterfaceStatsArgs{ + Dom: Dom, Device: Device, } @@ -5978,9 +5960,9 @@ func (l *Libvirt) AuthSaslInit() (rMechlist string, err error) { func (l *Libvirt) AuthSaslStart(Mech string, Nil int32, Data []int8) (rComplete int32, rNil int32, rData []int8, err error) { var buf []byte - args := AuthSaslStartArgs { + args := AuthSaslStartArgs{ Mech: Mech, - Nil: Nil, + Nil: Nil, Data: Data, } @@ -6023,8 +6005,8 @@ func (l *Libvirt) AuthSaslStart(Mech string, Nil int32, Data []int8) (rComplete func (l *Libvirt) AuthSaslStep(Nil int32, Data []int8) (rComplete int32, rNil int32, rData []int8, err error) { var buf []byte - args := AuthSaslStepArgs { - Nil: Nil, + args := AuthSaslStepArgs{ + Nil: Nil, Data: Data, } @@ -6115,7 +6097,7 @@ func (l *Libvirt) ConnectNumOfStoragePools() (rNum int32, err error) { func (l *Libvirt) ConnectListStoragePools(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListStoragePoolsArgs { + args := ConnectListStoragePoolsArgs{ Maxnames: Maxnames, } @@ -6172,7 +6154,7 @@ func (l *Libvirt) ConnectNumOfDefinedStoragePools() (rNum int32, err error) { func (l *Libvirt) ConnectListDefinedStoragePools(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListDefinedStoragePoolsArgs { + args := ConnectListDefinedStoragePoolsArgs{ Maxnames: Maxnames, } @@ -6205,10 +6187,10 @@ func (l *Libvirt) ConnectListDefinedStoragePools(Maxnames int32) (rNames []strin func (l *Libvirt) ConnectFindStoragePoolSources(Type string, SrcSpec OptString, Flags uint32) (rXML string, err error) { var buf []byte - args := ConnectFindStoragePoolSourcesArgs { - Type: Type, + args := ConnectFindStoragePoolSourcesArgs{ + Type: Type, SrcSpec: SrcSpec, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -6240,8 +6222,8 @@ func (l *Libvirt) ConnectFindStoragePoolSources(Type string, SrcSpec OptString, func (l *Libvirt) StoragePoolCreateXML(XML string, Flags StoragePoolCreateFlags) (rPool StoragePool, err error) { var buf []byte - args := StoragePoolCreateXMLArgs { - XML: XML, + args := StoragePoolCreateXMLArgs{ + XML: XML, Flags: Flags, } @@ -6274,8 +6256,8 @@ func (l *Libvirt) StoragePoolCreateXML(XML string, Flags StoragePoolCreateFlags) func (l *Libvirt) StoragePoolDefineXML(XML string, Flags uint32) (rPool StoragePool, err error) { var buf []byte - args := StoragePoolDefineXMLArgs { - XML: XML, + args := StoragePoolDefineXMLArgs{ + XML: XML, Flags: Flags, } @@ -6308,8 +6290,8 @@ func (l *Libvirt) StoragePoolDefineXML(XML string, Flags uint32) (rPool StorageP func (l *Libvirt) StoragePoolCreate(Pool StoragePool, Flags StoragePoolCreateFlags) (err error) { var buf []byte - args := StoragePoolCreateArgs { - Pool: Pool, + args := StoragePoolCreateArgs{ + Pool: Pool, Flags: Flags, } @@ -6318,7 +6300,6 @@ func (l *Libvirt) StoragePoolCreate(Pool StoragePool, Flags StoragePoolCreateFla return } - _, err = l.requestStream(78, constants.Program, buf, nil, nil) if err != nil { return @@ -6331,8 +6312,8 @@ func (l *Libvirt) StoragePoolCreate(Pool StoragePool, Flags StoragePoolCreateFla func (l *Libvirt) StoragePoolBuild(Pool StoragePool, Flags StoragePoolBuildFlags) (err error) { var buf []byte - args := StoragePoolBuildArgs { - Pool: Pool, + args := StoragePoolBuildArgs{ + Pool: Pool, Flags: Flags, } @@ -6341,7 +6322,6 @@ func (l *Libvirt) StoragePoolBuild(Pool StoragePool, Flags StoragePoolBuildFlags return } - _, err = l.requestStream(79, constants.Program, buf, nil, nil) if err != nil { return @@ -6354,7 +6334,7 @@ func (l *Libvirt) StoragePoolBuild(Pool StoragePool, Flags StoragePoolBuildFlags func (l *Libvirt) StoragePoolDestroy(Pool StoragePool) (err error) { var buf []byte - args := StoragePoolDestroyArgs { + args := StoragePoolDestroyArgs{ Pool: Pool, } @@ -6363,7 +6343,6 @@ func (l *Libvirt) StoragePoolDestroy(Pool StoragePool) (err error) { return } - _, err = l.requestStream(80, constants.Program, buf, nil, nil) if err != nil { return @@ -6376,8 +6355,8 @@ func (l *Libvirt) StoragePoolDestroy(Pool StoragePool) (err error) { func (l *Libvirt) StoragePoolDelete(Pool StoragePool, Flags StoragePoolDeleteFlags) (err error) { var buf []byte - args := StoragePoolDeleteArgs { - Pool: Pool, + args := StoragePoolDeleteArgs{ + Pool: Pool, Flags: Flags, } @@ -6386,7 +6365,6 @@ func (l *Libvirt) StoragePoolDelete(Pool StoragePool, Flags StoragePoolDeleteFla return } - _, err = l.requestStream(81, constants.Program, buf, nil, nil) if err != nil { return @@ -6399,7 +6377,7 @@ func (l *Libvirt) StoragePoolDelete(Pool StoragePool, Flags StoragePoolDeleteFla func (l *Libvirt) StoragePoolUndefine(Pool StoragePool) (err error) { var buf []byte - args := StoragePoolUndefineArgs { + args := StoragePoolUndefineArgs{ Pool: Pool, } @@ -6408,7 +6386,6 @@ func (l *Libvirt) StoragePoolUndefine(Pool StoragePool) (err error) { return } - _, err = l.requestStream(82, constants.Program, buf, nil, nil) if err != nil { return @@ -6421,8 +6398,8 @@ func (l *Libvirt) StoragePoolUndefine(Pool StoragePool) (err error) { func (l *Libvirt) StoragePoolRefresh(Pool StoragePool, Flags uint32) (err error) { var buf []byte - args := StoragePoolRefreshArgs { - Pool: Pool, + args := StoragePoolRefreshArgs{ + Pool: Pool, Flags: Flags, } @@ -6431,7 +6408,6 @@ func (l *Libvirt) StoragePoolRefresh(Pool StoragePool, Flags uint32) (err error) return } - _, err = l.requestStream(83, constants.Program, buf, nil, nil) if err != nil { return @@ -6444,7 +6420,7 @@ func (l *Libvirt) StoragePoolRefresh(Pool StoragePool, Flags uint32) (err error) func (l *Libvirt) StoragePoolLookupByName(Name string) (rPool StoragePool, err error) { var buf []byte - args := StoragePoolLookupByNameArgs { + args := StoragePoolLookupByNameArgs{ Name: Name, } @@ -6477,7 +6453,7 @@ func (l *Libvirt) StoragePoolLookupByName(Name string) (rPool StoragePool, err e func (l *Libvirt) StoragePoolLookupByUUID(UUID UUID) (rPool StoragePool, err error) { var buf []byte - args := StoragePoolLookupByUUIDArgs { + args := StoragePoolLookupByUUIDArgs{ UUID: UUID, } @@ -6510,7 +6486,7 @@ func (l *Libvirt) StoragePoolLookupByUUID(UUID UUID) (rPool StoragePool, err err func (l *Libvirt) StoragePoolLookupByVolume(Vol StorageVol) (rPool StoragePool, err error) { var buf []byte - args := StoragePoolLookupByVolumeArgs { + args := StoragePoolLookupByVolumeArgs{ Vol: Vol, } @@ -6543,7 +6519,7 @@ func (l *Libvirt) StoragePoolLookupByVolume(Vol StorageVol) (rPool StoragePool, func (l *Libvirt) StoragePoolGetInfo(Pool StoragePool) (rState uint8, rCapacity uint64, rAllocation uint64, rAvailable uint64, err error) { var buf []byte - args := StoragePoolGetInfoArgs { + args := StoragePoolGetInfoArgs{ Pool: Pool, } @@ -6591,8 +6567,8 @@ func (l *Libvirt) StoragePoolGetInfo(Pool StoragePool) (rState uint8, rCapacity func (l *Libvirt) StoragePoolGetXMLDesc(Pool StoragePool, Flags StorageXMLFlags) (rXML string, err error) { var buf []byte - args := StoragePoolGetXMLDescArgs { - Pool: Pool, + args := StoragePoolGetXMLDescArgs{ + Pool: Pool, Flags: Flags, } @@ -6625,7 +6601,7 @@ func (l *Libvirt) StoragePoolGetXMLDesc(Pool StoragePool, Flags StorageXMLFlags) func (l *Libvirt) StoragePoolGetAutostart(Pool StoragePool) (rAutostart int32, err error) { var buf []byte - args := StoragePoolGetAutostartArgs { + args := StoragePoolGetAutostartArgs{ Pool: Pool, } @@ -6658,8 +6634,8 @@ func (l *Libvirt) StoragePoolGetAutostart(Pool StoragePool) (rAutostart int32, e func (l *Libvirt) StoragePoolSetAutostart(Pool StoragePool, Autostart int32) (err error) { var buf []byte - args := StoragePoolSetAutostartArgs { - Pool: Pool, + args := StoragePoolSetAutostartArgs{ + Pool: Pool, Autostart: Autostart, } @@ -6668,7 +6644,6 @@ func (l *Libvirt) StoragePoolSetAutostart(Pool StoragePool, Autostart int32) (er return } - _, err = l.requestStream(90, constants.Program, buf, nil, nil) if err != nil { return @@ -6681,7 +6656,7 @@ func (l *Libvirt) StoragePoolSetAutostart(Pool StoragePool, Autostart int32) (er func (l *Libvirt) StoragePoolNumOfVolumes(Pool StoragePool) (rNum int32, err error) { var buf []byte - args := StoragePoolNumOfVolumesArgs { + args := StoragePoolNumOfVolumesArgs{ Pool: Pool, } @@ -6714,8 +6689,8 @@ func (l *Libvirt) StoragePoolNumOfVolumes(Pool StoragePool) (rNum int32, err err func (l *Libvirt) StoragePoolListVolumes(Pool StoragePool, Maxnames int32) (rNames []string, err error) { var buf []byte - args := StoragePoolListVolumesArgs { - Pool: Pool, + args := StoragePoolListVolumesArgs{ + Pool: Pool, Maxnames: Maxnames, } @@ -6748,9 +6723,9 @@ func (l *Libvirt) StoragePoolListVolumes(Pool StoragePool, Maxnames int32) (rNam func (l *Libvirt) StorageVolCreateXML(Pool StoragePool, XML string, Flags StorageVolCreateFlags) (rVol StorageVol, err error) { var buf []byte - args := StorageVolCreateXMLArgs { - Pool: Pool, - XML: XML, + args := StorageVolCreateXMLArgs{ + Pool: Pool, + XML: XML, Flags: Flags, } @@ -6783,8 +6758,8 @@ func (l *Libvirt) StorageVolCreateXML(Pool StoragePool, XML string, Flags Storag func (l *Libvirt) StorageVolDelete(Vol StorageVol, Flags StorageVolDeleteFlags) (err error) { var buf []byte - args := StorageVolDeleteArgs { - Vol: Vol, + args := StorageVolDeleteArgs{ + Vol: Vol, Flags: Flags, } @@ -6793,7 +6768,6 @@ func (l *Libvirt) StorageVolDelete(Vol StorageVol, Flags StorageVolDeleteFlags) return } - _, err = l.requestStream(94, constants.Program, buf, nil, nil) if err != nil { return @@ -6806,7 +6780,7 @@ func (l *Libvirt) StorageVolDelete(Vol StorageVol, Flags StorageVolDeleteFlags) func (l *Libvirt) StorageVolLookupByName(Pool StoragePool, Name string) (rVol StorageVol, err error) { var buf []byte - args := StorageVolLookupByNameArgs { + args := StorageVolLookupByNameArgs{ Pool: Pool, Name: Name, } @@ -6840,7 +6814,7 @@ func (l *Libvirt) StorageVolLookupByName(Pool StoragePool, Name string) (rVol St func (l *Libvirt) StorageVolLookupByKey(Key string) (rVol StorageVol, err error) { var buf []byte - args := StorageVolLookupByKeyArgs { + args := StorageVolLookupByKeyArgs{ Key: Key, } @@ -6873,7 +6847,7 @@ func (l *Libvirt) StorageVolLookupByKey(Key string) (rVol StorageVol, err error) func (l *Libvirt) StorageVolLookupByPath(Path string) (rVol StorageVol, err error) { var buf []byte - args := StorageVolLookupByPathArgs { + args := StorageVolLookupByPathArgs{ Path: Path, } @@ -6906,7 +6880,7 @@ func (l *Libvirt) StorageVolLookupByPath(Path string) (rVol StorageVol, err erro func (l *Libvirt) StorageVolGetInfo(Vol StorageVol) (rType int8, rCapacity uint64, rAllocation uint64, err error) { var buf []byte - args := StorageVolGetInfoArgs { + args := StorageVolGetInfoArgs{ Vol: Vol, } @@ -6949,8 +6923,8 @@ func (l *Libvirt) StorageVolGetInfo(Vol StorageVol) (rType int8, rCapacity uint6 func (l *Libvirt) StorageVolGetXMLDesc(Vol StorageVol, Flags uint32) (rXML string, err error) { var buf []byte - args := StorageVolGetXMLDescArgs { - Vol: Vol, + args := StorageVolGetXMLDescArgs{ + Vol: Vol, Flags: Flags, } @@ -6983,7 +6957,7 @@ func (l *Libvirt) StorageVolGetXMLDesc(Vol StorageVol, Flags uint32) (rXML strin func (l *Libvirt) StorageVolGetPath(Vol StorageVol) (rName string, err error) { var buf []byte - args := StorageVolGetPathArgs { + args := StorageVolGetPathArgs{ Vol: Vol, } @@ -7016,9 +6990,9 @@ func (l *Libvirt) StorageVolGetPath(Vol StorageVol) (rName string, err error) { func (l *Libvirt) NodeGetCellsFreeMemory(StartCell int32, Maxcells int32) (rCells []uint64, err error) { var buf []byte - args := NodeGetCellsFreeMemoryArgs { + args := NodeGetCellsFreeMemoryArgs{ StartCell: StartCell, - Maxcells: Maxcells, + Maxcells: Maxcells, } buf, err = encode(&args) @@ -7074,12 +7048,12 @@ func (l *Libvirt) NodeGetFreeMemory() (rFreeMem uint64, err error) { func (l *Libvirt) DomainBlockPeek(Dom Domain, Path string, Offset uint64, Size uint32, Flags uint32) (rBuffer []byte, err error) { var buf []byte - args := DomainBlockPeekArgs { - Dom: Dom, - Path: Path, + args := DomainBlockPeekArgs{ + Dom: Dom, + Path: Path, Offset: Offset, - Size: Size, - Flags: Flags, + Size: Size, + Flags: Flags, } buf, err = encode(&args) @@ -7111,11 +7085,11 @@ func (l *Libvirt) DomainBlockPeek(Dom Domain, Path string, Offset uint64, Size u func (l *Libvirt) DomainMemoryPeek(Dom Domain, Offset uint64, Size uint32, Flags DomainMemoryFlags) (rBuffer []byte, err error) { var buf []byte - args := DomainMemoryPeekArgs { - Dom: Dom, + args := DomainMemoryPeekArgs{ + Dom: Dom, Offset: Offset, - Size: Size, - Flags: Flags, + Size: Size, + Flags: Flags, } buf, err = encode(&args) @@ -7195,7 +7169,6 @@ func (l *Libvirt) ConnectDomainEventDeregister() (rCbRegistered int32, err error func (l *Libvirt) DomainEventLifecycle() (err error) { var buf []byte - _, err = l.requestStream(107, constants.Program, buf, nil, nil) if err != nil { return @@ -7208,12 +7181,12 @@ func (l *Libvirt) DomainEventLifecycle() (err error) { func (l *Libvirt) DomainMigratePrepare2(UriIn OptString, Flags uint64, Dname OptString, Resource uint64, DomXML string) (rCookie []byte, rUriOut OptString, err error) { var buf []byte - args := DomainMigratePrepare2Args { - UriIn: UriIn, - Flags: Flags, - Dname: Dname, + args := DomainMigratePrepare2Args{ + UriIn: UriIn, + Flags: Flags, + Dname: Dname, Resource: Resource, - DomXML: DomXML, + DomXML: DomXML, } buf, err = encode(&args) @@ -7250,11 +7223,11 @@ func (l *Libvirt) DomainMigratePrepare2(UriIn OptString, Flags uint64, Dname Opt func (l *Libvirt) DomainMigrateFinish2(Dname string, Cookie []byte, Uri string, Flags uint64, Retcode int32) (rDdom Domain, err error) { var buf []byte - args := DomainMigrateFinish2Args { - Dname: Dname, - Cookie: Cookie, - Uri: Uri, - Flags: Flags, + args := DomainMigrateFinish2Args{ + Dname: Dname, + Cookie: Cookie, + Uri: Uri, + Flags: Flags, Retcode: Retcode, } @@ -7311,8 +7284,8 @@ func (l *Libvirt) ConnectGetUri() (rUri string, err error) { func (l *Libvirt) NodeNumOfDevices(Cap OptString, Flags uint32) (rNum int32, err error) { var buf []byte - args := NodeNumOfDevicesArgs { - Cap: Cap, + args := NodeNumOfDevicesArgs{ + Cap: Cap, Flags: Flags, } @@ -7345,10 +7318,10 @@ func (l *Libvirt) NodeNumOfDevices(Cap OptString, Flags uint32) (rNum int32, err func (l *Libvirt) NodeListDevices(Cap OptString, Maxnames int32, Flags uint32) (rNames []string, err error) { var buf []byte - args := NodeListDevicesArgs { - Cap: Cap, + args := NodeListDevicesArgs{ + Cap: Cap, Maxnames: Maxnames, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -7380,7 +7353,7 @@ func (l *Libvirt) NodeListDevices(Cap OptString, Maxnames int32, Flags uint32) ( func (l *Libvirt) NodeDeviceLookupByName(Name string) (rDev NodeDevice, err error) { var buf []byte - args := NodeDeviceLookupByNameArgs { + args := NodeDeviceLookupByNameArgs{ Name: Name, } @@ -7413,8 +7386,8 @@ func (l *Libvirt) NodeDeviceLookupByName(Name string) (rDev NodeDevice, err erro func (l *Libvirt) NodeDeviceGetXMLDesc(Name string, Flags uint32) (rXML string, err error) { var buf []byte - args := NodeDeviceGetXMLDescArgs { - Name: Name, + args := NodeDeviceGetXMLDescArgs{ + Name: Name, Flags: Flags, } @@ -7447,7 +7420,7 @@ func (l *Libvirt) NodeDeviceGetXMLDesc(Name string, Flags uint32) (rXML string, func (l *Libvirt) NodeDeviceGetParent(Name string) (rParentName OptString, err error) { var buf []byte - args := NodeDeviceGetParentArgs { + args := NodeDeviceGetParentArgs{ Name: Name, } @@ -7480,7 +7453,7 @@ func (l *Libvirt) NodeDeviceGetParent(Name string) (rParentName OptString, err e func (l *Libvirt) NodeDeviceNumOfCaps(Name string) (rNum int32, err error) { var buf []byte - args := NodeDeviceNumOfCapsArgs { + args := NodeDeviceNumOfCapsArgs{ Name: Name, } @@ -7513,8 +7486,8 @@ func (l *Libvirt) NodeDeviceNumOfCaps(Name string) (rNum int32, err error) { func (l *Libvirt) NodeDeviceListCaps(Name string, Maxnames int32) (rNames []string, err error) { var buf []byte - args := NodeDeviceListCapsArgs { - Name: Name, + args := NodeDeviceListCapsArgs{ + Name: Name, Maxnames: Maxnames, } @@ -7547,7 +7520,7 @@ func (l *Libvirt) NodeDeviceListCaps(Name string, Maxnames int32) (rNames []stri func (l *Libvirt) NodeDeviceDettach(Name string) (err error) { var buf []byte - args := NodeDeviceDettachArgs { + args := NodeDeviceDettachArgs{ Name: Name, } @@ -7556,7 +7529,6 @@ func (l *Libvirt) NodeDeviceDettach(Name string) (err error) { return } - _, err = l.requestStream(118, constants.Program, buf, nil, nil) if err != nil { return @@ -7569,7 +7541,7 @@ func (l *Libvirt) NodeDeviceDettach(Name string) (err error) { func (l *Libvirt) NodeDeviceReAttach(Name string) (err error) { var buf []byte - args := NodeDeviceReAttachArgs { + args := NodeDeviceReAttachArgs{ Name: Name, } @@ -7578,7 +7550,6 @@ func (l *Libvirt) NodeDeviceReAttach(Name string) (err error) { return } - _, err = l.requestStream(119, constants.Program, buf, nil, nil) if err != nil { return @@ -7591,7 +7562,7 @@ func (l *Libvirt) NodeDeviceReAttach(Name string) (err error) { func (l *Libvirt) NodeDeviceReset(Name string) (err error) { var buf []byte - args := NodeDeviceResetArgs { + args := NodeDeviceResetArgs{ Name: Name, } @@ -7600,7 +7571,6 @@ func (l *Libvirt) NodeDeviceReset(Name string) (err error) { return } - _, err = l.requestStream(120, constants.Program, buf, nil, nil) if err != nil { return @@ -7613,7 +7583,7 @@ func (l *Libvirt) NodeDeviceReset(Name string) (err error) { func (l *Libvirt) DomainGetSecurityLabel(Dom Domain) (rLabel []int8, rEnforcing int32, err error) { var buf []byte - args := DomainGetSecurityLabelArgs { + args := DomainGetSecurityLabelArgs{ Dom: Dom, } @@ -7680,9 +7650,9 @@ func (l *Libvirt) NodeGetSecurityModel() (rModel []int8, rDoi []int8, err error) func (l *Libvirt) NodeDeviceCreateXML(XMLDesc string, Flags uint32) (rDev NodeDevice, err error) { var buf []byte - args := NodeDeviceCreateXMLArgs { + args := NodeDeviceCreateXMLArgs{ XMLDesc: XMLDesc, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -7714,7 +7684,7 @@ func (l *Libvirt) NodeDeviceCreateXML(XMLDesc string, Flags uint32) (rDev NodeDe func (l *Libvirt) NodeDeviceDestroy(Name string) (err error) { var buf []byte - args := NodeDeviceDestroyArgs { + args := NodeDeviceDestroyArgs{ Name: Name, } @@ -7723,7 +7693,6 @@ func (l *Libvirt) NodeDeviceDestroy(Name string) (err error) { return } - _, err = l.requestStream(124, constants.Program, buf, nil, nil) if err != nil { return @@ -7736,11 +7705,11 @@ func (l *Libvirt) NodeDeviceDestroy(Name string) (err error) { func (l *Libvirt) StorageVolCreateXMLFrom(Pool StoragePool, XML string, Clonevol StorageVol, Flags StorageVolCreateFlags) (rVol StorageVol, err error) { var buf []byte - args := StorageVolCreateXMLFromArgs { - Pool: Pool, - XML: XML, + args := StorageVolCreateXMLFromArgs{ + Pool: Pool, + XML: XML, Clonevol: Clonevol, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -7796,7 +7765,7 @@ func (l *Libvirt) ConnectNumOfInterfaces() (rNum int32, err error) { func (l *Libvirt) ConnectListInterfaces(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListInterfacesArgs { + args := ConnectListInterfacesArgs{ Maxnames: Maxnames, } @@ -7829,7 +7798,7 @@ func (l *Libvirt) ConnectListInterfaces(Maxnames int32) (rNames []string, err er func (l *Libvirt) InterfaceLookupByName(Name string) (rIface Interface, err error) { var buf []byte - args := InterfaceLookupByNameArgs { + args := InterfaceLookupByNameArgs{ Name: Name, } @@ -7862,7 +7831,7 @@ func (l *Libvirt) InterfaceLookupByName(Name string) (rIface Interface, err erro func (l *Libvirt) InterfaceLookupByMacString(Mac string) (rIface Interface, err error) { var buf []byte - args := InterfaceLookupByMacStringArgs { + args := InterfaceLookupByMacStringArgs{ Mac: Mac, } @@ -7895,7 +7864,7 @@ func (l *Libvirt) InterfaceLookupByMacString(Mac string) (rIface Interface, err func (l *Libvirt) InterfaceGetXMLDesc(Iface Interface, Flags uint32) (rXML string, err error) { var buf []byte - args := InterfaceGetXMLDescArgs { + args := InterfaceGetXMLDescArgs{ Iface: Iface, Flags: Flags, } @@ -7929,8 +7898,8 @@ func (l *Libvirt) InterfaceGetXMLDesc(Iface Interface, Flags uint32) (rXML strin func (l *Libvirt) InterfaceDefineXML(XML string, Flags uint32) (rIface Interface, err error) { var buf []byte - args := InterfaceDefineXMLArgs { - XML: XML, + args := InterfaceDefineXMLArgs{ + XML: XML, Flags: Flags, } @@ -7963,7 +7932,7 @@ func (l *Libvirt) InterfaceDefineXML(XML string, Flags uint32) (rIface Interface func (l *Libvirt) InterfaceUndefine(Iface Interface) (err error) { var buf []byte - args := InterfaceUndefineArgs { + args := InterfaceUndefineArgs{ Iface: Iface, } @@ -7972,7 +7941,6 @@ func (l *Libvirt) InterfaceUndefine(Iface Interface) (err error) { return } - _, err = l.requestStream(132, constants.Program, buf, nil, nil) if err != nil { return @@ -7985,7 +7953,7 @@ func (l *Libvirt) InterfaceUndefine(Iface Interface) (err error) { func (l *Libvirt) InterfaceCreate(Iface Interface, Flags uint32) (err error) { var buf []byte - args := InterfaceCreateArgs { + args := InterfaceCreateArgs{ Iface: Iface, Flags: Flags, } @@ -7995,7 +7963,6 @@ func (l *Libvirt) InterfaceCreate(Iface Interface, Flags uint32) (err error) { return } - _, err = l.requestStream(133, constants.Program, buf, nil, nil) if err != nil { return @@ -8008,7 +7975,7 @@ func (l *Libvirt) InterfaceCreate(Iface Interface, Flags uint32) (err error) { func (l *Libvirt) InterfaceDestroy(Iface Interface, Flags uint32) (err error) { var buf []byte - args := InterfaceDestroyArgs { + args := InterfaceDestroyArgs{ Iface: Iface, Flags: Flags, } @@ -8018,7 +7985,6 @@ func (l *Libvirt) InterfaceDestroy(Iface Interface, Flags uint32) (err error) { return } - _, err = l.requestStream(134, constants.Program, buf, nil, nil) if err != nil { return @@ -8031,10 +7997,10 @@ func (l *Libvirt) InterfaceDestroy(Iface Interface, Flags uint32) (err error) { func (l *Libvirt) ConnectDomainXMLFromNative(NativeFormat string, NativeConfig string, Flags uint32) (rDomainXML string, err error) { var buf []byte - args := ConnectDomainXMLFromNativeArgs { + args := ConnectDomainXMLFromNativeArgs{ NativeFormat: NativeFormat, NativeConfig: NativeConfig, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -8066,10 +8032,10 @@ func (l *Libvirt) ConnectDomainXMLFromNative(NativeFormat string, NativeConfig s func (l *Libvirt) ConnectDomainXMLToNative(NativeFormat string, DomainXML string, Flags uint32) (rNativeConfig string, err error) { var buf []byte - args := ConnectDomainXMLToNativeArgs { + args := ConnectDomainXMLToNativeArgs{ NativeFormat: NativeFormat, - DomainXML: DomainXML, - Flags: Flags, + DomainXML: DomainXML, + Flags: Flags, } buf, err = encode(&args) @@ -8125,7 +8091,7 @@ func (l *Libvirt) ConnectNumOfDefinedInterfaces() (rNum int32, err error) { func (l *Libvirt) ConnectListDefinedInterfaces(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListDefinedInterfacesArgs { + args := ConnectListDefinedInterfacesArgs{ Maxnames: Maxnames, } @@ -8182,7 +8148,7 @@ func (l *Libvirt) ConnectNumOfSecrets() (rNum int32, err error) { func (l *Libvirt) ConnectListSecrets(Maxuuids int32) (rUuids []string, err error) { var buf []byte - args := ConnectListSecretsArgs { + args := ConnectListSecretsArgs{ Maxuuids: Maxuuids, } @@ -8215,7 +8181,7 @@ func (l *Libvirt) ConnectListSecrets(Maxuuids int32) (rUuids []string, err error func (l *Libvirt) SecretLookupByUUID(UUID UUID) (rOptSecret Secret, err error) { var buf []byte - args := SecretLookupByUUIDArgs { + args := SecretLookupByUUIDArgs{ UUID: UUID, } @@ -8248,8 +8214,8 @@ func (l *Libvirt) SecretLookupByUUID(UUID UUID) (rOptSecret Secret, err error) { func (l *Libvirt) SecretDefineXML(XML string, Flags uint32) (rOptSecret Secret, err error) { var buf []byte - args := SecretDefineXMLArgs { - XML: XML, + args := SecretDefineXMLArgs{ + XML: XML, Flags: Flags, } @@ -8282,9 +8248,9 @@ func (l *Libvirt) SecretDefineXML(XML string, Flags uint32) (rOptSecret Secret, func (l *Libvirt) SecretGetXMLDesc(OptSecret Secret, Flags uint32) (rXML string, err error) { var buf []byte - args := SecretGetXMLDescArgs { + args := SecretGetXMLDescArgs{ OptSecret: OptSecret, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -8316,10 +8282,10 @@ func (l *Libvirt) SecretGetXMLDesc(OptSecret Secret, Flags uint32) (rXML string, func (l *Libvirt) SecretSetValue(OptSecret Secret, Value []byte, Flags uint32) (err error) { var buf []byte - args := SecretSetValueArgs { + args := SecretSetValueArgs{ OptSecret: OptSecret, - Value: Value, - Flags: Flags, + Value: Value, + Flags: Flags, } buf, err = encode(&args) @@ -8327,7 +8293,6 @@ func (l *Libvirt) SecretSetValue(OptSecret Secret, Value []byte, Flags uint32) ( return } - _, err = l.requestStream(144, constants.Program, buf, nil, nil) if err != nil { return @@ -8340,9 +8305,9 @@ func (l *Libvirt) SecretSetValue(OptSecret Secret, Value []byte, Flags uint32) ( func (l *Libvirt) SecretGetValue(OptSecret Secret, Flags uint32) (rValue []byte, err error) { var buf []byte - args := SecretGetValueArgs { + args := SecretGetValueArgs{ OptSecret: OptSecret, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -8374,7 +8339,7 @@ func (l *Libvirt) SecretGetValue(OptSecret Secret, Flags uint32) (rValue []byte, func (l *Libvirt) SecretUndefine(OptSecret Secret) (err error) { var buf []byte - args := SecretUndefineArgs { + args := SecretUndefineArgs{ OptSecret: OptSecret, } @@ -8383,7 +8348,6 @@ func (l *Libvirt) SecretUndefine(OptSecret Secret) (err error) { return } - _, err = l.requestStream(146, constants.Program, buf, nil, nil) if err != nil { return @@ -8396,9 +8360,9 @@ func (l *Libvirt) SecretUndefine(OptSecret Secret) (err error) { func (l *Libvirt) SecretLookupByUsage(UsageType int32, UsageID string) (rOptSecret Secret, err error) { var buf []byte - args := SecretLookupByUsageArgs { + args := SecretLookupByUsageArgs{ UsageType: UsageType, - UsageID: UsageID, + UsageID: UsageID, } buf, err = encode(&args) @@ -8430,11 +8394,11 @@ func (l *Libvirt) SecretLookupByUsage(UsageType int32, UsageID string) (rOptSecr func (l *Libvirt) DomainMigratePrepareTunnel(Flags uint64, outStream io.Reader, Dname OptString, Resource uint64, DomXML string) (err error) { var buf []byte - args := DomainMigratePrepareTunnelArgs { - Flags: Flags, - Dname: Dname, + args := DomainMigratePrepareTunnelArgs{ + Flags: Flags, + Dname: Dname, Resource: Resource, - DomXML: DomXML, + DomXML: DomXML, } buf, err = encode(&args) @@ -8442,7 +8406,6 @@ func (l *Libvirt) DomainMigratePrepareTunnel(Flags uint64, outStream io.Reader, return } - _, err = l.requestStream(148, constants.Program, buf, outStream, nil) if err != nil { return @@ -8479,7 +8442,7 @@ func (l *Libvirt) ConnectIsSecure() (rSecure int32, err error) { func (l *Libvirt) DomainIsActive(Dom Domain) (rActive int32, err error) { var buf []byte - args := DomainIsActiveArgs { + args := DomainIsActiveArgs{ Dom: Dom, } @@ -8512,7 +8475,7 @@ func (l *Libvirt) DomainIsActive(Dom Domain) (rActive int32, err error) { func (l *Libvirt) DomainIsPersistent(Dom Domain) (rPersistent int32, err error) { var buf []byte - args := DomainIsPersistentArgs { + args := DomainIsPersistentArgs{ Dom: Dom, } @@ -8545,7 +8508,7 @@ func (l *Libvirt) DomainIsPersistent(Dom Domain) (rPersistent int32, err error) func (l *Libvirt) NetworkIsActive(Net Network) (rActive int32, err error) { var buf []byte - args := NetworkIsActiveArgs { + args := NetworkIsActiveArgs{ Net: Net, } @@ -8578,7 +8541,7 @@ func (l *Libvirt) NetworkIsActive(Net Network) (rActive int32, err error) { func (l *Libvirt) NetworkIsPersistent(Net Network) (rPersistent int32, err error) { var buf []byte - args := NetworkIsPersistentArgs { + args := NetworkIsPersistentArgs{ Net: Net, } @@ -8611,7 +8574,7 @@ func (l *Libvirt) NetworkIsPersistent(Net Network) (rPersistent int32, err error func (l *Libvirt) StoragePoolIsActive(Pool StoragePool) (rActive int32, err error) { var buf []byte - args := StoragePoolIsActiveArgs { + args := StoragePoolIsActiveArgs{ Pool: Pool, } @@ -8644,7 +8607,7 @@ func (l *Libvirt) StoragePoolIsActive(Pool StoragePool) (rActive int32, err erro func (l *Libvirt) StoragePoolIsPersistent(Pool StoragePool) (rPersistent int32, err error) { var buf []byte - args := StoragePoolIsPersistentArgs { + args := StoragePoolIsPersistentArgs{ Pool: Pool, } @@ -8677,7 +8640,7 @@ func (l *Libvirt) StoragePoolIsPersistent(Pool StoragePool) (rPersistent int32, func (l *Libvirt) InterfaceIsActive(Iface Interface) (rActive int32, err error) { var buf []byte - args := InterfaceIsActiveArgs { + args := InterfaceIsActiveArgs{ Iface: Iface, } @@ -8734,8 +8697,8 @@ func (l *Libvirt) ConnectGetLibVersion() (rLibVer uint64, err error) { func (l *Libvirt) ConnectCompareCPU(XML string, Flags ConnectCompareCPUFlags) (rResult int32, err error) { var buf []byte - args := ConnectCompareCPUArgs { - XML: XML, + args := ConnectCompareCPUArgs{ + XML: XML, Flags: Flags, } @@ -8768,10 +8731,10 @@ func (l *Libvirt) ConnectCompareCPU(XML string, Flags ConnectCompareCPUFlags) (r func (l *Libvirt) DomainMemoryStats(Dom Domain, MaxStats uint32, Flags uint32) (rStats []DomainMemoryStat, err error) { var buf []byte - args := DomainMemoryStatsArgs { - Dom: Dom, + args := DomainMemoryStatsArgs{ + Dom: Dom, MaxStats: MaxStats, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -8803,9 +8766,9 @@ func (l *Libvirt) DomainMemoryStats(Dom Domain, MaxStats uint32, Flags uint32) ( func (l *Libvirt) DomainAttachDeviceFlags(Dom Domain, XML string, Flags uint32) (err error) { var buf []byte - args := DomainAttachDeviceFlagsArgs { - Dom: Dom, - XML: XML, + args := DomainAttachDeviceFlagsArgs{ + Dom: Dom, + XML: XML, Flags: Flags, } @@ -8814,7 +8777,6 @@ func (l *Libvirt) DomainAttachDeviceFlags(Dom Domain, XML string, Flags uint32) return } - _, err = l.requestStream(160, constants.Program, buf, nil, nil) if err != nil { return @@ -8827,9 +8789,9 @@ func (l *Libvirt) DomainAttachDeviceFlags(Dom Domain, XML string, Flags uint32) func (l *Libvirt) DomainDetachDeviceFlags(Dom Domain, XML string, Flags uint32) (err error) { var buf []byte - args := DomainDetachDeviceFlagsArgs { - Dom: Dom, - XML: XML, + args := DomainDetachDeviceFlagsArgs{ + Dom: Dom, + XML: XML, Flags: Flags, } @@ -8838,7 +8800,6 @@ func (l *Libvirt) DomainDetachDeviceFlags(Dom Domain, XML string, Flags uint32) return } - _, err = l.requestStream(161, constants.Program, buf, nil, nil) if err != nil { return @@ -8851,9 +8812,9 @@ func (l *Libvirt) DomainDetachDeviceFlags(Dom Domain, XML string, Flags uint32) func (l *Libvirt) ConnectBaselineCPU(XMLCPUs []string, Flags ConnectBaselineCPUFlags) (rCPU string, err error) { var buf []byte - args := ConnectBaselineCPUArgs { + args := ConnectBaselineCPUArgs{ XMLCPUs: XMLCPUs, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -8885,7 +8846,7 @@ func (l *Libvirt) ConnectBaselineCPU(XMLCPUs []string, Flags ConnectBaselineCPUF func (l *Libvirt) DomainGetJobInfo(Dom Domain) (rType int32, rTimeElapsed uint64, rTimeRemaining uint64, rDataTotal uint64, rDataProcessed uint64, rDataRemaining uint64, rMemTotal uint64, rMemProcessed uint64, rMemRemaining uint64, rFileTotal uint64, rFileProcessed uint64, rFileRemaining uint64, err error) { var buf []byte - args := DomainGetJobInfoArgs { + args := DomainGetJobInfoArgs{ Dom: Dom, } @@ -8973,7 +8934,7 @@ func (l *Libvirt) DomainGetJobInfo(Dom Domain) (rType int32, rTimeElapsed uint64 func (l *Libvirt) DomainAbortJob(Dom Domain) (err error) { var buf []byte - args := DomainAbortJobArgs { + args := DomainAbortJobArgs{ Dom: Dom, } @@ -8982,7 +8943,6 @@ func (l *Libvirt) DomainAbortJob(Dom Domain) (err error) { return } - _, err = l.requestStream(164, constants.Program, buf, nil, nil) if err != nil { return @@ -8995,8 +8955,8 @@ func (l *Libvirt) DomainAbortJob(Dom Domain) (err error) { func (l *Libvirt) StorageVolWipe(Vol StorageVol, Flags uint32) (err error) { var buf []byte - args := StorageVolWipeArgs { - Vol: Vol, + args := StorageVolWipeArgs{ + Vol: Vol, Flags: Flags, } @@ -9005,7 +8965,6 @@ func (l *Libvirt) StorageVolWipe(Vol StorageVol, Flags uint32) (err error) { return } - _, err = l.requestStream(165, constants.Program, buf, nil, nil) if err != nil { return @@ -9018,10 +8977,10 @@ func (l *Libvirt) StorageVolWipe(Vol StorageVol, Flags uint32) (err error) { func (l *Libvirt) DomainMigrateSetMaxDowntime(Dom Domain, Downtime uint64, Flags uint32) (err error) { var buf []byte - args := DomainMigrateSetMaxDowntimeArgs { - Dom: Dom, + args := DomainMigrateSetMaxDowntimeArgs{ + Dom: Dom, Downtime: Downtime, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9029,7 +8988,6 @@ func (l *Libvirt) DomainMigrateSetMaxDowntime(Dom Domain, Downtime uint64, Flags return } - _, err = l.requestStream(166, constants.Program, buf, nil, nil) if err != nil { return @@ -9042,7 +9000,7 @@ func (l *Libvirt) DomainMigrateSetMaxDowntime(Dom Domain, Downtime uint64, Flags func (l *Libvirt) ConnectDomainEventRegisterAny(EventID int32) (err error) { var buf []byte - args := ConnectDomainEventRegisterAnyArgs { + args := ConnectDomainEventRegisterAnyArgs{ EventID: EventID, } @@ -9051,7 +9009,6 @@ func (l *Libvirt) ConnectDomainEventRegisterAny(EventID int32) (err error) { return } - _, err = l.requestStream(167, constants.Program, buf, nil, nil) if err != nil { return @@ -9064,7 +9021,7 @@ func (l *Libvirt) ConnectDomainEventRegisterAny(EventID int32) (err error) { func (l *Libvirt) ConnectDomainEventDeregisterAny(EventID int32) (err error) { var buf []byte - args := ConnectDomainEventDeregisterAnyArgs { + args := ConnectDomainEventDeregisterAnyArgs{ EventID: EventID, } @@ -9073,7 +9030,6 @@ func (l *Libvirt) ConnectDomainEventDeregisterAny(EventID int32) (err error) { return } - _, err = l.requestStream(168, constants.Program, buf, nil, nil) if err != nil { return @@ -9086,7 +9042,6 @@ func (l *Libvirt) ConnectDomainEventDeregisterAny(EventID int32) (err error) { func (l *Libvirt) DomainEventReboot() (err error) { var buf []byte - _, err = l.requestStream(169, constants.Program, buf, nil, nil) if err != nil { return @@ -9099,7 +9054,6 @@ func (l *Libvirt) DomainEventReboot() (err error) { func (l *Libvirt) DomainEventRtcChange() (err error) { var buf []byte - _, err = l.requestStream(170, constants.Program, buf, nil, nil) if err != nil { return @@ -9112,7 +9066,6 @@ func (l *Libvirt) DomainEventRtcChange() (err error) { func (l *Libvirt) DomainEventWatchdog() (err error) { var buf []byte - _, err = l.requestStream(171, constants.Program, buf, nil, nil) if err != nil { return @@ -9125,7 +9078,6 @@ func (l *Libvirt) DomainEventWatchdog() (err error) { func (l *Libvirt) DomainEventIOError() (err error) { var buf []byte - _, err = l.requestStream(172, constants.Program, buf, nil, nil) if err != nil { return @@ -9138,7 +9090,6 @@ func (l *Libvirt) DomainEventIOError() (err error) { func (l *Libvirt) DomainEventGraphics() (err error) { var buf []byte - _, err = l.requestStream(173, constants.Program, buf, nil, nil) if err != nil { return @@ -9151,9 +9102,9 @@ func (l *Libvirt) DomainEventGraphics() (err error) { func (l *Libvirt) DomainUpdateDeviceFlags(Dom Domain, XML string, Flags DomainDeviceModifyFlags) (err error) { var buf []byte - args := DomainUpdateDeviceFlagsArgs { - Dom: Dom, - XML: XML, + args := DomainUpdateDeviceFlagsArgs{ + Dom: Dom, + XML: XML, Flags: Flags, } @@ -9162,7 +9113,6 @@ func (l *Libvirt) DomainUpdateDeviceFlags(Dom Domain, XML string, Flags DomainDe return } - _, err = l.requestStream(174, constants.Program, buf, nil, nil) if err != nil { return @@ -9175,7 +9125,7 @@ func (l *Libvirt) DomainUpdateDeviceFlags(Dom Domain, XML string, Flags DomainDe func (l *Libvirt) NwfilterLookupByName(Name string) (rOptNwfilter Nwfilter, err error) { var buf []byte - args := NwfilterLookupByNameArgs { + args := NwfilterLookupByNameArgs{ Name: Name, } @@ -9208,7 +9158,7 @@ func (l *Libvirt) NwfilterLookupByName(Name string) (rOptNwfilter Nwfilter, err func (l *Libvirt) NwfilterLookupByUUID(UUID UUID) (rOptNwfilter Nwfilter, err error) { var buf []byte - args := NwfilterLookupByUUIDArgs { + args := NwfilterLookupByUUIDArgs{ UUID: UUID, } @@ -9241,9 +9191,9 @@ func (l *Libvirt) NwfilterLookupByUUID(UUID UUID) (rOptNwfilter Nwfilter, err er func (l *Libvirt) NwfilterGetXMLDesc(OptNwfilter Nwfilter, Flags uint32) (rXML string, err error) { var buf []byte - args := NwfilterGetXMLDescArgs { + args := NwfilterGetXMLDescArgs{ OptNwfilter: OptNwfilter, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9299,7 +9249,7 @@ func (l *Libvirt) ConnectNumOfNwfilters() (rNum int32, err error) { func (l *Libvirt) ConnectListNwfilters(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListNwfiltersArgs { + args := ConnectListNwfiltersArgs{ Maxnames: Maxnames, } @@ -9332,7 +9282,7 @@ func (l *Libvirt) ConnectListNwfilters(Maxnames int32) (rNames []string, err err func (l *Libvirt) NwfilterDefineXML(XML string) (rOptNwfilter Nwfilter, err error) { var buf []byte - args := NwfilterDefineXMLArgs { + args := NwfilterDefineXMLArgs{ XML: XML, } @@ -9365,7 +9315,7 @@ func (l *Libvirt) NwfilterDefineXML(XML string) (rOptNwfilter Nwfilter, err erro func (l *Libvirt) NwfilterUndefine(OptNwfilter Nwfilter) (err error) { var buf []byte - args := NwfilterUndefineArgs { + args := NwfilterUndefineArgs{ OptNwfilter: OptNwfilter, } @@ -9374,7 +9324,6 @@ func (l *Libvirt) NwfilterUndefine(OptNwfilter Nwfilter) (err error) { return } - _, err = l.requestStream(181, constants.Program, buf, nil, nil) if err != nil { return @@ -9387,8 +9336,8 @@ func (l *Libvirt) NwfilterUndefine(OptNwfilter Nwfilter) (err error) { func (l *Libvirt) DomainManagedSave(Dom Domain, Flags uint32) (err error) { var buf []byte - args := DomainManagedSaveArgs { - Dom: Dom, + args := DomainManagedSaveArgs{ + Dom: Dom, Flags: Flags, } @@ -9397,7 +9346,6 @@ func (l *Libvirt) DomainManagedSave(Dom Domain, Flags uint32) (err error) { return } - _, err = l.requestStream(182, constants.Program, buf, nil, nil) if err != nil { return @@ -9410,8 +9358,8 @@ func (l *Libvirt) DomainManagedSave(Dom Domain, Flags uint32) (err error) { func (l *Libvirt) DomainHasManagedSaveImage(Dom Domain, Flags uint32) (rResult int32, err error) { var buf []byte - args := DomainHasManagedSaveImageArgs { - Dom: Dom, + args := DomainHasManagedSaveImageArgs{ + Dom: Dom, Flags: Flags, } @@ -9444,8 +9392,8 @@ func (l *Libvirt) DomainHasManagedSaveImage(Dom Domain, Flags uint32) (rResult i func (l *Libvirt) DomainManagedSaveRemove(Dom Domain, Flags uint32) (err error) { var buf []byte - args := DomainManagedSaveRemoveArgs { - Dom: Dom, + args := DomainManagedSaveRemoveArgs{ + Dom: Dom, Flags: Flags, } @@ -9454,7 +9402,6 @@ func (l *Libvirt) DomainManagedSaveRemove(Dom Domain, Flags uint32) (err error) return } - _, err = l.requestStream(184, constants.Program, buf, nil, nil) if err != nil { return @@ -9467,10 +9414,10 @@ func (l *Libvirt) DomainManagedSaveRemove(Dom Domain, Flags uint32) (err error) func (l *Libvirt) DomainSnapshotCreateXML(Dom Domain, XMLDesc string, Flags uint32) (rSnap DomainSnapshot, err error) { var buf []byte - args := DomainSnapshotCreateXMLArgs { - Dom: Dom, + args := DomainSnapshotCreateXMLArgs{ + Dom: Dom, XMLDesc: XMLDesc, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9502,8 +9449,8 @@ func (l *Libvirt) DomainSnapshotCreateXML(Dom Domain, XMLDesc string, Flags uint func (l *Libvirt) DomainSnapshotGetXMLDesc(Snap DomainSnapshot, Flags uint32) (rXML string, err error) { var buf []byte - args := DomainSnapshotGetXMLDescArgs { - Snap: Snap, + args := DomainSnapshotGetXMLDescArgs{ + Snap: Snap, Flags: Flags, } @@ -9536,8 +9483,8 @@ func (l *Libvirt) DomainSnapshotGetXMLDesc(Snap DomainSnapshot, Flags uint32) (r func (l *Libvirt) DomainSnapshotNum(Dom Domain, Flags uint32) (rNum int32, err error) { var buf []byte - args := DomainSnapshotNumArgs { - Dom: Dom, + args := DomainSnapshotNumArgs{ + Dom: Dom, Flags: Flags, } @@ -9570,10 +9517,10 @@ func (l *Libvirt) DomainSnapshotNum(Dom Domain, Flags uint32) (rNum int32, err e func (l *Libvirt) DomainSnapshotListNames(Dom Domain, Maxnames int32, Flags uint32) (rNames []string, err error) { var buf []byte - args := DomainSnapshotListNamesArgs { - Dom: Dom, + args := DomainSnapshotListNamesArgs{ + Dom: Dom, Maxnames: Maxnames, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9605,9 +9552,9 @@ func (l *Libvirt) DomainSnapshotListNames(Dom Domain, Maxnames int32, Flags uint func (l *Libvirt) DomainSnapshotLookupByName(Dom Domain, Name string, Flags uint32) (rSnap DomainSnapshot, err error) { var buf []byte - args := DomainSnapshotLookupByNameArgs { - Dom: Dom, - Name: Name, + args := DomainSnapshotLookupByNameArgs{ + Dom: Dom, + Name: Name, Flags: Flags, } @@ -9640,8 +9587,8 @@ func (l *Libvirt) DomainSnapshotLookupByName(Dom Domain, Name string, Flags uint func (l *Libvirt) DomainHasCurrentSnapshot(Dom Domain, Flags uint32) (rResult int32, err error) { var buf []byte - args := DomainHasCurrentSnapshotArgs { - Dom: Dom, + args := DomainHasCurrentSnapshotArgs{ + Dom: Dom, Flags: Flags, } @@ -9674,8 +9621,8 @@ func (l *Libvirt) DomainHasCurrentSnapshot(Dom Domain, Flags uint32) (rResult in func (l *Libvirt) DomainSnapshotCurrent(Dom Domain, Flags uint32) (rSnap DomainSnapshot, err error) { var buf []byte - args := DomainSnapshotCurrentArgs { - Dom: Dom, + args := DomainSnapshotCurrentArgs{ + Dom: Dom, Flags: Flags, } @@ -9708,8 +9655,8 @@ func (l *Libvirt) DomainSnapshotCurrent(Dom Domain, Flags uint32) (rSnap DomainS func (l *Libvirt) DomainRevertToSnapshot(Snap DomainSnapshot, Flags uint32) (err error) { var buf []byte - args := DomainRevertToSnapshotArgs { - Snap: Snap, + args := DomainRevertToSnapshotArgs{ + Snap: Snap, Flags: Flags, } @@ -9718,7 +9665,6 @@ func (l *Libvirt) DomainRevertToSnapshot(Snap DomainSnapshot, Flags uint32) (err return } - _, err = l.requestStream(192, constants.Program, buf, nil, nil) if err != nil { return @@ -9731,8 +9677,8 @@ func (l *Libvirt) DomainRevertToSnapshot(Snap DomainSnapshot, Flags uint32) (err func (l *Libvirt) DomainSnapshotDelete(Snap DomainSnapshot, Flags DomainSnapshotDeleteFlags) (err error) { var buf []byte - args := DomainSnapshotDeleteArgs { - Snap: Snap, + args := DomainSnapshotDeleteArgs{ + Snap: Snap, Flags: Flags, } @@ -9741,7 +9687,6 @@ func (l *Libvirt) DomainSnapshotDelete(Snap DomainSnapshot, Flags DomainSnapshot return } - _, err = l.requestStream(193, constants.Program, buf, nil, nil) if err != nil { return @@ -9754,9 +9699,9 @@ func (l *Libvirt) DomainSnapshotDelete(Snap DomainSnapshot, Flags DomainSnapshot func (l *Libvirt) DomainGetBlockInfo(Dom Domain, Path string, Flags uint32) (rAllocation uint64, rCapacity uint64, rPhysical uint64, err error) { var buf []byte - args := DomainGetBlockInfoArgs { - Dom: Dom, - Path: Path, + args := DomainGetBlockInfoArgs{ + Dom: Dom, + Path: Path, Flags: Flags, } @@ -9799,7 +9744,6 @@ func (l *Libvirt) DomainGetBlockInfo(Dom Domain, Path string, Flags uint32) (rAl func (l *Libvirt) DomainEventIOErrorReason() (err error) { var buf []byte - _, err = l.requestStream(195, constants.Program, buf, nil, nil) if err != nil { return @@ -9812,8 +9756,8 @@ func (l *Libvirt) DomainEventIOErrorReason() (err error) { func (l *Libvirt) DomainCreateWithFlags(Dom Domain, Flags uint32) (rDom Domain, err error) { var buf []byte - args := DomainCreateWithFlagsArgs { - Dom: Dom, + args := DomainCreateWithFlagsArgs{ + Dom: Dom, Flags: Flags, } @@ -9846,10 +9790,10 @@ func (l *Libvirt) DomainCreateWithFlags(Dom Domain, Flags uint32) (rDom Domain, func (l *Libvirt) DomainSetMemoryParameters(Dom Domain, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetMemoryParametersArgs { - Dom: Dom, + args := DomainSetMemoryParametersArgs{ + Dom: Dom, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9857,7 +9801,6 @@ func (l *Libvirt) DomainSetMemoryParameters(Dom Domain, Params []TypedParam, Fla return } - _, err = l.requestStream(197, constants.Program, buf, nil, nil) if err != nil { return @@ -9870,10 +9813,10 @@ func (l *Libvirt) DomainSetMemoryParameters(Dom Domain, Params []TypedParam, Fla func (l *Libvirt) DomainGetMemoryParameters(Dom Domain, Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainGetMemoryParametersArgs { - Dom: Dom, + args := DomainGetMemoryParametersArgs{ + Dom: Dom, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9910,10 +9853,10 @@ func (l *Libvirt) DomainGetMemoryParameters(Dom Domain, Nparams int32, Flags uin func (l *Libvirt) DomainSetVcpusFlags(Dom Domain, Nvcpus uint32, Flags uint32) (err error) { var buf []byte - args := DomainSetVcpusFlagsArgs { - Dom: Dom, + args := DomainSetVcpusFlagsArgs{ + Dom: Dom, Nvcpus: Nvcpus, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9921,7 +9864,6 @@ func (l *Libvirt) DomainSetVcpusFlags(Dom Domain, Nvcpus uint32, Flags uint32) ( return } - _, err = l.requestStream(199, constants.Program, buf, nil, nil) if err != nil { return @@ -9934,8 +9876,8 @@ func (l *Libvirt) DomainSetVcpusFlags(Dom Domain, Nvcpus uint32, Flags uint32) ( func (l *Libvirt) DomainGetVcpusFlags(Dom Domain, Flags uint32) (rNum int32, err error) { var buf []byte - args := DomainGetVcpusFlagsArgs { - Dom: Dom, + args := DomainGetVcpusFlagsArgs{ + Dom: Dom, Flags: Flags, } @@ -9968,10 +9910,10 @@ func (l *Libvirt) DomainGetVcpusFlags(Dom Domain, Flags uint32) (rNum int32, err func (l *Libvirt) DomainOpenConsole(Dom Domain, DevName OptString, inStream io.Writer, Flags uint32) (err error) { var buf []byte - args := DomainOpenConsoleArgs { - Dom: Dom, + args := DomainOpenConsoleArgs{ + Dom: Dom, DevName: DevName, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9979,7 +9921,6 @@ func (l *Libvirt) DomainOpenConsole(Dom Domain, DevName OptString, inStream io.W return } - _, err = l.requestStream(201, constants.Program, buf, nil, inStream) if err != nil { return @@ -9992,7 +9933,7 @@ func (l *Libvirt) DomainOpenConsole(Dom Domain, DevName OptString, inStream io.W func (l *Libvirt) DomainIsUpdated(Dom Domain) (rUpdated int32, err error) { var buf []byte - args := DomainIsUpdatedArgs { + args := DomainIsUpdatedArgs{ Dom: Dom, } @@ -10025,7 +9966,7 @@ func (l *Libvirt) DomainIsUpdated(Dom Domain) (rUpdated int32, err error) { func (l *Libvirt) ConnectGetSysinfo(Flags uint32) (rSysinfo string, err error) { var buf []byte - args := ConnectGetSysinfoArgs { + args := ConnectGetSysinfoArgs{ Flags: Flags, } @@ -10058,10 +9999,10 @@ func (l *Libvirt) ConnectGetSysinfo(Flags uint32) (rSysinfo string, err error) { func (l *Libvirt) DomainSetMemoryFlags(Dom Domain, Memory uint64, Flags uint32) (err error) { var buf []byte - args := DomainSetMemoryFlagsArgs { - Dom: Dom, + args := DomainSetMemoryFlagsArgs{ + Dom: Dom, Memory: Memory, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10069,7 +10010,6 @@ func (l *Libvirt) DomainSetMemoryFlags(Dom Domain, Memory uint64, Flags uint32) return } - _, err = l.requestStream(204, constants.Program, buf, nil, nil) if err != nil { return @@ -10082,10 +10022,10 @@ func (l *Libvirt) DomainSetMemoryFlags(Dom Domain, Memory uint64, Flags uint32) func (l *Libvirt) DomainSetBlkioParameters(Dom Domain, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetBlkioParametersArgs { - Dom: Dom, + args := DomainSetBlkioParametersArgs{ + Dom: Dom, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10093,7 +10033,6 @@ func (l *Libvirt) DomainSetBlkioParameters(Dom Domain, Params []TypedParam, Flag return } - _, err = l.requestStream(205, constants.Program, buf, nil, nil) if err != nil { return @@ -10106,10 +10045,10 @@ func (l *Libvirt) DomainSetBlkioParameters(Dom Domain, Params []TypedParam, Flag func (l *Libvirt) DomainGetBlkioParameters(Dom Domain, Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainGetBlkioParametersArgs { - Dom: Dom, + args := DomainGetBlkioParametersArgs{ + Dom: Dom, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10146,10 +10085,10 @@ func (l *Libvirt) DomainGetBlkioParameters(Dom Domain, Nparams int32, Flags uint func (l *Libvirt) DomainMigrateSetMaxSpeed(Dom Domain, Bandwidth uint64, Flags uint32) (err error) { var buf []byte - args := DomainMigrateSetMaxSpeedArgs { - Dom: Dom, + args := DomainMigrateSetMaxSpeedArgs{ + Dom: Dom, Bandwidth: Bandwidth, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10157,7 +10096,6 @@ func (l *Libvirt) DomainMigrateSetMaxSpeed(Dom Domain, Bandwidth uint64, Flags u return } - _, err = l.requestStream(207, constants.Program, buf, nil, nil) if err != nil { return @@ -10170,11 +10108,11 @@ func (l *Libvirt) DomainMigrateSetMaxSpeed(Dom Domain, Bandwidth uint64, Flags u func (l *Libvirt) StorageVolUpload(Vol StorageVol, outStream io.Reader, Offset uint64, Length uint64, Flags StorageVolUploadFlags) (err error) { var buf []byte - args := StorageVolUploadArgs { - Vol: Vol, + args := StorageVolUploadArgs{ + Vol: Vol, Offset: Offset, Length: Length, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10182,7 +10120,6 @@ func (l *Libvirt) StorageVolUpload(Vol StorageVol, outStream io.Reader, Offset u return } - _, err = l.requestStream(208, constants.Program, buf, outStream, nil) if err != nil { return @@ -10195,11 +10132,11 @@ func (l *Libvirt) StorageVolUpload(Vol StorageVol, outStream io.Reader, Offset u func (l *Libvirt) StorageVolDownload(Vol StorageVol, inStream io.Writer, Offset uint64, Length uint64, Flags StorageVolDownloadFlags) (err error) { var buf []byte - args := StorageVolDownloadArgs { - Vol: Vol, + args := StorageVolDownloadArgs{ + Vol: Vol, Offset: Offset, Length: Length, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10207,7 +10144,6 @@ func (l *Libvirt) StorageVolDownload(Vol StorageVol, inStream io.Writer, Offset return } - _, err = l.requestStream(209, constants.Program, buf, nil, inStream) if err != nil { return @@ -10220,8 +10156,8 @@ func (l *Libvirt) StorageVolDownload(Vol StorageVol, inStream io.Writer, Offset func (l *Libvirt) DomainInjectNmi(Dom Domain, Flags uint32) (err error) { var buf []byte - args := DomainInjectNmiArgs { - Dom: Dom, + args := DomainInjectNmiArgs{ + Dom: Dom, Flags: Flags, } @@ -10230,7 +10166,6 @@ func (l *Libvirt) DomainInjectNmi(Dom Domain, Flags uint32) (err error) { return } - _, err = l.requestStream(210, constants.Program, buf, nil, nil) if err != nil { return @@ -10243,10 +10178,10 @@ func (l *Libvirt) DomainInjectNmi(Dom Domain, Flags uint32) (err error) { func (l *Libvirt) DomainScreenshot(Dom Domain, inStream io.Writer, Screen uint32, Flags uint32) (rMime OptString, err error) { var buf []byte - args := DomainScreenshotArgs { - Dom: Dom, + args := DomainScreenshotArgs{ + Dom: Dom, Screen: Screen, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10278,8 +10213,8 @@ func (l *Libvirt) DomainScreenshot(Dom Domain, inStream io.Writer, Screen uint32 func (l *Libvirt) DomainGetState(Dom Domain, Flags uint32) (rState int32, rReason int32, err error) { var buf []byte - args := DomainGetStateArgs { - Dom: Dom, + args := DomainGetStateArgs{ + Dom: Dom, Flags: Flags, } @@ -10317,11 +10252,11 @@ func (l *Libvirt) DomainGetState(Dom Domain, Flags uint32) (rState int32, rReaso func (l *Libvirt) DomainMigrateBegin3(Dom Domain, Xmlin OptString, Flags uint64, Dname OptString, Resource uint64) (rCookieOut []byte, rXML string, err error) { var buf []byte - args := DomainMigrateBegin3Args { - Dom: Dom, - Xmlin: Xmlin, - Flags: Flags, - Dname: Dname, + args := DomainMigrateBegin3Args{ + Dom: Dom, + Xmlin: Xmlin, + Flags: Flags, + Dname: Dname, Resource: Resource, } @@ -10359,13 +10294,13 @@ func (l *Libvirt) DomainMigrateBegin3(Dom Domain, Xmlin OptString, Flags uint64, func (l *Libvirt) DomainMigratePrepare3(CookieIn []byte, UriIn OptString, Flags uint64, Dname OptString, Resource uint64, DomXML string) (rCookieOut []byte, rUriOut OptString, err error) { var buf []byte - args := DomainMigratePrepare3Args { + args := DomainMigratePrepare3Args{ CookieIn: CookieIn, - UriIn: UriIn, - Flags: Flags, - Dname: Dname, + UriIn: UriIn, + Flags: Flags, + Dname: Dname, Resource: Resource, - DomXML: DomXML, + DomXML: DomXML, } buf, err = encode(&args) @@ -10402,12 +10337,12 @@ func (l *Libvirt) DomainMigratePrepare3(CookieIn []byte, UriIn OptString, Flags func (l *Libvirt) DomainMigratePrepareTunnel3(CookieIn []byte, outStream io.Reader, Flags uint64, Dname OptString, Resource uint64, DomXML string) (rCookieOut []byte, err error) { var buf []byte - args := DomainMigratePrepareTunnel3Args { + args := DomainMigratePrepareTunnel3Args{ CookieIn: CookieIn, - Flags: Flags, - Dname: Dname, + Flags: Flags, + Dname: Dname, Resource: Resource, - DomXML: DomXML, + DomXML: DomXML, } buf, err = encode(&args) @@ -10439,14 +10374,14 @@ func (l *Libvirt) DomainMigratePrepareTunnel3(CookieIn []byte, outStream io.Read func (l *Libvirt) DomainMigratePerform3(Dom Domain, Xmlin OptString, CookieIn []byte, Dconnuri OptString, Uri OptString, Flags uint64, Dname OptString, Resource uint64) (rCookieOut []byte, err error) { var buf []byte - args := DomainMigratePerform3Args { - Dom: Dom, - Xmlin: Xmlin, + args := DomainMigratePerform3Args{ + Dom: Dom, + Xmlin: Xmlin, CookieIn: CookieIn, Dconnuri: Dconnuri, - Uri: Uri, - Flags: Flags, - Dname: Dname, + Uri: Uri, + Flags: Flags, + Dname: Dname, Resource: Resource, } @@ -10479,12 +10414,12 @@ func (l *Libvirt) DomainMigratePerform3(Dom Domain, Xmlin OptString, CookieIn [] func (l *Libvirt) DomainMigrateFinish3(Dname string, CookieIn []byte, Dconnuri OptString, Uri OptString, Flags uint64, Cancelled int32) (rDom Domain, rCookieOut []byte, err error) { var buf []byte - args := DomainMigrateFinish3Args { - Dname: Dname, - CookieIn: CookieIn, - Dconnuri: Dconnuri, - Uri: Uri, - Flags: Flags, + args := DomainMigrateFinish3Args{ + Dname: Dname, + CookieIn: CookieIn, + Dconnuri: Dconnuri, + Uri: Uri, + Flags: Flags, Cancelled: Cancelled, } @@ -10522,10 +10457,10 @@ func (l *Libvirt) DomainMigrateFinish3(Dname string, CookieIn []byte, Dconnuri O func (l *Libvirt) DomainMigrateConfirm3(Dom Domain, CookieIn []byte, Flags uint64, Cancelled int32) (err error) { var buf []byte - args := DomainMigrateConfirm3Args { - Dom: Dom, - CookieIn: CookieIn, - Flags: Flags, + args := DomainMigrateConfirm3Args{ + Dom: Dom, + CookieIn: CookieIn, + Flags: Flags, Cancelled: Cancelled, } @@ -10534,7 +10469,6 @@ func (l *Libvirt) DomainMigrateConfirm3(Dom Domain, CookieIn []byte, Flags uint6 return } - _, err = l.requestStream(218, constants.Program, buf, nil, nil) if err != nil { return @@ -10547,10 +10481,10 @@ func (l *Libvirt) DomainMigrateConfirm3(Dom Domain, CookieIn []byte, Flags uint6 func (l *Libvirt) DomainSetSchedulerParametersFlags(Dom Domain, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetSchedulerParametersFlagsArgs { - Dom: Dom, + args := DomainSetSchedulerParametersFlagsArgs{ + Dom: Dom, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10558,7 +10492,6 @@ func (l *Libvirt) DomainSetSchedulerParametersFlags(Dom Domain, Params []TypedPa return } - _, err = l.requestStream(219, constants.Program, buf, nil, nil) if err != nil { return @@ -10571,7 +10504,7 @@ func (l *Libvirt) DomainSetSchedulerParametersFlags(Dom Domain, Params []TypedPa func (l *Libvirt) InterfaceChangeBegin(Flags uint32) (err error) { var buf []byte - args := InterfaceChangeBeginArgs { + args := InterfaceChangeBeginArgs{ Flags: Flags, } @@ -10580,7 +10513,6 @@ func (l *Libvirt) InterfaceChangeBegin(Flags uint32) (err error) { return } - _, err = l.requestStream(220, constants.Program, buf, nil, nil) if err != nil { return @@ -10593,7 +10525,7 @@ func (l *Libvirt) InterfaceChangeBegin(Flags uint32) (err error) { func (l *Libvirt) InterfaceChangeCommit(Flags uint32) (err error) { var buf []byte - args := InterfaceChangeCommitArgs { + args := InterfaceChangeCommitArgs{ Flags: Flags, } @@ -10602,7 +10534,6 @@ func (l *Libvirt) InterfaceChangeCommit(Flags uint32) (err error) { return } - _, err = l.requestStream(221, constants.Program, buf, nil, nil) if err != nil { return @@ -10615,7 +10546,7 @@ func (l *Libvirt) InterfaceChangeCommit(Flags uint32) (err error) { func (l *Libvirt) InterfaceChangeRollback(Flags uint32) (err error) { var buf []byte - args := InterfaceChangeRollbackArgs { + args := InterfaceChangeRollbackArgs{ Flags: Flags, } @@ -10624,7 +10555,6 @@ func (l *Libvirt) InterfaceChangeRollback(Flags uint32) (err error) { return } - _, err = l.requestStream(222, constants.Program, buf, nil, nil) if err != nil { return @@ -10637,10 +10567,10 @@ func (l *Libvirt) InterfaceChangeRollback(Flags uint32) (err error) { func (l *Libvirt) DomainGetSchedulerParametersFlags(Dom Domain, Nparams int32, Flags uint32) (rParams []TypedParam, err error) { var buf []byte - args := DomainGetSchedulerParametersFlagsArgs { - Dom: Dom, + args := DomainGetSchedulerParametersFlagsArgs{ + Dom: Dom, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10672,7 +10602,6 @@ func (l *Libvirt) DomainGetSchedulerParametersFlags(Dom Domain, Nparams int32, F func (l *Libvirt) DomainEventControlError() (err error) { var buf []byte - _, err = l.requestStream(224, constants.Program, buf, nil, nil) if err != nil { return @@ -10685,11 +10614,11 @@ func (l *Libvirt) DomainEventControlError() (err error) { func (l *Libvirt) DomainPinVcpuFlags(Dom Domain, Vcpu uint32, Cpumap []byte, Flags uint32) (err error) { var buf []byte - args := DomainPinVcpuFlagsArgs { - Dom: Dom, - Vcpu: Vcpu, + args := DomainPinVcpuFlagsArgs{ + Dom: Dom, + Vcpu: Vcpu, Cpumap: Cpumap, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10697,7 +10626,6 @@ func (l *Libvirt) DomainPinVcpuFlags(Dom Domain, Vcpu uint32, Cpumap []byte, Fla return } - _, err = l.requestStream(225, constants.Program, buf, nil, nil) if err != nil { return @@ -10710,12 +10638,12 @@ func (l *Libvirt) DomainPinVcpuFlags(Dom Domain, Vcpu uint32, Cpumap []byte, Fla func (l *Libvirt) DomainSendKey(Dom Domain, Codeset uint32, Holdtime uint32, Keycodes []uint32, Flags uint32) (err error) { var buf []byte - args := DomainSendKeyArgs { - Dom: Dom, - Codeset: Codeset, + args := DomainSendKeyArgs{ + Dom: Dom, + Codeset: Codeset, Holdtime: Holdtime, Keycodes: Keycodes, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10723,7 +10651,6 @@ func (l *Libvirt) DomainSendKey(Dom Domain, Codeset uint32, Holdtime uint32, Key return } - _, err = l.requestStream(226, constants.Program, buf, nil, nil) if err != nil { return @@ -10736,10 +10663,10 @@ func (l *Libvirt) DomainSendKey(Dom Domain, Codeset uint32, Holdtime uint32, Key func (l *Libvirt) NodeGetCPUStats(CPUNum int32, Nparams int32, Flags uint32) (rParams []NodeGetCPUStats, rNparams int32, err error) { var buf []byte - args := NodeGetCPUStatsArgs { - CPUNum: CPUNum, + args := NodeGetCPUStatsArgs{ + CPUNum: CPUNum, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10776,10 +10703,10 @@ func (l *Libvirt) NodeGetCPUStats(CPUNum int32, Nparams int32, Flags uint32) (rP func (l *Libvirt) NodeGetMemoryStats(Nparams int32, CellNum int32, Flags uint32) (rParams []NodeGetMemoryStats, rNparams int32, err error) { var buf []byte - args := NodeGetMemoryStatsArgs { + args := NodeGetMemoryStatsArgs{ Nparams: Nparams, CellNum: CellNum, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10816,8 +10743,8 @@ func (l *Libvirt) NodeGetMemoryStats(Nparams int32, CellNum int32, Flags uint32) func (l *Libvirt) DomainGetControlInfo(Dom Domain, Flags uint32) (rState uint32, rDetails uint32, rStateTime uint64, err error) { var buf []byte - args := DomainGetControlInfoArgs { - Dom: Dom, + args := DomainGetControlInfoArgs{ + Dom: Dom, Flags: Flags, } @@ -10860,11 +10787,11 @@ func (l *Libvirt) DomainGetControlInfo(Dom Domain, Flags uint32) (rState uint32, func (l *Libvirt) DomainGetVcpuPinInfo(Dom Domain, Ncpumaps int32, Maplen int32, Flags uint32) (rCpumaps []byte, rNum int32, err error) { var buf []byte - args := DomainGetVcpuPinInfoArgs { - Dom: Dom, + args := DomainGetVcpuPinInfoArgs{ + Dom: Dom, Ncpumaps: Ncpumaps, - Maplen: Maplen, - Flags: Flags, + Maplen: Maplen, + Flags: Flags, } buf, err = encode(&args) @@ -10901,8 +10828,8 @@ func (l *Libvirt) DomainGetVcpuPinInfo(Dom Domain, Ncpumaps int32, Maplen int32, func (l *Libvirt) DomainUndefineFlags(Dom Domain, Flags DomainUndefineFlagsValues) (err error) { var buf []byte - args := DomainUndefineFlagsArgs { - Dom: Dom, + args := DomainUndefineFlagsArgs{ + Dom: Dom, Flags: Flags, } @@ -10911,7 +10838,6 @@ func (l *Libvirt) DomainUndefineFlags(Dom Domain, Flags DomainUndefineFlagsValue return } - _, err = l.requestStream(231, constants.Program, buf, nil, nil) if err != nil { return @@ -10924,10 +10850,10 @@ func (l *Libvirt) DomainUndefineFlags(Dom Domain, Flags DomainUndefineFlagsValue func (l *Libvirt) DomainSaveFlags(Dom Domain, To string, Dxml OptString, Flags uint32) (err error) { var buf []byte - args := DomainSaveFlagsArgs { - Dom: Dom, - To: To, - Dxml: Dxml, + args := DomainSaveFlagsArgs{ + Dom: Dom, + To: To, + Dxml: Dxml, Flags: Flags, } @@ -10936,7 +10862,6 @@ func (l *Libvirt) DomainSaveFlags(Dom Domain, To string, Dxml OptString, Flags u return } - _, err = l.requestStream(232, constants.Program, buf, nil, nil) if err != nil { return @@ -10949,9 +10874,9 @@ func (l *Libvirt) DomainSaveFlags(Dom Domain, To string, Dxml OptString, Flags u func (l *Libvirt) DomainRestoreFlags(From string, Dxml OptString, Flags uint32) (err error) { var buf []byte - args := DomainRestoreFlagsArgs { - From: From, - Dxml: Dxml, + args := DomainRestoreFlagsArgs{ + From: From, + Dxml: Dxml, Flags: Flags, } @@ -10960,7 +10885,6 @@ func (l *Libvirt) DomainRestoreFlags(From string, Dxml OptString, Flags uint32) return } - _, err = l.requestStream(233, constants.Program, buf, nil, nil) if err != nil { return @@ -10973,8 +10897,8 @@ func (l *Libvirt) DomainRestoreFlags(From string, Dxml OptString, Flags uint32) func (l *Libvirt) DomainDestroyFlags(Dom Domain, Flags DomainDestroyFlagsValues) (err error) { var buf []byte - args := DomainDestroyFlagsArgs { - Dom: Dom, + args := DomainDestroyFlagsArgs{ + Dom: Dom, Flags: Flags, } @@ -10983,7 +10907,6 @@ func (l *Libvirt) DomainDestroyFlags(Dom Domain, Flags DomainDestroyFlagsValues) return } - _, err = l.requestStream(234, constants.Program, buf, nil, nil) if err != nil { return @@ -10996,8 +10919,8 @@ func (l *Libvirt) DomainDestroyFlags(Dom Domain, Flags DomainDestroyFlagsValues) func (l *Libvirt) DomainSaveImageGetXMLDesc(File string, Flags uint32) (rXML string, err error) { var buf []byte - args := DomainSaveImageGetXMLDescArgs { - File: File, + args := DomainSaveImageGetXMLDescArgs{ + File: File, Flags: Flags, } @@ -11030,9 +10953,9 @@ func (l *Libvirt) DomainSaveImageGetXMLDesc(File string, Flags uint32) (rXML str func (l *Libvirt) DomainSaveImageDefineXML(File string, Dxml string, Flags uint32) (err error) { var buf []byte - args := DomainSaveImageDefineXMLArgs { - File: File, - Dxml: Dxml, + args := DomainSaveImageDefineXMLArgs{ + File: File, + Dxml: Dxml, Flags: Flags, } @@ -11041,7 +10964,6 @@ func (l *Libvirt) DomainSaveImageDefineXML(File string, Dxml string, Flags uint3 return } - _, err = l.requestStream(236, constants.Program, buf, nil, nil) if err != nil { return @@ -11054,9 +10976,9 @@ func (l *Libvirt) DomainSaveImageDefineXML(File string, Dxml string, Flags uint3 func (l *Libvirt) DomainBlockJobAbort(Dom Domain, Path string, Flags DomainBlockJobAbortFlags) (err error) { var buf []byte - args := DomainBlockJobAbortArgs { - Dom: Dom, - Path: Path, + args := DomainBlockJobAbortArgs{ + Dom: Dom, + Path: Path, Flags: Flags, } @@ -11065,7 +10987,6 @@ func (l *Libvirt) DomainBlockJobAbort(Dom Domain, Path string, Flags DomainBlock return } - _, err = l.requestStream(237, constants.Program, buf, nil, nil) if err != nil { return @@ -11078,9 +10999,9 @@ func (l *Libvirt) DomainBlockJobAbort(Dom Domain, Path string, Flags DomainBlock func (l *Libvirt) DomainGetBlockJobInfo(Dom Domain, Path string, Flags uint32) (rFound int32, rType int32, rBandwidth uint64, rCur uint64, rEnd uint64, err error) { var buf []byte - args := DomainGetBlockJobInfoArgs { - Dom: Dom, - Path: Path, + args := DomainGetBlockJobInfoArgs{ + Dom: Dom, + Path: Path, Flags: Flags, } @@ -11133,11 +11054,11 @@ func (l *Libvirt) DomainGetBlockJobInfo(Dom Domain, Path string, Flags uint32) ( func (l *Libvirt) DomainBlockJobSetSpeed(Dom Domain, Path string, Bandwidth uint64, Flags DomainBlockJobSetSpeedFlags) (err error) { var buf []byte - args := DomainBlockJobSetSpeedArgs { - Dom: Dom, - Path: Path, + args := DomainBlockJobSetSpeedArgs{ + Dom: Dom, + Path: Path, Bandwidth: Bandwidth, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11145,7 +11066,6 @@ func (l *Libvirt) DomainBlockJobSetSpeed(Dom Domain, Path string, Bandwidth uint return } - _, err = l.requestStream(239, constants.Program, buf, nil, nil) if err != nil { return @@ -11158,11 +11078,11 @@ func (l *Libvirt) DomainBlockJobSetSpeed(Dom Domain, Path string, Bandwidth uint func (l *Libvirt) DomainBlockPull(Dom Domain, Path string, Bandwidth uint64, Flags DomainBlockPullFlags) (err error) { var buf []byte - args := DomainBlockPullArgs { - Dom: Dom, - Path: Path, + args := DomainBlockPullArgs{ + Dom: Dom, + Path: Path, Bandwidth: Bandwidth, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11170,7 +11090,6 @@ func (l *Libvirt) DomainBlockPull(Dom Domain, Path string, Bandwidth uint64, Fla return } - _, err = l.requestStream(240, constants.Program, buf, nil, nil) if err != nil { return @@ -11183,7 +11102,6 @@ func (l *Libvirt) DomainBlockPull(Dom Domain, Path string, Bandwidth uint64, Fla func (l *Libvirt) DomainEventBlockJob() (err error) { var buf []byte - _, err = l.requestStream(241, constants.Program, buf, nil, nil) if err != nil { return @@ -11196,8 +11114,8 @@ func (l *Libvirt) DomainEventBlockJob() (err error) { func (l *Libvirt) DomainMigrateGetMaxSpeed(Dom Domain, Flags uint32) (rBandwidth uint64, err error) { var buf []byte - args := DomainMigrateGetMaxSpeedArgs { - Dom: Dom, + args := DomainMigrateGetMaxSpeedArgs{ + Dom: Dom, Flags: Flags, } @@ -11230,11 +11148,11 @@ func (l *Libvirt) DomainMigrateGetMaxSpeed(Dom Domain, Flags uint32) (rBandwidth func (l *Libvirt) DomainBlockStatsFlags(Dom Domain, Path string, Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainBlockStatsFlagsArgs { - Dom: Dom, - Path: Path, + args := DomainBlockStatsFlagsArgs{ + Dom: Dom, + Path: Path, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11271,8 +11189,8 @@ func (l *Libvirt) DomainBlockStatsFlags(Dom Domain, Path string, Nparams int32, func (l *Libvirt) DomainSnapshotGetParent(Snap DomainSnapshot, Flags uint32) (rSnap DomainSnapshot, err error) { var buf []byte - args := DomainSnapshotGetParentArgs { - Snap: Snap, + args := DomainSnapshotGetParentArgs{ + Snap: Snap, Flags: Flags, } @@ -11305,8 +11223,8 @@ func (l *Libvirt) DomainSnapshotGetParent(Snap DomainSnapshot, Flags uint32) (rS func (l *Libvirt) DomainReset(Dom Domain, Flags uint32) (err error) { var buf []byte - args := DomainResetArgs { - Dom: Dom, + args := DomainResetArgs{ + Dom: Dom, Flags: Flags, } @@ -11315,7 +11233,6 @@ func (l *Libvirt) DomainReset(Dom Domain, Flags uint32) (err error) { return } - _, err = l.requestStream(245, constants.Program, buf, nil, nil) if err != nil { return @@ -11328,8 +11245,8 @@ func (l *Libvirt) DomainReset(Dom Domain, Flags uint32) (err error) { func (l *Libvirt) DomainSnapshotNumChildren(Snap DomainSnapshot, Flags uint32) (rNum int32, err error) { var buf []byte - args := DomainSnapshotNumChildrenArgs { - Snap: Snap, + args := DomainSnapshotNumChildrenArgs{ + Snap: Snap, Flags: Flags, } @@ -11362,10 +11279,10 @@ func (l *Libvirt) DomainSnapshotNumChildren(Snap DomainSnapshot, Flags uint32) ( func (l *Libvirt) DomainSnapshotListChildrenNames(Snap DomainSnapshot, Maxnames int32, Flags uint32) (rNames []string, err error) { var buf []byte - args := DomainSnapshotListChildrenNamesArgs { - Snap: Snap, + args := DomainSnapshotListChildrenNamesArgs{ + Snap: Snap, Maxnames: Maxnames, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11397,7 +11314,6 @@ func (l *Libvirt) DomainSnapshotListChildrenNames(Snap DomainSnapshot, Maxnames func (l *Libvirt) DomainEventDiskChange() (err error) { var buf []byte - _, err = l.requestStream(248, constants.Program, buf, nil, nil) if err != nil { return @@ -11410,9 +11326,9 @@ func (l *Libvirt) DomainEventDiskChange() (err error) { func (l *Libvirt) DomainOpenGraphics(Dom Domain, Idx uint32, Flags DomainOpenGraphicsFlags) (err error) { var buf []byte - args := DomainOpenGraphicsArgs { - Dom: Dom, - Idx: Idx, + args := DomainOpenGraphicsArgs{ + Dom: Dom, + Idx: Idx, Flags: Flags, } @@ -11421,7 +11337,6 @@ func (l *Libvirt) DomainOpenGraphics(Dom Domain, Idx uint32, Flags DomainOpenGra return } - _, err = l.requestStream(249, constants.Program, buf, nil, nil) if err != nil { return @@ -11434,10 +11349,10 @@ func (l *Libvirt) DomainOpenGraphics(Dom Domain, Idx uint32, Flags DomainOpenGra func (l *Libvirt) NodeSuspendForDuration(Target uint32, Duration uint64, Flags uint32) (err error) { var buf []byte - args := NodeSuspendForDurationArgs { - Target: Target, + args := NodeSuspendForDurationArgs{ + Target: Target, Duration: Duration, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11445,7 +11360,6 @@ func (l *Libvirt) NodeSuspendForDuration(Target uint32, Duration uint64, Flags u return } - _, err = l.requestStream(250, constants.Program, buf, nil, nil) if err != nil { return @@ -11458,10 +11372,10 @@ func (l *Libvirt) NodeSuspendForDuration(Target uint32, Duration uint64, Flags u func (l *Libvirt) DomainBlockResize(Dom Domain, Disk string, Size uint64, Flags DomainBlockResizeFlags) (err error) { var buf []byte - args := DomainBlockResizeArgs { - Dom: Dom, - Disk: Disk, - Size: Size, + args := DomainBlockResizeArgs{ + Dom: Dom, + Disk: Disk, + Size: Size, Flags: Flags, } @@ -11470,7 +11384,6 @@ func (l *Libvirt) DomainBlockResize(Dom Domain, Disk string, Size uint64, Flags return } - _, err = l.requestStream(251, constants.Program, buf, nil, nil) if err != nil { return @@ -11483,11 +11396,11 @@ func (l *Libvirt) DomainBlockResize(Dom Domain, Disk string, Size uint64, Flags func (l *Libvirt) DomainSetBlockIOTune(Dom Domain, Disk string, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetBlockIOTuneArgs { - Dom: Dom, - Disk: Disk, + args := DomainSetBlockIOTuneArgs{ + Dom: Dom, + Disk: Disk, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11495,7 +11408,6 @@ func (l *Libvirt) DomainSetBlockIOTune(Dom Domain, Disk string, Params []TypedPa return } - _, err = l.requestStream(252, constants.Program, buf, nil, nil) if err != nil { return @@ -11508,11 +11420,11 @@ func (l *Libvirt) DomainSetBlockIOTune(Dom Domain, Disk string, Params []TypedPa func (l *Libvirt) DomainGetBlockIOTune(Dom Domain, Disk OptString, Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainGetBlockIOTuneArgs { - Dom: Dom, - Disk: Disk, + args := DomainGetBlockIOTuneArgs{ + Dom: Dom, + Disk: Disk, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11549,10 +11461,10 @@ func (l *Libvirt) DomainGetBlockIOTune(Dom Domain, Disk OptString, Nparams int32 func (l *Libvirt) DomainSetNumaParameters(Dom Domain, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetNumaParametersArgs { - Dom: Dom, + args := DomainSetNumaParametersArgs{ + Dom: Dom, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11560,7 +11472,6 @@ func (l *Libvirt) DomainSetNumaParameters(Dom Domain, Params []TypedParam, Flags return } - _, err = l.requestStream(254, constants.Program, buf, nil, nil) if err != nil { return @@ -11573,10 +11484,10 @@ func (l *Libvirt) DomainSetNumaParameters(Dom Domain, Params []TypedParam, Flags func (l *Libvirt) DomainGetNumaParameters(Dom Domain, Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainGetNumaParametersArgs { - Dom: Dom, + args := DomainGetNumaParametersArgs{ + Dom: Dom, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11613,11 +11524,11 @@ func (l *Libvirt) DomainGetNumaParameters(Dom Domain, Nparams int32, Flags uint3 func (l *Libvirt) DomainSetInterfaceParameters(Dom Domain, Device string, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetInterfaceParametersArgs { - Dom: Dom, + args := DomainSetInterfaceParametersArgs{ + Dom: Dom, Device: Device, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11625,7 +11536,6 @@ func (l *Libvirt) DomainSetInterfaceParameters(Dom Domain, Device string, Params return } - _, err = l.requestStream(256, constants.Program, buf, nil, nil) if err != nil { return @@ -11638,11 +11548,11 @@ func (l *Libvirt) DomainSetInterfaceParameters(Dom Domain, Device string, Params func (l *Libvirt) DomainGetInterfaceParameters(Dom Domain, Device string, Nparams int32, Flags DomainModificationImpact) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainGetInterfaceParametersArgs { - Dom: Dom, - Device: Device, + args := DomainGetInterfaceParametersArgs{ + Dom: Dom, + Device: Device, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11679,8 +11589,8 @@ func (l *Libvirt) DomainGetInterfaceParameters(Dom Domain, Device string, Nparam func (l *Libvirt) DomainShutdownFlags(Dom Domain, Flags DomainShutdownFlagValues) (err error) { var buf []byte - args := DomainShutdownFlagsArgs { - Dom: Dom, + args := DomainShutdownFlagsArgs{ + Dom: Dom, Flags: Flags, } @@ -11689,7 +11599,6 @@ func (l *Libvirt) DomainShutdownFlags(Dom Domain, Flags DomainShutdownFlagValues return } - _, err = l.requestStream(258, constants.Program, buf, nil, nil) if err != nil { return @@ -11702,10 +11611,10 @@ func (l *Libvirt) DomainShutdownFlags(Dom Domain, Flags DomainShutdownFlagValues func (l *Libvirt) StorageVolWipePattern(Vol StorageVol, Algorithm uint32, Flags uint32) (err error) { var buf []byte - args := StorageVolWipePatternArgs { - Vol: Vol, + args := StorageVolWipePatternArgs{ + Vol: Vol, Algorithm: Algorithm, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11713,7 +11622,6 @@ func (l *Libvirt) StorageVolWipePattern(Vol StorageVol, Algorithm uint32, Flags return } - _, err = l.requestStream(259, constants.Program, buf, nil, nil) if err != nil { return @@ -11726,10 +11634,10 @@ func (l *Libvirt) StorageVolWipePattern(Vol StorageVol, Algorithm uint32, Flags func (l *Libvirt) StorageVolResize(Vol StorageVol, Capacity uint64, Flags StorageVolResizeFlags) (err error) { var buf []byte - args := StorageVolResizeArgs { - Vol: Vol, + args := StorageVolResizeArgs{ + Vol: Vol, Capacity: Capacity, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11737,7 +11645,6 @@ func (l *Libvirt) StorageVolResize(Vol StorageVol, Capacity uint64, Flags Storag return } - _, err = l.requestStream(260, constants.Program, buf, nil, nil) if err != nil { return @@ -11750,11 +11657,11 @@ func (l *Libvirt) StorageVolResize(Vol StorageVol, Capacity uint64, Flags Storag func (l *Libvirt) DomainPmSuspendForDuration(Dom Domain, Target uint32, Duration uint64, Flags uint32) (err error) { var buf []byte - args := DomainPmSuspendForDurationArgs { - Dom: Dom, - Target: Target, + args := DomainPmSuspendForDurationArgs{ + Dom: Dom, + Target: Target, Duration: Duration, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11762,7 +11669,6 @@ func (l *Libvirt) DomainPmSuspendForDuration(Dom Domain, Target uint32, Duration return } - _, err = l.requestStream(261, constants.Program, buf, nil, nil) if err != nil { return @@ -11775,12 +11681,12 @@ func (l *Libvirt) DomainPmSuspendForDuration(Dom Domain, Target uint32, Duration func (l *Libvirt) DomainGetCPUStats(Dom Domain, Nparams uint32, StartCPU int32, Ncpus uint32, Flags TypedParameterFlags) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainGetCPUStatsArgs { - Dom: Dom, - Nparams: Nparams, + args := DomainGetCPUStatsArgs{ + Dom: Dom, + Nparams: Nparams, StartCPU: StartCPU, - Ncpus: Ncpus, - Flags: Flags, + Ncpus: Ncpus, + Flags: Flags, } buf, err = encode(&args) @@ -11817,10 +11723,10 @@ func (l *Libvirt) DomainGetCPUStats(Dom Domain, Nparams uint32, StartCPU int32, func (l *Libvirt) DomainGetDiskErrors(Dom Domain, Maxerrors uint32, Flags uint32) (rErrors []DomainDiskError, rNerrors int32, err error) { var buf []byte - args := DomainGetDiskErrorsArgs { - Dom: Dom, + args := DomainGetDiskErrorsArgs{ + Dom: Dom, Maxerrors: Maxerrors, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11857,13 +11763,13 @@ func (l *Libvirt) DomainGetDiskErrors(Dom Domain, Maxerrors uint32, Flags uint32 func (l *Libvirt) DomainSetMetadata(Dom Domain, Type int32, Metadata OptString, Key OptString, Uri OptString, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainSetMetadataArgs { - Dom: Dom, - Type: Type, + args := DomainSetMetadataArgs{ + Dom: Dom, + Type: Type, Metadata: Metadata, - Key: Key, - Uri: Uri, - Flags: Flags, + Key: Key, + Uri: Uri, + Flags: Flags, } buf, err = encode(&args) @@ -11871,7 +11777,6 @@ func (l *Libvirt) DomainSetMetadata(Dom Domain, Type int32, Metadata OptString, return } - _, err = l.requestStream(264, constants.Program, buf, nil, nil) if err != nil { return @@ -11884,10 +11789,10 @@ func (l *Libvirt) DomainSetMetadata(Dom Domain, Type int32, Metadata OptString, func (l *Libvirt) DomainGetMetadata(Dom Domain, Type int32, Uri OptString, Flags DomainModificationImpact) (rMetadata string, err error) { var buf []byte - args := DomainGetMetadataArgs { - Dom: Dom, - Type: Type, - Uri: Uri, + args := DomainGetMetadataArgs{ + Dom: Dom, + Type: Type, + Uri: Uri, Flags: Flags, } @@ -11920,12 +11825,12 @@ func (l *Libvirt) DomainGetMetadata(Dom Domain, Type int32, Uri OptString, Flags func (l *Libvirt) DomainBlockRebase(Dom Domain, Path string, Base OptString, Bandwidth uint64, Flags DomainBlockRebaseFlags) (err error) { var buf []byte - args := DomainBlockRebaseArgs { - Dom: Dom, - Path: Path, - Base: Base, + args := DomainBlockRebaseArgs{ + Dom: Dom, + Path: Path, + Base: Base, Bandwidth: Bandwidth, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11933,7 +11838,6 @@ func (l *Libvirt) DomainBlockRebase(Dom Domain, Path string, Base OptString, Ban return } - _, err = l.requestStream(266, constants.Program, buf, nil, nil) if err != nil { return @@ -11946,8 +11850,8 @@ func (l *Libvirt) DomainBlockRebase(Dom Domain, Path string, Base OptString, Ban func (l *Libvirt) DomainPmWakeup(Dom Domain, Flags uint32) (err error) { var buf []byte - args := DomainPmWakeupArgs { - Dom: Dom, + args := DomainPmWakeupArgs{ + Dom: Dom, Flags: Flags, } @@ -11956,7 +11860,6 @@ func (l *Libvirt) DomainPmWakeup(Dom Domain, Flags uint32) (err error) { return } - _, err = l.requestStream(267, constants.Program, buf, nil, nil) if err != nil { return @@ -11969,7 +11872,6 @@ func (l *Libvirt) DomainPmWakeup(Dom Domain, Flags uint32) (err error) { func (l *Libvirt) DomainEventTrayChange() (err error) { var buf []byte - _, err = l.requestStream(268, constants.Program, buf, nil, nil) if err != nil { return @@ -11982,7 +11884,6 @@ func (l *Libvirt) DomainEventTrayChange() (err error) { func (l *Libvirt) DomainEventPmwakeup() (err error) { var buf []byte - _, err = l.requestStream(269, constants.Program, buf, nil, nil) if err != nil { return @@ -11995,7 +11896,6 @@ func (l *Libvirt) DomainEventPmwakeup() (err error) { func (l *Libvirt) DomainEventPmsuspend() (err error) { var buf []byte - _, err = l.requestStream(270, constants.Program, buf, nil, nil) if err != nil { return @@ -12008,8 +11908,8 @@ func (l *Libvirt) DomainEventPmsuspend() (err error) { func (l *Libvirt) DomainSnapshotIsCurrent(Snap DomainSnapshot, Flags uint32) (rCurrent int32, err error) { var buf []byte - args := DomainSnapshotIsCurrentArgs { - Snap: Snap, + args := DomainSnapshotIsCurrentArgs{ + Snap: Snap, Flags: Flags, } @@ -12042,8 +11942,8 @@ func (l *Libvirt) DomainSnapshotIsCurrent(Snap DomainSnapshot, Flags uint32) (rC func (l *Libvirt) DomainSnapshotHasMetadata(Snap DomainSnapshot, Flags uint32) (rMetadata int32, err error) { var buf []byte - args := DomainSnapshotHasMetadataArgs { - Snap: Snap, + args := DomainSnapshotHasMetadataArgs{ + Snap: Snap, Flags: Flags, } @@ -12076,9 +11976,9 @@ func (l *Libvirt) DomainSnapshotHasMetadata(Snap DomainSnapshot, Flags uint32) ( func (l *Libvirt) ConnectListAllDomains(NeedResults int32, Flags ConnectListAllDomainsFlags) (rDomains []Domain, rRet uint32, err error) { var buf []byte - args := ConnectListAllDomainsArgs { + args := ConnectListAllDomainsArgs{ NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12115,10 +12015,10 @@ func (l *Libvirt) ConnectListAllDomains(NeedResults int32, Flags ConnectListAllD func (l *Libvirt) DomainListAllSnapshots(Dom Domain, NeedResults int32, Flags uint32) (rSnapshots []DomainSnapshot, rRet int32, err error) { var buf []byte - args := DomainListAllSnapshotsArgs { - Dom: Dom, + args := DomainListAllSnapshotsArgs{ + Dom: Dom, NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12155,10 +12055,10 @@ func (l *Libvirt) DomainListAllSnapshots(Dom Domain, NeedResults int32, Flags ui func (l *Libvirt) DomainSnapshotListAllChildren(Snapshot DomainSnapshot, NeedResults int32, Flags uint32) (rSnapshots []DomainSnapshot, rRet int32, err error) { var buf []byte - args := DomainSnapshotListAllChildrenArgs { - Snapshot: Snapshot, + args := DomainSnapshotListAllChildrenArgs{ + Snapshot: Snapshot, NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12195,7 +12095,6 @@ func (l *Libvirt) DomainSnapshotListAllChildren(Snapshot DomainSnapshot, NeedRes func (l *Libvirt) DomainEventBalloonChange() (err error) { var buf []byte - _, err = l.requestStream(276, constants.Program, buf, nil, nil) if err != nil { return @@ -12208,8 +12107,8 @@ func (l *Libvirt) DomainEventBalloonChange() (err error) { func (l *Libvirt) DomainGetHostname(Dom Domain, Flags uint32) (rHostname string, err error) { var buf []byte - args := DomainGetHostnameArgs { - Dom: Dom, + args := DomainGetHostnameArgs{ + Dom: Dom, Flags: Flags, } @@ -12242,7 +12141,7 @@ func (l *Libvirt) DomainGetHostname(Dom Domain, Flags uint32) (rHostname string, func (l *Libvirt) DomainGetSecurityLabelList(Dom Domain) (rLabels []DomainGetSecurityLabelRet, rRet int32, err error) { var buf []byte - args := DomainGetSecurityLabelListArgs { + args := DomainGetSecurityLabelListArgs{ Dom: Dom, } @@ -12280,10 +12179,10 @@ func (l *Libvirt) DomainGetSecurityLabelList(Dom Domain) (rLabels []DomainGetSec func (l *Libvirt) DomainPinEmulator(Dom Domain, Cpumap []byte, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainPinEmulatorArgs { - Dom: Dom, + args := DomainPinEmulatorArgs{ + Dom: Dom, Cpumap: Cpumap, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12291,7 +12190,6 @@ func (l *Libvirt) DomainPinEmulator(Dom Domain, Cpumap []byte, Flags DomainModif return } - _, err = l.requestStream(279, constants.Program, buf, nil, nil) if err != nil { return @@ -12304,10 +12202,10 @@ func (l *Libvirt) DomainPinEmulator(Dom Domain, Cpumap []byte, Flags DomainModif func (l *Libvirt) DomainGetEmulatorPinInfo(Dom Domain, Maplen int32, Flags DomainModificationImpact) (rCpumaps []byte, rRet int32, err error) { var buf []byte - args := DomainGetEmulatorPinInfoArgs { - Dom: Dom, + args := DomainGetEmulatorPinInfoArgs{ + Dom: Dom, Maplen: Maplen, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12344,9 +12242,9 @@ func (l *Libvirt) DomainGetEmulatorPinInfo(Dom Domain, Maplen int32, Flags Domai func (l *Libvirt) ConnectListAllStoragePools(NeedResults int32, Flags ConnectListAllStoragePoolsFlags) (rPools []StoragePool, rRet uint32, err error) { var buf []byte - args := ConnectListAllStoragePoolsArgs { + args := ConnectListAllStoragePoolsArgs{ NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12383,10 +12281,10 @@ func (l *Libvirt) ConnectListAllStoragePools(NeedResults int32, Flags ConnectLis func (l *Libvirt) StoragePoolListAllVolumes(Pool StoragePool, NeedResults int32, Flags uint32) (rVols []StorageVol, rRet uint32, err error) { var buf []byte - args := StoragePoolListAllVolumesArgs { - Pool: Pool, + args := StoragePoolListAllVolumesArgs{ + Pool: Pool, NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12423,9 +12321,9 @@ func (l *Libvirt) StoragePoolListAllVolumes(Pool StoragePool, NeedResults int32, func (l *Libvirt) ConnectListAllNetworks(NeedResults int32, Flags ConnectListAllNetworksFlags) (rNets []Network, rRet uint32, err error) { var buf []byte - args := ConnectListAllNetworksArgs { + args := ConnectListAllNetworksArgs{ NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12462,9 +12360,9 @@ func (l *Libvirt) ConnectListAllNetworks(NeedResults int32, Flags ConnectListAll func (l *Libvirt) ConnectListAllInterfaces(NeedResults int32, Flags ConnectListAllInterfacesFlags) (rIfaces []Interface, rRet uint32, err error) { var buf []byte - args := ConnectListAllInterfacesArgs { + args := ConnectListAllInterfacesArgs{ NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12501,9 +12399,9 @@ func (l *Libvirt) ConnectListAllInterfaces(NeedResults int32, Flags ConnectListA func (l *Libvirt) ConnectListAllNodeDevices(NeedResults int32, Flags uint32) (rDevices []NodeDevice, rRet uint32, err error) { var buf []byte - args := ConnectListAllNodeDevicesArgs { + args := ConnectListAllNodeDevicesArgs{ NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12540,9 +12438,9 @@ func (l *Libvirt) ConnectListAllNodeDevices(NeedResults int32, Flags uint32) (rD func (l *Libvirt) ConnectListAllNwfilters(NeedResults int32, Flags uint32) (rFilters []Nwfilter, rRet uint32, err error) { var buf []byte - args := ConnectListAllNwfiltersArgs { + args := ConnectListAllNwfiltersArgs{ NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12579,9 +12477,9 @@ func (l *Libvirt) ConnectListAllNwfilters(NeedResults int32, Flags uint32) (rFil func (l *Libvirt) ConnectListAllSecrets(NeedResults int32, Flags ConnectListAllSecretsFlags) (rSecrets []Secret, rRet uint32, err error) { var buf []byte - args := ConnectListAllSecretsArgs { + args := ConnectListAllSecretsArgs{ NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12618,9 +12516,9 @@ func (l *Libvirt) ConnectListAllSecrets(NeedResults int32, Flags ConnectListAllS func (l *Libvirt) NodeSetMemoryParameters(Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := NodeSetMemoryParametersArgs { + args := NodeSetMemoryParametersArgs{ Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12628,7 +12526,6 @@ func (l *Libvirt) NodeSetMemoryParameters(Params []TypedParam, Flags uint32) (er return } - _, err = l.requestStream(288, constants.Program, buf, nil, nil) if err != nil { return @@ -12641,9 +12538,9 @@ func (l *Libvirt) NodeSetMemoryParameters(Params []TypedParam, Flags uint32) (er func (l *Libvirt) NodeGetMemoryParameters(Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := NodeGetMemoryParametersArgs { + args := NodeGetMemoryParametersArgs{ Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12680,13 +12577,13 @@ func (l *Libvirt) NodeGetMemoryParameters(Nparams int32, Flags uint32) (rParams func (l *Libvirt) DomainBlockCommit(Dom Domain, Disk string, Base OptString, Top OptString, Bandwidth uint64, Flags DomainBlockCommitFlags) (err error) { var buf []byte - args := DomainBlockCommitArgs { - Dom: Dom, - Disk: Disk, - Base: Base, - Top: Top, + args := DomainBlockCommitArgs{ + Dom: Dom, + Disk: Disk, + Base: Base, + Top: Top, Bandwidth: Bandwidth, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12694,7 +12591,6 @@ func (l *Libvirt) DomainBlockCommit(Dom Domain, Disk string, Base OptString, Top return } - _, err = l.requestStream(290, constants.Program, buf, nil, nil) if err != nil { return @@ -12707,13 +12603,13 @@ func (l *Libvirt) DomainBlockCommit(Dom Domain, Disk string, Base OptString, Top func (l *Libvirt) NetworkUpdate(Net Network, Command uint32, Section uint32, ParentIndex int32, XML string, Flags NetworkUpdateFlags) (err error) { var buf []byte - args := NetworkUpdateArgs { - Net: Net, - Command: Command, - Section: Section, + args := NetworkUpdateArgs{ + Net: Net, + Command: Command, + Section: Section, ParentIndex: ParentIndex, - XML: XML, - Flags: Flags, + XML: XML, + Flags: Flags, } buf, err = encode(&args) @@ -12721,7 +12617,6 @@ func (l *Libvirt) NetworkUpdate(Net Network, Command uint32, Section uint32, Par return } - _, err = l.requestStream(291, constants.Program, buf, nil, nil) if err != nil { return @@ -12734,7 +12629,6 @@ func (l *Libvirt) NetworkUpdate(Net Network, Command uint32, Section uint32, Par func (l *Libvirt) DomainEventPmsuspendDisk() (err error) { var buf []byte - _, err = l.requestStream(292, constants.Program, buf, nil, nil) if err != nil { return @@ -12747,10 +12641,10 @@ func (l *Libvirt) DomainEventPmsuspendDisk() (err error) { func (l *Libvirt) NodeGetCPUMap(NeedMap int32, NeedOnline int32, Flags uint32) (rCpumap []byte, rOnline uint32, rRet int32, err error) { var buf []byte - args := NodeGetCPUMapArgs { - NeedMap: NeedMap, + args := NodeGetCPUMapArgs{ + NeedMap: NeedMap, NeedOnline: NeedOnline, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12792,11 +12686,11 @@ func (l *Libvirt) NodeGetCPUMap(NeedMap int32, NeedOnline int32, Flags uint32) ( func (l *Libvirt) DomainFstrim(Dom Domain, MountPoint OptString, Minimum uint64, Flags uint32) (err error) { var buf []byte - args := DomainFstrimArgs { - Dom: Dom, + args := DomainFstrimArgs{ + Dom: Dom, MountPoint: MountPoint, - Minimum: Minimum, - Flags: Flags, + Minimum: Minimum, + Flags: Flags, } buf, err = encode(&args) @@ -12804,7 +12698,6 @@ func (l *Libvirt) DomainFstrim(Dom Domain, MountPoint OptString, Minimum uint64, return } - _, err = l.requestStream(294, constants.Program, buf, nil, nil) if err != nil { return @@ -12817,11 +12710,11 @@ func (l *Libvirt) DomainFstrim(Dom Domain, MountPoint OptString, Minimum uint64, func (l *Libvirt) DomainSendProcessSignal(Dom Domain, PidValue int64, Signum uint32, Flags uint32) (err error) { var buf []byte - args := DomainSendProcessSignalArgs { - Dom: Dom, + args := DomainSendProcessSignalArgs{ + Dom: Dom, PidValue: PidValue, - Signum: Signum, - Flags: Flags, + Signum: Signum, + Flags: Flags, } buf, err = encode(&args) @@ -12829,7 +12722,6 @@ func (l *Libvirt) DomainSendProcessSignal(Dom Domain, PidValue int64, Signum uin return } - _, err = l.requestStream(295, constants.Program, buf, nil, nil) if err != nil { return @@ -12842,9 +12734,9 @@ func (l *Libvirt) DomainSendProcessSignal(Dom Domain, PidValue int64, Signum uin func (l *Libvirt) DomainOpenChannel(Dom Domain, Name OptString, inStream io.Writer, Flags DomainChannelFlags) (err error) { var buf []byte - args := DomainOpenChannelArgs { - Dom: Dom, - Name: Name, + args := DomainOpenChannelArgs{ + Dom: Dom, + Name: Name, Flags: Flags, } @@ -12853,7 +12745,6 @@ func (l *Libvirt) DomainOpenChannel(Dom Domain, Name OptString, inStream io.Writ return } - _, err = l.requestStream(296, constants.Program, buf, nil, inStream) if err != nil { return @@ -12866,9 +12757,9 @@ func (l *Libvirt) DomainOpenChannel(Dom Domain, Name OptString, inStream io.Writ func (l *Libvirt) NodeDeviceLookupScsiHostByWwn(Wwnn string, Wwpn string, Flags uint32) (rDev NodeDevice, err error) { var buf []byte - args := NodeDeviceLookupScsiHostByWwnArgs { - Wwnn: Wwnn, - Wwpn: Wwpn, + args := NodeDeviceLookupScsiHostByWwnArgs{ + Wwnn: Wwnn, + Wwpn: Wwpn, Flags: Flags, } @@ -12901,8 +12792,8 @@ func (l *Libvirt) NodeDeviceLookupScsiHostByWwn(Wwnn string, Wwpn string, Flags func (l *Libvirt) DomainGetJobStats(Dom Domain, Flags DomainGetJobStatsFlags) (rType int32, rParams []TypedParam, err error) { var buf []byte - args := DomainGetJobStatsArgs { - Dom: Dom, + args := DomainGetJobStatsArgs{ + Dom: Dom, Flags: Flags, } @@ -12940,8 +12831,8 @@ func (l *Libvirt) DomainGetJobStats(Dom Domain, Flags DomainGetJobStatsFlags) (r func (l *Libvirt) DomainMigrateGetCompressionCache(Dom Domain, Flags uint32) (rCacheSize uint64, err error) { var buf []byte - args := DomainMigrateGetCompressionCacheArgs { - Dom: Dom, + args := DomainMigrateGetCompressionCacheArgs{ + Dom: Dom, Flags: Flags, } @@ -12974,10 +12865,10 @@ func (l *Libvirt) DomainMigrateGetCompressionCache(Dom Domain, Flags uint32) (rC func (l *Libvirt) DomainMigrateSetCompressionCache(Dom Domain, CacheSize uint64, Flags uint32) (err error) { var buf []byte - args := DomainMigrateSetCompressionCacheArgs { - Dom: Dom, + args := DomainMigrateSetCompressionCacheArgs{ + Dom: Dom, CacheSize: CacheSize, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12985,7 +12876,6 @@ func (l *Libvirt) DomainMigrateSetCompressionCache(Dom Domain, CacheSize uint64, return } - _, err = l.requestStream(300, constants.Program, buf, nil, nil) if err != nil { return @@ -12998,10 +12888,10 @@ func (l *Libvirt) DomainMigrateSetCompressionCache(Dom Domain, CacheSize uint64, func (l *Libvirt) NodeDeviceDetachFlags(Name string, DriverName OptString, Flags uint32) (err error) { var buf []byte - args := NodeDeviceDetachFlagsArgs { - Name: Name, + args := NodeDeviceDetachFlagsArgs{ + Name: Name, DriverName: DriverName, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13009,7 +12899,6 @@ func (l *Libvirt) NodeDeviceDetachFlags(Name string, DriverName OptString, Flags return } - _, err = l.requestStream(301, constants.Program, buf, nil, nil) if err != nil { return @@ -13022,10 +12911,10 @@ func (l *Libvirt) NodeDeviceDetachFlags(Name string, DriverName OptString, Flags func (l *Libvirt) DomainMigrateBegin3Params(Dom Domain, Params []TypedParam, Flags uint32) (rCookieOut []byte, rXML string, err error) { var buf []byte - args := DomainMigrateBegin3ParamsArgs { - Dom: Dom, + args := DomainMigrateBegin3ParamsArgs{ + Dom: Dom, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13062,10 +12951,10 @@ func (l *Libvirt) DomainMigrateBegin3Params(Dom Domain, Params []TypedParam, Fla func (l *Libvirt) DomainMigratePrepare3Params(Params []TypedParam, CookieIn []byte, Flags uint32) (rCookieOut []byte, rUriOut OptString, err error) { var buf []byte - args := DomainMigratePrepare3ParamsArgs { - Params: Params, + args := DomainMigratePrepare3ParamsArgs{ + Params: Params, CookieIn: CookieIn, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13102,10 +12991,10 @@ func (l *Libvirt) DomainMigratePrepare3Params(Params []TypedParam, CookieIn []by func (l *Libvirt) DomainMigratePrepareTunnel3Params(Params []TypedParam, CookieIn []byte, Flags uint32) (rCookieOut []byte, err error) { var buf []byte - args := DomainMigratePrepareTunnel3ParamsArgs { - Params: Params, + args := DomainMigratePrepareTunnel3ParamsArgs{ + Params: Params, CookieIn: CookieIn, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13137,12 +13026,12 @@ func (l *Libvirt) DomainMigratePrepareTunnel3Params(Params []TypedParam, CookieI func (l *Libvirt) DomainMigratePerform3Params(Dom Domain, Dconnuri OptString, Params []TypedParam, CookieIn []byte, Flags DomainMigrateFlags) (rCookieOut []byte, err error) { var buf []byte - args := DomainMigratePerform3ParamsArgs { - Dom: Dom, + args := DomainMigratePerform3ParamsArgs{ + Dom: Dom, Dconnuri: Dconnuri, - Params: Params, + Params: Params, CookieIn: CookieIn, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13174,10 +13063,10 @@ func (l *Libvirt) DomainMigratePerform3Params(Dom Domain, Dconnuri OptString, Pa func (l *Libvirt) DomainMigrateFinish3Params(Params []TypedParam, CookieIn []byte, Flags uint32, Cancelled int32) (rDom Domain, rCookieOut []byte, err error) { var buf []byte - args := DomainMigrateFinish3ParamsArgs { - Params: Params, - CookieIn: CookieIn, - Flags: Flags, + args := DomainMigrateFinish3ParamsArgs{ + Params: Params, + CookieIn: CookieIn, + Flags: Flags, Cancelled: Cancelled, } @@ -13215,11 +13104,11 @@ func (l *Libvirt) DomainMigrateFinish3Params(Params []TypedParam, CookieIn []byt func (l *Libvirt) DomainMigrateConfirm3Params(Dom Domain, Params []TypedParam, CookieIn []byte, Flags uint32, Cancelled int32) (err error) { var buf []byte - args := DomainMigrateConfirm3ParamsArgs { - Dom: Dom, - Params: Params, - CookieIn: CookieIn, - Flags: Flags, + args := DomainMigrateConfirm3ParamsArgs{ + Dom: Dom, + Params: Params, + CookieIn: CookieIn, + Flags: Flags, Cancelled: Cancelled, } @@ -13228,7 +13117,6 @@ func (l *Libvirt) DomainMigrateConfirm3Params(Dom Domain, Params []TypedParam, C return } - _, err = l.requestStream(307, constants.Program, buf, nil, nil) if err != nil { return @@ -13241,10 +13129,10 @@ func (l *Libvirt) DomainMigrateConfirm3Params(Dom Domain, Params []TypedParam, C func (l *Libvirt) DomainSetMemoryStatsPeriod(Dom Domain, Period int32, Flags DomainMemoryModFlags) (err error) { var buf []byte - args := DomainSetMemoryStatsPeriodArgs { - Dom: Dom, + args := DomainSetMemoryStatsPeriodArgs{ + Dom: Dom, Period: Period, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13252,7 +13140,6 @@ func (l *Libvirt) DomainSetMemoryStatsPeriod(Dom Domain, Period int32, Flags Dom return } - _, err = l.requestStream(308, constants.Program, buf, nil, nil) if err != nil { return @@ -13265,9 +13152,9 @@ func (l *Libvirt) DomainSetMemoryStatsPeriod(Dom Domain, Period int32, Flags Dom func (l *Libvirt) DomainCreateXMLWithFiles(XMLDesc string, Flags DomainCreateFlags) (rDom Domain, err error) { var buf []byte - args := DomainCreateXMLWithFilesArgs { + args := DomainCreateXMLWithFilesArgs{ XMLDesc: XMLDesc, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13299,8 +13186,8 @@ func (l *Libvirt) DomainCreateXMLWithFiles(XMLDesc string, Flags DomainCreateFla func (l *Libvirt) DomainCreateWithFiles(Dom Domain, Flags DomainCreateFlags) (rDom Domain, err error) { var buf []byte - args := DomainCreateWithFilesArgs { - Dom: Dom, + args := DomainCreateWithFilesArgs{ + Dom: Dom, Flags: Flags, } @@ -13333,7 +13220,6 @@ func (l *Libvirt) DomainCreateWithFiles(Dom Domain, Flags DomainCreateFlags) (rD func (l *Libvirt) DomainEventDeviceRemoved() (err error) { var buf []byte - _, err = l.requestStream(311, constants.Program, buf, nil, nil) if err != nil { return @@ -13346,10 +13232,10 @@ func (l *Libvirt) DomainEventDeviceRemoved() (err error) { func (l *Libvirt) ConnectGetCPUModelNames(Arch string, NeedResults int32, Flags uint32) (rModels []string, rRet int32, err error) { var buf []byte - args := ConnectGetCPUModelNamesArgs { - Arch: Arch, + args := ConnectGetCPUModelNamesArgs{ + Arch: Arch, NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13386,9 +13272,9 @@ func (l *Libvirt) ConnectGetCPUModelNames(Arch string, NeedResults int32, Flags func (l *Libvirt) ConnectNetworkEventRegisterAny(EventID int32, Net OptNetwork) (rCallbackID int32, err error) { var buf []byte - args := ConnectNetworkEventRegisterAnyArgs { + args := ConnectNetworkEventRegisterAnyArgs{ EventID: EventID, - Net: Net, + Net: Net, } buf, err = encode(&args) @@ -13420,7 +13306,7 @@ func (l *Libvirt) ConnectNetworkEventRegisterAny(EventID int32, Net OptNetwork) func (l *Libvirt) ConnectNetworkEventDeregisterAny(CallbackID int32) (err error) { var buf []byte - args := ConnectNetworkEventDeregisterAnyArgs { + args := ConnectNetworkEventDeregisterAnyArgs{ CallbackID: CallbackID, } @@ -13429,7 +13315,6 @@ func (l *Libvirt) ConnectNetworkEventDeregisterAny(CallbackID int32) (err error) return } - _, err = l.requestStream(314, constants.Program, buf, nil, nil) if err != nil { return @@ -13442,7 +13327,6 @@ func (l *Libvirt) ConnectNetworkEventDeregisterAny(CallbackID int32) (err error) func (l *Libvirt) NetworkEventLifecycle() (err error) { var buf []byte - _, err = l.requestStream(315, constants.Program, buf, nil, nil) if err != nil { return @@ -13455,9 +13339,9 @@ func (l *Libvirt) NetworkEventLifecycle() (err error) { func (l *Libvirt) ConnectDomainEventCallbackRegisterAny(EventID int32, Dom OptDomain) (rCallbackID int32, err error) { var buf []byte - args := ConnectDomainEventCallbackRegisterAnyArgs { + args := ConnectDomainEventCallbackRegisterAnyArgs{ EventID: EventID, - Dom: Dom, + Dom: Dom, } buf, err = encode(&args) @@ -13489,7 +13373,7 @@ func (l *Libvirt) ConnectDomainEventCallbackRegisterAny(EventID int32, Dom OptDo func (l *Libvirt) ConnectDomainEventCallbackDeregisterAny(CallbackID int32) (err error) { var buf []byte - args := ConnectDomainEventCallbackDeregisterAnyArgs { + args := ConnectDomainEventCallbackDeregisterAnyArgs{ CallbackID: CallbackID, } @@ -13498,7 +13382,6 @@ func (l *Libvirt) ConnectDomainEventCallbackDeregisterAny(CallbackID int32) (err return } - _, err = l.requestStream(317, constants.Program, buf, nil, nil) if err != nil { return @@ -13511,7 +13394,6 @@ func (l *Libvirt) ConnectDomainEventCallbackDeregisterAny(CallbackID int32) (err func (l *Libvirt) DomainEventCallbackLifecycle() (err error) { var buf []byte - _, err = l.requestStream(318, constants.Program, buf, nil, nil) if err != nil { return @@ -13524,7 +13406,6 @@ func (l *Libvirt) DomainEventCallbackLifecycle() (err error) { func (l *Libvirt) DomainEventCallbackReboot() (err error) { var buf []byte - _, err = l.requestStream(319, constants.Program, buf, nil, nil) if err != nil { return @@ -13537,7 +13418,6 @@ func (l *Libvirt) DomainEventCallbackReboot() (err error) { func (l *Libvirt) DomainEventCallbackRtcChange() (err error) { var buf []byte - _, err = l.requestStream(320, constants.Program, buf, nil, nil) if err != nil { return @@ -13550,7 +13430,6 @@ func (l *Libvirt) DomainEventCallbackRtcChange() (err error) { func (l *Libvirt) DomainEventCallbackWatchdog() (err error) { var buf []byte - _, err = l.requestStream(321, constants.Program, buf, nil, nil) if err != nil { return @@ -13563,7 +13442,6 @@ func (l *Libvirt) DomainEventCallbackWatchdog() (err error) { func (l *Libvirt) DomainEventCallbackIOError() (err error) { var buf []byte - _, err = l.requestStream(322, constants.Program, buf, nil, nil) if err != nil { return @@ -13576,7 +13454,6 @@ func (l *Libvirt) DomainEventCallbackIOError() (err error) { func (l *Libvirt) DomainEventCallbackGraphics() (err error) { var buf []byte - _, err = l.requestStream(323, constants.Program, buf, nil, nil) if err != nil { return @@ -13589,7 +13466,6 @@ func (l *Libvirt) DomainEventCallbackGraphics() (err error) { func (l *Libvirt) DomainEventCallbackIOErrorReason() (err error) { var buf []byte - _, err = l.requestStream(324, constants.Program, buf, nil, nil) if err != nil { return @@ -13602,7 +13478,6 @@ func (l *Libvirt) DomainEventCallbackIOErrorReason() (err error) { func (l *Libvirt) DomainEventCallbackControlError() (err error) { var buf []byte - _, err = l.requestStream(325, constants.Program, buf, nil, nil) if err != nil { return @@ -13615,7 +13490,6 @@ func (l *Libvirt) DomainEventCallbackControlError() (err error) { func (l *Libvirt) DomainEventCallbackBlockJob() (err error) { var buf []byte - _, err = l.requestStream(326, constants.Program, buf, nil, nil) if err != nil { return @@ -13628,7 +13502,6 @@ func (l *Libvirt) DomainEventCallbackBlockJob() (err error) { func (l *Libvirt) DomainEventCallbackDiskChange() (err error) { var buf []byte - _, err = l.requestStream(327, constants.Program, buf, nil, nil) if err != nil { return @@ -13641,7 +13514,6 @@ func (l *Libvirt) DomainEventCallbackDiskChange() (err error) { func (l *Libvirt) DomainEventCallbackTrayChange() (err error) { var buf []byte - _, err = l.requestStream(328, constants.Program, buf, nil, nil) if err != nil { return @@ -13654,7 +13526,6 @@ func (l *Libvirt) DomainEventCallbackTrayChange() (err error) { func (l *Libvirt) DomainEventCallbackPmwakeup() (err error) { var buf []byte - _, err = l.requestStream(329, constants.Program, buf, nil, nil) if err != nil { return @@ -13667,7 +13538,6 @@ func (l *Libvirt) DomainEventCallbackPmwakeup() (err error) { func (l *Libvirt) DomainEventCallbackPmsuspend() (err error) { var buf []byte - _, err = l.requestStream(330, constants.Program, buf, nil, nil) if err != nil { return @@ -13680,7 +13550,6 @@ func (l *Libvirt) DomainEventCallbackPmsuspend() (err error) { func (l *Libvirt) DomainEventCallbackBalloonChange() (err error) { var buf []byte - _, err = l.requestStream(331, constants.Program, buf, nil, nil) if err != nil { return @@ -13693,7 +13562,6 @@ func (l *Libvirt) DomainEventCallbackBalloonChange() (err error) { func (l *Libvirt) DomainEventCallbackPmsuspendDisk() (err error) { var buf []byte - _, err = l.requestStream(332, constants.Program, buf, nil, nil) if err != nil { return @@ -13706,7 +13574,6 @@ func (l *Libvirt) DomainEventCallbackPmsuspendDisk() (err error) { func (l *Libvirt) DomainEventCallbackDeviceRemoved() (err error) { var buf []byte - _, err = l.requestStream(333, constants.Program, buf, nil, nil) if err != nil { return @@ -13719,11 +13586,11 @@ func (l *Libvirt) DomainEventCallbackDeviceRemoved() (err error) { func (l *Libvirt) DomainCoreDumpWithFormat(Dom Domain, To string, Dumpformat uint32, Flags DomainCoreDumpFlags) (err error) { var buf []byte - args := DomainCoreDumpWithFormatArgs { - Dom: Dom, - To: To, + args := DomainCoreDumpWithFormatArgs{ + Dom: Dom, + To: To, Dumpformat: Dumpformat, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13731,7 +13598,6 @@ func (l *Libvirt) DomainCoreDumpWithFormat(Dom Domain, To string, Dumpformat uin return } - _, err = l.requestStream(334, constants.Program, buf, nil, nil) if err != nil { return @@ -13744,10 +13610,10 @@ func (l *Libvirt) DomainCoreDumpWithFormat(Dom Domain, To string, Dumpformat uin func (l *Libvirt) DomainFsfreeze(Dom Domain, Mountpoints []string, Flags uint32) (rFilesystems int32, err error) { var buf []byte - args := DomainFsfreezeArgs { - Dom: Dom, + args := DomainFsfreezeArgs{ + Dom: Dom, Mountpoints: Mountpoints, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13779,10 +13645,10 @@ func (l *Libvirt) DomainFsfreeze(Dom Domain, Mountpoints []string, Flags uint32) func (l *Libvirt) DomainFsthaw(Dom Domain, Mountpoints []string, Flags uint32) (rFilesystems int32, err error) { var buf []byte - args := DomainFsthawArgs { - Dom: Dom, + args := DomainFsthawArgs{ + Dom: Dom, Mountpoints: Mountpoints, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13814,8 +13680,8 @@ func (l *Libvirt) DomainFsthaw(Dom Domain, Mountpoints []string, Flags uint32) ( func (l *Libvirt) DomainGetTime(Dom Domain, Flags uint32) (rSeconds int64, rNseconds uint32, err error) { var buf []byte - args := DomainGetTimeArgs { - Dom: Dom, + args := DomainGetTimeArgs{ + Dom: Dom, Flags: Flags, } @@ -13853,11 +13719,11 @@ func (l *Libvirt) DomainGetTime(Dom Domain, Flags uint32) (rSeconds int64, rNsec func (l *Libvirt) DomainSetTime(Dom Domain, Seconds int64, Nseconds uint32, Flags DomainSetTimeFlags) (err error) { var buf []byte - args := DomainSetTimeArgs { - Dom: Dom, - Seconds: Seconds, + args := DomainSetTimeArgs{ + Dom: Dom, + Seconds: Seconds, Nseconds: Nseconds, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13865,7 +13731,6 @@ func (l *Libvirt) DomainSetTime(Dom Domain, Seconds int64, Nseconds uint32, Flag return } - _, err = l.requestStream(338, constants.Program, buf, nil, nil) if err != nil { return @@ -13878,7 +13743,6 @@ func (l *Libvirt) DomainSetTime(Dom Domain, Seconds int64, Nseconds uint32, Flag func (l *Libvirt) DomainEventBlockJob2() (err error) { var buf []byte - _, err = l.requestStream(339, constants.Program, buf, nil, nil) if err != nil { return @@ -13891,11 +13755,11 @@ func (l *Libvirt) DomainEventBlockJob2() (err error) { func (l *Libvirt) NodeGetFreePages(Pages []uint32, StartCell int32, CellCount uint32, Flags uint32) (rCounts []uint64, err error) { var buf []byte - args := NodeGetFreePagesArgs { - Pages: Pages, + args := NodeGetFreePagesArgs{ + Pages: Pages, StartCell: StartCell, CellCount: CellCount, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13927,11 +13791,11 @@ func (l *Libvirt) NodeGetFreePages(Pages []uint32, StartCell int32, CellCount ui func (l *Libvirt) NetworkGetDhcpLeases(Net Network, Mac OptString, NeedResults int32, Flags uint32) (rLeases []NetworkDhcpLease, rRet uint32, err error) { var buf []byte - args := NetworkGetDhcpLeasesArgs { - Net: Net, - Mac: Mac, + args := NetworkGetDhcpLeasesArgs{ + Net: Net, + Mac: Mac, NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13968,12 +13832,12 @@ func (l *Libvirt) NetworkGetDhcpLeases(Net Network, Mac OptString, NeedResults i func (l *Libvirt) ConnectGetDomainCapabilities(Emulatorbin OptString, Arch OptString, Machine OptString, Virttype OptString, Flags uint32) (rCapabilities string, err error) { var buf []byte - args := ConnectGetDomainCapabilitiesArgs { + args := ConnectGetDomainCapabilitiesArgs{ Emulatorbin: Emulatorbin, - Arch: Arch, - Machine: Machine, - Virttype: Virttype, - Flags: Flags, + Arch: Arch, + Machine: Machine, + Virttype: Virttype, + Flags: Flags, } buf, err = encode(&args) @@ -14005,9 +13869,9 @@ func (l *Libvirt) ConnectGetDomainCapabilities(Emulatorbin OptString, Arch OptSt func (l *Libvirt) DomainOpenGraphicsFd(Dom Domain, Idx uint32, Flags DomainOpenGraphicsFlags) (err error) { var buf []byte - args := DomainOpenGraphicsFdArgs { - Dom: Dom, - Idx: Idx, + args := DomainOpenGraphicsFdArgs{ + Dom: Dom, + Idx: Idx, Flags: Flags, } @@ -14016,7 +13880,6 @@ func (l *Libvirt) DomainOpenGraphicsFd(Dom Domain, Idx uint32, Flags DomainOpenG return } - _, err = l.requestStream(343, constants.Program, buf, nil, nil) if err != nil { return @@ -14029,8 +13892,8 @@ func (l *Libvirt) DomainOpenGraphicsFd(Dom Domain, Idx uint32, Flags DomainOpenG func (l *Libvirt) ConnectGetAllDomainStats(Doms []Domain, Stats uint32, Flags ConnectGetAllDomainStatsFlags) (rRetStats []DomainStatsRecord, err error) { var buf []byte - args := ConnectGetAllDomainStatsArgs { - Doms: Doms, + args := ConnectGetAllDomainStatsArgs{ + Doms: Doms, Stats: Stats, Flags: Flags, } @@ -14064,12 +13927,12 @@ func (l *Libvirt) ConnectGetAllDomainStats(Doms []Domain, Stats uint32, Flags Co func (l *Libvirt) DomainBlockCopy(Dom Domain, Path string, Destxml string, Params []TypedParam, Flags DomainBlockCopyFlags) (err error) { var buf []byte - args := DomainBlockCopyArgs { - Dom: Dom, - Path: Path, + args := DomainBlockCopyArgs{ + Dom: Dom, + Path: Path, Destxml: Destxml, - Params: Params, - Flags: Flags, + Params: Params, + Flags: Flags, } buf, err = encode(&args) @@ -14077,7 +13940,6 @@ func (l *Libvirt) DomainBlockCopy(Dom Domain, Path string, Destxml string, Param return } - _, err = l.requestStream(345, constants.Program, buf, nil, nil) if err != nil { return @@ -14090,7 +13952,6 @@ func (l *Libvirt) DomainBlockCopy(Dom Domain, Path string, Destxml string, Param func (l *Libvirt) DomainEventCallbackTunable() (err error) { var buf []byte - _, err = l.requestStream(346, constants.Program, buf, nil, nil) if err != nil { return @@ -14103,12 +13964,12 @@ func (l *Libvirt) DomainEventCallbackTunable() (err error) { func (l *Libvirt) NodeAllocPages(PageSizes []uint32, PageCounts []uint64, StartCell int32, CellCount uint32, Flags NodeAllocPagesFlags) (rRet int32, err error) { var buf []byte - args := NodeAllocPagesArgs { - PageSizes: PageSizes, + args := NodeAllocPagesArgs{ + PageSizes: PageSizes, PageCounts: PageCounts, - StartCell: StartCell, - CellCount: CellCount, - Flags: Flags, + StartCell: StartCell, + CellCount: CellCount, + Flags: Flags, } buf, err = encode(&args) @@ -14140,7 +14001,6 @@ func (l *Libvirt) NodeAllocPages(PageSizes []uint32, PageCounts []uint64, StartC func (l *Libvirt) DomainEventCallbackAgentLifecycle() (err error) { var buf []byte - _, err = l.requestStream(348, constants.Program, buf, nil, nil) if err != nil { return @@ -14153,8 +14013,8 @@ func (l *Libvirt) DomainEventCallbackAgentLifecycle() (err error) { func (l *Libvirt) DomainGetFsinfo(Dom Domain, Flags uint32) (rInfo []DomainFsinfo, rRet uint32, err error) { var buf []byte - args := DomainGetFsinfoArgs { - Dom: Dom, + args := DomainGetFsinfoArgs{ + Dom: Dom, Flags: Flags, } @@ -14192,8 +14052,8 @@ func (l *Libvirt) DomainGetFsinfo(Dom Domain, Flags uint32) (rInfo []DomainFsinf func (l *Libvirt) DomainDefineXMLFlags(XML string, Flags DomainDefineFlags) (rDom Domain, err error) { var buf []byte - args := DomainDefineXMLFlagsArgs { - XML: XML, + args := DomainDefineXMLFlagsArgs{ + XML: XML, Flags: Flags, } @@ -14226,8 +14086,8 @@ func (l *Libvirt) DomainDefineXMLFlags(XML string, Flags DomainDefineFlags) (rDo func (l *Libvirt) DomainGetIothreadInfo(Dom Domain, Flags DomainModificationImpact) (rInfo []DomainIothreadInfo, rRet uint32, err error) { var buf []byte - args := DomainGetIothreadInfoArgs { - Dom: Dom, + args := DomainGetIothreadInfoArgs{ + Dom: Dom, Flags: Flags, } @@ -14265,11 +14125,11 @@ func (l *Libvirt) DomainGetIothreadInfo(Dom Domain, Flags DomainModificationImpa func (l *Libvirt) DomainPinIothread(Dom Domain, IothreadsID uint32, Cpumap []byte, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainPinIothreadArgs { - Dom: Dom, + args := DomainPinIothreadArgs{ + Dom: Dom, IothreadsID: IothreadsID, - Cpumap: Cpumap, - Flags: Flags, + Cpumap: Cpumap, + Flags: Flags, } buf, err = encode(&args) @@ -14277,7 +14137,6 @@ func (l *Libvirt) DomainPinIothread(Dom Domain, IothreadsID uint32, Cpumap []byt return } - _, err = l.requestStream(352, constants.Program, buf, nil, nil) if err != nil { return @@ -14290,10 +14149,10 @@ func (l *Libvirt) DomainPinIothread(Dom Domain, IothreadsID uint32, Cpumap []byt func (l *Libvirt) DomainInterfaceAddresses(Dom Domain, Source uint32, Flags uint32) (rIfaces []DomainInterface, err error) { var buf []byte - args := DomainInterfaceAddressesArgs { - Dom: Dom, + args := DomainInterfaceAddressesArgs{ + Dom: Dom, Source: Source, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14325,7 +14184,6 @@ func (l *Libvirt) DomainInterfaceAddresses(Dom Domain, Source uint32, Flags uint func (l *Libvirt) DomainEventCallbackDeviceAdded() (err error) { var buf []byte - _, err = l.requestStream(354, constants.Program, buf, nil, nil) if err != nil { return @@ -14338,10 +14196,10 @@ func (l *Libvirt) DomainEventCallbackDeviceAdded() (err error) { func (l *Libvirt) DomainAddIothread(Dom Domain, IothreadID uint32, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainAddIothreadArgs { - Dom: Dom, + args := DomainAddIothreadArgs{ + Dom: Dom, IothreadID: IothreadID, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14349,7 +14207,6 @@ func (l *Libvirt) DomainAddIothread(Dom Domain, IothreadID uint32, Flags DomainM return } - _, err = l.requestStream(355, constants.Program, buf, nil, nil) if err != nil { return @@ -14362,10 +14219,10 @@ func (l *Libvirt) DomainAddIothread(Dom Domain, IothreadID uint32, Flags DomainM func (l *Libvirt) DomainDelIothread(Dom Domain, IothreadID uint32, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainDelIothreadArgs { - Dom: Dom, + args := DomainDelIothreadArgs{ + Dom: Dom, IothreadID: IothreadID, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14373,7 +14230,6 @@ func (l *Libvirt) DomainDelIothread(Dom Domain, IothreadID uint32, Flags DomainM return } - _, err = l.requestStream(356, constants.Program, buf, nil, nil) if err != nil { return @@ -14386,11 +14242,11 @@ func (l *Libvirt) DomainDelIothread(Dom Domain, IothreadID uint32, Flags DomainM func (l *Libvirt) DomainSetUserPassword(Dom Domain, User OptString, Password OptString, Flags DomainSetUserPasswordFlags) (err error) { var buf []byte - args := DomainSetUserPasswordArgs { - Dom: Dom, - User: User, + args := DomainSetUserPasswordArgs{ + Dom: Dom, + User: User, Password: Password, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14398,7 +14254,6 @@ func (l *Libvirt) DomainSetUserPassword(Dom Domain, User OptString, Password Opt return } - _, err = l.requestStream(357, constants.Program, buf, nil, nil) if err != nil { return @@ -14411,10 +14266,10 @@ func (l *Libvirt) DomainSetUserPassword(Dom Domain, User OptString, Password Opt func (l *Libvirt) DomainRename(Dom Domain, NewName OptString, Flags uint32) (rRetcode int32, err error) { var buf []byte - args := DomainRenameArgs { - Dom: Dom, + args := DomainRenameArgs{ + Dom: Dom, NewName: NewName, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14446,7 +14301,6 @@ func (l *Libvirt) DomainRename(Dom Domain, NewName OptString, Flags uint32) (rRe func (l *Libvirt) DomainEventCallbackMigrationIteration() (err error) { var buf []byte - _, err = l.requestStream(359, constants.Program, buf, nil, nil) if err != nil { return @@ -14459,7 +14313,6 @@ func (l *Libvirt) DomainEventCallbackMigrationIteration() (err error) { func (l *Libvirt) ConnectRegisterCloseCallback() (err error) { var buf []byte - _, err = l.requestStream(360, constants.Program, buf, nil, nil) if err != nil { return @@ -14472,7 +14325,6 @@ func (l *Libvirt) ConnectRegisterCloseCallback() (err error) { func (l *Libvirt) ConnectUnregisterCloseCallback() (err error) { var buf []byte - _, err = l.requestStream(361, constants.Program, buf, nil, nil) if err != nil { return @@ -14485,7 +14337,6 @@ func (l *Libvirt) ConnectUnregisterCloseCallback() (err error) { func (l *Libvirt) ConnectEventConnectionClosed() (err error) { var buf []byte - _, err = l.requestStream(362, constants.Program, buf, nil, nil) if err != nil { return @@ -14498,7 +14349,6 @@ func (l *Libvirt) ConnectEventConnectionClosed() (err error) { func (l *Libvirt) DomainEventCallbackJobCompleted() (err error) { var buf []byte - _, err = l.requestStream(363, constants.Program, buf, nil, nil) if err != nil { return @@ -14511,8 +14361,8 @@ func (l *Libvirt) DomainEventCallbackJobCompleted() (err error) { func (l *Libvirt) DomainMigrateStartPostCopy(Dom Domain, Flags uint32) (err error) { var buf []byte - args := DomainMigrateStartPostCopyArgs { - Dom: Dom, + args := DomainMigrateStartPostCopyArgs{ + Dom: Dom, Flags: Flags, } @@ -14521,7 +14371,6 @@ func (l *Libvirt) DomainMigrateStartPostCopy(Dom Domain, Flags uint32) (err erro return } - _, err = l.requestStream(364, constants.Program, buf, nil, nil) if err != nil { return @@ -14534,8 +14383,8 @@ func (l *Libvirt) DomainMigrateStartPostCopy(Dom Domain, Flags uint32) (err erro func (l *Libvirt) DomainGetPerfEvents(Dom Domain, Flags DomainModificationImpact) (rParams []TypedParam, err error) { var buf []byte - args := DomainGetPerfEventsArgs { - Dom: Dom, + args := DomainGetPerfEventsArgs{ + Dom: Dom, Flags: Flags, } @@ -14568,10 +14417,10 @@ func (l *Libvirt) DomainGetPerfEvents(Dom Domain, Flags DomainModificationImpact func (l *Libvirt) DomainSetPerfEvents(Dom Domain, Params []TypedParam, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainSetPerfEventsArgs { - Dom: Dom, + args := DomainSetPerfEventsArgs{ + Dom: Dom, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14579,7 +14428,6 @@ func (l *Libvirt) DomainSetPerfEvents(Dom Domain, Params []TypedParam, Flags Dom return } - _, err = l.requestStream(366, constants.Program, buf, nil, nil) if err != nil { return @@ -14592,7 +14440,6 @@ func (l *Libvirt) DomainSetPerfEvents(Dom Domain, Params []TypedParam, Flags Dom func (l *Libvirt) DomainEventCallbackDeviceRemovalFailed() (err error) { var buf []byte - _, err = l.requestStream(367, constants.Program, buf, nil, nil) if err != nil { return @@ -14605,9 +14452,9 @@ func (l *Libvirt) DomainEventCallbackDeviceRemovalFailed() (err error) { func (l *Libvirt) ConnectStoragePoolEventRegisterAny(EventID int32, Pool OptStoragePool) (rCallbackID int32, err error) { var buf []byte - args := ConnectStoragePoolEventRegisterAnyArgs { + args := ConnectStoragePoolEventRegisterAnyArgs{ EventID: EventID, - Pool: Pool, + Pool: Pool, } buf, err = encode(&args) @@ -14639,7 +14486,7 @@ func (l *Libvirt) ConnectStoragePoolEventRegisterAny(EventID int32, Pool OptStor func (l *Libvirt) ConnectStoragePoolEventDeregisterAny(CallbackID int32) (err error) { var buf []byte - args := ConnectStoragePoolEventDeregisterAnyArgs { + args := ConnectStoragePoolEventDeregisterAnyArgs{ CallbackID: CallbackID, } @@ -14648,7 +14495,6 @@ func (l *Libvirt) ConnectStoragePoolEventDeregisterAny(CallbackID int32) (err er return } - _, err = l.requestStream(369, constants.Program, buf, nil, nil) if err != nil { return @@ -14661,7 +14507,6 @@ func (l *Libvirt) ConnectStoragePoolEventDeregisterAny(CallbackID int32) (err er func (l *Libvirt) StoragePoolEventLifecycle() (err error) { var buf []byte - _, err = l.requestStream(370, constants.Program, buf, nil, nil) if err != nil { return @@ -14674,8 +14519,8 @@ func (l *Libvirt) StoragePoolEventLifecycle() (err error) { func (l *Libvirt) DomainGetGuestVcpus(Dom Domain, Flags uint32) (rParams []TypedParam, err error) { var buf []byte - args := DomainGetGuestVcpusArgs { - Dom: Dom, + args := DomainGetGuestVcpusArgs{ + Dom: Dom, Flags: Flags, } @@ -14708,11 +14553,11 @@ func (l *Libvirt) DomainGetGuestVcpus(Dom Domain, Flags uint32) (rParams []Typed func (l *Libvirt) DomainSetGuestVcpus(Dom Domain, Cpumap string, State int32, Flags uint32) (err error) { var buf []byte - args := DomainSetGuestVcpusArgs { - Dom: Dom, + args := DomainSetGuestVcpusArgs{ + Dom: Dom, Cpumap: Cpumap, - State: State, - Flags: Flags, + State: State, + Flags: Flags, } buf, err = encode(&args) @@ -14720,7 +14565,6 @@ func (l *Libvirt) DomainSetGuestVcpus(Dom Domain, Cpumap string, State int32, Fl return } - _, err = l.requestStream(372, constants.Program, buf, nil, nil) if err != nil { return @@ -14733,7 +14577,6 @@ func (l *Libvirt) DomainSetGuestVcpus(Dom Domain, Cpumap string, State int32, Fl func (l *Libvirt) StoragePoolEventRefresh() (err error) { var buf []byte - _, err = l.requestStream(373, constants.Program, buf, nil, nil) if err != nil { return @@ -14746,9 +14589,9 @@ func (l *Libvirt) StoragePoolEventRefresh() (err error) { func (l *Libvirt) ConnectNodeDeviceEventRegisterAny(EventID int32, Dev OptNodeDevice) (rCallbackID int32, err error) { var buf []byte - args := ConnectNodeDeviceEventRegisterAnyArgs { + args := ConnectNodeDeviceEventRegisterAnyArgs{ EventID: EventID, - Dev: Dev, + Dev: Dev, } buf, err = encode(&args) @@ -14780,7 +14623,7 @@ func (l *Libvirt) ConnectNodeDeviceEventRegisterAny(EventID int32, Dev OptNodeDe func (l *Libvirt) ConnectNodeDeviceEventDeregisterAny(CallbackID int32) (err error) { var buf []byte - args := ConnectNodeDeviceEventDeregisterAnyArgs { + args := ConnectNodeDeviceEventDeregisterAnyArgs{ CallbackID: CallbackID, } @@ -14789,7 +14632,6 @@ func (l *Libvirt) ConnectNodeDeviceEventDeregisterAny(CallbackID int32) (err err return } - _, err = l.requestStream(375, constants.Program, buf, nil, nil) if err != nil { return @@ -14802,7 +14644,6 @@ func (l *Libvirt) ConnectNodeDeviceEventDeregisterAny(CallbackID int32) (err err func (l *Libvirt) NodeDeviceEventLifecycle() (err error) { var buf []byte - _, err = l.requestStream(376, constants.Program, buf, nil, nil) if err != nil { return @@ -14815,7 +14656,6 @@ func (l *Libvirt) NodeDeviceEventLifecycle() (err error) { func (l *Libvirt) NodeDeviceEventUpdate() (err error) { var buf []byte - _, err = l.requestStream(377, constants.Program, buf, nil, nil) if err != nil { return @@ -14828,8 +14668,8 @@ func (l *Libvirt) NodeDeviceEventUpdate() (err error) { func (l *Libvirt) StorageVolGetInfoFlags(Vol StorageVol, Flags uint32) (rType int8, rCapacity uint64, rAllocation uint64, err error) { var buf []byte - args := StorageVolGetInfoFlagsArgs { - Vol: Vol, + args := StorageVolGetInfoFlagsArgs{ + Vol: Vol, Flags: Flags, } @@ -14872,7 +14712,6 @@ func (l *Libvirt) StorageVolGetInfoFlags(Vol StorageVol, Flags uint32) (rType in func (l *Libvirt) DomainEventCallbackMetadataChange() (err error) { var buf []byte - _, err = l.requestStream(379, constants.Program, buf, nil, nil) if err != nil { return @@ -14885,8 +14724,8 @@ func (l *Libvirt) DomainEventCallbackMetadataChange() (err error) { func (l *Libvirt) ConnectSecretEventRegisterAny(EventID int32, OptSecret OptSecret) (rCallbackID int32, err error) { var buf []byte - args := ConnectSecretEventRegisterAnyArgs { - EventID: EventID, + args := ConnectSecretEventRegisterAnyArgs{ + EventID: EventID, OptSecret: OptSecret, } @@ -14919,7 +14758,7 @@ func (l *Libvirt) ConnectSecretEventRegisterAny(EventID int32, OptSecret OptSecr func (l *Libvirt) ConnectSecretEventDeregisterAny(CallbackID int32) (err error) { var buf []byte - args := ConnectSecretEventDeregisterAnyArgs { + args := ConnectSecretEventDeregisterAnyArgs{ CallbackID: CallbackID, } @@ -14928,7 +14767,6 @@ func (l *Libvirt) ConnectSecretEventDeregisterAny(CallbackID int32) (err error) return } - _, err = l.requestStream(381, constants.Program, buf, nil, nil) if err != nil { return @@ -14941,7 +14779,6 @@ func (l *Libvirt) ConnectSecretEventDeregisterAny(CallbackID int32) (err error) func (l *Libvirt) SecretEventLifecycle() (err error) { var buf []byte - _, err = l.requestStream(382, constants.Program, buf, nil, nil) if err != nil { return @@ -14954,7 +14791,6 @@ func (l *Libvirt) SecretEventLifecycle() (err error) { func (l *Libvirt) SecretEventValueChanged() (err error) { var buf []byte - _, err = l.requestStream(383, constants.Program, buf, nil, nil) if err != nil { return @@ -14967,11 +14803,11 @@ func (l *Libvirt) SecretEventValueChanged() (err error) { func (l *Libvirt) DomainSetVcpu(Dom Domain, Cpumap string, State int32, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainSetVcpuArgs { - Dom: Dom, + args := DomainSetVcpuArgs{ + Dom: Dom, Cpumap: Cpumap, - State: State, - Flags: Flags, + State: State, + Flags: Flags, } buf, err = encode(&args) @@ -14979,7 +14815,6 @@ func (l *Libvirt) DomainSetVcpu(Dom Domain, Cpumap string, State int32, Flags Do return } - _, err = l.requestStream(384, constants.Program, buf, nil, nil) if err != nil { return @@ -14992,7 +14827,6 @@ func (l *Libvirt) DomainSetVcpu(Dom Domain, Cpumap string, State int32, Flags Do func (l *Libvirt) DomainEventBlockThreshold() (err error) { var buf []byte - _, err = l.requestStream(385, constants.Program, buf, nil, nil) if err != nil { return @@ -15005,11 +14839,11 @@ func (l *Libvirt) DomainEventBlockThreshold() (err error) { func (l *Libvirt) DomainSetBlockThreshold(Dom Domain, Dev string, Threshold uint64, Flags uint32) (err error) { var buf []byte - args := DomainSetBlockThresholdArgs { - Dom: Dom, - Dev: Dev, + args := DomainSetBlockThresholdArgs{ + Dom: Dom, + Dev: Dev, Threshold: Threshold, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -15017,7 +14851,6 @@ func (l *Libvirt) DomainSetBlockThreshold(Dom Domain, Dev string, Threshold uint return } - _, err = l.requestStream(386, constants.Program, buf, nil, nil) if err != nil { return @@ -15030,8 +14863,8 @@ func (l *Libvirt) DomainSetBlockThreshold(Dom Domain, Dev string, Threshold uint func (l *Libvirt) DomainMigrateGetMaxDowntime(Dom Domain, Flags uint32) (rDowntime uint64, err error) { var buf []byte - args := DomainMigrateGetMaxDowntimeArgs { - Dom: Dom, + args := DomainMigrateGetMaxDowntimeArgs{ + Dom: Dom, Flags: Flags, } @@ -15064,8 +14897,8 @@ func (l *Libvirt) DomainMigrateGetMaxDowntime(Dom Domain, Flags uint32) (rDownti func (l *Libvirt) DomainManagedSaveGetXMLDesc(Dom Domain, Flags DomainXMLFlags) (rXML string, err error) { var buf []byte - args := DomainManagedSaveGetXMLDescArgs { - Dom: Dom, + args := DomainManagedSaveGetXMLDescArgs{ + Dom: Dom, Flags: Flags, } @@ -15098,9 +14931,9 @@ func (l *Libvirt) DomainManagedSaveGetXMLDesc(Dom Domain, Flags DomainXMLFlags) func (l *Libvirt) DomainManagedSaveDefineXML(Dom Domain, Dxml OptString, Flags DomainSaveRestoreFlags) (err error) { var buf []byte - args := DomainManagedSaveDefineXMLArgs { - Dom: Dom, - Dxml: Dxml, + args := DomainManagedSaveDefineXMLArgs{ + Dom: Dom, + Dxml: Dxml, Flags: Flags, } @@ -15109,7 +14942,6 @@ func (l *Libvirt) DomainManagedSaveDefineXML(Dom Domain, Dxml OptString, Flags D return } - _, err = l.requestStream(389, constants.Program, buf, nil, nil) if err != nil { return @@ -15122,11 +14954,11 @@ func (l *Libvirt) DomainManagedSaveDefineXML(Dom Domain, Dxml OptString, Flags D func (l *Libvirt) DomainSetLifecycleAction(Dom Domain, Type uint32, Action uint32, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainSetLifecycleActionArgs { - Dom: Dom, - Type: Type, + args := DomainSetLifecycleActionArgs{ + Dom: Dom, + Type: Type, Action: Action, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -15134,7 +14966,6 @@ func (l *Libvirt) DomainSetLifecycleAction(Dom Domain, Type uint32, Action uint3 return } - _, err = l.requestStream(390, constants.Program, buf, nil, nil) if err != nil { return @@ -15147,7 +14978,7 @@ func (l *Libvirt) DomainSetLifecycleAction(Dom Domain, Type uint32, Action uint3 func (l *Libvirt) StoragePoolLookupByTargetPath(Path string) (rPool StoragePool, err error) { var buf []byte - args := StoragePoolLookupByTargetPathArgs { + args := StoragePoolLookupByTargetPathArgs{ Path: Path, } @@ -15180,8 +15011,8 @@ func (l *Libvirt) StoragePoolLookupByTargetPath(Path string) (rPool StoragePool, func (l *Libvirt) DomainDetachDeviceAlias(Dom Domain, Alias string, Flags uint32) (err error) { var buf []byte - args := DomainDetachDeviceAliasArgs { - Dom: Dom, + args := DomainDetachDeviceAliasArgs{ + Dom: Dom, Alias: Alias, Flags: Flags, } @@ -15191,7 +15022,6 @@ func (l *Libvirt) DomainDetachDeviceAlias(Dom Domain, Alias string, Flags uint32 return } - _, err = l.requestStream(392, constants.Program, buf, nil, nil) if err != nil { return @@ -15204,13 +15034,13 @@ func (l *Libvirt) DomainDetachDeviceAlias(Dom Domain, Alias string, Flags uint32 func (l *Libvirt) ConnectCompareHypervisorCPU(Emulator OptString, Arch OptString, Machine OptString, Virttype OptString, XMLCPU string, Flags uint32) (rResult int32, err error) { var buf []byte - args := ConnectCompareHypervisorCPUArgs { + args := ConnectCompareHypervisorCPUArgs{ Emulator: Emulator, - Arch: Arch, - Machine: Machine, + Arch: Arch, + Machine: Machine, Virttype: Virttype, - XMLCPU: XMLCPU, - Flags: Flags, + XMLCPU: XMLCPU, + Flags: Flags, } buf, err = encode(&args) @@ -15242,13 +15072,13 @@ func (l *Libvirt) ConnectCompareHypervisorCPU(Emulator OptString, Arch OptString func (l *Libvirt) ConnectBaselineHypervisorCPU(Emulator OptString, Arch OptString, Machine OptString, Virttype OptString, XMLCPUs []string, Flags uint32) (rCPU string, err error) { var buf []byte - args := ConnectBaselineHypervisorCPUArgs { + args := ConnectBaselineHypervisorCPUArgs{ Emulator: Emulator, - Arch: Arch, - Machine: Machine, + Arch: Arch, + Machine: Machine, Virttype: Virttype, - XMLCPUs: XMLCPUs, - Flags: Flags, + XMLCPUs: XMLCPUs, + Flags: Flags, } buf, err = encode(&args) @@ -15280,9 +15110,9 @@ func (l *Libvirt) ConnectBaselineHypervisorCPU(Emulator OptString, Arch OptStrin func (l *Libvirt) NodeGetSevInfo(Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := NodeGetSevInfoArgs { + args := NodeGetSevInfoArgs{ Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -15319,8 +15149,8 @@ func (l *Libvirt) NodeGetSevInfo(Nparams int32, Flags uint32) (rParams []TypedPa func (l *Libvirt) DomainGetLaunchSecurityInfo(Dom Domain, Flags uint32) (rParams []TypedParam, err error) { var buf []byte - args := DomainGetLaunchSecurityInfoArgs { - Dom: Dom, + args := DomainGetLaunchSecurityInfoArgs{ + Dom: Dom, Flags: Flags, } @@ -15353,7 +15183,7 @@ func (l *Libvirt) DomainGetLaunchSecurityInfo(Dom Domain, Flags uint32) (rParams func (l *Libvirt) NwfilterBindingLookupByPortDev(Name string) (rOptNwfilter NwfilterBinding, err error) { var buf []byte - args := NwfilterBindingLookupByPortDevArgs { + args := NwfilterBindingLookupByPortDevArgs{ Name: Name, } @@ -15386,9 +15216,9 @@ func (l *Libvirt) NwfilterBindingLookupByPortDev(Name string) (rOptNwfilter Nwfi func (l *Libvirt) NwfilterBindingGetXMLDesc(OptNwfilter NwfilterBinding, Flags uint32) (rXML string, err error) { var buf []byte - args := NwfilterBindingGetXMLDescArgs { + args := NwfilterBindingGetXMLDescArgs{ OptNwfilter: OptNwfilter, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -15420,8 +15250,8 @@ func (l *Libvirt) NwfilterBindingGetXMLDesc(OptNwfilter NwfilterBinding, Flags u func (l *Libvirt) NwfilterBindingCreateXML(XML string, Flags uint32) (rOptNwfilter NwfilterBinding, err error) { var buf []byte - args := NwfilterBindingCreateXMLArgs { - XML: XML, + args := NwfilterBindingCreateXMLArgs{ + XML: XML, Flags: Flags, } @@ -15454,7 +15284,7 @@ func (l *Libvirt) NwfilterBindingCreateXML(XML string, Flags uint32) (rOptNwfilt func (l *Libvirt) NwfilterBindingDelete(OptNwfilter NwfilterBinding) (err error) { var buf []byte - args := NwfilterBindingDeleteArgs { + args := NwfilterBindingDeleteArgs{ OptNwfilter: OptNwfilter, } @@ -15463,7 +15293,6 @@ func (l *Libvirt) NwfilterBindingDelete(OptNwfilter NwfilterBinding) (err error) return } - _, err = l.requestStream(400, constants.Program, buf, nil, nil) if err != nil { return @@ -15476,9 +15305,9 @@ func (l *Libvirt) NwfilterBindingDelete(OptNwfilter NwfilterBinding) (err error) func (l *Libvirt) ConnectListAllNwfilterBindings(NeedResults int32, Flags uint32) (rBindings []NwfilterBinding, rRet uint32, err error) { var buf []byte - args := ConnectListAllNwfilterBindingsArgs { + args := ConnectListAllNwfilterBindingsArgs{ NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -15515,11 +15344,11 @@ func (l *Libvirt) ConnectListAllNwfilterBindings(NeedResults int32, Flags uint32 func (l *Libvirt) DomainSetIothreadParams(Dom Domain, IothreadID uint32, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetIothreadParamsArgs { - Dom: Dom, + args := DomainSetIothreadParamsArgs{ + Dom: Dom, IothreadID: IothreadID, - Params: Params, - Flags: Flags, + Params: Params, + Flags: Flags, } buf, err = encode(&args) @@ -15527,7 +15356,6 @@ func (l *Libvirt) DomainSetIothreadParams(Dom Domain, IothreadID uint32, Params return } - _, err = l.requestStream(402, constants.Program, buf, nil, nil) if err != nil { return @@ -15535,4 +15363,3 @@ func (l *Libvirt) DomainSetIothreadParams(Dom Domain, IothreadID uint32, Params return } - diff --git a/vendor/github.com/digitalocean/go-libvirt/units.go b/vendor/github.com/digitalocean/go-libvirt/units.go index 03686507f..85f4d4f01 100644 --- a/vendor/github.com/digitalocean/go-libvirt/units.go +++ b/vendor/github.com/digitalocean/go-libvirt/units.go @@ -18,10 +18,10 @@ package libvirt const ( - // B - byte - B = 1 - // KiB - kibibyte + // B - byte + B = 1 + // KiB - kibibyte KiB = 1024 * B - // MiB - mebibyte + // MiB - mebibyte MiB = 1024 * KiB ) diff --git a/vendor/github.com/golang-collections/collections/stack/stack.go b/vendor/github.com/golang-collections/collections/stack/stack.go index 04063dfab..fc75f45a0 100644 --- a/vendor/github.com/golang-collections/collections/stack/stack.go +++ b/vendor/github.com/golang-collections/collections/stack/stack.go @@ -2,22 +2,25 @@ package stack type ( Stack struct { - top *node + top *node length int } node struct { value interface{} - prev *node - } + prev *node + } ) + // Create a new stack func New() *Stack { - return &Stack{nil,0} + return &Stack{nil, 0} } + // Return the number of items in the stack func (this *Stack) Len() int { return this.length } + // View the top item on the stack func (this *Stack) Peek() interface{} { if this.length == 0 { @@ -25,20 +28,22 @@ func (this *Stack) Peek() interface{} { } return this.top.value } + // Pop the top item of the stack and return it func (this *Stack) Pop() interface{} { if this.length == 0 { return nil } - + n := this.top this.top = n.prev this.length-- return n.value } + // Push a value onto the top of the stack func (this *Stack) Push(value interface{}) { - n := &node{value,this.top} + n := &node{value, this.top} this.top = n this.length++ -} \ No newline at end of file +} diff --git a/vendor/github.com/hashicorp/go-getter/gcs/v2/get_gcs.go b/vendor/github.com/hashicorp/go-getter/gcs/v2/get_gcs.go index dd9b6f256..97ae6e318 100644 --- a/vendor/github.com/hashicorp/go-getter/gcs/v2/get_gcs.go +++ b/vendor/github.com/hashicorp/go-getter/gcs/v2/get_gcs.go @@ -15,7 +15,7 @@ import ( // Getter is a Getter implementation that will download a module from // a GCS bucket. -type Getter struct {} +type Getter struct{} func (g *Getter) Mode(ctx context.Context, u *url.URL) (getter.Mode, error) { diff --git a/vendor/github.com/hashicorp/go-sockaddr/ifaddrs.go b/vendor/github.com/hashicorp/go-sockaddr/ifaddrs.go index 80f61bef6..d58cb50af 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/ifaddrs.go +++ b/vendor/github.com/hashicorp/go-sockaddr/ifaddrs.go @@ -1214,7 +1214,7 @@ func parseDefaultIfNameFromIPCmd(routeOut string) (string, error) { // Android. func parseDefaultIfNameFromIPCmdAndroid(routeOut string) (string, error) { parsedLines := parseIfNameFromIPCmd(routeOut) - if (len(parsedLines) > 0) { + if len(parsedLines) > 0 { ifName := strings.TrimSpace(parsedLines[0][4]) return ifName, nil } @@ -1222,7 +1222,6 @@ func parseDefaultIfNameFromIPCmdAndroid(routeOut string) (string, error) { return "", errors.New("No default interface found") } - // parseIfNameFromIPCmd parses interfaces from ip(8) for // Linux. func parseIfNameFromIPCmd(routeOut string) [][]string { diff --git a/vendor/github.com/hashicorp/go-sockaddr/route_info_android.go b/vendor/github.com/hashicorp/go-sockaddr/route_info_android.go index 9885915a6..6f484cc44 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/route_info_android.go +++ b/vendor/github.com/hashicorp/go-sockaddr/route_info_android.go @@ -25,7 +25,6 @@ func (ri routeInfo) GetDefaultInterfaceName() (string, error) { return "", err } - var ifName string if ifName, err = parseDefaultIfNameFromIPCmdAndroid(string(out)); err != nil { return "", errors.New("No default interface found") diff --git a/vendor/github.com/hashicorp/go-uuid/uuid.go b/vendor/github.com/hashicorp/go-uuid/uuid.go index 0c10c4e9f..6424c8465 100644 --- a/vendor/github.com/hashicorp/go-uuid/uuid.go +++ b/vendor/github.com/hashicorp/go-uuid/uuid.go @@ -24,7 +24,6 @@ func GenerateRandomBytesWithReader(size int, reader io.Reader) ([]byte, error) { return buf, nil } - const uuidLen = 16 // GenerateUUID is used to generate a random UUID @@ -58,7 +57,7 @@ func FormatUUID(buf []byte) (string, error) { } func ParseUUID(uuid string) ([]byte, error) { - if len(uuid) != 2 * uuidLen + 4 { + if len(uuid) != 2*uuidLen+4 { return nil, fmt.Errorf("uuid string is wrong length") } diff --git a/vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go b/vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go index 92d70934d..a0b97e3f7 100644 --- a/vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go +++ b/vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go @@ -34,6 +34,6 @@ type LRUCache interface { // Clears all cache entries. Purge() - // Resizes cache, returning number evicted - Resize(int) int + // Resizes cache, returning number evicted + Resize(int) int } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Config.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Config.go index 993bb0319..b93c4ffb0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Config.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Config.go @@ -41,4 +41,4 @@ func (c *Config) SetEndpoint(endpoint string) { func (c *Config) SetTimeout(timeout time.Duration) { c.Timeout = timeout -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Const.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Const.go index bb8341d8e..3ba92895d 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Const.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Const.go @@ -29,4 +29,3 @@ const ( HeaderJdcloudPrefix = "x-jdcloud" HeaderJdcloudRequestId = "x-jdcloud-request-id" ) - diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/JdcloudClient.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/JdcloudClient.go index 82adae99e..125d3734f 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/JdcloudClient.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/JdcloudClient.go @@ -15,12 +15,12 @@ package core import ( + "encoding/base64" + "encoding/json" + "fmt" "net/http" "strings" "time" - "fmt" - "encoding/json" - "encoding/base64" ) // JDCloudClient is the base struct of service clients diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Logger.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Logger.go index deff03c9c..7f057c9bb 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Logger.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Logger.go @@ -20,11 +20,11 @@ const ( LogFatal = iota LogError LogWarn - LogInfo + LogInfo ) type Logger interface { - Log(level int, message... interface{}) + Log(level int, message ...interface{}) } type DefaultLogger struct { @@ -35,9 +35,8 @@ func NewDefaultLogger(level int) *DefaultLogger { return &DefaultLogger{level} } -func (logger DefaultLogger) Log (level int, message... interface{}) { +func (logger DefaultLogger) Log(level int, message ...interface{}) { if level <= logger.Level { fmt.Println(message...) } } - diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ParameterBuilder.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ParameterBuilder.go index a48dcc5d1..d90c53596 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ParameterBuilder.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ParameterBuilder.go @@ -16,12 +16,12 @@ package core import ( "encoding/json" + "errors" "fmt" + urllib "net/url" + "reflect" "regexp" "strings" - "errors" - "reflect" - urllib "net/url" ) var baseRequestFields []string @@ -72,7 +72,7 @@ func (b WithBodyBuilder) BuildURL(url string, paramJson []byte) (string, error) return "", err } - b.Logger.Log(LogInfo, "URL=" + encodedUrl) + b.Logger.Log(LogInfo, "URL="+encodedUrl) return encodedUrl, nil } @@ -123,7 +123,7 @@ func (b WithoutBodyBuilder) BuildURL(url string, paramJson []byte) (string, erro } b.Logger.Log(LogInfo, string(paramJson)) - b.Logger.Log(LogInfo, "URL=" + encodedUrl) + b.Logger.Log(LogInfo, "URL="+encodedUrl) return encodedUrl, nil } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ResponseProcessor.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ResponseProcessor.go index 217b4b868..294559d5a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ResponseProcessor.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ResponseProcessor.go @@ -1,10 +1,10 @@ package core import ( - "net/http" - "io/ioutil" "errors" "fmt" + "io/ioutil" + "net/http" ) type ResponseProcessor interface { @@ -37,4 +37,4 @@ func (p WithoutBodyResponseProcessor) Process(response *http.Response) ([]byte, } return nil, errors.New("can not get requestId in HEAD response") -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Signer.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Signer.go index 670868597..337764b2c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Signer.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Signer.go @@ -17,18 +17,18 @@ package core import ( + "bytes" "crypto/hmac" "crypto/sha256" "encoding/hex" "fmt" + "github.com/gofrs/uuid" "io" "net/http" "net/url" "sort" "strings" "time" - "bytes" - "github.com/gofrs/uuid" ) const ( @@ -40,7 +40,7 @@ const ( emptyStringSHA256 = `e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855` ) -var ignoredHeaders = []string {"Authorization", "User-Agent", "X-Jdcloud-Request-Id"} +var ignoredHeaders = []string{"Authorization", "User-Agent", "X-Jdcloud-Request-Id"} var noEscape [256]bool func init() { @@ -56,16 +56,15 @@ func init() { } } - type Signer struct { Credentials Credential - Logger Logger + Logger Logger } func NewSigner(credsProvider Credential, logger Logger) *Signer { return &Signer{ Credentials: credsProvider, - Logger: logger, + Logger: logger, } } @@ -102,13 +101,13 @@ func (v4 Signer) signWithBody(r *http.Request, body io.ReadSeeker, service, regi signTime time.Time) (http.Header, error) { ctx := &signingCtx{ - Request: r, - Body: body, - Query: r.URL.Query(), - Time: signTime, - ExpireTime: exp, - ServiceName: service, - Region: region, + Request: r, + Body: body, + Query: r.URL.Query(), + Time: signTime, + ExpireTime: exp, + ServiceName: service, + Region: region, } for key := range ctx.Query { @@ -141,7 +140,7 @@ func (v4 *Signer) logSigningInfo(ctx *signingCtx) { func (ctx *signingCtx) build() { ctx.buildTime() // no depends - ctx.buildNonce() // no depends + ctx.buildNonce() // no depends ctx.buildCredentialString() // no depends ctx.buildBodyDigest() diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Utils.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Utils.go index 62e2edbf4..ce09b2e30 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Utils.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Utils.go @@ -8,4 +8,4 @@ func includes(fields []string, field string) bool { } return false -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/Charge.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/Charge.go index c9669e0c5..caaa692be 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/Charge.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/Charge.go @@ -16,21 +16,20 @@ package models - type Charge struct { - /* 支付模式，取值为：prepaid_by_duration，postpaid_by_usage或postpaid_by_duration，prepaid_by_duration表示预付费，postpaid_by_usage表示按用量后付费，postpaid_by_duration表示按配置后付费，默认为postpaid_by_duration (Optional) */ - ChargeMode string `json:"chargeMode"` + /* 支付模式，取值为：prepaid_by_duration，postpaid_by_usage或postpaid_by_duration，prepaid_by_duration表示预付费，postpaid_by_usage表示按用量后付费，postpaid_by_duration表示按配置后付费，默认为postpaid_by_duration (Optional) */ + ChargeMode string `json:"chargeMode"` - /* 费用支付状态，取值为：normal、overdue、arrear，normal表示正常，overdue表示已到期，arrear表示欠费 (Optional) */ - ChargeStatus string `json:"chargeStatus"` + /* 费用支付状态，取值为：normal、overdue、arrear，normal表示正常，overdue表示已到期，arrear表示欠费 (Optional) */ + ChargeStatus string `json:"chargeStatus"` - /* 计费开始时间，遵循ISO8601标准，使用UTC时间，格式为：YYYY-MM-DDTHH:mm:ssZ (Optional) */ - ChargeStartTime string `json:"chargeStartTime"` + /* 计费开始时间，遵循ISO8601标准，使用UTC时间，格式为：YYYY-MM-DDTHH:mm:ssZ (Optional) */ + ChargeStartTime string `json:"chargeStartTime"` - /* 过期时间，预付费资源的到期时间，遵循ISO8601标准，使用UTC时间，格式为：YYYY-MM-DDTHH:mm:ssZ，后付费资源此字段内容为空 (Optional) */ - ChargeExpiredTime string `json:"chargeExpiredTime"` + /* 过期时间，预付费资源的到期时间，遵循ISO8601标准，使用UTC时间，格式为：YYYY-MM-DDTHH:mm:ssZ，后付费资源此字段内容为空 (Optional) */ + ChargeExpiredTime string `json:"chargeExpiredTime"` - /* 预期释放时间，资源的预期释放时间，预付费/后付费资源均有此值，遵循ISO8601标准，使用UTC时间，格式为：YYYY-MM-DDTHH:mm:ssZ (Optional) */ - ChargeRetireTime string `json:"chargeRetireTime"` + /* 预期释放时间，资源的预期释放时间，预付费/后付费资源均有此值，遵循ISO8601标准，使用UTC时间，格式为：YYYY-MM-DDTHH:mm:ssZ (Optional) */ + ChargeRetireTime string `json:"chargeRetireTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/ChargeSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/ChargeSpec.go index 32169444e..1daedb863 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/ChargeSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/ChargeSpec.go @@ -16,15 +16,14 @@ package models - type ChargeSpec struct { - /* 计费模式，取值为：prepaid_by_duration，postpaid_by_usage或postpaid_by_duration，prepaid_by_duration表示预付费，postpaid_by_usage表示按用量后付费，postpaid_by_duration表示按配置后付费，默认为postpaid_by_duration (Optional) */ - ChargeMode *string `json:"chargeMode"` + /* 计费模式，取值为：prepaid_by_duration，postpaid_by_usage或postpaid_by_duration，prepaid_by_duration表示预付费，postpaid_by_usage表示按用量后付费，postpaid_by_duration表示按配置后付费，默认为postpaid_by_duration (Optional) */ + ChargeMode *string `json:"chargeMode"` - /* 预付费计费单位，当chargeMode为prepaid_by_duration时有效，取值为：month、year，默认为month (Optional) */ - ChargeUnit *string `json:"chargeUnit"` + /* 预付费计费单位，当chargeMode为prepaid_by_duration时有效，取值为：month、year，默认为month (Optional) */ + ChargeUnit *string `json:"chargeUnit"` - /* 预付费计费时长，当chargeMode取值为prepaid_by_duration时有效。当chargeUnit为month时取值为：1~9，当chargeUnit为year时取值为：1、2、3 (Optional) */ - ChargeDuration *int `json:"chargeDuration"` + /* 预付费计费时长，当chargeMode取值为prepaid_by_duration时有效。当chargeUnit为month时取值为：1~9，当chargeUnit为year时取值为：1、2、3 (Optional) */ + ChargeDuration *int `json:"chargeDuration"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Filter.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Filter.go index e89325aed..8e6630337 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Filter.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Filter.go @@ -16,15 +16,14 @@ package models - type Filter struct { - /* 过滤条件的名称 */ - Name string `json:"name"` + /* 过滤条件的名称 */ + Name string `json:"name"` - /* 过滤条件的操作符，默认eq (Optional) */ - Operator *string `json:"operator"` + /* 过滤条件的操作符，默认eq (Optional) */ + Operator *string `json:"operator"` - /* 过滤条件的值 */ - Values []string `json:"values"` + /* 过滤条件的值 */ + Values []string `json:"values"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Quota.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Quota.go index a9553732c..15e4f43b2 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Quota.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Quota.go @@ -16,15 +16,14 @@ package models - type Quota struct { - /* 配额项的名称 (Optional) */ - Name string `json:"name"` + /* 配额项的名称 (Optional) */ + Name string `json:"name"` - /* 配额 (Optional) */ - Max int `json:"max"` + /* 配额 (Optional) */ + Max int `json:"max"` - /* 已使用的数目 (Optional) */ - Used int `json:"used"` + /* 已使用的数目 (Optional) */ + Used int `json:"used"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/SimpleResponses.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/SimpleResponses.go index dcc6059fd..03cfabb64 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/SimpleResponses.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/SimpleResponses.go @@ -16,9 +16,8 @@ package models - type SimpleResponses struct { - /* Request ID (Optional) */ - RequestId string `json:"requestId"` + /* Request ID (Optional) */ + RequestId string `json:"requestId"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Sort.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Sort.go index b99a1853a..07e0e0f1b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Sort.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Sort.go @@ -16,12 +16,11 @@ package models - type Sort struct { - /* 排序条件的名称 (Optional) */ - Name *string `json:"name"` + /* 排序条件的名称 (Optional) */ + Name *string `json:"name"` - /* 排序条件的方向 (Optional) */ - Direction *string `json:"direction"` + /* 排序条件的方向 (Optional) */ + Direction *string `json:"direction"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/TagFilter.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/TagFilter.go index 60e1f0774..18ae84e7a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/TagFilter.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/TagFilter.go @@ -16,12 +16,11 @@ package models - type TagFilter struct { - /* Tag键 */ - Key string `json:"key"` + /* Tag键 */ + Key string `json:"key"` - /* Tag值 */ - Values []string `json:"values"` + /* Tag值 */ + Values []string `json:"values"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Disk.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Disk.go index 27a2f0a2a..937518878 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Disk.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Disk.go @@ -20,54 +20,54 @@ import charge "github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models" type Disk struct { - /* 云硬盘ID (Optional) */ - DiskId string `json:"diskId"` + /* 云硬盘ID (Optional) */ + DiskId string `json:"diskId"` - /* 云硬盘所属AZ (Optional) */ - Az string `json:"az"` + /* 云硬盘所属AZ (Optional) */ + Az string `json:"az"` - /* 云硬盘名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - Name string `json:"name"` + /* 云硬盘名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + Name string `json:"name"` - /* 云硬盘描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* 云硬盘描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` - /* 云硬盘类型，取值为 ssd,premium-hdd,ssd.gp1,ssd.io1,hdd.std1 (Optional) */ - DiskType string `json:"diskType"` + /* 云硬盘类型，取值为 ssd,premium-hdd,ssd.gp1,ssd.io1,hdd.std1 (Optional) */ + DiskType string `json:"diskType"` - /* 云硬盘大小，单位为 GiB (Optional) */ - DiskSizeGB int `json:"diskSizeGB"` + /* 云硬盘大小，单位为 GiB (Optional) */ + DiskSizeGB int `json:"diskSizeGB"` - /* 该云硬盘实际应用的iops值 (Optional) */ - Iops int `json:"iops"` + /* 该云硬盘实际应用的iops值 (Optional) */ + Iops int `json:"iops"` - /* 该云硬盘实际应用的吞吐量的数值 (Optional) */ - Throughput int `json:"throughput"` + /* 该云硬盘实际应用的吞吐量的数值 (Optional) */ + Throughput int `json:"throughput"` - /* 云硬盘状态，取值为 creating、available、in-use、extending、restoring、deleting、deleted、error_create、error_delete、error_restore、error_extend 之一 (Optional) */ - Status string `json:"status"` + /* 云硬盘状态，取值为 creating、available、in-use、extending、restoring、deleting、deleted、error_create、error_delete、error_restore、error_extend 之一 (Optional) */ + Status string `json:"status"` - /* 挂载信息 (Optional) */ - Attachments []DiskAttachment `json:"attachments"` + /* 挂载信息 (Optional) */ + Attachments []DiskAttachment `json:"attachments"` - /* 创建该云硬盘的快照ID (Optional) */ - SnapshotId string `json:"snapshotId"` + /* 创建该云硬盘的快照ID (Optional) */ + SnapshotId string `json:"snapshotId"` - /* 云盘是否支持多挂载 (Optional) */ - MultiAttachable bool `json:"multiAttachable"` + /* 云盘是否支持多挂载 (Optional) */ + MultiAttachable bool `json:"multiAttachable"` - /* 云盘是否为加密盘 (Optional) */ - Encrypted bool `json:"encrypted"` + /* 云盘是否为加密盘 (Optional) */ + Encrypted bool `json:"encrypted"` - /* 云盘是否被暂停（IOPS限制为极低） (Optional) */ - Enable bool `json:"enable"` + /* 云盘是否被暂停（IOPS限制为极低） (Optional) */ + Enable bool `json:"enable"` - /* 创建云硬盘时间 (Optional) */ - CreateTime string `json:"createTime"` + /* 创建云硬盘时间 (Optional) */ + CreateTime string `json:"createTime"` - /* 云硬盘计费配置信息 (Optional) */ - Charge charge.Charge `json:"charge"` + /* 云硬盘计费配置信息 (Optional) */ + Charge charge.Charge `json:"charge"` - /* Tag信息 (Optional) */ - Tags []Tag `json:"tags"` + /* Tag信息 (Optional) */ + Tags []Tag `json:"tags"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskAttachment.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskAttachment.go index 220f3a51f..17e068c63 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskAttachment.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskAttachment.go @@ -16,24 +16,23 @@ package models - type DiskAttachment struct { - /* 挂载ID (Optional) */ - AttachmentId string `json:"attachmentId"` + /* 挂载ID (Optional) */ + AttachmentId string `json:"attachmentId"` - /* 云硬盘ID (Optional) */ - DiskId string `json:"diskId"` + /* 云硬盘ID (Optional) */ + DiskId string `json:"diskId"` - /* 挂载实例的类型，取值为 vm、nc (Optional) */ - InstanceType string `json:"instanceType"` + /* 挂载实例的类型，取值为 vm、nc (Optional) */ + InstanceType string `json:"instanceType"` - /* 挂载实例的ID (Optional) */ - InstanceId string `json:"instanceId"` + /* 挂载实例的ID (Optional) */ + InstanceId string `json:"instanceId"` - /* 挂载状态，取值为 "attaching", "attached", "detaching", "detached" (Optional) */ - Status string `json:"status"` + /* 挂载状态，取值为 "attaching", "attached", "detaching", "detached" (Optional) */ + Status string `json:"status"` - /* 挂载时间 (Optional) */ - AttachTime string `json:"attachTime"` + /* 挂载时间 (Optional) */ + AttachTime string `json:"attachTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpec.go index c694ebf82..a9956c021 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpec.go @@ -20,30 +20,30 @@ import charge "github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models" type DiskSpec struct { - /* 云硬盘所属的可用区 */ - Az string `json:"az"` + /* 云硬盘所属的可用区 */ + Az string `json:"az"` - /* 云硬盘名称 */ - Name string `json:"name"` + /* 云硬盘名称 */ + Name string `json:"name"` - /* 云硬盘描述 (Optional) */ - Description *string `json:"description"` + /* 云硬盘描述 (Optional) */ + Description *string `json:"description"` - /* 云硬盘类型，取值为ssd、premium-hdd、ssd.gp1、ssd.io1、hdd.std1之一 */ - DiskType string `json:"diskType"` + /* 云硬盘类型，取值为ssd、premium-hdd、ssd.gp1、ssd.io1、hdd.std1之一 */ + DiskType string `json:"diskType"` - /* 云硬盘大小，单位为 GiB，ssd 类型取值范围[20,1000]GB，步长为10G，premium-hdd 类型取值范围[20,3000]GB，步长为10G */ - DiskSizeGB int `json:"diskSizeGB"` + /* 云硬盘大小，单位为 GiB，ssd 类型取值范围[20,1000]GB，步长为10G，premium-hdd 类型取值范围[20,3000]GB，步长为10G */ + DiskSizeGB int `json:"diskSizeGB"` - /* 用于创建云硬盘的快照ID (Optional) */ - SnapshotId *string `json:"snapshotId"` + /* 用于创建云硬盘的快照ID (Optional) */ + SnapshotId *string `json:"snapshotId"` - /* 计费配置；如不指定，默认计费类型是后付费-按使用时常付费 (Optional) */ - Charge *charge.ChargeSpec `json:"charge"` + /* 计费配置；如不指定，默认计费类型是后付费-按使用时常付费 (Optional) */ + Charge *charge.ChargeSpec `json:"charge"` - /* 云硬盘是否支持一盘多主机挂载，默认为false（不支持） (Optional) */ - MultiAttachable *bool `json:"multiAttachable"` + /* 云硬盘是否支持一盘多主机挂载，默认为false（不支持） (Optional) */ + MultiAttachable *bool `json:"multiAttachable"` - /* 云硬盘是否加密，默认为false（不加密） (Optional) */ - Encrypt *bool `json:"encrypt"` + /* 云硬盘是否加密，默认为false（不加密） (Optional) */ + Encrypt *bool `json:"encrypt"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpecification.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpecification.go index 8f439a49e..a021a754c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpecification.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpecification.go @@ -16,39 +16,38 @@ package models - type DiskSpecification struct { - /* 云硬盘类型 (Optional) */ - DiskType string `json:"diskType"` + /* 云硬盘类型 (Optional) */ + DiskType string `json:"diskType"` - /* 支持的最小尺寸，单位为 GiB (Optional) */ - MinSizeGB int `json:"minSizeGB"` + /* 支持的最小尺寸，单位为 GiB (Optional) */ + MinSizeGB int `json:"minSizeGB"` - /* 支持的最大尺寸，单位为 GiB (Optional) */ - MaxSizeGB int `json:"maxSizeGB"` + /* 支持的最大尺寸，单位为 GiB (Optional) */ + MaxSizeGB int `json:"maxSizeGB"` - /* 步长尺寸，单位为 GiB (Optional) */ - StepSizeGB int `json:"stepSizeGB"` + /* 步长尺寸，单位为 GiB (Optional) */ + StepSizeGB int `json:"stepSizeGB"` - /* 描述信息 (Optional) */ - Description string `json:"description"` + /* 描述信息 (Optional) */ + Description string `json:"description"` - /* 默认的iops数量(基础iops数量) (Optional) */ - DefaultIOPS int `json:"defaultIOPS"` + /* 默认的iops数量(基础iops数量) (Optional) */ + DefaultIOPS int `json:"defaultIOPS"` - /* iops步长增量 (Optional) */ - StepIOPS float32 `json:"stepIOPS"` + /* iops步长增量 (Optional) */ + StepIOPS float32 `json:"stepIOPS"` - /* 最大iops数量 (Optional) */ - MaxIOPS int `json:"maxIOPS"` + /* 最大iops数量 (Optional) */ + MaxIOPS int `json:"maxIOPS"` - /* 默认的吞吐量 (Optional) */ - DefaultThroughput int `json:"defaultThroughput"` + /* 默认的吞吐量 (Optional) */ + DefaultThroughput int `json:"defaultThroughput"` - /* 吞吐量步长增量 (Optional) */ - StepThroughput float32 `json:"stepThroughput"` + /* 吞吐量步长增量 (Optional) */ + StepThroughput float32 `json:"stepThroughput"` - /* 最大吞吐量 (Optional) */ - MaxThroughput int `json:"maxThroughput"` + /* 最大吞吐量 (Optional) */ + MaxThroughput int `json:"maxThroughput"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Quota.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Quota.go index 4f318f4a0..372b997e3 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Quota.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Quota.go @@ -16,12 +16,11 @@ package models - type Quota struct { - /* 配额 (Optional) */ - Limit int `json:"limit"` + /* 配额 (Optional) */ + Limit int `json:"limit"` - /* 已使用的数目 (Optional) */ - Used int `json:"used"` + /* 已使用的数目 (Optional) */ + Used int `json:"used"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/ShareInfo.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/ShareInfo.go index 70f5df781..4a0c63491 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/ShareInfo.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/ShareInfo.go @@ -16,12 +16,11 @@ package models - type ShareInfo struct { - /* 被共享快照的用户的pin (Optional) */ - ShareTo string `json:"shareTo"` + /* 被共享快照的用户的pin (Optional) */ + ShareTo string `json:"shareTo"` - /* 共享时间 (Optional) */ - ShareTime string `json:"shareTime"` + /* 共享时间 (Optional) */ + ShareTime string `json:"shareTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Snapshot.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Snapshot.go index 12a3bbf94..afe5750d0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Snapshot.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Snapshot.go @@ -16,39 +16,38 @@ package models - type Snapshot struct { - /* 云硬盘快照ID (Optional) */ - SnapshotId string `json:"snapshotId"` + /* 云硬盘快照ID (Optional) */ + SnapshotId string `json:"snapshotId"` - /* 快照来源 可以有self，others两种来源 (Optional) */ - SnapshotSource string `json:"snapshotSource"` + /* 快照来源 可以有self，others两种来源 (Optional) */ + SnapshotSource string `json:"snapshotSource"` - /* 创建快照的云硬盘ID(snapshotSource为others时不展示) (Optional) */ - DiskId string `json:"diskId"` + /* 创建快照的云硬盘ID(snapshotSource为others时不展示) (Optional) */ + DiskId string `json:"diskId"` - /* 快照大小，单位为GiB (Optional) */ - SnapshotSizeGB int `json:"snapshotSizeGB"` + /* 快照大小，单位为GiB (Optional) */ + SnapshotSizeGB int `json:"snapshotSizeGB"` - /* 快照关联的所有镜像ID(snapshotSource为others时不展示) (Optional) */ - Images []string `json:"images"` + /* 快照关联的所有镜像ID(snapshotSource为others时不展示) (Optional) */ + Images []string `json:"images"` - /* 快照名称 (Optional) */ - Name string `json:"name"` + /* 快照名称 (Optional) */ + Name string `json:"name"` - /* 快照描述 (Optional) */ - Description string `json:"description"` + /* 快照描述 (Optional) */ + Description string `json:"description"` - /* 快照状态，取值为 creating、available、in-use、deleting、error_create、error_delete 之一 (Optional) */ - Status string `json:"status"` + /* 快照状态，取值为 creating、available、in-use、deleting、error_create、error_delete 之一 (Optional) */ + Status string `json:"status"` - /* 创建时间 (Optional) */ - CreateTime string `json:"createTime"` + /* 创建时间 (Optional) */ + CreateTime string `json:"createTime"` - /* 共享信息 (Optional) */ - SharInfo []ShareInfo `json:"sharInfo"` + /* 共享信息 (Optional) */ + SharInfo []ShareInfo `json:"sharInfo"` - /* 快照是否为加密盘的快照 (Optional) */ - Encrypted bool `json:"encrypted"` + /* 快照是否为加密盘的快照 (Optional) */ + Encrypted bool `json:"encrypted"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/SnapshotSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/SnapshotSpec.go index 0918fa64a..4f4420f80 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/SnapshotSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/SnapshotSpec.go @@ -16,15 +16,14 @@ package models - type SnapshotSpec struct { - /* 快照名称 */ - Name string `json:"name"` + /* 快照名称 */ + Name string `json:"name"` - /* 快照描述 (Optional) */ - Description *string `json:"description"` + /* 快照描述 (Optional) */ + Description *string `json:"description"` - /* 用于创建快照的云盘ID */ - DiskId string `json:"diskId"` + /* 用于创建快照的云盘ID */ + DiskId string `json:"diskId"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Soldout.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Soldout.go index 587bbdf25..341f9d37e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Soldout.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Soldout.go @@ -16,15 +16,14 @@ package models - type Soldout struct { - /* 云硬盘所属的可用区 */ - AzName string `json:"azName"` + /* 云硬盘所属的可用区 */ + AzName string `json:"azName"` - /* 云硬盘类型，取值为ssd、premium-hdd、ssd.gp1、ssd.io1、hdd.std1之一 */ - MediaType string `json:"mediaType"` + /* 云硬盘类型，取值为ssd、premium-hdd、ssd.gp1、ssd.io1、hdd.std1之一 */ + MediaType string `json:"mediaType"` - /* 是否售罄 */ - IsSoldOut bool `json:"isSoldOut"` + /* 是否售罄 */ + IsSoldOut bool `json:"isSoldOut"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Tag.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Tag.go index 467465457..22f6316be 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Tag.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Tag.go @@ -16,12 +16,11 @@ package models - type Tag struct { - /* Tag键 (Optional) */ - Key string `json:"key"` + /* Tag键 (Optional) */ + Key string `json:"key"` - /* Tag值 (Optional) */ - Value string `json:"value"` + /* Tag值 (Optional) */ + Value string `json:"value"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/TagFilter.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/TagFilter.go index 60e1f0774..18ae84e7a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/TagFilter.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/TagFilter.go @@ -16,12 +16,11 @@ package models - type TagFilter struct { - /* Tag键 */ - Key string `json:"key"` + /* Tag键 */ + Key string `json:"key"` - /* Tag值 */ - Values []string `json:"values"` + /* Tag值 */ + Values []string `json:"values"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AssociateElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AssociateElasticIp.go index c562811b1..f20e0af40 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AssociateElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AssociateElasticIp.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AssociateElasticIpRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 云主机ID */ - InstanceId string `json:"instanceId"` - - /* 弹性公网IP的ID */ - ElasticIpId string `json:"elasticIpId"` + /* 弹性公网IP的ID */ + ElasticIpId string `json:"elasticIpId"` } /* @@ -42,21 +41,21 @@ type AssociateElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAssociateElasticIpRequest( - regionId string, - instanceId string, - elasticIpId string, + regionId string, + instanceId string, + elasticIpId string, ) *AssociateElasticIpRequest { return &AssociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:associateElasticIp", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - ElasticIpId: elasticIpId, + RegionId: regionId, + InstanceId: instanceId, + ElasticIpId: elasticIpId, } } @@ -66,63 +65,63 @@ func NewAssociateElasticIpRequest( * param elasticIpId: 弹性公网IP的ID (Required) */ func NewAssociateElasticIpRequestWithAllParams( - regionId string, - instanceId string, - elasticIpId string, + regionId string, + instanceId string, + elasticIpId string, ) *AssociateElasticIpRequest { - return &AssociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:associateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - ElasticIpId: elasticIpId, - } + return &AssociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:associateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + ElasticIpId: elasticIpId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAssociateElasticIpRequestWithoutParam() *AssociateElasticIpRequest { - return &AssociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:associateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AssociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:associateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *AssociateElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *AssociateElasticIpRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param elasticIpId: 弹性公网IP的ID(Required) */ func (r *AssociateElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = elasticIpId + r.ElasticIpId = elasticIpId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AssociateElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AssociateElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AssociateElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AssociateElasticIpResult `json:"result"` } type AssociateElasticIpResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachDisk.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachDisk.go index e699d8ea5..da0a75268 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachDisk.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachDisk.go @@ -17,27 +17,26 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AttachDiskRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 云硬盘ID */ + DiskId string `json:"diskId"` - /* 云硬盘ID */ - DiskId string `json:"diskId"` + /* 数据盘的逻辑挂载点[vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi]，挂载系统盘时vda必传 (Optional) */ + DeviceName *string `json:"deviceName"` - /* 数据盘的逻辑挂载点[vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi]，挂载系统盘时vda必传 (Optional) */ - DeviceName *string `json:"deviceName"` - - /* 自动随主机删除此云硬盘，默认为False。仅按配置计费云硬盘支持修改此参数，包年包月云硬盘默认为False且不可修改。如果是共享型云硬盘，此参数无效。 (Optional) */ - AutoDelete *bool `json:"autoDelete"` + /* 自动随主机删除此云硬盘，默认为False。仅按配置计费云硬盘支持修改此参数，包年包月云硬盘默认为False且不可修改。如果是共享型云硬盘，此参数无效。 (Optional) */ + AutoDelete *bool `json:"autoDelete"` } /* @@ -48,21 +47,21 @@ type AttachDiskRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAttachDiskRequest( - regionId string, - instanceId string, - diskId string, + regionId string, + instanceId string, + diskId string, ) *AttachDiskRequest { return &AttachDiskRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:attachDisk", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - DiskId: diskId, + RegionId: regionId, + InstanceId: instanceId, + DiskId: diskId, } } @@ -74,77 +73,77 @@ func NewAttachDiskRequest( * param autoDelete: 自动随主机删除此云硬盘，默认为False。仅按配置计费云硬盘支持修改此参数，包年包月云硬盘默认为False且不可修改。如果是共享型云硬盘，此参数无效。 (Optional) */ func NewAttachDiskRequestWithAllParams( - regionId string, - instanceId string, - diskId string, - deviceName *string, - autoDelete *bool, + regionId string, + instanceId string, + diskId string, + deviceName *string, + autoDelete *bool, ) *AttachDiskRequest { - return &AttachDiskRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:attachDisk", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - DiskId: diskId, - DeviceName: deviceName, - AutoDelete: autoDelete, - } + return &AttachDiskRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:attachDisk", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + DiskId: diskId, + DeviceName: deviceName, + AutoDelete: autoDelete, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAttachDiskRequestWithoutParam() *AttachDiskRequest { - return &AttachDiskRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:attachDisk", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AttachDiskRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:attachDisk", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *AttachDiskRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *AttachDiskRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param diskId: 云硬盘ID(Required) */ func (r *AttachDiskRequest) SetDiskId(diskId string) { - r.DiskId = diskId + r.DiskId = diskId } /* param deviceName: 数据盘的逻辑挂载点[vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi]，挂载系统盘时vda必传(Optional) */ func (r *AttachDiskRequest) SetDeviceName(deviceName string) { - r.DeviceName = &deviceName + r.DeviceName = &deviceName } /* param autoDelete: 自动随主机删除此云硬盘，默认为False。仅按配置计费云硬盘支持修改此参数，包年包月云硬盘默认为False且不可修改。如果是共享型云硬盘，此参数无效。(Optional) */ func (r *AttachDiskRequest) SetAutoDelete(autoDelete bool) { - r.AutoDelete = &autoDelete + r.AutoDelete = &autoDelete } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AttachDiskRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AttachDiskResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AttachDiskResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AttachDiskResult `json:"result"` } type AttachDiskResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachNetworkInterface.go index 75c7720fd..182f5c2f8 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachNetworkInterface.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AttachNetworkInterfaceRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 弹性网卡ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* 弹性网卡ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` - - /* 随主机自动删除，默认为False (Optional) */ - AutoDelete *bool `json:"autoDelete"` + /* 随主机自动删除，默认为False (Optional) */ + AutoDelete *bool `json:"autoDelete"` } /* @@ -45,21 +44,21 @@ type AttachNetworkInterfaceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAttachNetworkInterfaceRequest( - regionId string, - instanceId string, - networkInterfaceId string, + regionId string, + instanceId string, + networkInterfaceId string, ) *AttachNetworkInterfaceRequest { return &AttachNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:attachNetworkInterface", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + InstanceId: instanceId, + NetworkInterfaceId: networkInterfaceId, } } @@ -70,70 +69,70 @@ func NewAttachNetworkInterfaceRequest( * param autoDelete: 随主机自动删除，默认为False (Optional) */ func NewAttachNetworkInterfaceRequestWithAllParams( - regionId string, - instanceId string, - networkInterfaceId string, - autoDelete *bool, + regionId string, + instanceId string, + networkInterfaceId string, + autoDelete *bool, ) *AttachNetworkInterfaceRequest { - return &AttachNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:attachNetworkInterface", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - NetworkInterfaceId: networkInterfaceId, - AutoDelete: autoDelete, - } + return &AttachNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:attachNetworkInterface", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + NetworkInterfaceId: networkInterfaceId, + AutoDelete: autoDelete, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAttachNetworkInterfaceRequestWithoutParam() *AttachNetworkInterfaceRequest { - return &AttachNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:attachNetworkInterface", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AttachNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:attachNetworkInterface", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *AttachNetworkInterfaceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *AttachNetworkInterfaceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param networkInterfaceId: 弹性网卡ID(Required) */ func (r *AttachNetworkInterfaceRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } /* param autoDelete: 随主机自动删除，默认为False(Optional) */ func (r *AttachNetworkInterfaceRequest) SetAutoDelete(autoDelete bool) { - r.AutoDelete = &autoDelete + r.AutoDelete = &autoDelete } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AttachNetworkInterfaceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AttachNetworkInterfaceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AttachNetworkInterfaceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AttachNetworkInterfaceResult `json:"result"` } type AttachNetworkInterfaceResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CopyImages.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CopyImages.go index a6c82e8e7..1bc6a26a9 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CopyImages.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CopyImages.go @@ -17,22 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type CopyImagesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 源镜像ID */ + SourceImageIds []string `json:"sourceImageIds"` - /* 源镜像ID */ - SourceImageIds []string `json:"sourceImageIds"` - - /* 目标区域 */ - DestinationRegion string `json:"destinationRegion"` + /* 目标区域 */ + DestinationRegion string `json:"destinationRegion"` } /* @@ -43,21 +42,21 @@ type CopyImagesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCopyImagesRequest( - regionId string, - sourceImageIds []string, - destinationRegion string, + regionId string, + sourceImageIds []string, + destinationRegion string, ) *CopyImagesRequest { return &CopyImagesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images:copyImages", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - SourceImageIds: sourceImageIds, - DestinationRegion: destinationRegion, + RegionId: regionId, + SourceImageIds: sourceImageIds, + DestinationRegion: destinationRegion, } } @@ -67,64 +66,64 @@ func NewCopyImagesRequest( * param destinationRegion: 目标区域 (Required) */ func NewCopyImagesRequestWithAllParams( - regionId string, - sourceImageIds []string, - destinationRegion string, + regionId string, + sourceImageIds []string, + destinationRegion string, ) *CopyImagesRequest { - return &CopyImagesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images:copyImages", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - SourceImageIds: sourceImageIds, - DestinationRegion: destinationRegion, - } + return &CopyImagesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images:copyImages", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + SourceImageIds: sourceImageIds, + DestinationRegion: destinationRegion, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCopyImagesRequestWithoutParam() *CopyImagesRequest { - return &CopyImagesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images:copyImages", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CopyImagesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images:copyImages", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *CopyImagesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param sourceImageIds: 源镜像ID(Required) */ func (r *CopyImagesRequest) SetSourceImageIds(sourceImageIds []string) { - r.SourceImageIds = sourceImageIds + r.SourceImageIds = sourceImageIds } /* param destinationRegion: 目标区域(Required) */ func (r *CopyImagesRequest) SetDestinationRegion(destinationRegion string) { - r.DestinationRegion = destinationRegion + r.DestinationRegion = destinationRegion } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CopyImagesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CopyImagesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CopyImagesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CopyImagesResult `json:"result"` } type CopyImagesResult struct { - CopyImages []vm.CopyImage `json:"copyImages"` -} \ No newline at end of file + CopyImages []vm.CopyImage `json:"copyImages"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateImage.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateImage.go index f9274a996..ca11b2661 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateImage.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateImage.go @@ -17,28 +17,27 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type CreateImageRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 镜像名称，参考公共参数规范。 */ + Name string `json:"name"` - /* 镜像名称，参考公共参数规范。 */ - Name string `json:"name"` + /* 镜像描述，参考公共参数规范。 */ + Description string `json:"description"` - /* 镜像描述，参考公共参数规范。 */ - Description string `json:"description"` - - /* 数据盘列表，可以在实例已挂载数据盘的基础上，额外增加新的快照、空盘、或排除云主机中的数据盘。 (Optional) */ - DataDisks []vm.InstanceDiskAttachmentSpec `json:"dataDisks"` + /* 数据盘列表，可以在实例已挂载数据盘的基础上，额外增加新的快照、空盘、或排除云主机中的数据盘。 (Optional) */ + DataDisks []vm.InstanceDiskAttachmentSpec `json:"dataDisks"` } /* @@ -50,23 +49,23 @@ type CreateImageRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateImageRequest( - regionId string, - instanceId string, - name string, - description string, + regionId string, + instanceId string, + name string, + description string, ) *CreateImageRequest { return &CreateImageRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:createImage", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - Name: name, - Description: description, + RegionId: regionId, + InstanceId: instanceId, + Name: name, + Description: description, } } @@ -78,78 +77,78 @@ func NewCreateImageRequest( * param dataDisks: 数据盘列表，可以在实例已挂载数据盘的基础上，额外增加新的快照、空盘、或排除云主机中的数据盘。 (Optional) */ func NewCreateImageRequestWithAllParams( - regionId string, - instanceId string, - name string, - description string, - dataDisks []vm.InstanceDiskAttachmentSpec, + regionId string, + instanceId string, + name string, + description string, + dataDisks []vm.InstanceDiskAttachmentSpec, ) *CreateImageRequest { - return &CreateImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:createImage", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - Name: name, - Description: description, - DataDisks: dataDisks, - } + return &CreateImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:createImage", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + Name: name, + Description: description, + DataDisks: dataDisks, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateImageRequestWithoutParam() *CreateImageRequest { - return &CreateImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:createImage", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:createImage", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *CreateImageRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *CreateImageRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param name: 镜像名称，参考公共参数规范。(Required) */ func (r *CreateImageRequest) SetName(name string) { - r.Name = name + r.Name = name } /* param description: 镜像描述，参考公共参数规范。(Required) */ func (r *CreateImageRequest) SetDescription(description string) { - r.Description = description + r.Description = description } /* param dataDisks: 数据盘列表，可以在实例已挂载数据盘的基础上，额外增加新的快照、空盘、或排除云主机中的数据盘。(Optional) */ func (r *CreateImageRequest) SetDataDisks(dataDisks []vm.InstanceDiskAttachmentSpec) { - r.DataDisks = dataDisks + r.DataDisks = dataDisks } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateImageRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateImageResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateImageResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateImageResult `json:"result"` } type CreateImageResult struct { - ImageId string `json:"imageId"` -} \ No newline at end of file + ImageId string `json:"imageId"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateInstances.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateInstances.go index f5d342dc0..259a4d6f5 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateInstances.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateInstances.go @@ -17,28 +17,27 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type CreateInstancesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 描述云主机配置 + */ + InstanceSpec *vm.InstanceSpec `json:"instanceSpec"` - /* 描述云主机配置 - */ - InstanceSpec *vm.InstanceSpec `json:"instanceSpec"` + /* 购买云主机的数量；取值范围：[1,100]，默认为1。 + (Optional) */ + MaxCount *int `json:"maxCount"` - /* 购买云主机的数量；取值范围：[1,100]，默认为1。 - (Optional) */ - MaxCount *int `json:"maxCount"` - - /* 用于保证请求的幂等性。由客户端生成，长度不能超过64个字符。 - (Optional) */ - ClientToken *string `json:"clientToken"` + /* 用于保证请求的幂等性。由客户端生成，长度不能超过64个字符。 + (Optional) */ + ClientToken *string `json:"clientToken"` } /* @@ -47,21 +46,21 @@ type CreateInstancesRequest struct { (Required) * * @Deprecated, not compatible when mandatory parameters changed - */ +*/ func NewCreateInstancesRequest( - regionId string, - instanceSpec *vm.InstanceSpec, + regionId string, + instanceSpec *vm.InstanceSpec, ) *CreateInstancesRequest { return &CreateInstancesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceSpec: instanceSpec, + RegionId: regionId, + InstanceSpec: instanceSpec, } } @@ -73,76 +72,76 @@ func NewCreateInstancesRequest( (Optional) * param clientToken: 用于保证请求的幂等性。由客户端生成，长度不能超过64个字符。 (Optional) - */ +*/ func NewCreateInstancesRequestWithAllParams( - regionId string, - instanceSpec *vm.InstanceSpec, - maxCount *int, - clientToken *string, + regionId string, + instanceSpec *vm.InstanceSpec, + maxCount *int, + clientToken *string, ) *CreateInstancesRequest { - return &CreateInstancesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceSpec: instanceSpec, - MaxCount: maxCount, - ClientToken: clientToken, - } + return &CreateInstancesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceSpec: instanceSpec, + MaxCount: maxCount, + ClientToken: clientToken, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateInstancesRequestWithoutParam() *CreateInstancesRequest { - return &CreateInstancesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateInstancesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *CreateInstancesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceSpec: 描述云主机配置 (Required) */ func (r *CreateInstancesRequest) SetInstanceSpec(instanceSpec *vm.InstanceSpec) { - r.InstanceSpec = instanceSpec + r.InstanceSpec = instanceSpec } /* param maxCount: 购买云主机的数量；取值范围：[1,100]，默认为1。 (Optional) */ func (r *CreateInstancesRequest) SetMaxCount(maxCount int) { - r.MaxCount = &maxCount + r.MaxCount = &maxCount } /* param clientToken: 用于保证请求的幂等性。由客户端生成，长度不能超过64个字符。 (Optional) */ func (r *CreateInstancesRequest) SetClientToken(clientToken string) { - r.ClientToken = &clientToken + r.ClientToken = &clientToken } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateInstancesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateInstancesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateInstancesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateInstancesResult `json:"result"` } type CreateInstancesResult struct { - InstanceIds []string `json:"instanceIds"` -} \ No newline at end of file + InstanceIds []string `json:"instanceIds"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateKeypair.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateKeypair.go index 6ffeee01c..75151d78a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateKeypair.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateKeypair.go @@ -17,19 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateKeypairRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 - */ - KeyName string `json:"keyName"` + /* 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 + */ + KeyName string `json:"keyName"` } /* @@ -38,21 +37,21 @@ type CreateKeypairRequest struct { (Required) * * @Deprecated, not compatible when mandatory parameters changed - */ +*/ func NewCreateKeypairRequest( - regionId string, - keyName string, + regionId string, + keyName string, ) *CreateKeypairRequest { return &CreateKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/keypairs", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - KeyName: keyName, + RegionId: regionId, + KeyName: keyName, } } @@ -60,62 +59,62 @@ func NewCreateKeypairRequest( * param regionId: 地域ID (Required) * param keyName: 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 (Required) - */ +*/ func NewCreateKeypairRequestWithAllParams( - regionId string, - keyName string, + regionId string, + keyName string, ) *CreateKeypairRequest { - return &CreateKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - KeyName: keyName, - } + return &CreateKeypairRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + KeyName: keyName, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateKeypairRequestWithoutParam() *CreateKeypairRequest { - return &CreateKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateKeypairRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *CreateKeypairRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param keyName: 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 (Required) */ func (r *CreateKeypairRequest) SetKeyName(keyName string) { - r.KeyName = keyName + r.KeyName = keyName } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateKeypairRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateKeypairResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateKeypairResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateKeypairResult `json:"result"` } type CreateKeypairResult struct { - KeyName string `json:"keyName"` - PrivateKey string `json:"privateKey"` - KeyFingerprint string `json:"keyFingerprint"` -} \ No newline at end of file + KeyName string `json:"keyName"` + PrivateKey string `json:"privateKey"` + KeyFingerprint string `json:"keyFingerprint"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteImage.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteImage.go index 3496eace4..f72caf808 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteImage.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteImage.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteImageRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* 镜像ID */ - ImageId string `json:"imageId"` + /* 镜像ID */ + ImageId string `json:"imageId"` } /* @@ -38,19 +37,19 @@ type DeleteImageRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteImageRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *DeleteImageRequest { return &DeleteImageRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -59,56 +58,56 @@ func NewDeleteImageRequest( * param imageId: 镜像ID (Required) */ func NewDeleteImageRequestWithAllParams( - regionId string, - imageId string, + regionId string, + imageId string, ) *DeleteImageRequest { - return &DeleteImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - } + return &DeleteImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteImageRequestWithoutParam() *DeleteImageRequest { - return &DeleteImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DeleteImageRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *DeleteImageRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteImageRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteImageResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteImageResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteImageResult `json:"result"` } type DeleteImageResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteInstance.go index 6482ece51..c401f6b2b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteInstance.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteInstanceRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` } /* @@ -38,19 +37,19 @@ type DeleteInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteInstanceRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *DeleteInstanceRequest { return &DeleteInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -59,56 +58,56 @@ func NewDeleteInstanceRequest( * param instanceId: 云主机ID (Required) */ func NewDeleteInstanceRequestWithAllParams( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *DeleteInstanceRequest { - return &DeleteInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - } + return &DeleteInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteInstanceRequestWithoutParam() *DeleteInstanceRequest { - return &DeleteInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DeleteInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *DeleteInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteInstanceResult `json:"result"` } type DeleteInstanceResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteKeypair.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteKeypair.go index ddac09b04..cb47a109e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteKeypair.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteKeypair.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteKeypairRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* 密钥名称 */ - KeyName string `json:"keyName"` + /* 密钥名称 */ + KeyName string `json:"keyName"` } /* @@ -38,19 +37,19 @@ type DeleteKeypairRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteKeypairRequest( - regionId string, - keyName string, + regionId string, + keyName string, ) *DeleteKeypairRequest { return &DeleteKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/keypairs/{keyName}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - KeyName: keyName, + RegionId: regionId, + KeyName: keyName, } } @@ -59,56 +58,56 @@ func NewDeleteKeypairRequest( * param keyName: 密钥名称 (Required) */ func NewDeleteKeypairRequestWithAllParams( - regionId string, - keyName string, + regionId string, + keyName string, ) *DeleteKeypairRequest { - return &DeleteKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs/{keyName}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - KeyName: keyName, - } + return &DeleteKeypairRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs/{keyName}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + KeyName: keyName, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteKeypairRequestWithoutParam() *DeleteKeypairRequest { - return &DeleteKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs/{keyName}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteKeypairRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs/{keyName}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DeleteKeypairRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param keyName: 密钥名称(Required) */ func (r *DeleteKeypairRequest) SetKeyName(keyName string) { - r.KeyName = keyName + r.KeyName = keyName } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteKeypairRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteKeypairResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteKeypairResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteKeypairResult `json:"result"` } type DeleteKeypairResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImage.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImage.go index 14b9b1709..c931329cc 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImage.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImage.go @@ -17,19 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeImageRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* 镜像ID */ - ImageId string `json:"imageId"` + /* 镜像ID */ + ImageId string `json:"imageId"` } /* @@ -39,19 +38,19 @@ type DescribeImageRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeImageRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *DescribeImageRequest { return &DescribeImageRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -60,57 +59,57 @@ func NewDescribeImageRequest( * param imageId: 镜像ID (Required) */ func NewDescribeImageRequestWithAllParams( - regionId string, - imageId string, + regionId string, + imageId string, ) *DescribeImageRequest { - return &DescribeImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - } + return &DescribeImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeImageRequestWithoutParam() *DescribeImageRequest { - return &DescribeImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeImageRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *DescribeImageRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeImageRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeImageResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeImageResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeImageResult `json:"result"` } type DescribeImageResult struct { - Image vm.Image `json:"image"` -} \ No newline at end of file + Image vm.Image `json:"image"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraints.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraints.go index 8011469e2..794e5e576 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraints.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraints.go @@ -17,19 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeImageConstraintsRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* 镜像ID */ - ImageId string `json:"imageId"` + /* 镜像ID */ + ImageId string `json:"imageId"` } /* @@ -39,19 +38,19 @@ type DescribeImageConstraintsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeImageConstraintsRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *DescribeImageConstraintsRequest { return &DescribeImageConstraintsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}/constraints", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -60,57 +59,57 @@ func NewDescribeImageConstraintsRequest( * param imageId: 镜像ID (Required) */ func NewDescribeImageConstraintsRequestWithAllParams( - regionId string, - imageId string, + regionId string, + imageId string, ) *DescribeImageConstraintsRequest { - return &DescribeImageConstraintsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}/constraints", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - } + return &DescribeImageConstraintsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}/constraints", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeImageConstraintsRequestWithoutParam() *DescribeImageConstraintsRequest { - return &DescribeImageConstraintsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}/constraints", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeImageConstraintsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}/constraints", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeImageConstraintsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *DescribeImageConstraintsRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeImageConstraintsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeImageConstraintsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeImageConstraintsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeImageConstraintsResult `json:"result"` } type DescribeImageConstraintsResult struct { - ImageConstraints vm.ImageConstraint `json:"imageConstraints"` -} \ No newline at end of file + ImageConstraints vm.ImageConstraint `json:"imageConstraints"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraintsBatch.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraintsBatch.go index f0a968cc1..4b33b11bc 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraintsBatch.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraintsBatch.go @@ -17,19 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeImageConstraintsBatchRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* 镜像ID列表 (Optional) */ - Ids []string `json:"ids"` + /* 镜像ID列表 (Optional) */ + Ids []string `json:"ids"` } /* @@ -38,17 +37,17 @@ type DescribeImageConstraintsBatchRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeImageConstraintsBatchRequest( - regionId string, + regionId string, ) *DescribeImageConstraintsBatchRequest { return &DescribeImageConstraintsBatchRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/imageConstraints", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -57,57 +56,57 @@ func NewDescribeImageConstraintsBatchRequest( * param ids: 镜像ID列表 (Optional) */ func NewDescribeImageConstraintsBatchRequestWithAllParams( - regionId string, - ids []string, + regionId string, + ids []string, ) *DescribeImageConstraintsBatchRequest { - return &DescribeImageConstraintsBatchRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/imageConstraints", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - Ids: ids, - } + return &DescribeImageConstraintsBatchRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/imageConstraints", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + Ids: ids, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeImageConstraintsBatchRequestWithoutParam() *DescribeImageConstraintsBatchRequest { - return &DescribeImageConstraintsBatchRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/imageConstraints", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeImageConstraintsBatchRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/imageConstraints", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeImageConstraintsBatchRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param ids: 镜像ID列表(Optional) */ func (r *DescribeImageConstraintsBatchRequest) SetIds(ids []string) { - r.Ids = ids + r.Ids = ids } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeImageConstraintsBatchRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeImageConstraintsBatchResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeImageConstraintsBatchResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeImageConstraintsBatchResult `json:"result"` } type DescribeImageConstraintsBatchResult struct { - ImageConstraints []vm.ImageConstraint `json:"imageConstraints"` -} \ No newline at end of file + ImageConstraints []vm.ImageConstraint `json:"imageConstraints"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageMembers.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageMembers.go index b4374fad7..e92a3d4ba 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageMembers.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageMembers.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DescribeImageMembersRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* 镜像ID */ - ImageId string `json:"imageId"` + /* 镜像ID */ + ImageId string `json:"imageId"` } /* @@ -38,19 +37,19 @@ type DescribeImageMembersRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeImageMembersRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *DescribeImageMembersRequest { return &DescribeImageMembersRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}/members", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -59,57 +58,57 @@ func NewDescribeImageMembersRequest( * param imageId: 镜像ID (Required) */ func NewDescribeImageMembersRequestWithAllParams( - regionId string, - imageId string, + regionId string, + imageId string, ) *DescribeImageMembersRequest { - return &DescribeImageMembersRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}/members", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - } + return &DescribeImageMembersRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}/members", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeImageMembersRequestWithoutParam() *DescribeImageMembersRequest { - return &DescribeImageMembersRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}/members", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeImageMembersRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}/members", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeImageMembersRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *DescribeImageMembersRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeImageMembersRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeImageMembersResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeImageMembersResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeImageMembersResult `json:"result"` } type DescribeImageMembersResult struct { - Pins []string `json:"pins"` -} \ No newline at end of file + Pins []string `json:"pins"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImages.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImages.go index 01e89cf65..05cea3038 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImages.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImages.go @@ -17,37 +17,36 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeImagesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 镜像来源，如果没有指定ids参数，此参数必传；取值范围：public、shared、thirdparty、private (Optional) */ + ImageSource *string `json:"imageSource"` - /* 镜像来源，如果没有指定ids参数，此参数必传；取值范围：public、shared、thirdparty、private (Optional) */ - ImageSource *string `json:"imageSource"` + /* 操作系统平台，取值范围：Windows Server、CentOS、Ubuntu (Optional) */ + Platform *string `json:"platform"` - /* 操作系统平台，取值范围：Windows Server、CentOS、Ubuntu (Optional) */ - Platform *string `json:"platform"` + /* 镜像ID列表，如果指定了此参数，其它参数可为空 (Optional) */ + Ids []string `json:"ids"` - /* 镜像ID列表，如果指定了此参数，其它参数可为空 (Optional) */ - Ids []string `json:"ids"` + /* 镜像支持的系统盘类型，[localDisk,cloudDisk] (Optional) */ + RootDeviceType *string `json:"rootDeviceType"` - /* 镜像支持的系统盘类型，[localDisk,cloudDisk] (Optional) */ - RootDeviceType *string `json:"rootDeviceType"` + /* 参考镜像状态 (Optional) */ + Status *string `json:"status"` - /* 参考镜像状态 (Optional) */ - Status *string `json:"status"` + /* 页码；默认为1 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* 页码；默认为1 (Optional) */ - PageNumber *int `json:"pageNumber"` - - /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ + PageSize *int `json:"pageSize"` } /* @@ -56,17 +55,17 @@ type DescribeImagesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeImagesRequest( - regionId string, + regionId string, ) *DescribeImagesRequest { return &DescribeImagesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -81,100 +80,100 @@ func NewDescribeImagesRequest( * param pageSize: 分页大小；默认为20；取值范围[10, 100] (Optional) */ func NewDescribeImagesRequestWithAllParams( - regionId string, - imageSource *string, - platform *string, - ids []string, - rootDeviceType *string, - status *string, - pageNumber *int, - pageSize *int, + regionId string, + imageSource *string, + platform *string, + ids []string, + rootDeviceType *string, + status *string, + pageNumber *int, + pageSize *int, ) *DescribeImagesRequest { - return &DescribeImagesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageSource: imageSource, - Platform: platform, - Ids: ids, - RootDeviceType: rootDeviceType, - Status: status, - PageNumber: pageNumber, - PageSize: pageSize, - } + return &DescribeImagesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageSource: imageSource, + Platform: platform, + Ids: ids, + RootDeviceType: rootDeviceType, + Status: status, + PageNumber: pageNumber, + PageSize: pageSize, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeImagesRequestWithoutParam() *DescribeImagesRequest { - return &DescribeImagesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeImagesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeImagesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageSource: 镜像来源，如果没有指定ids参数，此参数必传；取值范围：public、shared、thirdparty、private(Optional) */ func (r *DescribeImagesRequest) SetImageSource(imageSource string) { - r.ImageSource = &imageSource + r.ImageSource = &imageSource } /* param platform: 操作系统平台，取值范围：Windows Server、CentOS、Ubuntu(Optional) */ func (r *DescribeImagesRequest) SetPlatform(platform string) { - r.Platform = &platform + r.Platform = &platform } /* param ids: 镜像ID列表，如果指定了此参数，其它参数可为空(Optional) */ func (r *DescribeImagesRequest) SetIds(ids []string) { - r.Ids = ids + r.Ids = ids } /* param rootDeviceType: 镜像支持的系统盘类型，[localDisk,cloudDisk](Optional) */ func (r *DescribeImagesRequest) SetRootDeviceType(rootDeviceType string) { - r.RootDeviceType = &rootDeviceType + r.RootDeviceType = &rootDeviceType } /* param status: 参考镜像状态(Optional) */ func (r *DescribeImagesRequest) SetStatus(status string) { - r.Status = &status + r.Status = &status } /* param pageNumber: 页码；默认为1(Optional) */ func (r *DescribeImagesRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小；默认为20；取值范围[10, 100](Optional) */ func (r *DescribeImagesRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeImagesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeImagesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeImagesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeImagesResult `json:"result"` } type DescribeImagesResult struct { - Images []vm.Image `json:"images"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + Images []vm.Image `json:"images"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstance.go index 84eb194e0..6783a1532 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstance.go @@ -17,19 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeInstanceRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` } /* @@ -39,19 +38,19 @@ type DescribeInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeInstanceRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *DescribeInstanceRequest { return &DescribeInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -60,57 +59,57 @@ func NewDescribeInstanceRequest( * param instanceId: 云主机ID (Required) */ func NewDescribeInstanceRequestWithAllParams( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *DescribeInstanceRequest { - return &DescribeInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - } + return &DescribeInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeInstanceRequestWithoutParam() *DescribeInstanceRequest { - return &DescribeInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *DescribeInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeInstanceResult `json:"result"` } type DescribeInstanceResult struct { - Instance vm.Instance `json:"instance"` -} \ No newline at end of file + Instance vm.Instance `json:"instance"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstancePrivateIpAddress.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstancePrivateIpAddress.go index 457d57089..99a47de0b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstancePrivateIpAddress.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstancePrivateIpAddress.go @@ -17,34 +17,33 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeInstancePrivateIpAddressRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 页码；默认为1 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* 页码；默认为1 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ + PageSize *int `json:"pageSize"` - /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ - PageSize *int `json:"pageSize"` - - /* instanceId - 云主机ID，精确匹配，支持多个 -privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个 -vpcId - 私有网络ID，精确匹配，支持多个 -status - 云主机状态，精确匹配，支持多个，参考云主机状态 -name - 云主机名称，模糊匹配，支持单个 -imageId - 镜像ID，精确匹配，支持多个 -networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 -subnetId - 子网ID，精确匹配，支持多个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* instanceId - 云主机ID，精确匹配，支持多个 + privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个 + vpcId - 私有网络ID，精确匹配，支持多个 + status - 云主机状态，精确匹配，支持多个，参考云主机状态 + name - 云主机名称，模糊匹配，支持单个 + imageId - 镜像ID，精确匹配，支持多个 + networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 + subnetId - 子网ID，精确匹配，支持多个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -53,17 +52,17 @@ subnetId - 子网ID，精确匹配，支持多个 * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeInstancePrivateIpAddressRequest( - regionId string, + regionId string, ) *DescribeInstancePrivateIpAddressRequest { return &DescribeInstancePrivateIpAddressRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instancePrivateIpAddress", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -80,54 +79,54 @@ imageId - 镜像ID，精确匹配，支持多个 networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 subnetId - 子网ID，精确匹配，支持多个 (Optional) - */ +*/ func NewDescribeInstancePrivateIpAddressRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeInstancePrivateIpAddressRequest { - return &DescribeInstancePrivateIpAddressRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instancePrivateIpAddress", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeInstancePrivateIpAddressRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instancePrivateIpAddress", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeInstancePrivateIpAddressRequestWithoutParam() *DescribeInstancePrivateIpAddressRequest { - return &DescribeInstancePrivateIpAddressRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instancePrivateIpAddress", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeInstancePrivateIpAddressRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instancePrivateIpAddress", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeInstancePrivateIpAddressRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码；默认为1(Optional) */ func (r *DescribeInstancePrivateIpAddressRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小；默认为20；取值范围[10, 100](Optional) */ func (r *DescribeInstancePrivateIpAddressRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: instanceId - 云主机ID，精确匹配，支持多个 @@ -140,22 +139,22 @@ networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 subnetId - 子网ID，精确匹配，支持多个 (Optional) */ func (r *DescribeInstancePrivateIpAddressRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeInstancePrivateIpAddressRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeInstancePrivateIpAddressResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeInstancePrivateIpAddressResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeInstancePrivateIpAddressResult `json:"result"` } type DescribeInstancePrivateIpAddressResult struct { - InstancePrivateIpAddress []vm.InstancePrivateIpAddress `json:"instancePrivateIpAddress"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + InstancePrivateIpAddress []vm.InstancePrivateIpAddress `json:"instancePrivateIpAddress"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceStatus.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceStatus.go index 2dbeb035a..5db261b45 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceStatus.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceStatus.go @@ -17,34 +17,33 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeInstanceStatusRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 页码；默认为1 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* 页码；默认为1 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ + PageSize *int `json:"pageSize"` - /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ - PageSize *int `json:"pageSize"` - - /* instanceId - 云主机ID，精确匹配，支持多个 -privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个 -vpcId - 私有网络ID，精确匹配，支持多个 -status - 云主机状态，精确匹配，支持多个，参考云主机状态 -name - 云主机名称，模糊匹配，支持单个 -imageId - 镜像ID，精确匹配，支持多个 -networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 -subnetId - 子网ID，精确匹配，支持多个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* instanceId - 云主机ID，精确匹配，支持多个 + privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个 + vpcId - 私有网络ID，精确匹配，支持多个 + status - 云主机状态，精确匹配，支持多个，参考云主机状态 + name - 云主机名称，模糊匹配，支持单个 + imageId - 镜像ID，精确匹配，支持多个 + networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 + subnetId - 子网ID，精确匹配，支持多个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -53,17 +52,17 @@ subnetId - 子网ID，精确匹配，支持多个 * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeInstanceStatusRequest( - regionId string, + regionId string, ) *DescribeInstanceStatusRequest { return &DescribeInstanceStatusRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instanceStatus", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -80,54 +79,54 @@ imageId - 镜像ID，精确匹配，支持多个 networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 subnetId - 子网ID，精确匹配，支持多个 (Optional) - */ +*/ func NewDescribeInstanceStatusRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeInstanceStatusRequest { - return &DescribeInstanceStatusRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instanceStatus", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeInstanceStatusRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instanceStatus", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeInstanceStatusRequestWithoutParam() *DescribeInstanceStatusRequest { - return &DescribeInstanceStatusRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instanceStatus", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeInstanceStatusRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instanceStatus", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeInstanceStatusRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码；默认为1(Optional) */ func (r *DescribeInstanceStatusRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小；默认为20；取值范围[10, 100](Optional) */ func (r *DescribeInstanceStatusRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: instanceId - 云主机ID，精确匹配，支持多个 @@ -140,22 +139,22 @@ networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 subnetId - 子网ID，精确匹配，支持多个 (Optional) */ func (r *DescribeInstanceStatusRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeInstanceStatusRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeInstanceStatusResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeInstanceStatusResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeInstanceStatusResult `json:"result"` } type DescribeInstanceStatusResult struct { - InstanceStatuses []vm.InstanceStatus `json:"instanceStatuses"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + InstanceStatuses []vm.InstanceStatus `json:"instanceStatuses"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceTypes.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceTypes.go index 6ff9017ff..c997144af 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceTypes.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceTypes.go @@ -17,22 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeInstanceTypesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* instanceTypes - 实例规格，精确匹配，支持多个 -az - 可用区，精确匹配，支持多个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* instanceTypes - 实例规格，精确匹配，支持多个 + az - 可用区，精确匹配，支持多个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -41,17 +40,17 @@ az - 可用区，精确匹配，支持多个 * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeInstanceTypesRequest( - regionId string, + regionId string, ) *DescribeInstanceTypesRequest { return &DescribeInstanceTypesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instanceTypes", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -60,63 +59,63 @@ func NewDescribeInstanceTypesRequest( * param filters: instanceTypes - 实例规格，精确匹配，支持多个 az - 可用区，精确匹配，支持多个 (Optional) - */ +*/ func NewDescribeInstanceTypesRequestWithAllParams( - regionId string, - filters []common.Filter, + regionId string, + filters []common.Filter, ) *DescribeInstanceTypesRequest { - return &DescribeInstanceTypesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instanceTypes", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - Filters: filters, - } + return &DescribeInstanceTypesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instanceTypes", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeInstanceTypesRequestWithoutParam() *DescribeInstanceTypesRequest { - return &DescribeInstanceTypesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instanceTypes", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeInstanceTypesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instanceTypes", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeInstanceTypesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param filters: instanceTypes - 实例规格，精确匹配，支持多个 az - 可用区，精确匹配，支持多个 (Optional) */ func (r *DescribeInstanceTypesRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeInstanceTypesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeInstanceTypesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeInstanceTypesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeInstanceTypesResult `json:"result"` } type DescribeInstanceTypesResult struct { - InstanceTypes []vm.InstanceType `json:"instanceTypes"` - SpecificInstanceTypes []vm.InstanceType `json:"specificInstanceTypes"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + InstanceTypes []vm.InstanceType `json:"instanceTypes"` + SpecificInstanceTypes []vm.InstanceType `json:"specificInstanceTypes"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceVncUrl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceVncUrl.go index 3026725f6..b60e1a224 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceVncUrl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceVncUrl.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DescribeInstanceVncUrlRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` } /* @@ -38,19 +37,19 @@ type DescribeInstanceVncUrlRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeInstanceVncUrlRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *DescribeInstanceVncUrlRequest { return &DescribeInstanceVncUrlRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}/vnc", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -59,57 +58,57 @@ func NewDescribeInstanceVncUrlRequest( * param instanceId: 云主机ID (Required) */ func NewDescribeInstanceVncUrlRequestWithAllParams( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *DescribeInstanceVncUrlRequest { - return &DescribeInstanceVncUrlRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}/vnc", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - } + return &DescribeInstanceVncUrlRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}/vnc", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeInstanceVncUrlRequestWithoutParam() *DescribeInstanceVncUrlRequest { - return &DescribeInstanceVncUrlRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}/vnc", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeInstanceVncUrlRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}/vnc", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeInstanceVncUrlRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *DescribeInstanceVncUrlRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeInstanceVncUrlRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeInstanceVncUrlResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeInstanceVncUrlResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeInstanceVncUrlResult `json:"result"` } type DescribeInstanceVncUrlResult struct { - VncUrl string `json:"vncUrl"` -} \ No newline at end of file + VncUrl string `json:"vncUrl"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstances.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstances.go index a1330c290..6eca2a945 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstances.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstances.go @@ -17,37 +17,36 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeInstancesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 页码；默认为1 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* 页码；默认为1 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ + PageSize *int `json:"pageSize"` - /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ - PageSize *int `json:"pageSize"` - - /* instanceId - 云主机ID，精确匹配，支持多个 -privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个 -az - 可用区，精确匹配，支持多个 -vpcId - 私有网络ID，精确匹配，支持多个 -status - 云主机状态，精确匹配，支持多个，参考云主机状态 -name - 云主机名称，模糊匹配，支持单个 -imageId - 镜像ID，精确匹配，支持多个 -networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 -subnetId - 子网ID，精确匹配，支持多个 -agId - 使用可用组id，支持单个 -faultDomain - 错误域，支持多个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* instanceId - 云主机ID，精确匹配，支持多个 + privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个 + az - 可用区，精确匹配，支持多个 + vpcId - 私有网络ID，精确匹配，支持多个 + status - 云主机状态，精确匹配，支持多个，参考云主机状态 + name - 云主机名称，模糊匹配，支持单个 + imageId - 镜像ID，精确匹配，支持多个 + networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 + subnetId - 子网ID，精确匹配，支持多个 + agId - 使用可用组id，支持单个 + faultDomain - 错误域，支持多个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -56,17 +55,17 @@ faultDomain - 错误域，支持多个 * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeInstancesRequest( - regionId string, + regionId string, ) *DescribeInstancesRequest { return &DescribeInstancesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -86,54 +85,54 @@ subnetId - 子网ID，精确匹配，支持多个 agId - 使用可用组id，支持单个 faultDomain - 错误域，支持多个 (Optional) - */ +*/ func NewDescribeInstancesRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeInstancesRequest { - return &DescribeInstancesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeInstancesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeInstancesRequestWithoutParam() *DescribeInstancesRequest { - return &DescribeInstancesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeInstancesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeInstancesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码；默认为1(Optional) */ func (r *DescribeInstancesRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小；默认为20；取值范围[10, 100](Optional) */ func (r *DescribeInstancesRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: instanceId - 云主机ID，精确匹配，支持多个 @@ -149,22 +148,22 @@ agId - 使用可用组id，支持单个 faultDomain - 错误域，支持多个 (Optional) */ func (r *DescribeInstancesRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeInstancesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeInstancesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeInstancesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeInstancesResult `json:"result"` } type DescribeInstancesResult struct { - Instances []vm.Instance `json:"instances"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + Instances []vm.Instance `json:"instances"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeKeypairs.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeKeypairs.go index 75b6c5c53..42b2a4264 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeKeypairs.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeKeypairs.go @@ -17,27 +17,26 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeKeypairsRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 页码；默认为1 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* 页码；默认为1 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ + PageSize *int `json:"pageSize"` - /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ - PageSize *int `json:"pageSize"` - - /* keyNames - 密钥对名称，精确匹配，支持多个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* keyNames - 密钥对名称，精确匹配，支持多个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -46,17 +45,17 @@ type DescribeKeypairsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeKeypairsRequest( - regionId string, + regionId string, ) *DescribeKeypairsRequest { return &DescribeKeypairsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/keypairs", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -66,75 +65,75 @@ func NewDescribeKeypairsRequest( * param pageSize: 分页大小；默认为20；取值范围[10, 100] (Optional) * param filters: keyNames - 密钥对名称，精确匹配，支持多个 (Optional) - */ +*/ func NewDescribeKeypairsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeKeypairsRequest { - return &DescribeKeypairsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeKeypairsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeKeypairsRequestWithoutParam() *DescribeKeypairsRequest { - return &DescribeKeypairsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeKeypairsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeKeypairsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码；默认为1(Optional) */ func (r *DescribeKeypairsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小；默认为20；取值范围[10, 100](Optional) */ func (r *DescribeKeypairsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: keyNames - 密钥对名称，精确匹配，支持多个 (Optional) */ func (r *DescribeKeypairsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeKeypairsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeKeypairsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeKeypairsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeKeypairsResult `json:"result"` } type DescribeKeypairsResult struct { - Keypairs []vm.Keypair `json:"keypairs"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + Keypairs []vm.Keypair `json:"keypairs"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeQuotas.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeQuotas.go index 66041bb0c..64a79b559 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeQuotas.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeQuotas.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeQuotasRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* resourceTypes - 资源类型，支持多个[instance，keypair，image，instanceTemplate，imageShare] + (Optional) */ + Filters []common.Filter `json:"filters"` - /* resourceTypes - 资源类型，支持多个[instance，keypair，image，instanceTemplate，imageShare] - (Optional) */ - Filters []common.Filter `json:"filters"` - - /* 私有镜像Id，查询镜像共享(imageShare)配额时，此参数必传 (Optional) */ - ImageId *string `json:"imageId"` + /* 私有镜像Id，查询镜像共享(imageShare)配额时，此参数必传 (Optional) */ + ImageId *string `json:"imageId"` } /* @@ -43,17 +42,17 @@ type DescribeQuotasRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeQuotasRequest( - regionId string, + regionId string, ) *DescribeQuotasRequest { return &DescribeQuotasRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/quotas", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -62,67 +61,67 @@ func NewDescribeQuotasRequest( * param filters: resourceTypes - 资源类型，支持多个[instance，keypair，image，instanceTemplate，imageShare] (Optional) * param imageId: 私有镜像Id，查询镜像共享(imageShare)配额时，此参数必传 (Optional) - */ +*/ func NewDescribeQuotasRequestWithAllParams( - regionId string, - filters []common.Filter, - imageId *string, + regionId string, + filters []common.Filter, + imageId *string, ) *DescribeQuotasRequest { - return &DescribeQuotasRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/quotas", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - Filters: filters, - ImageId: imageId, - } + return &DescribeQuotasRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/quotas", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + Filters: filters, + ImageId: imageId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeQuotasRequestWithoutParam() *DescribeQuotasRequest { - return &DescribeQuotasRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/quotas", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeQuotasRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/quotas", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeQuotasRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param filters: resourceTypes - 资源类型，支持多个[instance，keypair，image，instanceTemplate，imageShare] (Optional) */ func (r *DescribeQuotasRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } /* param imageId: 私有镜像Id，查询镜像共享(imageShare)配额时，此参数必传(Optional) */ func (r *DescribeQuotasRequest) SetImageId(imageId string) { - r.ImageId = &imageId + r.ImageId = &imageId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeQuotasRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeQuotasResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeQuotasResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeQuotasResult `json:"result"` } type DescribeQuotasResult struct { - Quotas []vm.Quota `json:"quotas"` -} \ No newline at end of file + Quotas []vm.Quota `json:"quotas"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachDisk.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachDisk.go index e393dfb85..39525f058 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachDisk.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachDisk.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DetachDiskRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 云硬盘ID */ + DiskId string `json:"diskId"` - /* 云硬盘ID */ - DiskId string `json:"diskId"` - - /* 强制缷载，默认False。如果此参数传值为True，代表数据盘的IO会被强制断掉。 (Optional) */ - Force *bool `json:"force"` + /* 强制缷载，默认False。如果此参数传值为True，代表数据盘的IO会被强制断掉。 (Optional) */ + Force *bool `json:"force"` } /* @@ -45,21 +44,21 @@ type DetachDiskRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDetachDiskRequest( - regionId string, - instanceId string, - diskId string, + regionId string, + instanceId string, + diskId string, ) *DetachDiskRequest { return &DetachDiskRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:detachDisk", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - DiskId: diskId, + RegionId: regionId, + InstanceId: instanceId, + DiskId: diskId, } } @@ -70,70 +69,70 @@ func NewDetachDiskRequest( * param force: 强制缷载，默认False。如果此参数传值为True，代表数据盘的IO会被强制断掉。 (Optional) */ func NewDetachDiskRequestWithAllParams( - regionId string, - instanceId string, - diskId string, - force *bool, + regionId string, + instanceId string, + diskId string, + force *bool, ) *DetachDiskRequest { - return &DetachDiskRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:detachDisk", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - DiskId: diskId, - Force: force, - } + return &DetachDiskRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:detachDisk", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + DiskId: diskId, + Force: force, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDetachDiskRequestWithoutParam() *DetachDiskRequest { - return &DetachDiskRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:detachDisk", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &DetachDiskRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:detachDisk", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DetachDiskRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *DetachDiskRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param diskId: 云硬盘ID(Required) */ func (r *DetachDiskRequest) SetDiskId(diskId string) { - r.DiskId = diskId + r.DiskId = diskId } /* param force: 强制缷载，默认False。如果此参数传值为True，代表数据盘的IO会被强制断掉。(Optional) */ func (r *DetachDiskRequest) SetForce(force bool) { - r.Force = &force + r.Force = &force } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DetachDiskRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DetachDiskResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DetachDiskResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DetachDiskResult `json:"result"` } type DetachDiskResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachNetworkInterface.go index 83087439f..3d19658f0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachNetworkInterface.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DetachNetworkInterfaceRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 云主机ID */ - InstanceId string `json:"instanceId"` - - /* 弹性网卡ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* 弹性网卡ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` } /* @@ -42,21 +41,21 @@ type DetachNetworkInterfaceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDetachNetworkInterfaceRequest( - regionId string, - instanceId string, - networkInterfaceId string, + regionId string, + instanceId string, + networkInterfaceId string, ) *DetachNetworkInterfaceRequest { return &DetachNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:detachNetworkInterface", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + InstanceId: instanceId, + NetworkInterfaceId: networkInterfaceId, } } @@ -66,63 +65,63 @@ func NewDetachNetworkInterfaceRequest( * param networkInterfaceId: 弹性网卡ID (Required) */ func NewDetachNetworkInterfaceRequestWithAllParams( - regionId string, - instanceId string, - networkInterfaceId string, + regionId string, + instanceId string, + networkInterfaceId string, ) *DetachNetworkInterfaceRequest { - return &DetachNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:detachNetworkInterface", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - NetworkInterfaceId: networkInterfaceId, - } + return &DetachNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:detachNetworkInterface", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + NetworkInterfaceId: networkInterfaceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDetachNetworkInterfaceRequestWithoutParam() *DetachNetworkInterfaceRequest { - return &DetachNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:detachNetworkInterface", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &DetachNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:detachNetworkInterface", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DetachNetworkInterfaceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *DetachNetworkInterfaceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param networkInterfaceId: 弹性网卡ID(Required) */ func (r *DetachNetworkInterfaceRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DetachNetworkInterfaceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DetachNetworkInterfaceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DetachNetworkInterfaceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DetachNetworkInterfaceResult `json:"result"` } type DetachNetworkInterfaceResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DisassociateElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DisassociateElasticIp.go index d1c023f6b..da1c69220 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DisassociateElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DisassociateElasticIp.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DisassociateElasticIpRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 云主机ID */ - InstanceId string `json:"instanceId"` - - /* 弹性公网IP的ID */ - ElasticIpId string `json:"elasticIpId"` + /* 弹性公网IP的ID */ + ElasticIpId string `json:"elasticIpId"` } /* @@ -42,21 +41,21 @@ type DisassociateElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDisassociateElasticIpRequest( - regionId string, - instanceId string, - elasticIpId string, + regionId string, + instanceId string, + elasticIpId string, ) *DisassociateElasticIpRequest { return &DisassociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:disassociateElasticIp", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - ElasticIpId: elasticIpId, + RegionId: regionId, + InstanceId: instanceId, + ElasticIpId: elasticIpId, } } @@ -66,63 +65,63 @@ func NewDisassociateElasticIpRequest( * param elasticIpId: 弹性公网IP的ID (Required) */ func NewDisassociateElasticIpRequestWithAllParams( - regionId string, - instanceId string, - elasticIpId string, + regionId string, + instanceId string, + elasticIpId string, ) *DisassociateElasticIpRequest { - return &DisassociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:disassociateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - ElasticIpId: elasticIpId, - } + return &DisassociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:disassociateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + ElasticIpId: elasticIpId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDisassociateElasticIpRequestWithoutParam() *DisassociateElasticIpRequest { - return &DisassociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:disassociateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &DisassociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:disassociateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DisassociateElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *DisassociateElasticIpRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param elasticIpId: 弹性公网IP的ID(Required) */ func (r *DisassociateElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = elasticIpId + r.ElasticIpId = elasticIpId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DisassociateElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DisassociateElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DisassociateElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DisassociateElasticIpResult `json:"result"` } type DisassociateElasticIpResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ImportKeypair.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ImportKeypair.go index 387a85c6b..eed6d9827 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ImportKeypair.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ImportKeypair.go @@ -17,22 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ImportKeypairRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 + */ + KeyName string `json:"keyName"` - /* 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 - */ - KeyName string `json:"keyName"` - - /* 密钥对的公钥部分 */ - PublicKey string `json:"publicKey"` + /* 密钥对的公钥部分 */ + PublicKey string `json:"publicKey"` } /* @@ -42,23 +41,23 @@ type ImportKeypairRequest struct { * param publicKey: 密钥对的公钥部分 (Required) * * @Deprecated, not compatible when mandatory parameters changed - */ +*/ func NewImportKeypairRequest( - regionId string, - keyName string, - publicKey string, + regionId string, + keyName string, + publicKey string, ) *ImportKeypairRequest { return &ImportKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/keypairs:import", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - KeyName: keyName, - PublicKey: publicKey, + RegionId: regionId, + KeyName: keyName, + PublicKey: publicKey, } } @@ -67,68 +66,68 @@ func NewImportKeypairRequest( * param keyName: 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 (Required) * param publicKey: 密钥对的公钥部分 (Required) - */ +*/ func NewImportKeypairRequestWithAllParams( - regionId string, - keyName string, - publicKey string, + regionId string, + keyName string, + publicKey string, ) *ImportKeypairRequest { - return &ImportKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs:import", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - KeyName: keyName, - PublicKey: publicKey, - } + return &ImportKeypairRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs:import", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + KeyName: keyName, + PublicKey: publicKey, + } } /* This constructor has better compatible ability when API parameters changed */ func NewImportKeypairRequestWithoutParam() *ImportKeypairRequest { - return &ImportKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs:import", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ImportKeypairRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs:import", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ImportKeypairRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param keyName: 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 (Required) */ func (r *ImportKeypairRequest) SetKeyName(keyName string) { - r.KeyName = keyName + r.KeyName = keyName } /* param publicKey: 密钥对的公钥部分(Required) */ func (r *ImportKeypairRequest) SetPublicKey(publicKey string) { - r.PublicKey = publicKey + r.PublicKey = publicKey } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ImportKeypairRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ImportKeypairResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ImportKeypairResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ImportKeypairResult `json:"result"` } type ImportKeypairResult struct { - KeyName string `json:"keyName"` - KeyFingerprint string `json:"keyFingerprint"` -} \ No newline at end of file + KeyName string `json:"keyName"` + KeyFingerprint string `json:"keyFingerprint"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyImageAttribute.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyImageAttribute.go index 0b811aaf6..8b68ea046 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyImageAttribute.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyImageAttribute.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyImageAttributeRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 镜像ID */ + ImageId string `json:"imageId"` - /* 镜像ID */ - ImageId string `json:"imageId"` + /* 名称，参考公共参数规范。 (Optional) */ + Name *string `json:"name"` - /* 名称，参考公共参数规范。 (Optional) */ - Name *string `json:"name"` - - /* 描述，参考公共参数规范。 (Optional) */ - Description *string `json:"description"` + /* 描述，参考公共参数规范。 (Optional) */ + Description *string `json:"description"` } /* @@ -44,19 +43,19 @@ type ModifyImageAttributeRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyImageAttributeRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *ModifyImageAttributeRequest { return &ModifyImageAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}:modifyImageAttribute", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -67,70 +66,70 @@ func NewModifyImageAttributeRequest( * param description: 描述，参考公共参数规范。 (Optional) */ func NewModifyImageAttributeRequestWithAllParams( - regionId string, - imageId string, - name *string, - description *string, + regionId string, + imageId string, + name *string, + description *string, ) *ModifyImageAttributeRequest { - return &ModifyImageAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}:modifyImageAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - Name: name, - Description: description, - } + return &ModifyImageAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}:modifyImageAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + Name: name, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyImageAttributeRequestWithoutParam() *ModifyImageAttributeRequest { - return &ModifyImageAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}:modifyImageAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyImageAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}:modifyImageAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ModifyImageAttributeRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *ModifyImageAttributeRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } /* param name: 名称，参考公共参数规范。(Optional) */ func (r *ModifyImageAttributeRequest) SetName(name string) { - r.Name = &name + r.Name = &name } /* param description: 描述，参考公共参数规范。(Optional) */ func (r *ModifyImageAttributeRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyImageAttributeRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyImageAttributeResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyImageAttributeResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyImageAttributeResult `json:"result"` } type ModifyImageAttributeResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceAttribute.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceAttribute.go index cba1debfd..a8bd346a9 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceAttribute.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceAttribute.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyInstanceAttributeRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 名称，参考公共参数规范。 (Optional) */ + Name *string `json:"name"` - /* 名称，参考公共参数规范。 (Optional) */ - Name *string `json:"name"` - - /* 描述，参考公共参数规范。 (Optional) */ - Description *string `json:"description"` + /* 描述，参考公共参数规范。 (Optional) */ + Description *string `json:"description"` } /* @@ -44,19 +43,19 @@ type ModifyInstanceAttributeRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyInstanceAttributeRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *ModifyInstanceAttributeRequest { return &ModifyInstanceAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceAttribute", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -67,70 +66,70 @@ func NewModifyInstanceAttributeRequest( * param description: 描述，参考公共参数规范。 (Optional) */ func NewModifyInstanceAttributeRequestWithAllParams( - regionId string, - instanceId string, - name *string, - description *string, + regionId string, + instanceId string, + name *string, + description *string, ) *ModifyInstanceAttributeRequest { - return &ModifyInstanceAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - Name: name, - Description: description, - } + return &ModifyInstanceAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + Name: name, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyInstanceAttributeRequestWithoutParam() *ModifyInstanceAttributeRequest { - return &ModifyInstanceAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyInstanceAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ModifyInstanceAttributeRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *ModifyInstanceAttributeRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param name: 名称，参考公共参数规范。(Optional) */ func (r *ModifyInstanceAttributeRequest) SetName(name string) { - r.Name = &name + r.Name = &name } /* param description: 描述，参考公共参数规范。(Optional) */ func (r *ModifyInstanceAttributeRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyInstanceAttributeRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyInstanceAttributeResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyInstanceAttributeResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyInstanceAttributeResult `json:"result"` } type ModifyInstanceAttributeResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceDiskAttribute.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceDiskAttribute.go index 8be479476..a12780e77 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceDiskAttribute.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceDiskAttribute.go @@ -17,22 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type ModifyInstanceDiskAttributeRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 云主机ID */ - InstanceId string `json:"instanceId"` - - /* 云硬盘列表 (Optional) */ - DataDisks []vm.InstanceDiskAttribute `json:"dataDisks"` + /* 云硬盘列表 (Optional) */ + DataDisks []vm.InstanceDiskAttribute `json:"dataDisks"` } /* @@ -42,19 +41,19 @@ type ModifyInstanceDiskAttributeRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyInstanceDiskAttributeRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *ModifyInstanceDiskAttributeRequest { return &ModifyInstanceDiskAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceDiskAttribute", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -64,63 +63,63 @@ func NewModifyInstanceDiskAttributeRequest( * param dataDisks: 云硬盘列表 (Optional) */ func NewModifyInstanceDiskAttributeRequestWithAllParams( - regionId string, - instanceId string, - dataDisks []vm.InstanceDiskAttribute, + regionId string, + instanceId string, + dataDisks []vm.InstanceDiskAttribute, ) *ModifyInstanceDiskAttributeRequest { - return &ModifyInstanceDiskAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceDiskAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - DataDisks: dataDisks, - } + return &ModifyInstanceDiskAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceDiskAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + DataDisks: dataDisks, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyInstanceDiskAttributeRequestWithoutParam() *ModifyInstanceDiskAttributeRequest { - return &ModifyInstanceDiskAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceDiskAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyInstanceDiskAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceDiskAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ModifyInstanceDiskAttributeRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *ModifyInstanceDiskAttributeRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param dataDisks: 云硬盘列表(Optional) */ func (r *ModifyInstanceDiskAttributeRequest) SetDataDisks(dataDisks []vm.InstanceDiskAttribute) { - r.DataDisks = dataDisks + r.DataDisks = dataDisks } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyInstanceDiskAttributeRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyInstanceDiskAttributeResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyInstanceDiskAttributeResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyInstanceDiskAttributeResult `json:"result"` } type ModifyInstanceDiskAttributeResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceNetworkAttribute.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceNetworkAttribute.go index dd219907c..262133b4b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceNetworkAttribute.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceNetworkAttribute.go @@ -17,22 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type ModifyInstanceNetworkAttributeRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 云主机ID */ - InstanceId string `json:"instanceId"` - - /* 弹性网卡列表 (Optional) */ - Networks []vm.InstanceNetworkAttribute `json:"networks"` + /* 弹性网卡列表 (Optional) */ + Networks []vm.InstanceNetworkAttribute `json:"networks"` } /* @@ -42,19 +41,19 @@ type ModifyInstanceNetworkAttributeRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyInstanceNetworkAttributeRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *ModifyInstanceNetworkAttributeRequest { return &ModifyInstanceNetworkAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceNetworkAttribute", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -64,63 +63,63 @@ func NewModifyInstanceNetworkAttributeRequest( * param networks: 弹性网卡列表 (Optional) */ func NewModifyInstanceNetworkAttributeRequestWithAllParams( - regionId string, - instanceId string, - networks []vm.InstanceNetworkAttribute, + regionId string, + instanceId string, + networks []vm.InstanceNetworkAttribute, ) *ModifyInstanceNetworkAttributeRequest { - return &ModifyInstanceNetworkAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceNetworkAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - Networks: networks, - } + return &ModifyInstanceNetworkAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceNetworkAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + Networks: networks, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyInstanceNetworkAttributeRequestWithoutParam() *ModifyInstanceNetworkAttributeRequest { - return &ModifyInstanceNetworkAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceNetworkAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyInstanceNetworkAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceNetworkAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ModifyInstanceNetworkAttributeRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *ModifyInstanceNetworkAttributeRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param networks: 弹性网卡列表(Optional) */ func (r *ModifyInstanceNetworkAttributeRequest) SetNetworks(networks []vm.InstanceNetworkAttribute) { - r.Networks = networks + r.Networks = networks } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyInstanceNetworkAttributeRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyInstanceNetworkAttributeResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyInstanceNetworkAttributeResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyInstanceNetworkAttributeResult `json:"result"` } type ModifyInstanceNetworkAttributeResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstancePassword.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstancePassword.go index 0d82721ef..8c3f3e0de 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstancePassword.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstancePassword.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyInstancePasswordRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 云主机ID */ - InstanceId string `json:"instanceId"` - - /* 密码，参考公共参数规范。 */ - Password string `json:"password"` + /* 密码，参考公共参数规范。 */ + Password string `json:"password"` } /* @@ -42,21 +41,21 @@ type ModifyInstancePasswordRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyInstancePasswordRequest( - regionId string, - instanceId string, - password string, + regionId string, + instanceId string, + password string, ) *ModifyInstancePasswordRequest { return &ModifyInstancePasswordRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:modifyInstancePassword", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - Password: password, + RegionId: regionId, + InstanceId: instanceId, + Password: password, } } @@ -66,63 +65,63 @@ func NewModifyInstancePasswordRequest( * param password: 密码，参考公共参数规范。 (Required) */ func NewModifyInstancePasswordRequestWithAllParams( - regionId string, - instanceId string, - password string, + regionId string, + instanceId string, + password string, ) *ModifyInstancePasswordRequest { - return &ModifyInstancePasswordRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstancePassword", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - Password: password, - } + return &ModifyInstancePasswordRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstancePassword", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + Password: password, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyInstancePasswordRequestWithoutParam() *ModifyInstancePasswordRequest { - return &ModifyInstancePasswordRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstancePassword", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyInstancePasswordRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstancePassword", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ModifyInstancePasswordRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *ModifyInstancePasswordRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param password: 密码，参考公共参数规范。(Required) */ func (r *ModifyInstancePasswordRequest) SetPassword(password string) { - r.Password = password + r.Password = password } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyInstancePasswordRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyInstancePasswordResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyInstancePasswordResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyInstancePasswordResult `json:"result"` } type ModifyInstancePasswordResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebootInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebootInstance.go index 7bfac4809..f4fae6f1b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebootInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebootInstance.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type RebootInstanceRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` } /* @@ -38,19 +37,19 @@ type RebootInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewRebootInstanceRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *RebootInstanceRequest { return &RebootInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:rebootInstance", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -59,56 +58,56 @@ func NewRebootInstanceRequest( * param instanceId: 云主机ID (Required) */ func NewRebootInstanceRequestWithAllParams( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *RebootInstanceRequest { - return &RebootInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:rebootInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - } + return &RebootInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:rebootInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewRebootInstanceRequestWithoutParam() *RebootInstanceRequest { - return &RebootInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:rebootInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &RebootInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:rebootInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *RebootInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *RebootInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r RebootInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type RebootInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result RebootInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result RebootInstanceResult `json:"result"` } type RebootInstanceResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebuildInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebuildInstance.go index 0aa5380f7..2c15d0968 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebuildInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebuildInstance.go @@ -17,27 +17,26 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type RebuildInstanceRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 云主机密码，参考公共参数规范。 */ + Password string `json:"password"` - /* 云主机密码，参考公共参数规范。 */ - Password string `json:"password"` + /* 镜像ID。可查询DescribeImages接口获得指定地域的镜像信息。 (Optional) */ + ImageId *string `json:"imageId"` - /* 镜像ID。可查询DescribeImages接口获得指定地域的镜像信息。 (Optional) */ - ImageId *string `json:"imageId"` - - /* 密钥对名称；当前只支持一个。仅Linux系统支持指定。 (Optional) */ - KeyNames []string `json:"keyNames"` + /* 密钥对名称；当前只支持一个。仅Linux系统支持指定。 (Optional) */ + KeyNames []string `json:"keyNames"` } /* @@ -48,21 +47,21 @@ type RebuildInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewRebuildInstanceRequest( - regionId string, - instanceId string, - password string, + regionId string, + instanceId string, + password string, ) *RebuildInstanceRequest { return &RebuildInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:rebuildInstance", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - Password: password, + RegionId: regionId, + InstanceId: instanceId, + Password: password, } } @@ -74,77 +73,77 @@ func NewRebuildInstanceRequest( * param keyNames: 密钥对名称；当前只支持一个。仅Linux系统支持指定。 (Optional) */ func NewRebuildInstanceRequestWithAllParams( - regionId string, - instanceId string, - password string, - imageId *string, - keyNames []string, + regionId string, + instanceId string, + password string, + imageId *string, + keyNames []string, ) *RebuildInstanceRequest { - return &RebuildInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:rebuildInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - Password: password, - ImageId: imageId, - KeyNames: keyNames, - } + return &RebuildInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:rebuildInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + Password: password, + ImageId: imageId, + KeyNames: keyNames, + } } /* This constructor has better compatible ability when API parameters changed */ func NewRebuildInstanceRequestWithoutParam() *RebuildInstanceRequest { - return &RebuildInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:rebuildInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &RebuildInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:rebuildInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *RebuildInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *RebuildInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param password: 云主机密码，参考公共参数规范。(Required) */ func (r *RebuildInstanceRequest) SetPassword(password string) { - r.Password = password + r.Password = password } /* param imageId: 镜像ID。可查询DescribeImages接口获得指定地域的镜像信息。(Optional) */ func (r *RebuildInstanceRequest) SetImageId(imageId string) { - r.ImageId = &imageId + r.ImageId = &imageId } /* param keyNames: 密钥对名称；当前只支持一个。仅Linux系统支持指定。(Optional) */ func (r *RebuildInstanceRequest) SetKeyNames(keyNames []string) { - r.KeyNames = keyNames + r.KeyNames = keyNames } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r RebuildInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type RebuildInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result RebuildInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result RebuildInstanceResult `json:"result"` } type RebuildInstanceResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ResizeInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ResizeInstance.go index 4c5f83bc3..28c9e5e18 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ResizeInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ResizeInstance.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ResizeInstanceRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 云主机ID */ - InstanceId string `json:"instanceId"` - - /* 实例规格，可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 */ - InstanceType string `json:"instanceType"` + /* 实例规格，可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 */ + InstanceType string `json:"instanceType"` } /* @@ -42,21 +41,21 @@ type ResizeInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewResizeInstanceRequest( - regionId string, - instanceId string, - instanceType string, + regionId string, + instanceId string, + instanceType string, ) *ResizeInstanceRequest { return &ResizeInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:resizeInstance", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - InstanceType: instanceType, + RegionId: regionId, + InstanceId: instanceId, + InstanceType: instanceType, } } @@ -66,63 +65,63 @@ func NewResizeInstanceRequest( * param instanceType: 实例规格，可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 (Required) */ func NewResizeInstanceRequestWithAllParams( - regionId string, - instanceId string, - instanceType string, + regionId string, + instanceId string, + instanceType string, ) *ResizeInstanceRequest { - return &ResizeInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:resizeInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - InstanceType: instanceType, - } + return &ResizeInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:resizeInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + InstanceType: instanceType, + } } /* This constructor has better compatible ability when API parameters changed */ func NewResizeInstanceRequestWithoutParam() *ResizeInstanceRequest { - return &ResizeInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:resizeInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ResizeInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:resizeInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ResizeInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *ResizeInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param instanceType: 实例规格，可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。(Required) */ func (r *ResizeInstanceRequest) SetInstanceType(instanceType string) { - r.InstanceType = instanceType + r.InstanceType = instanceType } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ResizeInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ResizeInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ResizeInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ResizeInstanceResult `json:"result"` } type ResizeInstanceResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ShareImage.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ShareImage.go index 3f047a801..f5ef68b22 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ShareImage.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ShareImage.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ShareImageRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 镜像ID */ + ImageId string `json:"imageId"` - /* 镜像ID */ - ImageId string `json:"imageId"` - - /* 需要共享的帐户 (Optional) */ - Pins []string `json:"pins"` + /* 需要共享的帐户 (Optional) */ + Pins []string `json:"pins"` } /* @@ -41,19 +40,19 @@ type ShareImageRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewShareImageRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *ShareImageRequest { return &ShareImageRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}:share", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -63,63 +62,63 @@ func NewShareImageRequest( * param pins: 需要共享的帐户 (Optional) */ func NewShareImageRequestWithAllParams( - regionId string, - imageId string, - pins []string, + regionId string, + imageId string, + pins []string, ) *ShareImageRequest { - return &ShareImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}:share", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - Pins: pins, - } + return &ShareImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}:share", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + Pins: pins, + } } /* This constructor has better compatible ability when API parameters changed */ func NewShareImageRequestWithoutParam() *ShareImageRequest { - return &ShareImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}:share", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ShareImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}:share", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ShareImageRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *ShareImageRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } /* param pins: 需要共享的帐户(Optional) */ func (r *ShareImageRequest) SetPins(pins []string) { - r.Pins = pins + r.Pins = pins } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ShareImageRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ShareImageResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ShareImageResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ShareImageResult `json:"result"` } type ShareImageResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StartInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StartInstance.go index cdb93d9d9..19c1d4e4b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StartInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StartInstance.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type StartInstanceRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` } /* @@ -38,19 +37,19 @@ type StartInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewStartInstanceRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *StartInstanceRequest { return &StartInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:startInstance", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -59,56 +58,56 @@ func NewStartInstanceRequest( * param instanceId: 云主机ID (Required) */ func NewStartInstanceRequestWithAllParams( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *StartInstanceRequest { - return &StartInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:startInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - } + return &StartInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:startInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewStartInstanceRequestWithoutParam() *StartInstanceRequest { - return &StartInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:startInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &StartInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:startInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *StartInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *StartInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r StartInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type StartInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result StartInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result StartInstanceResult `json:"result"` } type StartInstanceResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StopInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StopInstance.go index c23c6cd42..f3a2c8024 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StopInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StopInstance.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type StopInstanceRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` - - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` } /* @@ -38,19 +37,19 @@ type StopInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewStopInstanceRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *StopInstanceRequest { return &StopInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:stopInstance", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -59,56 +58,56 @@ func NewStopInstanceRequest( * param instanceId: 云主机ID (Required) */ func NewStopInstanceRequestWithAllParams( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *StopInstanceRequest { - return &StopInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:stopInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - } + return &StopInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:stopInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewStopInstanceRequestWithoutParam() *StopInstanceRequest { - return &StopInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:stopInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &StopInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:stopInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *StopInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *StopInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r StopInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type StopInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result StopInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result StopInstanceResult `json:"result"` } type StopInstanceResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/UnShareImage.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/UnShareImage.go index 0e34ed4f9..ad7e1a79e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/UnShareImage.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/UnShareImage.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type UnShareImageRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* 地域ID */ + RegionId string `json:"regionId"` - /* 地域ID */ - RegionId string `json:"regionId"` + /* 镜像ID */ + ImageId string `json:"imageId"` - /* 镜像ID */ - ImageId string `json:"imageId"` - - /* 需要取消的帐户 (Optional) */ - Pins []string `json:"pins"` + /* 需要取消的帐户 (Optional) */ + Pins []string `json:"pins"` } /* @@ -41,19 +40,19 @@ type UnShareImageRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewUnShareImageRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *UnShareImageRequest { return &UnShareImageRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}:unshare", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -63,63 +62,63 @@ func NewUnShareImageRequest( * param pins: 需要取消的帐户 (Optional) */ func NewUnShareImageRequestWithAllParams( - regionId string, - imageId string, - pins []string, + regionId string, + imageId string, + pins []string, ) *UnShareImageRequest { - return &UnShareImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}:unshare", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - Pins: pins, - } + return &UnShareImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}:unshare", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + Pins: pins, + } } /* This constructor has better compatible ability when API parameters changed */ func NewUnShareImageRequestWithoutParam() *UnShareImageRequest { - return &UnShareImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}:unshare", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &UnShareImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}:unshare", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *UnShareImageRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *UnShareImageRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } /* param pins: 需要取消的帐户(Optional) */ func (r *UnShareImageRequest) SetPins(pins []string) { - r.Pins = pins + r.Pins = pins } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r UnShareImageRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type UnShareImageResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result UnShareImageResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result UnShareImageResult `json:"result"` } type UnShareImageResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client/VmClient.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client/VmClient.go index 6ec95e956..4694e4814 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client/VmClient.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client/VmClient.go @@ -17,85 +17,85 @@ package client import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" - "encoding/json" - "errors" + "encoding/json" + "errors" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" ) type VmClient struct { - core.JDCloudClient + core.JDCloudClient } func NewVmClient(credential *core.Credential) *VmClient { - if credential == nil { - return nil - } + if credential == nil { + return nil + } - config := core.NewConfig() - config.SetEndpoint("vm.jdcloud-api.com") + config := core.NewConfig() + config.SetEndpoint("vm.jdcloud-api.com") - return &VmClient{ - core.JDCloudClient{ - Credential: *credential, - Config: *config, - ServiceName: "vm", - Revision: "1.0.8", - Logger: core.NewDefaultLogger(core.LogInfo), - }} + return &VmClient{ + core.JDCloudClient{ + Credential: *credential, + Config: *config, + ServiceName: "vm", + Revision: "1.0.8", + Logger: core.NewDefaultLogger(core.LogInfo), + }} } func (c *VmClient) SetConfig(config *core.Config) { - c.Config = *config + c.Config = *config } func (c *VmClient) SetLogger(logger core.Logger) { - c.Logger = logger + c.Logger = logger } /* 查询镜像共享帐户列表，只允许操作您的个人私有镜像。 */ func (c *VmClient) DescribeImageMembers(request *vm.DescribeImageMembersRequest) (*vm.DescribeImageMembersResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeImageMembersResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeImageMembersResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 为云主机创建私有镜像。云主机状态必须为stopped。
云主机没有正在进行中的任务才可制作镜像。
制作镜像以备份系统盘为基础，在此之上可选择全部或部分挂载数据盘制作整机镜像（如不做任何更改将默认制作整机镜像），制作镜像过程会为所挂载云硬盘创建快照并与镜像关联。
调用接口后，需要等待镜像状态变为ready后，才能正常使用镜像。 - */ +*/ func (c *VmClient) CreateImage(request *vm.CreateImageRequest) (*vm.CreateImageResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.CreateImageResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.CreateImageResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建一台或多台指定配置的云主机，创建模式分为三种：1.普通方式、2.使用高可用组、3.使用启动模板。三种方式创建云主机时参数的必传与非必传是不同的，具体请参考参数详细说明
@@ -147,199 +147,199 @@ func (c *VmClient) CreateImage(request *vm.CreateImageRequest) (*vm.CreateImageR - 虚机的az会覆盖磁盘的az属性 - 密码 - 参考公共参数规范 - */ +*/ func (c *VmClient) CreateInstances(request *vm.CreateInstancesRequest) (*vm.CreateInstancesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.CreateInstancesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.CreateInstancesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 为云主机主网卡下的主内网IP绑定弹性公网IP。
一台云主机只能绑定一个弹性公网IP(主网卡)，若主网卡已存在弹性公网IP，会返回错误。
- */ +*/ func (c *VmClient) AssociateElasticIp(request *vm.AssociateElasticIpRequest) (*vm.AssociateElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.AssociateElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.AssociateElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 共享镜像，只允许操作您的个人私有镜像，单个镜像最多可共享给20个京东云帐户。
整机镜像目前不支持共享。 - */ +*/ func (c *VmClient) ShareImage(request *vm.ShareImageRequest) (*vm.ShareImageResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ShareImageResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ShareImageResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 云主机解绑弹性公网IP，解绑的是主网卡、内网主IP对应的弹性公网IP。 */ func (c *VmClient) DisassociateElasticIp(request *vm.DisassociateElasticIpRequest) (*vm.DisassociateElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DisassociateElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DisassociateElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 停止单个云主机，只能停止running状态的云主机，云主机没有正在进行中的任务才可停止 */ func (c *VmClient) StopInstance(request *vm.StopInstanceRequest) (*vm.StopInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.StopInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.StopInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 启动单个云主机，只能启动stopped状态的云主机，云主机没有正在进行中的任务才可启动。
只能启动正常计费状态的云主机。 - */ +*/ func (c *VmClient) StartInstance(request *vm.StartInstanceRequest) (*vm.StartInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.StartInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.StartInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询镜像信息列表。
通过此接口可以查询到京东云官方镜像、第三方镜像、私有镜像、或其他用户共享给您的镜像。
此接口支持分页查询，默认每页20条。 - */ +*/ func (c *VmClient) DescribeImages(request *vm.DescribeImagesRequest) (*vm.DescribeImagesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeImagesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeImagesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询镜像的实例规格限制。
通过此接口可以查看镜像不支持的实例规格。只有官方镜像、第三方镜像有实例规格的限制，个人的私有镜像没有此限制。 - */ +*/ func (c *VmClient) DescribeImageConstraints(request *vm.DescribeImageConstraintsRequest) (*vm.DescribeImageConstraintsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeImageConstraintsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeImageConstraintsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 获取云主机vnc，用于连接管理云主机。
vnc地址的有效期为1个小时，调用接口获取vnc地址后如果1个小时内没有使用，vnc地址自动失效，再次使用需要重新获取。 - */ +*/ func (c *VmClient) DescribeInstanceVncUrl(request *vm.DescribeInstanceVncUrlRequest) (*vm.DescribeInstanceVncUrlResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeInstanceVncUrlResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeInstanceVncUrlResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 云主机使用指定镜像重置云主机系统
@@ -347,66 +347,66 @@ func (c *VmClient) DescribeInstanceVncUrl(request *vm.DescribeInstanceVncUrlRequ 若当前云主机的系统盘类型为local类型，那么更换的镜像必须为localDisk类型的镜像；同理若当前云主机的系统盘为cloud类型，那么更换的镜像必须为cloudDisk类型的镜像。可查询DescribeImages接口获得指定地域的镜像信息。
若不指定镜像ID，默认使用当前主机的原镜像重置系统。
指定的镜像必须能够支持当前主机的实例规格(instanceType)，否则会返回错误。可查询DescribeImageConstraints接口获得指定镜像支持的系统盘类型信息。 - */ +*/ func (c *VmClient) RebuildInstance(request *vm.RebuildInstanceRequest) (*vm.RebuildInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.RebuildInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.RebuildInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 取消共享镜像，只允许操作您的个人私有镜像。 */ func (c *VmClient) UnShareImage(request *vm.UnShareImageRequest) (*vm.UnShareImageResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.UnShareImageResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.UnShareImageResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改云主机部分信息，包括名称、描述。 */ func (c *VmClient) ModifyInstanceAttribute(request *vm.ModifyInstanceAttributeRequest) (*vm.ModifyInstanceAttributeResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ModifyInstanceAttributeResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ModifyInstanceAttributeResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 云主机变更实例规格
@@ -418,134 +418,134 @@ func (c *VmClient) ModifyInstanceAttribute(request *vm.ModifyInstanceAttributeRe 如果当前主机中的弹性网卡数量，大于新实例规格允许的弹性网卡数量，会返回错误。可查询DescribeInstanceTypes接口获得指定地域及可用区下的实例规格信息。
当前主机所使用的镜像，需要支持要变更的目标实例规格，否则返回错误。可查询DescribeImageConstraints接口获得指定镜像的实例规格限制信息。
云主机欠费或到期时，无法更改实例规格。 - */ +*/ func (c *VmClient) ResizeInstance(request *vm.ResizeInstanceRequest) (*vm.ResizeInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ResizeInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ResizeInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 批量查询镜像的实例规格限制。
通过此接口可以查看镜像不支持的实例规格。只有官方镜像、第三方镜像有实例规格的限制，个人的私有镜像没有此限制。 - */ +*/ func (c *VmClient) DescribeImageConstraintsBatch(request *vm.DescribeImageConstraintsBatchRequest) (*vm.DescribeImageConstraintsBatchResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeImageConstraintsBatchResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeImageConstraintsBatchResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 为一台云主机挂载一块数据盘(云硬盘)，云主机和云硬盘没有正在进行中的的任务时才可挂载。
云主机状态必须是running或stopped状态。
本地盘(local类型)做系统盘的云主机可挂载8块数据盘，云硬盘(cloud类型)做系统盘的云主机可挂载7块数据盘。 - */ +*/ func (c *VmClient) AttachDisk(request *vm.AttachDiskRequest) (*vm.AttachDiskResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.AttachDiskResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.AttachDiskResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改云主机密码，主机没有正在进行中的任务时才可操作。
修改密码后，需要重启云主机后生效。 - */ +*/ func (c *VmClient) ModifyInstancePassword(request *vm.ModifyInstancePasswordRequest) (*vm.ModifyInstancePasswordResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ModifyInstancePasswordResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ModifyInstancePasswordResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除一个私有镜像，只允许操作您的个人私有镜像。
若镜像已共享给其他用户，需先取消共享才可删除。 - */ +*/ func (c *VmClient) DeleteImage(request *vm.DeleteImageRequest) (*vm.DeleteImageResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DeleteImageResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DeleteImageResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询实例规格信息列表 */ func (c *VmClient) DescribeInstanceTypes(request *vm.DescribeInstanceTypesRequest) (*vm.DescribeInstanceTypesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeInstanceTypesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeInstanceTypesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 云主机挂载一块弹性网卡。
@@ -553,343 +553,343 @@ func (c *VmClient) DescribeInstanceTypes(request *vm.DescribeInstanceTypesReques 弹性网卡上如果绑定了公网IP，那么公网IP所在az需要与云主机的az保持一致，或者公网IP属于全可用区，才可挂载。
云主机挂载弹性网卡的数量，不能超过实例规格的限制。可查询DescribeInstanceTypes接口获得指定规格可挂载弹性网卡的数量上限。
弹性网卡与云主机必须在相同vpc下。 - */ +*/ func (c *VmClient) AttachNetworkInterface(request *vm.AttachNetworkInterfaceRequest) (*vm.AttachNetworkInterfaceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.AttachNetworkInterfaceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.AttachNetworkInterfaceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除ssh密钥对。 */ func (c *VmClient) DeleteKeypair(request *vm.DeleteKeypairRequest) (*vm.DeleteKeypairResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DeleteKeypairResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DeleteKeypairResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询镜像详情。 */ func (c *VmClient) DescribeImage(request *vm.DescribeImageRequest) (*vm.DescribeImageResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeImageResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeImageResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 云主机缷载一块弹性网卡。
云主机状态必须为running或stopped状态，并且没有正在进行中的任务才可操作。
不能缷载主网卡。 - */ +*/ func (c *VmClient) DetachNetworkInterface(request *vm.DetachNetworkInterfaceRequest) (*vm.DetachNetworkInterfaceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DetachNetworkInterfaceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DetachNetworkInterfaceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 导入由其他工具生成的密钥对的公钥部分。
若传入已存在的密钥名称，会返回错误。 - */ +*/ func (c *VmClient) ImportKeypair(request *vm.ImportKeypairRequest) (*vm.ImportKeypairResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ImportKeypairResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ImportKeypairResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 镜像跨区复制，将私有镜像复制到其它地域下，只允许操作您的个人私有镜像。
只支持rootDeviceType为cloudDisk的云硬盘系统盘镜像操作。 - */ +*/ func (c *VmClient) CopyImages(request *vm.CopyImagesRequest) (*vm.CopyImagesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.CopyImagesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.CopyImagesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询一台云主机的详细信息 */ func (c *VmClient) DescribeInstance(request *vm.DescribeInstanceRequest) (*vm.DescribeInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改虚机弹性网卡属性，包括是否随云主机一起删除。
不能修改主网卡。 - */ +*/ func (c *VmClient) ModifyInstanceNetworkAttribute(request *vm.ModifyInstanceNetworkAttributeRequest) (*vm.ModifyInstanceNetworkAttributeResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ModifyInstanceNetworkAttributeResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ModifyInstanceNetworkAttributeResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询配额，支持：云主机、镜像、密钥、模板、镜像共享 */ func (c *VmClient) DescribeQuotas(request *vm.DescribeQuotasRequest) (*vm.DescribeQuotasResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeQuotasResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeQuotasResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改镜像信息，包括名称、描述；只允许操作您的个人私有镜像。 */ func (c *VmClient) ModifyImageAttribute(request *vm.ModifyImageAttributeRequest) (*vm.ModifyImageAttributeResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ModifyImageAttributeResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ModifyImageAttributeResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 重启单个云主机，只能重启running状态的云主机，云主机没有正在进行中的任务才可重启。 */ func (c *VmClient) RebootInstance(request *vm.RebootInstanceRequest) (*vm.RebootInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.RebootInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.RebootInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改云主机挂载的数据盘属性，包括是否随主机删除。 */ func (c *VmClient) ModifyInstanceDiskAttribute(request *vm.ModifyInstanceDiskAttributeRequest) (*vm.ModifyInstanceDiskAttributeResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ModifyInstanceDiskAttributeResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ModifyInstanceDiskAttributeResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 批量查询云主机内网IP地址，查询的是主网卡内网主IP地址。 */ func (c *VmClient) DescribeInstancePrivateIpAddress(request *vm.DescribeInstancePrivateIpAddressRequest) (*vm.DescribeInstancePrivateIpAddressResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeInstancePrivateIpAddressResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeInstancePrivateIpAddressResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 批量查询云主机状态 */ func (c *VmClient) DescribeInstanceStatus(request *vm.DescribeInstanceStatusRequest) (*vm.DescribeInstanceStatusResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeInstanceStatusResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeInstanceStatusResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 批量查询密钥对。
此接口支持分页查询，默认每页20条。 - */ +*/ func (c *VmClient) DescribeKeypairs(request *vm.DescribeKeypairsRequest) (*vm.DescribeKeypairsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeKeypairsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeKeypairsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 云主机缷载数据盘，云主机和云硬盘没有正在进行中的任务时才可缷载。
*/ func (c *VmClient) DetachDisk(request *vm.DetachDiskRequest) (*vm.DetachDiskResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DetachDiskResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DetachDiskResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除按配置计费、或包年包月已到期的单个云主机。不能删除没有计费信息的云主机。
@@ -898,65 +898,64 @@ func (c *VmClient) DetachDisk(request *vm.DetachDiskRequest) (*vm.DetachDiskResp 如果主机中挂载的数据盘为按配置计费的云硬盘，并且不是共享型云硬盘，并且AutoDelete属性为true，那么数据盘会随主机一起删除。 [MFA enabled] */ func (c *VmClient) DeleteInstance(request *vm.DeleteInstanceRequest) (*vm.DeleteInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DeleteInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DeleteInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 批量查询云主机的详细信息
此接口支持分页查询，默认每页20条。 - */ +*/ func (c *VmClient) DescribeInstances(request *vm.DescribeInstancesRequest) (*vm.DescribeInstancesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeInstancesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeInstancesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建ssh密钥对。公钥部分存储在京东云，并返回未加密的 PEM 编码的 PKCS#8 格式私钥，您只有一次机会保存您的私钥。请妥善保管。
若传入已存在的密钥名称，会返回错误。 - */ +*/ func (c *VmClient) CreateKeypair(request *vm.CreateKeypairRequest) (*vm.CreateKeypairResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.CreateKeypairResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.CreateKeypairResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } - diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Ag.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Ag.go index 2e2d48e6a..2a0c190e0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Ag.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Ag.go @@ -16,12 +16,11 @@ package models - type Ag struct { - /* 高可用组名称 (Optional) */ - Name string `json:"name"` + /* 高可用组名称 (Optional) */ + Name string `json:"name"` - /* 高可用组id (Optional) */ - Id string `json:"id"` + /* 高可用组id (Optional) */ + Id string `json:"id"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/CopyImage.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/CopyImage.go index 43332d8c5..aaf55013d 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/CopyImage.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/CopyImage.go @@ -16,12 +16,11 @@ package models - type CopyImage struct { - /* 复制后的目标镜像ID (Optional) */ - DestinationImageId string `json:"destinationImageId"` + /* 复制后的目标镜像ID (Optional) */ + DestinationImageId string `json:"destinationImageId"` - /* 源镜像ID (Optional) */ - SourceImageId string `json:"sourceImageId"` + /* 源镜像ID (Optional) */ + SourceImageId string `json:"sourceImageId"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Gpu.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Gpu.go index 4755199be..c4cbd0265 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Gpu.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Gpu.go @@ -16,12 +16,11 @@ package models - type Gpu struct { - /* GPU型号 (Optional) */ - Model string `json:"model"` + /* GPU型号 (Optional) */ + Model string `json:"model"` - /* GPU数量 (Optional) */ - Number int `json:"number"` + /* GPU数量 (Optional) */ + Number int `json:"number"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Image.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Image.go index 70e7a6d95..0f9c0ddc6 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Image.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Image.go @@ -16,57 +16,56 @@ package models - type Image struct { - /* 镜像ID (Optional) */ - ImageId string `json:"imageId"` + /* 镜像ID (Optional) */ + ImageId string `json:"imageId"` - /* 镜像名称 (Optional) */ - Name string `json:"name"` + /* 镜像名称 (Optional) */ + Name string `json:"name"` - /* 镜像的操作系统发行版。取值：Ubuntu,CentOS,Windows Server (Optional) */ - Platform string `json:"platform"` + /* 镜像的操作系统发行版。取值：Ubuntu,CentOS,Windows Server (Optional) */ + Platform string `json:"platform"` - /* 镜像的操作系统版本。 (Optional) */ - OsVersion string `json:"osVersion"` + /* 镜像的操作系统版本。 (Optional) */ + OsVersion string `json:"osVersion"` - /* 镜像架构。取值：i386,x86_64 (Optional) */ - Architecture string `json:"architecture"` + /* 镜像架构。取值：i386,x86_64 (Optional) */ + Architecture string `json:"architecture"` - /* 镜像系统盘大小 (Optional) */ - SystemDiskSizeGB int `json:"systemDiskSizeGB"` + /* 镜像系统盘大小 (Optional) */ + SystemDiskSizeGB int `json:"systemDiskSizeGB"` - /* 镜像来源。取值：jcloud：官方镜像；marketplace：镜像市场镜像；self：用户自己的镜像；shared：其他用户分享的镜像 (Optional) */ - ImageSource string `json:"imageSource"` + /* 镜像来源。取值：jcloud：官方镜像；marketplace：镜像市场镜像；self：用户自己的镜像；shared：其他用户分享的镜像 (Optional) */ + ImageSource string `json:"imageSource"` - /* 镜像的操作系统类型。取值：windows,linux (Optional) */ - OsType string `json:"osType"` + /* 镜像的操作系统类型。取值：windows,linux (Optional) */ + OsType string `json:"osType"` - /* 参考镜像状态 (Optional) */ - Status string `json:"status"` + /* 参考镜像状态 (Optional) */ + Status string `json:"status"` - /* 创建时间 (Optional) */ - CreateTime string `json:"createTime"` + /* 创建时间 (Optional) */ + CreateTime string `json:"createTime"` - /* 镜像文件实际大小 (Optional) */ - SizeMB int `json:"sizeMB"` + /* 镜像文件实际大小 (Optional) */ + SizeMB int `json:"sizeMB"` - /* 镜像描述 (Optional) */ - Desc string `json:"desc"` + /* 镜像描述 (Optional) */ + Desc string `json:"desc"` - /* 镜像系统盘配置 (Optional) */ - SystemDisk InstanceDiskAttachment `json:"systemDisk"` + /* 镜像系统盘配置 (Optional) */ + SystemDisk InstanceDiskAttachment `json:"systemDisk"` - /* 镜像数据盘映射信息 (Optional) */ - DataDisks []InstanceDiskAttachment `json:"dataDisks"` + /* 镜像数据盘映射信息 (Optional) */ + DataDisks []InstanceDiskAttachment `json:"dataDisks"` - /* 创建云盘系统盘所使用的云硬盘快照ID。系统盘类型为本地盘的镜像，此参数为空。 (Optional) */ - SnapshotId string `json:"snapshotId"` + /* 创建云盘系统盘所使用的云硬盘快照ID。系统盘类型为本地盘的镜像，此参数为空。 (Optional) */ + SnapshotId string `json:"snapshotId"` - /* 镜像支持的系统盘类型。取值：localDisk：本地盘系统盘；cloudDisk：云盘系统盘。 (Optional) */ - RootDeviceType string `json:"rootDeviceType"` + /* 镜像支持的系统盘类型。取值：localDisk：本地盘系统盘；cloudDisk：云盘系统盘。 (Optional) */ + RootDeviceType string `json:"rootDeviceType"` - /* 镜像复制和转换时的进度，仅显示数值，单位为百分比 (Optional) */ - Progress string `json:"progress"` + /* 镜像复制和转换时的进度，仅显示数值，单位为百分比 (Optional) */ + Progress string `json:"progress"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageConstraint.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageConstraint.go index 66bca6972..4a6600165 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageConstraint.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageConstraint.go @@ -16,12 +16,11 @@ package models - type ImageConstraint struct { - /* 镜像ID (Optional) */ - ImageId string `json:"imageId"` + /* 镜像ID (Optional) */ + ImageId string `json:"imageId"` - /* 使用镜像创建实例的规格限制 (Optional) */ - ImageInstanceTypeConstraint ImageInstanceTypeConstraint `json:"imageInstanceTypeConstraint"` + /* 使用镜像创建实例的规格限制 (Optional) */ + ImageInstanceTypeConstraint ImageInstanceTypeConstraint `json:"imageInstanceTypeConstraint"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageInstanceTypeConstraint.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageInstanceTypeConstraint.go index a53ef7835..9cb6bd735 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageInstanceTypeConstraint.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageInstanceTypeConstraint.go @@ -16,12 +16,11 @@ package models - type ImageInstanceTypeConstraint struct { - /* 限制类型。取值：excludes：不支持的实例类型；includes：支持的实例类型。 (Optional) */ - ConstraintsType string `json:"constraintsType"` + /* 限制类型。取值：excludes：不支持的实例类型；includes：支持的实例类型。 (Optional) */ + ConstraintsType string `json:"constraintsType"` - /* 实例规格列表 (Optional) */ - InstanceTypes []string `json:"instanceTypes"` + /* 实例规格列表 (Optional) */ + InstanceTypes []string `json:"instanceTypes"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Instance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Instance.go index c49c6471c..8e1af0861 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Instance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Instance.go @@ -21,69 +21,69 @@ import disk "github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models" type Instance struct { - /* 云主机ID (Optional) */ - InstanceId string `json:"instanceId"` + /* 云主机ID (Optional) */ + InstanceId string `json:"instanceId"` - /* 云主机名称 (Optional) */ - InstanceName string `json:"instanceName"` + /* 云主机名称 (Optional) */ + InstanceName string `json:"instanceName"` - /* 实例规格 (Optional) */ - InstanceType string `json:"instanceType"` + /* 实例规格 (Optional) */ + InstanceType string `json:"instanceType"` - /* 主网卡所属VPC的ID (Optional) */ - VpcId string `json:"vpcId"` + /* 主网卡所属VPC的ID (Optional) */ + VpcId string `json:"vpcId"` - /* 主网卡所属子网的ID (Optional) */ - SubnetId string `json:"subnetId"` + /* 主网卡所属子网的ID (Optional) */ + SubnetId string `json:"subnetId"` - /* 主网卡主IP地址 (Optional) */ - PrivateIpAddress string `json:"privateIpAddress"` + /* 主网卡主IP地址 (Optional) */ + PrivateIpAddress string `json:"privateIpAddress"` - /* 主网卡主IP绑定弹性IP的ID (Optional) */ - ElasticIpId string `json:"elasticIpId"` + /* 主网卡主IP绑定弹性IP的ID (Optional) */ + ElasticIpId string `json:"elasticIpId"` - /* 主网卡主IP绑定弹性IP的地址 (Optional) */ - ElasticIpAddress string `json:"elasticIpAddress"` + /* 主网卡主IP绑定弹性IP的地址 (Optional) */ + ElasticIpAddress string `json:"elasticIpAddress"` - /* 云主机状态，参考云主机状态 (Optional) */ - Status string `json:"status"` + /* 云主机状态，参考云主机状态 (Optional) */ + Status string `json:"status"` - /* 云主机描述 (Optional) */ - Description string `json:"description"` + /* 云主机描述 (Optional) */ + Description string `json:"description"` - /* 镜像ID (Optional) */ - ImageId string `json:"imageId"` + /* 镜像ID (Optional) */ + ImageId string `json:"imageId"` - /* 系统盘配置 (Optional) */ - SystemDisk InstanceDiskAttachment `json:"systemDisk"` + /* 系统盘配置 (Optional) */ + SystemDisk InstanceDiskAttachment `json:"systemDisk"` - /* 数据盘配置 (Optional) */ - DataDisks []InstanceDiskAttachment `json:"dataDisks"` + /* 数据盘配置 (Optional) */ + DataDisks []InstanceDiskAttachment `json:"dataDisks"` - /* 主网卡配置 (Optional) */ - PrimaryNetworkInterface InstanceNetworkInterfaceAttachment `json:"primaryNetworkInterface"` + /* 主网卡配置 (Optional) */ + PrimaryNetworkInterface InstanceNetworkInterfaceAttachment `json:"primaryNetworkInterface"` - /* 辅助网卡配置 (Optional) */ - SecondaryNetworkInterfaces []InstanceNetworkInterfaceAttachment `json:"secondaryNetworkInterfaces"` + /* 辅助网卡配置 (Optional) */ + SecondaryNetworkInterfaces []InstanceNetworkInterfaceAttachment `json:"secondaryNetworkInterfaces"` - /* 创建时间 (Optional) */ - LaunchTime string `json:"launchTime"` + /* 创建时间 (Optional) */ + LaunchTime string `json:"launchTime"` - /* 云主机所在可用区 (Optional) */ - Az string `json:"az"` + /* 云主机所在可用区 (Optional) */ + Az string `json:"az"` - /* 密钥对名称 (Optional) */ - KeyNames []string `json:"keyNames"` + /* 密钥对名称 (Optional) */ + KeyNames []string `json:"keyNames"` - /* 计费信息 (Optional) */ - Charge charge.Charge `json:"charge"` + /* 计费信息 (Optional) */ + Charge charge.Charge `json:"charge"` - /* 高可用组，如果创建云主机使用了高可用组，此处可展示高可用组名称 (Optional) */ - Ag Ag `json:"ag"` + /* 高可用组，如果创建云主机使用了高可用组，此处可展示高可用组名称 (Optional) */ + Ag Ag `json:"ag"` - /* 高可用组中的错误域 (Optional) */ - FaultDomain string `json:"faultDomain"` + /* 高可用组中的错误域 (Optional) */ + FaultDomain string `json:"faultDomain"` - /* Tag信息 (Optional) */ - Tags []disk.Tag `json:"tags"` + /* Tag信息 (Optional) */ + Tags []disk.Tag `json:"tags"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachment.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachment.go index 33aa425e8..5b8e3e1d3 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachment.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachment.go @@ -20,27 +20,27 @@ import disk "github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models" type InstanceDiskAttachment struct { - /* 磁盘分类，取值为本地盘(local)或者数据盘(cloud)。 -系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 -数据盘仅支持云硬盘(cloud)。 - (Optional) */ - DiskCategory string `json:"diskCategory"` + /* 磁盘分类，取值为本地盘(local)或者数据盘(cloud)。 + 系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 + 数据盘仅支持云硬盘(cloud)。 + (Optional) */ + DiskCategory string `json:"diskCategory"` - /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 -如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 -如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 - (Optional) */ - AutoDelete bool `json:"autoDelete"` + /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 + 如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 + 如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 + (Optional) */ + AutoDelete bool `json:"autoDelete"` - /* 本地磁盘配置 (Optional) */ - LocalDisk LocalDisk `json:"localDisk"` + /* 本地磁盘配置 (Optional) */ + LocalDisk LocalDisk `json:"localDisk"` - /* 云硬盘配置 (Optional) */ - CloudDisk disk.Disk `json:"cloudDisk"` + /* 云硬盘配置 (Optional) */ + CloudDisk disk.Disk `json:"cloudDisk"` - /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi (Optional) */ - DeviceName string `json:"deviceName"` + /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi (Optional) */ + DeviceName string `json:"deviceName"` - /* 数据盘挂载状态，取值范围：attaching,detaching,attached,detached,error_attach,error_detach (Optional) */ - Status string `json:"status"` + /* 数据盘挂载状态，取值范围：attaching,detaching,attached,detached,error_attach,error_detach (Optional) */ + Status string `json:"status"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachmentSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachmentSpec.go index 452770331..1e4d57aed 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachmentSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachmentSpec.go @@ -20,28 +20,28 @@ import disk "github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models" type InstanceDiskAttachmentSpec struct { - /* 磁盘分类，取值为本地盘(local)或者云硬盘(cloud)。 -系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 -数据盘仅支持云硬盘(cloud)。 - (Optional) */ - DiskCategory *string `json:"diskCategory"` + /* 磁盘分类，取值为本地盘(local)或者云硬盘(cloud)。 + 系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 + 数据盘仅支持云硬盘(cloud)。 + (Optional) */ + DiskCategory *string `json:"diskCategory"` - /* 是否随云主机一起删除，即删除主机时是否自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 -如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 -如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 - (Optional) */ - AutoDelete *bool `json:"autoDelete"` + /* 是否随云主机一起删除，即删除主机时是否自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 + 如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 + 如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 + (Optional) */ + AutoDelete *bool `json:"autoDelete"` - /* 数据盘配置 (Optional) */ - CloudDiskSpec *disk.DiskSpec `json:"cloudDiskSpec"` + /* 数据盘配置 (Optional) */ + CloudDiskSpec *disk.DiskSpec `json:"cloudDiskSpec"` - /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi (Optional) */ - DeviceName *string `json:"deviceName"` + /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi (Optional) */ + DeviceName *string `json:"deviceName"` - /* 排除设备，使用此参数noDevice配合deviceName一起使用。 -创建整机镜像：如deviceName:vdb、noDevice:true，则表示云主机中的数据盘vdb不参与创建镜像。 -创建模板：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb不参与创建主机。 -创建主机：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb，或者模板(使用模板创建主机)中的数据盘vdb不参与创建主机。 - (Optional) */ - NoDevice *bool `json:"noDevice"` + /* 排除设备，使用此参数noDevice配合deviceName一起使用。 + 创建整机镜像：如deviceName:vdb、noDevice:true，则表示云主机中的数据盘vdb不参与创建镜像。 + 创建模板：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb不参与创建主机。 + 创建主机：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb，或者模板(使用模板创建主机)中的数据盘vdb不参与创建主机。 + (Optional) */ + NoDevice *bool `json:"noDevice"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttribute.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttribute.go index ef0197d39..dc86ab65c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttribute.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttribute.go @@ -16,15 +16,14 @@ package models - type InstanceDiskAttribute struct { - /* 云硬盘ID (Optional) */ - DiskId *string `json:"diskId"` + /* 云硬盘ID (Optional) */ + DiskId *string `json:"diskId"` - /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为false，本地盘(local)不能更改此值。 -如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 -如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 - (Optional) */ - AutoDelete *bool `json:"autoDelete"` + /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为false，本地盘(local)不能更改此值。 + 如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 + 如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 + (Optional) */ + AutoDelete *bool `json:"autoDelete"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkAttribute.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkAttribute.go index c44383dc5..266bd0392 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkAttribute.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkAttribute.go @@ -16,12 +16,11 @@ package models - type InstanceNetworkAttribute struct { - /* 弹性网卡ID (Optional) */ - NetworkInterfaceId *string `json:"networkInterfaceId"` + /* 弹性网卡ID (Optional) */ + NetworkInterfaceId *string `json:"networkInterfaceId"` - /* 随主机自动删除，默认为False (Optional) */ - AutoDelete *bool `json:"autoDelete"` + /* 随主机自动删除，默认为False (Optional) */ + AutoDelete *bool `json:"autoDelete"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterface.go index 29af23e42..97a4c6866 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterface.go @@ -20,27 +20,27 @@ import vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" type InstanceNetworkInterface struct { - /* 弹性网卡ID (Optional) */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* 弹性网卡ID (Optional) */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* 以太网地址 (Optional) */ - MacAddress string `json:"macAddress"` + /* 以太网地址 (Optional) */ + MacAddress string `json:"macAddress"` - /* 虚拟网络ID (Optional) */ - VpcId string `json:"vpcId"` + /* 虚拟网络ID (Optional) */ + VpcId string `json:"vpcId"` - /* 子网ID (Optional) */ - SubnetId string `json:"subnetId"` + /* 子网ID (Optional) */ + SubnetId string `json:"subnetId"` - /* (Optional) */ - SecurityGroups []SecurityGroupSimple `json:"securityGroups"` + /* (Optional) */ + SecurityGroups []SecurityGroupSimple `json:"securityGroups"` - /* 源和目标IP地址校验，取值为0或者1 (Optional) */ - SanityCheck int `json:"sanityCheck"` + /* 源和目标IP地址校验，取值为0或者1 (Optional) */ + SanityCheck int `json:"sanityCheck"` - /* 网卡主IP (Optional) */ - PrimaryIp vpc.NetworkInterfacePrivateIp `json:"primaryIp"` + /* 网卡主IP (Optional) */ + PrimaryIp vpc.NetworkInterfacePrivateIp `json:"primaryIp"` - /* 网卡辅IP (Optional) */ - SecondaryIps []vpc.NetworkInterfacePrivateIp `json:"secondaryIps"` + /* 网卡辅IP (Optional) */ + SecondaryIps []vpc.NetworkInterfacePrivateIp `json:"secondaryIps"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachment.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachment.go index 2a8c79961..e490a2db9 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachment.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachment.go @@ -16,15 +16,14 @@ package models - type InstanceNetworkInterfaceAttachment struct { - /* 设备Index (Optional) */ - DeviceIndex int `json:"deviceIndex"` + /* 设备Index (Optional) */ + DeviceIndex int `json:"deviceIndex"` - /* 指明删除实例时是否删除网卡，默认true；当前只能是true (Optional) */ - AutoDelete bool `json:"autoDelete"` + /* 指明删除实例时是否删除网卡，默认true；当前只能是true (Optional) */ + AutoDelete bool `json:"autoDelete"` - /* 网卡接口规范 (Optional) */ - NetworkInterface InstanceNetworkInterface `json:"networkInterface"` + /* 网卡接口规范 (Optional) */ + NetworkInterface InstanceNetworkInterface `json:"networkInterface"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachmentSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachmentSpec.go index d6e11621b..df91dede0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachmentSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachmentSpec.go @@ -20,9 +20,9 @@ import vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" type InstanceNetworkInterfaceAttachmentSpec struct { - /* 网卡设备Index，主网卡只能是1 (Optional) */ - DeviceIndex *int `json:"deviceIndex"` + /* 网卡设备Index，主网卡只能是1 (Optional) */ + DeviceIndex *int `json:"deviceIndex"` - /* 网卡接口规范 (Optional) */ - NetworkInterface *vpc.NetworkInterfaceSpec `json:"networkInterface"` + /* 网卡接口规范 (Optional) */ + NetworkInterface *vpc.NetworkInterfaceSpec `json:"networkInterface"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstancePrivateIpAddress.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstancePrivateIpAddress.go index 6436045c2..5d557520c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstancePrivateIpAddress.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstancePrivateIpAddress.go @@ -16,12 +16,11 @@ package models - type InstancePrivateIpAddress struct { - /* 云主机ID (Optional) */ - InstanceId string `json:"instanceId"` + /* 云主机ID (Optional) */ + InstanceId string `json:"instanceId"` - /* 主网卡内网主IP地址 (Optional) */ - PrivateIpAddress string `json:"privateIpAddress"` + /* 主网卡内网主IP地址 (Optional) */ + PrivateIpAddress string `json:"privateIpAddress"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceSpec.go index 5dc4861c5..56b5799ce 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceSpec.go @@ -21,49 +21,49 @@ import charge "github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models" type InstanceSpec struct { - /* 高可用组Id。指定了此参数后，只能通过高可用组关联的实例模板创建虚机，并且实例模板中的参数不可覆盖替换。实例模板以外的参数还可以指定。 (Optional) */ - AgId *string `json:"agId"` + /* 高可用组Id。指定了此参数后，只能通过高可用组关联的实例模板创建虚机，并且实例模板中的参数不可覆盖替换。实例模板以外的参数还可以指定。 (Optional) */ + AgId *string `json:"agId"` - /* 实例模板id，如果没有使用高可用组，那么对于实例模板中没有的信息，需要使用创建虚机的参数进行补充，或者选择覆盖启动模板中的参数。 (Optional) */ - InstanceTemplateId *string `json:"instanceTemplateId"` + /* 实例模板id，如果没有使用高可用组，那么对于实例模板中没有的信息，需要使用创建虚机的参数进行补充，或者选择覆盖启动模板中的参数。 (Optional) */ + InstanceTemplateId *string `json:"instanceTemplateId"` - /* 云主机所属的可用区。 (Optional) */ - Az *string `json:"az"` + /* 云主机所属的可用区。 (Optional) */ + Az *string `json:"az"` - /* 实例规格。可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 (Optional) */ - InstanceType *string `json:"instanceType"` + /* 实例规格。可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 (Optional) */ + InstanceType *string `json:"instanceType"` - /* 镜像ID。可查询DescribeImages接口获得指定地域的镜像信息。 (Optional) */ - ImageId *string `json:"imageId"` + /* 镜像ID。可查询DescribeImages接口获得指定地域的镜像信息。 (Optional) */ + ImageId *string `json:"imageId"` - /* 云主机名称，参考公共参数规范。 */ - Name string `json:"name"` + /* 云主机名称，参考公共参数规范。 */ + Name string `json:"name"` - /* 密码，参考公共参数规范。 (Optional) */ - Password *string `json:"password"` + /* 密码，参考公共参数规范。 (Optional) */ + Password *string `json:"password"` - /* 密钥对名称，当前只支持传入一个。 (Optional) */ - KeyNames []string `json:"keyNames"` + /* 密钥对名称，当前只支持传入一个。 (Optional) */ + KeyNames []string `json:"keyNames"` - /* 主网卡主IP关联的弹性IP规格 (Optional) */ - ElasticIp *vpc.ElasticIpSpec `json:"elasticIp"` + /* 主网卡主IP关联的弹性IP规格 (Optional) */ + ElasticIp *vpc.ElasticIpSpec `json:"elasticIp"` - /* 主网卡配置信息 (Optional) */ - PrimaryNetworkInterface *InstanceNetworkInterfaceAttachmentSpec `json:"primaryNetworkInterface"` + /* 主网卡配置信息 (Optional) */ + PrimaryNetworkInterface *InstanceNetworkInterfaceAttachmentSpec `json:"primaryNetworkInterface"` - /* 系统盘配置信息 (Optional) */ - SystemDisk *InstanceDiskAttachmentSpec `json:"systemDisk"` + /* 系统盘配置信息 (Optional) */ + SystemDisk *InstanceDiskAttachmentSpec `json:"systemDisk"` - /* 数据盘配置信息，本地盘(local类型)做系统盘的云主机可挂载8块数据盘，云硬盘(cloud类型)做系统盘的云主机可挂载7块数据盘。 (Optional) */ - DataDisks []InstanceDiskAttachmentSpec `json:"dataDisks"` + /* 数据盘配置信息，本地盘(local类型)做系统盘的云主机可挂载8块数据盘，云硬盘(cloud类型)做系统盘的云主机可挂载7块数据盘。 (Optional) */ + DataDisks []InstanceDiskAttachmentSpec `json:"dataDisks"` - /* 计费配置 -云主机不支持按用量方式计费，默认为按配置计费。 -打包创建数据盘的情况下，数据盘的计费方式只能与云主机保持一致。 -打包创建弹性公网IP的情况下，若公网IP的计费方式没有指定为按用量计费，那么公网IP计费方式只能与云主机保持一致。 - (Optional) */ - Charge *charge.ChargeSpec `json:"charge"` + /* 计费配置 + 云主机不支持按用量方式计费，默认为按配置计费。 + 打包创建数据盘的情况下，数据盘的计费方式只能与云主机保持一致。 + 打包创建弹性公网IP的情况下，若公网IP的计费方式没有指定为按用量计费，那么公网IP计费方式只能与云主机保持一致。 + (Optional) */ + Charge *charge.ChargeSpec `json:"charge"` - /* 主机描述，参考公共参数规范。 (Optional) */ - Description *string `json:"description"` + /* 主机描述，参考公共参数规范。 (Optional) */ + Description *string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceStatus.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceStatus.go index 3752f1930..9725d909d 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceStatus.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceStatus.go @@ -16,12 +16,11 @@ package models - type InstanceStatus struct { - /* 云主机ID (Optional) */ - InstanceId string `json:"instanceId"` + /* 云主机ID (Optional) */ + InstanceId string `json:"instanceId"` - /* 参考云主机状态 (Optional) */ - Status string `json:"status"` + /* 参考云主机状态 (Optional) */ + Status string `json:"status"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplate.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplate.go index 324918daf..7f5999ea5 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplate.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplate.go @@ -16,24 +16,23 @@ package models - type InstanceTemplate struct { - /* 启动模板ID (Optional) */ - Id string `json:"id"` + /* 启动模板ID (Optional) */ + Id string `json:"id"` - /* 启动模板名称 (Optional) */ - Name string `json:"name"` + /* 启动模板名称 (Optional) */ + Name string `json:"name"` - /* 启动模板描述 (Optional) */ - Description string `json:"description"` + /* 启动模板描述 (Optional) */ + Description string `json:"description"` - /* 启动模板的数据 (Optional) */ - InstanceTemplateData InstanceTemplateData `json:"instanceTemplateData"` + /* 启动模板的数据 (Optional) */ + InstanceTemplateData InstanceTemplateData `json:"instanceTemplateData"` - /* 关联的高可用组(ag)信息 (Optional) */ - Ags []Ag `json:"ags"` + /* 关联的高可用组(ag)信息 (Optional) */ + Ags []Ag `json:"ags"` - /* 创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateData.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateData.go index 025e481cd..0cfbe50eb 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateData.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateData.go @@ -16,33 +16,32 @@ package models - type InstanceTemplateData struct { - /* 实例规格 (Optional) */ - InstanceType string `json:"instanceType"` + /* 实例规格 (Optional) */ + InstanceType string `json:"instanceType"` - /* 主网卡所属VPC的ID (Optional) */ - VpcId string `json:"vpcId"` + /* 主网卡所属VPC的ID (Optional) */ + VpcId string `json:"vpcId"` - /* 镜像ID (Optional) */ - ImageId string `json:"imageId"` + /* 镜像ID (Optional) */ + ImageId string `json:"imageId"` - /* 启动模板中是否包含自定义密码，true：包含密码，false：不包含密码 (Optional) */ - IncludePassword bool `json:"includePassword"` + /* 启动模板中是否包含自定义密码，true：包含密码，false：不包含密码 (Optional) */ + IncludePassword bool `json:"includePassword"` - /* 系统盘信息 (Optional) */ - SystemDisk InstanceTemplateDiskAttachment `json:"systemDisk"` + /* 系统盘信息 (Optional) */ + SystemDisk InstanceTemplateDiskAttachment `json:"systemDisk"` - /* 数据盘信息，本地盘(local类型)做系统盘的云主机可挂载8块数据盘，云硬盘(cloud类型)做系统盘的云主机可挂载7块数据盘。 (Optional) */ - DataDisks []InstanceTemplateDiskAttachment `json:"dataDisks"` + /* 数据盘信息，本地盘(local类型)做系统盘的云主机可挂载8块数据盘，云硬盘(cloud类型)做系统盘的云主机可挂载7块数据盘。 (Optional) */ + DataDisks []InstanceTemplateDiskAttachment `json:"dataDisks"` - /* 主网卡信息 (Optional) */ - PrimaryNetworkInterface InstanceTemplateNetworkInterfaceAttachmentSpec `json:"primaryNetworkInterface"` + /* 主网卡信息 (Optional) */ + PrimaryNetworkInterface InstanceTemplateNetworkInterfaceAttachmentSpec `json:"primaryNetworkInterface"` - /* 主网卡主IP关联的弹性IP规格 (Optional) */ - ElasticIp InstanceTemplateElasticIp `json:"elasticIp"` + /* 主网卡主IP关联的弹性IP规格 (Optional) */ + ElasticIp InstanceTemplateElasticIp `json:"elasticIp"` - /* 密钥对名称；当前只支持一个 (Optional) */ - KeyNames []string `json:"keyNames"` + /* 密钥对名称；当前只支持一个 (Optional) */ + KeyNames []string `json:"keyNames"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDisk.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDisk.go index 460df4513..6c0ef4637 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDisk.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDisk.go @@ -16,15 +16,14 @@ package models - type InstanceTemplateDisk struct { - /* 云硬盘类型，取值为 ssd 或 premium-hdd (Optional) */ - DiskType string `json:"diskType"` + /* 云硬盘类型，取值为 ssd 或 premium-hdd (Optional) */ + DiskType string `json:"diskType"` - /* 云硬盘大小，单位为 GiB；ssd 类型取值范围[20,1000]GB，步长为10G，premium-hdd 类型取值范围[20,3000]GB，步长为10G (Optional) */ - DiskSizeGB int `json:"diskSizeGB"` + /* 云硬盘大小，单位为 GiB；ssd 类型取值范围[20,1000]GB，步长为10G，premium-hdd 类型取值范围[20,3000]GB，步长为10G (Optional) */ + DiskSizeGB int `json:"diskSizeGB"` - /* 用于创建云硬盘的快照ID (Optional) */ - SnapshotId string `json:"snapshotId"` + /* 用于创建云硬盘的快照ID (Optional) */ + SnapshotId string `json:"snapshotId"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachment.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachment.go index ca4db289a..f3bfb26d9 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachment.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachment.go @@ -16,31 +16,30 @@ package models - type InstanceTemplateDiskAttachment struct { - /* 磁盘分类，取值为本地盘(local)或者数据盘(cloud)。 -系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 -数据盘仅支持云硬盘(cloud)。 - (Optional) */ - DiskCategory string `json:"diskCategory"` + /* 磁盘分类，取值为本地盘(local)或者数据盘(cloud)。 + 系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 + 数据盘仅支持云硬盘(cloud)。 + (Optional) */ + DiskCategory string `json:"diskCategory"` - /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 -如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 -如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 - (Optional) */ - AutoDelete bool `json:"autoDelete"` + /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 + 如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 + 如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 + (Optional) */ + AutoDelete bool `json:"autoDelete"` - /* 数据盘配置 (Optional) */ - InstanceTemplateDisk InstanceTemplateDisk `json:"instanceTemplateDisk"` + /* 数据盘配置 (Optional) */ + InstanceTemplateDisk InstanceTemplateDisk `json:"instanceTemplateDisk"` - /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi。系统盘不需要使用，数据盘时才能够使用。 (Optional) */ - DeviceName string `json:"deviceName"` + /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi。系统盘不需要使用，数据盘时才能够使用。 (Optional) */ + DeviceName string `json:"deviceName"` - /* 排除设备，使用此参数noDevice配合deviceName一起使用。 -创建整机镜像：如deviceName:vdb、noDevice:true，则表示云主机中的数据盘vdb不参与创建镜像。 -创建模板：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb不参与创建主机。 -创建主机：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb，或者模板(使用模板创建主机)中的数据盘vdb不参与创建主机。 - (Optional) */ - NoDevice bool `json:"noDevice"` + /* 排除设备，使用此参数noDevice配合deviceName一起使用。 + 创建整机镜像：如deviceName:vdb、noDevice:true，则表示云主机中的数据盘vdb不参与创建镜像。 + 创建模板：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb不参与创建主机。 + 创建主机：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb，或者模板(使用模板创建主机)中的数据盘vdb不参与创建主机。 + (Optional) */ + NoDevice bool `json:"noDevice"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachmentSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachmentSpec.go index 1a6746bd8..c9d4d5d54 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachmentSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachmentSpec.go @@ -16,29 +16,28 @@ package models - type InstanceTemplateDiskAttachmentSpec struct { - /* 磁盘分类，取值为本地盘(local)或者数据盘(cloud)。 -系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 -数据盘仅支持云硬盘(cloud)。 - (Optional) */ - DiskCategory string `json:"diskCategory"` + /* 磁盘分类，取值为本地盘(local)或者数据盘(cloud)。 + 系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 + 数据盘仅支持云硬盘(cloud)。 + (Optional) */ + DiskCategory string `json:"diskCategory"` - /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 -如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 -如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 - (Optional) */ - AutoDelete bool `json:"autoDelete"` + /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 + 如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 + 如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 + (Optional) */ + AutoDelete bool `json:"autoDelete"` - /* 数据盘规格 (Optional) */ - CloudDiskSpec InstanceTemplateDiskSpec `json:"cloudDiskSpec"` + /* 数据盘规格 (Optional) */ + CloudDiskSpec InstanceTemplateDiskSpec `json:"cloudDiskSpec"` - /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi (Optional) */ - DeviceName string `json:"deviceName"` + /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi (Optional) */ + DeviceName string `json:"deviceName"` - /* 排除设备，使用此参数noDevice配合deviceName一起使用。 -创建模板：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb不参与创建主机。 - (Optional) */ - NoDevice bool `json:"noDevice"` + /* 排除设备，使用此参数noDevice配合deviceName一起使用。 + 创建模板：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb不参与创建主机。 + (Optional) */ + NoDevice bool `json:"noDevice"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskSpec.go index b9784ffe7..f16de8424 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskSpec.go @@ -16,15 +16,14 @@ package models - type InstanceTemplateDiskSpec struct { - /* 云硬盘类型，取值为 ssd 或 premium-hdd (Optional) */ - DiskType string `json:"diskType"` + /* 云硬盘类型，取值为 ssd 或 premium-hdd (Optional) */ + DiskType string `json:"diskType"` - /* 云硬盘大小，单位为 GiB；ssd 类型取值范围[20,1000]GB，步长为10G，premium-hdd 类型取值范围[20,3000]GB，步长为10G (Optional) */ - DiskSizeGB int `json:"diskSizeGB"` + /* 云硬盘大小，单位为 GiB；ssd 类型取值范围[20,1000]GB，步长为10G，premium-hdd 类型取值范围[20,3000]GB，步长为10G (Optional) */ + DiskSizeGB int `json:"diskSizeGB"` - /* 用于创建云硬盘的快照ID (Optional) */ - SnapshotId string `json:"snapshotId"` + /* 用于创建云硬盘的快照ID (Optional) */ + SnapshotId string `json:"snapshotId"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIp.go index b6db16956..f30ca0f1a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIp.go @@ -16,15 +16,14 @@ package models - type InstanceTemplateElasticIp struct { - /* 弹性公网IP的限速（单位：MB） */ - BandwidthMbps int `json:"bandwidthMbps"` + /* 弹性公网IP的限速（单位：MB） */ + BandwidthMbps int `json:"bandwidthMbps"` - /* IP服务商，取值为BGP,nonBGP (Optional) */ - Provider string `json:"provider"` + /* IP服务商，取值为BGP,nonBGP (Optional) */ + Provider string `json:"provider"` - /* 计费类型，支持按带宽计费(bandwith)，按流量计费(flow) */ - ChargeMode string `json:"chargeMode"` + /* 计费类型，支持按带宽计费(bandwith)，按流量计费(flow) */ + ChargeMode string `json:"chargeMode"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIpSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIpSpec.go index 8ef4e0061..d71e97075 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIpSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIpSpec.go @@ -16,15 +16,14 @@ package models - type InstanceTemplateElasticIpSpec struct { - /* 弹性公网IP的限速（单位：MB） */ - BandwidthMbps int `json:"bandwidthMbps"` + /* 弹性公网IP的限速（单位：MB） */ + BandwidthMbps int `json:"bandwidthMbps"` - /* IP服务商，取值为BGP,nonBGP (Optional) */ - Provider string `json:"provider"` + /* IP服务商，取值为BGP,nonBGP (Optional) */ + Provider string `json:"provider"` - /* 计费类型，支持按带宽计费(bandwith)，按流量计费(flow) */ - ChargeMode string `json:"chargeMode"` + /* 计费类型，支持按带宽计费(bandwith)，按流量计费(flow) */ + ChargeMode string `json:"chargeMode"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceAttachmentSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceAttachmentSpec.go index 755410d02..f563eebf8 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceAttachmentSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceAttachmentSpec.go @@ -16,15 +16,14 @@ package models - type InstanceTemplateNetworkInterfaceAttachmentSpec struct { - /* 设备Index；主网卡的index必须为1；当前仅支持主网卡 (Optional) */ - DeviceIndex int `json:"deviceIndex"` + /* 设备Index；主网卡的index必须为1；当前仅支持主网卡 (Optional) */ + DeviceIndex int `json:"deviceIndex"` - /* 指明删除实例时是否删除网卡，默认true；当前只能是true (Optional) */ - AutoDelete bool `json:"autoDelete"` + /* 指明删除实例时是否删除网卡，默认true；当前只能是true (Optional) */ + AutoDelete bool `json:"autoDelete"` - /* 网卡接口规范；此字段当前必填 */ - NetworkInterface InstanceTemplateNetworkInterfaceSpec `json:"networkInterface"` + /* 网卡接口规范；此字段当前必填 */ + NetworkInterface InstanceTemplateNetworkInterfaceSpec `json:"networkInterface"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceSpec.go index 84ee385bf..b9acb4ada 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceSpec.go @@ -16,15 +16,14 @@ package models - type InstanceTemplateNetworkInterfaceSpec struct { - /* 子网ID */ - SubnetId string `json:"subnetId"` + /* 子网ID */ + SubnetId string `json:"subnetId"` - /* 安全组ID列表 (Optional) */ - SecurityGroups []string `json:"securityGroups"` + /* 安全组ID列表 (Optional) */ + SecurityGroups []string `json:"securityGroups"` - /* PortSecurity，取值为0或者1，默认为1 (Optional) */ - SanityCheck int `json:"sanityCheck"` + /* PortSecurity，取值为0或者1，默认为1 (Optional) */ + SanityCheck int `json:"sanityCheck"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateSpec.go index 1eb5b7a7b..0b0d422c2 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateSpec.go @@ -16,30 +16,29 @@ package models - type InstanceTemplateSpec struct { - /* 实例规格，可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 */ - InstanceType string `json:"instanceType"` + /* 实例规格，可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 */ + InstanceType string `json:"instanceType"` - /* 镜像ID，可查询DescribeImages接口获得指定地域的镜像信息。 */ - ImageId string `json:"imageId"` + /* 镜像ID，可查询DescribeImages接口获得指定地域的镜像信息。 */ + ImageId string `json:"imageId"` - /* 密码，参考公共参数规范。 (Optional) */ - Password string `json:"password"` + /* 密码，参考公共参数规范。 (Optional) */ + Password string `json:"password"` - /* 密钥对名称；当前只支持一个 (Optional) */ - KeyNames []string `json:"keyNames"` + /* 密钥对名称；当前只支持一个 (Optional) */ + KeyNames []string `json:"keyNames"` - /* 主网卡主IP关联的弹性IP规格 (Optional) */ - ElasticIp InstanceTemplateElasticIpSpec `json:"elasticIp"` + /* 主网卡主IP关联的弹性IP规格 (Optional) */ + ElasticIp InstanceTemplateElasticIpSpec `json:"elasticIp"` - /* 主网卡配置信息 */ - PrimaryNetworkInterface InstanceTemplateNetworkInterfaceAttachmentSpec `json:"primaryNetworkInterface"` + /* 主网卡配置信息 */ + PrimaryNetworkInterface InstanceTemplateNetworkInterfaceAttachmentSpec `json:"primaryNetworkInterface"` - /* 系统盘配置信息 */ - SystemDisk InstanceTemplateDiskAttachmentSpec `json:"systemDisk"` + /* 系统盘配置信息 */ + SystemDisk InstanceTemplateDiskAttachmentSpec `json:"systemDisk"` - /* 数据盘配置信息 (Optional) */ - DataDisks []InstanceTemplateDiskAttachmentSpec `json:"dataDisks"` + /* 数据盘配置信息 (Optional) */ + DataDisks []InstanceTemplateDiskAttachmentSpec `json:"dataDisks"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceType.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceType.go index dbe403b20..770ffbfa2 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceType.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceType.go @@ -16,33 +16,32 @@ package models - type InstanceType struct { - /* 实例规格类型 (Optional) */ - Family string `json:"family"` + /* 实例规格类型 (Optional) */ + Family string `json:"family"` - /* 实例规格，比如g.b1.2xlarge (Optional) */ - InstanceType string `json:"instanceType"` + /* 实例规格，比如g.b1.2xlarge (Optional) */ + InstanceType string `json:"instanceType"` - /* cpu个数 (Optional) */ - Cpu int `json:"cpu"` + /* cpu个数 (Optional) */ + Cpu int `json:"cpu"` - /* 内存大小 (Optional) */ - MemoryMB int `json:"memoryMB"` + /* 内存大小 (Optional) */ + MemoryMB int `json:"memoryMB"` - /* 支持弹性网卡的数量 (Optional) */ - NicLimit int `json:"nicLimit"` + /* 支持弹性网卡的数量 (Optional) */ + NicLimit int `json:"nicLimit"` - /* 描述 (Optional) */ - Desc string `json:"desc"` + /* 描述 (Optional) */ + Desc string `json:"desc"` - /* 规格状态 (Optional) */ - State []InstanceTypeState `json:"state"` + /* 规格状态 (Optional) */ + State []InstanceTypeState `json:"state"` - /* Gpu配置 (Optional) */ - Gpu Gpu `json:"gpu"` + /* Gpu配置 (Optional) */ + Gpu Gpu `json:"gpu"` - /* 本地缓存盘配置，目前只有Gpu规格上才有 (Optional) */ - LocalDisks []LocalDisk `json:"localDisks"` + /* 本地缓存盘配置，目前只有Gpu规格上才有 (Optional) */ + LocalDisks []LocalDisk `json:"localDisks"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTypeState.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTypeState.go index e047de43e..13d55fa59 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTypeState.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTypeState.go @@ -16,12 +16,11 @@ package models - type InstanceTypeState struct { - /* 可用区 (Optional) */ - Az string `json:"az"` + /* 可用区 (Optional) */ + Az string `json:"az"` - /* 可售卖情况，true:可售卖、false:已售罄不可用 (Optional) */ - InStock bool `json:"inStock"` + /* 可售卖情况，true:可售卖、false:已售罄不可用 (Optional) */ + InStock bool `json:"inStock"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Keypair.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Keypair.go index 05c7ae891..15e5544d0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Keypair.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Keypair.go @@ -16,15 +16,14 @@ package models - type Keypair struct { - /* 密钥对名称 (Optional) */ - KeyName string `json:"keyName"` + /* 密钥对名称 (Optional) */ + KeyName string `json:"keyName"` - /* 密钥对的指纹，根据 RFC4716 定义的公钥指纹格式，采用 MD5 信息摘要算法。 (Optional) */ - KeyFingerprint string `json:"keyFingerprint"` + /* 密钥对的指纹，根据 RFC4716 定义的公钥指纹格式，采用 MD5 信息摘要算法。 (Optional) */ + KeyFingerprint string `json:"keyFingerprint"` - /* 创建时间 (Optional) */ - CreateTime string `json:"createTime"` + /* 创建时间 (Optional) */ + CreateTime string `json:"createTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/LocalDisk.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/LocalDisk.go index 740e65288..46ac8e441 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/LocalDisk.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/LocalDisk.go @@ -16,12 +16,11 @@ package models - type LocalDisk struct { - /* 磁盘类型，取值范围{premium-hdd, ssd} (Optional) */ - DiskType string `json:"diskType"` + /* 磁盘类型，取值范围{premium-hdd, ssd} (Optional) */ + DiskType string `json:"diskType"` - /* 磁盘大小 (Optional) */ - DiskSizeGB int `json:"diskSizeGB"` + /* 磁盘大小 (Optional) */ + DiskSizeGB int `json:"diskSizeGB"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Quota.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Quota.go index 4d7f16df6..e268f55c1 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Quota.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Quota.go @@ -16,15 +16,14 @@ package models - type Quota struct { - /* 资源类型[instance，keypair，image，instanceTemplate] (Optional) */ - ResourceType string `json:"resourceType"` + /* 资源类型[instance，keypair，image，instanceTemplate] (Optional) */ + ResourceType string `json:"resourceType"` - /* 配额上限 (Optional) */ - Limit int `json:"limit"` + /* 配额上限 (Optional) */ + Limit int `json:"limit"` - /* 已用配额 (Optional) */ - Used int `json:"used"` + /* 已用配额 (Optional) */ + Used int `json:"used"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/SecurityGroupSimple.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/SecurityGroupSimple.go index 17e221b6e..17e4eeeba 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/SecurityGroupSimple.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/SecurityGroupSimple.go @@ -16,12 +16,11 @@ package models - type SecurityGroupSimple struct { - /* 安全组ID (Optional) */ - GroupId string `json:"groupId"` + /* 安全组ID (Optional) */ + GroupId string `json:"groupId"` - /* 安全组名称 (Optional) */ - GroupName string `json:"groupName"` + /* 安全组名称 (Optional) */ + GroupName string `json:"groupName"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Tag.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Tag.go index 467465457..22f6316be 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Tag.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Tag.go @@ -16,12 +16,11 @@ package models - type Tag struct { - /* Tag键 (Optional) */ - Key string `json:"key"` + /* Tag键 (Optional) */ + Key string `json:"key"` - /* Tag值 (Optional) */ - Value string `json:"value"` + /* Tag值 (Optional) */ + Value string `json:"value"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/TagFilter.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/TagFilter.go index 13daa19a1..d8371cb24 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/TagFilter.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/TagFilter.go @@ -16,12 +16,11 @@ package models - type TagFilter struct { - /* Tag键 (Optional) */ - Key string `json:"key"` + /* Tag键 (Optional) */ + Key string `json:"key"` - /* Tag值 (Optional) */ - Values []string `json:"values"` + /* Tag值 (Optional) */ + Values []string `json:"values"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkAclRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkAclRules.go index 9f52c7283..6becd221d 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkAclRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkAclRules.go @@ -17,22 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type AddNetworkAclRulesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` - - /* networkAcl规则列表 */ - NetworkAclRuleSpecs []vpc.AddNetworkAclRuleSpec `json:"networkAclRuleSpecs"` + /* networkAcl规则列表 */ + NetworkAclRuleSpecs []vpc.AddNetworkAclRuleSpec `json:"networkAclRuleSpecs"` } /* @@ -43,21 +42,21 @@ type AddNetworkAclRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAddNetworkAclRulesRequest( - regionId string, - networkAclId string, - networkAclRuleSpecs []vpc.AddNetworkAclRuleSpec, + regionId string, + networkAclId string, + networkAclRuleSpecs []vpc.AddNetworkAclRuleSpec, ) *AddNetworkAclRulesRequest { return &AddNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}:addNetworkAclRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, - NetworkAclRuleSpecs: networkAclRuleSpecs, + RegionId: regionId, + NetworkAclId: networkAclId, + NetworkAclRuleSpecs: networkAclRuleSpecs, } } @@ -67,63 +66,63 @@ func NewAddNetworkAclRulesRequest( * param networkAclRuleSpecs: networkAcl规则列表 (Required) */ func NewAddNetworkAclRulesRequestWithAllParams( - regionId string, - networkAclId string, - networkAclRuleSpecs []vpc.AddNetworkAclRuleSpec, + regionId string, + networkAclId string, + networkAclRuleSpecs []vpc.AddNetworkAclRuleSpec, ) *AddNetworkAclRulesRequest { - return &AddNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:addNetworkAclRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - NetworkAclRuleSpecs: networkAclRuleSpecs, - } + return &AddNetworkAclRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:addNetworkAclRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + NetworkAclRuleSpecs: networkAclRuleSpecs, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAddNetworkAclRulesRequestWithoutParam() *AddNetworkAclRulesRequest { - return &AddNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:addNetworkAclRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AddNetworkAclRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:addNetworkAclRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AddNetworkAclRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *AddNetworkAclRulesRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } /* param networkAclRuleSpecs: networkAcl规则列表(Required) */ func (r *AddNetworkAclRulesRequest) SetNetworkAclRuleSpecs(networkAclRuleSpecs []vpc.AddNetworkAclRuleSpec) { - r.NetworkAclRuleSpecs = networkAclRuleSpecs + r.NetworkAclRuleSpecs = networkAclRuleSpecs } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AddNetworkAclRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AddNetworkAclRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AddNetworkAclRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AddNetworkAclRulesResult `json:"result"` } type AddNetworkAclRulesResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkSecurityGroupRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkSecurityGroupRules.go index e4f635018..662d17814 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkSecurityGroupRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkSecurityGroupRules.go @@ -17,22 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type AddNetworkSecurityGroupRulesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* NetworkSecurityGroup ID */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` - /* NetworkSecurityGroup ID */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` - - /* 安全组规则信息 */ - NetworkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules `json:"networkSecurityGroupRuleSpecs"` + /* 安全组规则信息 */ + NetworkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules `json:"networkSecurityGroupRuleSpecs"` } /* @@ -43,21 +42,21 @@ type AddNetworkSecurityGroupRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAddNetworkSecurityGroupRulesRequest( - regionId string, - networkSecurityGroupId string, - networkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules, + regionId string, + networkSecurityGroupId string, + networkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules, ) *AddNetworkSecurityGroupRulesRequest { return &AddNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:addNetworkSecurityGroupRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - NetworkSecurityGroupRuleSpecs: networkSecurityGroupRuleSpecs, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + NetworkSecurityGroupRuleSpecs: networkSecurityGroupRuleSpecs, } } @@ -67,63 +66,63 @@ func NewAddNetworkSecurityGroupRulesRequest( * param networkSecurityGroupRuleSpecs: 安全组规则信息 (Required) */ func NewAddNetworkSecurityGroupRulesRequestWithAllParams( - regionId string, - networkSecurityGroupId string, - networkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules, + regionId string, + networkSecurityGroupId string, + networkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules, ) *AddNetworkSecurityGroupRulesRequest { - return &AddNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:addNetworkSecurityGroupRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - NetworkSecurityGroupRuleSpecs: networkSecurityGroupRuleSpecs, - } + return &AddNetworkSecurityGroupRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:addNetworkSecurityGroupRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + NetworkSecurityGroupRuleSpecs: networkSecurityGroupRuleSpecs, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAddNetworkSecurityGroupRulesRequestWithoutParam() *AddNetworkSecurityGroupRulesRequest { - return &AddNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:addNetworkSecurityGroupRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AddNetworkSecurityGroupRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:addNetworkSecurityGroupRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AddNetworkSecurityGroupRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkSecurityGroupId: NetworkSecurityGroup ID(Required) */ func (r *AddNetworkSecurityGroupRulesRequest) SetNetworkSecurityGroupId(networkSecurityGroupId string) { - r.NetworkSecurityGroupId = networkSecurityGroupId + r.NetworkSecurityGroupId = networkSecurityGroupId } /* param networkSecurityGroupRuleSpecs: 安全组规则信息(Required) */ func (r *AddNetworkSecurityGroupRulesRequest) SetNetworkSecurityGroupRuleSpecs(networkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules) { - r.NetworkSecurityGroupRuleSpecs = networkSecurityGroupRuleSpecs + r.NetworkSecurityGroupRuleSpecs = networkSecurityGroupRuleSpecs } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AddNetworkSecurityGroupRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AddNetworkSecurityGroupRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AddNetworkSecurityGroupRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AddNetworkSecurityGroupRulesResult `json:"result"` } type AddNetworkSecurityGroupRulesResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddRouteTableRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddRouteTableRules.go index 1dbd5382b..8bd43417d 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddRouteTableRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddRouteTableRules.go @@ -17,22 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type AddRouteTableRulesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` - - /* 安全组规则信息 */ - RouteTableRuleSpecs []vpc.AddRouteTableRules `json:"routeTableRuleSpecs"` + /* 安全组规则信息 */ + RouteTableRuleSpecs []vpc.AddRouteTableRules `json:"routeTableRuleSpecs"` } /* @@ -43,21 +42,21 @@ type AddRouteTableRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAddRouteTableRulesRequest( - regionId string, - routeTableId string, - routeTableRuleSpecs []vpc.AddRouteTableRules, + regionId string, + routeTableId string, + routeTableRuleSpecs []vpc.AddRouteTableRules, ) *AddRouteTableRulesRequest { return &AddRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}:addRouteTableRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, - RouteTableRuleSpecs: routeTableRuleSpecs, + RegionId: regionId, + RouteTableId: routeTableId, + RouteTableRuleSpecs: routeTableRuleSpecs, } } @@ -67,63 +66,63 @@ func NewAddRouteTableRulesRequest( * param routeTableRuleSpecs: 安全组规则信息 (Required) */ func NewAddRouteTableRulesRequestWithAllParams( - regionId string, - routeTableId string, - routeTableRuleSpecs []vpc.AddRouteTableRules, + regionId string, + routeTableId string, + routeTableRuleSpecs []vpc.AddRouteTableRules, ) *AddRouteTableRulesRequest { - return &AddRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:addRouteTableRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - RouteTableRuleSpecs: routeTableRuleSpecs, - } + return &AddRouteTableRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:addRouteTableRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + RouteTableRuleSpecs: routeTableRuleSpecs, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAddRouteTableRulesRequestWithoutParam() *AddRouteTableRulesRequest { - return &AddRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:addRouteTableRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AddRouteTableRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:addRouteTableRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AddRouteTableRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *AddRouteTableRulesRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } /* param routeTableRuleSpecs: 安全组规则信息(Required) */ func (r *AddRouteTableRulesRequest) SetRouteTableRuleSpecs(routeTableRuleSpecs []vpc.AddRouteTableRules) { - r.RouteTableRuleSpecs = routeTableRuleSpecs + r.RouteTableRuleSpecs = routeTableRuleSpecs } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AddRouteTableRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AddRouteTableRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AddRouteTableRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AddRouteTableRulesResult `json:"result"` } type AddRouteTableRulesResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssignSecondaryIps.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssignSecondaryIps.go index ecf6b3a43..38d71461b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssignSecondaryIps.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssignSecondaryIps.go @@ -17,27 +17,26 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AssignSecondaryIpsRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* secondary ip被其他接口占用时，是否抢占。false：非抢占重分配，true：抢占重分配，默认抢占重分配。默认值：true (Optional) */ + Force *bool `json:"force"` - /* secondary ip被其他接口占用时，是否抢占。false：非抢占重分配，true：抢占重分配，默认抢占重分配。默认值：true (Optional) */ - Force *bool `json:"force"` + /* 指定分配的secondaryIp地址 (Optional) */ + SecondaryIps []string `json:"secondaryIps"` - /* 指定分配的secondaryIp地址 (Optional) */ - SecondaryIps []string `json:"secondaryIps"` - - /* 指定自动分配的secondaryIp个数 (Optional) */ - SecondaryIpCount *int `json:"secondaryIpCount"` + /* 指定自动分配的secondaryIp个数 (Optional) */ + SecondaryIpCount *int `json:"secondaryIpCount"` } /* @@ -47,19 +46,19 @@ type AssignSecondaryIpsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAssignSecondaryIpsRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *AssignSecondaryIpsRequest { return &AssignSecondaryIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:assignSecondaryIps", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -71,77 +70,77 @@ func NewAssignSecondaryIpsRequest( * param secondaryIpCount: 指定自动分配的secondaryIp个数 (Optional) */ func NewAssignSecondaryIpsRequestWithAllParams( - regionId string, - networkInterfaceId string, - force *bool, - secondaryIps []string, - secondaryIpCount *int, + regionId string, + networkInterfaceId string, + force *bool, + secondaryIps []string, + secondaryIpCount *int, ) *AssignSecondaryIpsRequest { - return &AssignSecondaryIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:assignSecondaryIps", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - Force: force, - SecondaryIps: secondaryIps, - SecondaryIpCount: secondaryIpCount, - } + return &AssignSecondaryIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:assignSecondaryIps", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + Force: force, + SecondaryIps: secondaryIps, + SecondaryIpCount: secondaryIpCount, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAssignSecondaryIpsRequestWithoutParam() *AssignSecondaryIpsRequest { - return &AssignSecondaryIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:assignSecondaryIps", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AssignSecondaryIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:assignSecondaryIps", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AssignSecondaryIpsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *AssignSecondaryIpsRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } /* param force: secondary ip被其他接口占用时，是否抢占。false：非抢占重分配，true：抢占重分配，默认抢占重分配。默认值：true(Optional) */ func (r *AssignSecondaryIpsRequest) SetForce(force bool) { - r.Force = &force + r.Force = &force } /* param secondaryIps: 指定分配的secondaryIp地址(Optional) */ func (r *AssignSecondaryIpsRequest) SetSecondaryIps(secondaryIps []string) { - r.SecondaryIps = secondaryIps + r.SecondaryIps = secondaryIps } /* param secondaryIpCount: 指定自动分配的secondaryIp个数(Optional) */ func (r *AssignSecondaryIpsRequest) SetSecondaryIpCount(secondaryIpCount int) { - r.SecondaryIpCount = &secondaryIpCount + r.SecondaryIpCount = &secondaryIpCount } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AssignSecondaryIpsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AssignSecondaryIpsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AssignSecondaryIpsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AssignSecondaryIpsResult `json:"result"` } type AssignSecondaryIpsResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateElasticIp.go index 325099c4f..c0380d3e4 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateElasticIp.go @@ -17,27 +17,26 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AssociateElasticIpRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* 绑定的弹性Ip Id (Optional) */ + ElasticIpId *string `json:"elasticIpId"` - /* 绑定的弹性Ip Id (Optional) */ - ElasticIpId *string `json:"elasticIpId"` + /* 绑定弹性Ip到指定的privateIp (Optional) */ + PrivateIpAddress *string `json:"privateIpAddress"` - /* 绑定弹性Ip到指定的privateIp (Optional) */ - PrivateIpAddress *string `json:"privateIpAddress"` - - /* 绑定的弹性Ip地址 (Optional) */ - ElasticIpAddress *string `json:"elasticIpAddress"` + /* 绑定的弹性Ip地址 (Optional) */ + ElasticIpAddress *string `json:"elasticIpAddress"` } /* @@ -47,19 +46,19 @@ type AssociateElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAssociateElasticIpRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *AssociateElasticIpRequest { return &AssociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:associateElasticIp", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -71,77 +70,77 @@ func NewAssociateElasticIpRequest( * param elasticIpAddress: 绑定的弹性Ip地址 (Optional) */ func NewAssociateElasticIpRequestWithAllParams( - regionId string, - networkInterfaceId string, - elasticIpId *string, - privateIpAddress *string, - elasticIpAddress *string, + regionId string, + networkInterfaceId string, + elasticIpId *string, + privateIpAddress *string, + elasticIpAddress *string, ) *AssociateElasticIpRequest { - return &AssociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:associateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - ElasticIpId: elasticIpId, - PrivateIpAddress: privateIpAddress, - ElasticIpAddress: elasticIpAddress, - } + return &AssociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:associateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + ElasticIpId: elasticIpId, + PrivateIpAddress: privateIpAddress, + ElasticIpAddress: elasticIpAddress, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAssociateElasticIpRequestWithoutParam() *AssociateElasticIpRequest { - return &AssociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:associateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AssociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:associateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AssociateElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *AssociateElasticIpRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } /* param elasticIpId: 绑定的弹性Ip Id(Optional) */ func (r *AssociateElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = &elasticIpId + r.ElasticIpId = &elasticIpId } /* param privateIpAddress: 绑定弹性Ip到指定的privateIp(Optional) */ func (r *AssociateElasticIpRequest) SetPrivateIpAddress(privateIpAddress string) { - r.PrivateIpAddress = &privateIpAddress + r.PrivateIpAddress = &privateIpAddress } /* param elasticIpAddress: 绑定的弹性Ip地址(Optional) */ func (r *AssociateElasticIpRequest) SetElasticIpAddress(elasticIpAddress string) { - r.ElasticIpAddress = &elasticIpAddress + r.ElasticIpAddress = &elasticIpAddress } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AssociateElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AssociateElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AssociateElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AssociateElasticIpResult `json:"result"` } type AssociateElasticIpResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateNetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateNetworkAcl.go index 2e33b993b..e7f5568c2 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateNetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateNetworkAcl.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AssociateNetworkAclRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` - - /* networkAcl要绑定的子网ID列表, subnet已被其他networkAcl绑定时，自动解绑 */ - SubnetIds []string `json:"subnetIds"` + /* networkAcl要绑定的子网ID列表, subnet已被其他networkAcl绑定时，自动解绑 */ + SubnetIds []string `json:"subnetIds"` } /* @@ -42,21 +41,21 @@ type AssociateNetworkAclRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAssociateNetworkAclRequest( - regionId string, - networkAclId string, - subnetIds []string, + regionId string, + networkAclId string, + subnetIds []string, ) *AssociateNetworkAclRequest { return &AssociateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}:associateNetworkAcl", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, - SubnetIds: subnetIds, + RegionId: regionId, + NetworkAclId: networkAclId, + SubnetIds: subnetIds, } } @@ -66,63 +65,63 @@ func NewAssociateNetworkAclRequest( * param subnetIds: networkAcl要绑定的子网ID列表, subnet已被其他networkAcl绑定时，自动解绑 (Required) */ func NewAssociateNetworkAclRequestWithAllParams( - regionId string, - networkAclId string, - subnetIds []string, + regionId string, + networkAclId string, + subnetIds []string, ) *AssociateNetworkAclRequest { - return &AssociateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:associateNetworkAcl", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - SubnetIds: subnetIds, - } + return &AssociateNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:associateNetworkAcl", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + SubnetIds: subnetIds, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAssociateNetworkAclRequestWithoutParam() *AssociateNetworkAclRequest { - return &AssociateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:associateNetworkAcl", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AssociateNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:associateNetworkAcl", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AssociateNetworkAclRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *AssociateNetworkAclRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } /* param subnetIds: networkAcl要绑定的子网ID列表, subnet已被其他networkAcl绑定时，自动解绑(Required) */ func (r *AssociateNetworkAclRequest) SetSubnetIds(subnetIds []string) { - r.SubnetIds = subnetIds + r.SubnetIds = subnetIds } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AssociateNetworkAclRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AssociateNetworkAclResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AssociateNetworkAclResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AssociateNetworkAclResult `json:"result"` } type AssociateNetworkAclResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateRouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateRouteTable.go index d7f544e8b..bafa9136f 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateRouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateRouteTable.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AssociateRouteTableRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` - - /* 路由表要绑定的子网ID列表, subnet已被其他路由表绑定时，自动解绑。 */ - SubnetIds []string `json:"subnetIds"` + /* 路由表要绑定的子网ID列表, subnet已被其他路由表绑定时，自动解绑。 */ + SubnetIds []string `json:"subnetIds"` } /* @@ -42,21 +41,21 @@ type AssociateRouteTableRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAssociateRouteTableRequest( - regionId string, - routeTableId string, - subnetIds []string, + regionId string, + routeTableId string, + subnetIds []string, ) *AssociateRouteTableRequest { return &AssociateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}:associateRouteTable", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, - SubnetIds: subnetIds, + RegionId: regionId, + RouteTableId: routeTableId, + SubnetIds: subnetIds, } } @@ -66,63 +65,63 @@ func NewAssociateRouteTableRequest( * param subnetIds: 路由表要绑定的子网ID列表, subnet已被其他路由表绑定时，自动解绑。 (Required) */ func NewAssociateRouteTableRequestWithAllParams( - regionId string, - routeTableId string, - subnetIds []string, + regionId string, + routeTableId string, + subnetIds []string, ) *AssociateRouteTableRequest { - return &AssociateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:associateRouteTable", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - SubnetIds: subnetIds, - } + return &AssociateRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:associateRouteTable", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + SubnetIds: subnetIds, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAssociateRouteTableRequestWithoutParam() *AssociateRouteTableRequest { - return &AssociateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:associateRouteTable", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AssociateRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:associateRouteTable", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AssociateRouteTableRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *AssociateRouteTableRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } /* param subnetIds: 路由表要绑定的子网ID列表, subnet已被其他路由表绑定时，自动解绑。(Required) */ func (r *AssociateRouteTableRequest) SetSubnetIds(subnetIds []string) { - r.SubnetIds = subnetIds + r.SubnetIds = subnetIds } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AssociateRouteTableRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AssociateRouteTableResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AssociateRouteTableResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AssociateRouteTableResult `json:"result"` } type AssociateRouteTableResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateElasticIps.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateElasticIps.go index 6ac78c2f5..fd88f11aa 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateElasticIps.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateElasticIps.go @@ -17,25 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type CreateElasticIpsRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 购买弹性ip数量；取值范围：[1,100] */ + MaxCount int `json:"maxCount"` - /* 购买弹性ip数量；取值范围：[1,100] */ - MaxCount int `json:"maxCount"` + /* 指定弹性ip地址进行创建，当申请创建多个弹性ip时，必须为空 (Optional) */ + ElasticIpAddress *string `json:"elasticIpAddress"` - /* 指定弹性ip地址进行创建，当申请创建多个弹性ip时，必须为空 (Optional) */ - ElasticIpAddress *string `json:"elasticIpAddress"` - - /* 弹性ip规格 */ - ElasticIpSpec *vpc.ElasticIpSpec `json:"elasticIpSpec"` + /* 弹性ip规格 */ + ElasticIpSpec *vpc.ElasticIpSpec `json:"elasticIpSpec"` } /* @@ -46,21 +45,21 @@ type CreateElasticIpsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateElasticIpsRequest( - regionId string, - maxCount int, - elasticIpSpec *vpc.ElasticIpSpec, + regionId string, + maxCount int, + elasticIpSpec *vpc.ElasticIpSpec, ) *CreateElasticIpsRequest { return &CreateElasticIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/elasticIps/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - MaxCount: maxCount, - ElasticIpSpec: elasticIpSpec, + RegionId: regionId, + MaxCount: maxCount, + ElasticIpSpec: elasticIpSpec, } } @@ -71,72 +70,72 @@ func NewCreateElasticIpsRequest( * param elasticIpSpec: 弹性ip规格 (Required) */ func NewCreateElasticIpsRequestWithAllParams( - regionId string, - maxCount int, - elasticIpAddress *string, - elasticIpSpec *vpc.ElasticIpSpec, + regionId string, + maxCount int, + elasticIpAddress *string, + elasticIpSpec *vpc.ElasticIpSpec, ) *CreateElasticIpsRequest { - return &CreateElasticIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - MaxCount: maxCount, - ElasticIpAddress: elasticIpAddress, - ElasticIpSpec: elasticIpSpec, - } + return &CreateElasticIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + MaxCount: maxCount, + ElasticIpAddress: elasticIpAddress, + ElasticIpSpec: elasticIpSpec, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateElasticIpsRequestWithoutParam() *CreateElasticIpsRequest { - return &CreateElasticIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateElasticIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateElasticIpsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param maxCount: 购买弹性ip数量；取值范围：[1,100](Required) */ func (r *CreateElasticIpsRequest) SetMaxCount(maxCount int) { - r.MaxCount = maxCount + r.MaxCount = maxCount } /* param elasticIpAddress: 指定弹性ip地址进行创建，当申请创建多个弹性ip时，必须为空(Optional) */ func (r *CreateElasticIpsRequest) SetElasticIpAddress(elasticIpAddress string) { - r.ElasticIpAddress = &elasticIpAddress + r.ElasticIpAddress = &elasticIpAddress } /* param elasticIpSpec: 弹性ip规格(Required) */ func (r *CreateElasticIpsRequest) SetElasticIpSpec(elasticIpSpec *vpc.ElasticIpSpec) { - r.ElasticIpSpec = elasticIpSpec + r.ElasticIpSpec = elasticIpSpec } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateElasticIpsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateElasticIpsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateElasticIpsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateElasticIpsResult `json:"result"` } type CreateElasticIpsResult struct { - ElasticIpIds []string `json:"elasticIpIds"` - RequestId string `json:"requestId"` -} \ No newline at end of file + ElasticIpIds []string `json:"elasticIpIds"` + RequestId string `json:"requestId"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkAcl.go index f1f81bfd8..4a552d754 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkAcl.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateNetworkAclRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 私有网络id */ + VpcId string `json:"vpcId"` - /* 私有网络id */ - VpcId string `json:"vpcId"` + /* networkAcl名称 */ + NetworkAclName string `json:"networkAclName"` - /* networkAcl名称 */ - NetworkAclName string `json:"networkAclName"` - - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } /* @@ -45,21 +44,21 @@ type CreateNetworkAclRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateNetworkAclRequest( - regionId string, - vpcId string, - networkAclName string, + regionId string, + vpcId string, + networkAclName string, ) *CreateNetworkAclRequest { return &CreateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, - NetworkAclName: networkAclName, + RegionId: regionId, + VpcId: vpcId, + NetworkAclName: networkAclName, } } @@ -70,71 +69,71 @@ func NewCreateNetworkAclRequest( * param description: 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ func NewCreateNetworkAclRequestWithAllParams( - regionId string, - vpcId string, - networkAclName string, - description *string, + regionId string, + vpcId string, + networkAclName string, + description *string, ) *CreateNetworkAclRequest { - return &CreateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - NetworkAclName: networkAclName, - Description: description, - } + return &CreateNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + NetworkAclName: networkAclName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateNetworkAclRequestWithoutParam() *CreateNetworkAclRequest { - return &CreateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateNetworkAclRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: 私有网络id(Required) */ func (r *CreateNetworkAclRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } /* param networkAclName: networkAcl名称(Required) */ func (r *CreateNetworkAclRequest) SetNetworkAclName(networkAclName string) { - r.NetworkAclName = networkAclName + r.NetworkAclName = networkAclName } /* param description: 描述,允许输入UTF-8编码下的全部字符，不超过256字符(Optional) */ func (r *CreateNetworkAclRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateNetworkAclRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateNetworkAclResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateNetworkAclResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateNetworkAclResult `json:"result"` } type CreateNetworkAclResult struct { - NetworkAclId string `json:"networkAclId"` -} \ No newline at end of file + NetworkAclId string `json:"networkAclId"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkInterface.go index 14ce0da3c..12003f4c6 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkInterface.go @@ -17,42 +17,41 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateNetworkInterfaceRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 子网ID */ + SubnetId string `json:"subnetId"` - /* 子网ID */ - SubnetId string `json:"subnetId"` + /* 可用区，用户的默认可用区 (Optional) */ + Az *string `json:"az"` - /* 可用区，用户的默认可用区 (Optional) */ - Az *string `json:"az"` + /* 网卡名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + NetworkInterfaceName *string `json:"networkInterfaceName"` - /* 网卡名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - NetworkInterfaceName *string `json:"networkInterfaceName"` + /* 网卡主IP，如果不指定，会自动从子网中分配 (Optional) */ + PrimaryIpAddress *string `json:"primaryIpAddress"` - /* 网卡主IP，如果不指定，会自动从子网中分配 (Optional) */ - PrimaryIpAddress *string `json:"primaryIpAddress"` + /* SecondaryIp列表 (Optional) */ + SecondaryIpAddresses []string `json:"secondaryIpAddresses"` - /* SecondaryIp列表 (Optional) */ - SecondaryIpAddresses []string `json:"secondaryIpAddresses"` + /* 自动分配的SecondaryIp数量 (Optional) */ + SecondaryIpCount *int `json:"secondaryIpCount"` - /* 自动分配的SecondaryIp数量 (Optional) */ - SecondaryIpCount *int `json:"secondaryIpCount"` + /* 要绑定的安全组ID列表，最多指定5个安全组 (Optional) */ + SecurityGroups []string `json:"securityGroups"` - /* 要绑定的安全组ID列表，最多指定5个安全组 (Optional) */ - SecurityGroups []string `json:"securityGroups"` + /* 源和目标IP地址校验，取值为0或者1,默认为1 (Optional) */ + SanityCheck *int `json:"sanityCheck"` - /* 源和目标IP地址校验，取值为0或者1,默认为1 (Optional) */ - SanityCheck *int `json:"sanityCheck"` - - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } /* @@ -62,19 +61,19 @@ type CreateNetworkInterfaceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateNetworkInterfaceRequest( - regionId string, - subnetId string, + regionId string, + subnetId string, ) *CreateNetworkInterfaceRequest { return &CreateNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - SubnetId: subnetId, + RegionId: regionId, + SubnetId: subnetId, } } @@ -91,113 +90,113 @@ func NewCreateNetworkInterfaceRequest( * param description: 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ func NewCreateNetworkInterfaceRequestWithAllParams( - regionId string, - subnetId string, - az *string, - networkInterfaceName *string, - primaryIpAddress *string, - secondaryIpAddresses []string, - secondaryIpCount *int, - securityGroups []string, - sanityCheck *int, - description *string, + regionId string, + subnetId string, + az *string, + networkInterfaceName *string, + primaryIpAddress *string, + secondaryIpAddresses []string, + secondaryIpCount *int, + securityGroups []string, + sanityCheck *int, + description *string, ) *CreateNetworkInterfaceRequest { - return &CreateNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - SubnetId: subnetId, - Az: az, - NetworkInterfaceName: networkInterfaceName, - PrimaryIpAddress: primaryIpAddress, - SecondaryIpAddresses: secondaryIpAddresses, - SecondaryIpCount: secondaryIpCount, - SecurityGroups: securityGroups, - SanityCheck: sanityCheck, - Description: description, - } + return &CreateNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + SubnetId: subnetId, + Az: az, + NetworkInterfaceName: networkInterfaceName, + PrimaryIpAddress: primaryIpAddress, + SecondaryIpAddresses: secondaryIpAddresses, + SecondaryIpCount: secondaryIpCount, + SecurityGroups: securityGroups, + SanityCheck: sanityCheck, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateNetworkInterfaceRequestWithoutParam() *CreateNetworkInterfaceRequest { - return &CreateNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateNetworkInterfaceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param subnetId: 子网ID(Required) */ func (r *CreateNetworkInterfaceRequest) SetSubnetId(subnetId string) { - r.SubnetId = subnetId + r.SubnetId = subnetId } /* param az: 可用区，用户的默认可用区(Optional) */ func (r *CreateNetworkInterfaceRequest) SetAz(az string) { - r.Az = &az + r.Az = &az } /* param networkInterfaceName: 网卡名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Optional) */ func (r *CreateNetworkInterfaceRequest) SetNetworkInterfaceName(networkInterfaceName string) { - r.NetworkInterfaceName = &networkInterfaceName + r.NetworkInterfaceName = &networkInterfaceName } /* param primaryIpAddress: 网卡主IP，如果不指定，会自动从子网中分配(Optional) */ func (r *CreateNetworkInterfaceRequest) SetPrimaryIpAddress(primaryIpAddress string) { - r.PrimaryIpAddress = &primaryIpAddress + r.PrimaryIpAddress = &primaryIpAddress } /* param secondaryIpAddresses: SecondaryIp列表(Optional) */ func (r *CreateNetworkInterfaceRequest) SetSecondaryIpAddresses(secondaryIpAddresses []string) { - r.SecondaryIpAddresses = secondaryIpAddresses + r.SecondaryIpAddresses = secondaryIpAddresses } /* param secondaryIpCount: 自动分配的SecondaryIp数量(Optional) */ func (r *CreateNetworkInterfaceRequest) SetSecondaryIpCount(secondaryIpCount int) { - r.SecondaryIpCount = &secondaryIpCount + r.SecondaryIpCount = &secondaryIpCount } /* param securityGroups: 要绑定的安全组ID列表，最多指定5个安全组(Optional) */ func (r *CreateNetworkInterfaceRequest) SetSecurityGroups(securityGroups []string) { - r.SecurityGroups = securityGroups + r.SecurityGroups = securityGroups } /* param sanityCheck: 源和目标IP地址校验，取值为0或者1,默认为1(Optional) */ func (r *CreateNetworkInterfaceRequest) SetSanityCheck(sanityCheck int) { - r.SanityCheck = &sanityCheck + r.SanityCheck = &sanityCheck } /* param description: 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符(Optional) */ func (r *CreateNetworkInterfaceRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateNetworkInterfaceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateNetworkInterfaceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateNetworkInterfaceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateNetworkInterfaceResult `json:"result"` } type CreateNetworkInterfaceResult struct { - NetworkInterfaceId string `json:"networkInterfaceId"` -} \ No newline at end of file + NetworkInterfaceId string `json:"networkInterfaceId"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkSecurityGroup.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkSecurityGroup.go index c0765bb2c..74d59b52a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkSecurityGroup.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkSecurityGroup.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateNetworkSecurityGroupRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 私有网络ID */ + VpcId string `json:"vpcId"` - /* 私有网络ID */ - VpcId string `json:"vpcId"` + /* 安全组名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + NetworkSecurityGroupName string `json:"networkSecurityGroupName"` - /* 安全组名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - NetworkSecurityGroupName string `json:"networkSecurityGroupName"` - - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } /* @@ -45,21 +44,21 @@ type CreateNetworkSecurityGroupRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateNetworkSecurityGroupRequest( - regionId string, - vpcId string, - networkSecurityGroupName string, + regionId string, + vpcId string, + networkSecurityGroupName string, ) *CreateNetworkSecurityGroupRequest { return &CreateNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, - NetworkSecurityGroupName: networkSecurityGroupName, + RegionId: regionId, + VpcId: vpcId, + NetworkSecurityGroupName: networkSecurityGroupName, } } @@ -70,71 +69,71 @@ func NewCreateNetworkSecurityGroupRequest( * param description: 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ func NewCreateNetworkSecurityGroupRequestWithAllParams( - regionId string, - vpcId string, - networkSecurityGroupName string, - description *string, + regionId string, + vpcId string, + networkSecurityGroupName string, + description *string, ) *CreateNetworkSecurityGroupRequest { - return &CreateNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - NetworkSecurityGroupName: networkSecurityGroupName, - Description: description, - } + return &CreateNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + NetworkSecurityGroupName: networkSecurityGroupName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateNetworkSecurityGroupRequestWithoutParam() *CreateNetworkSecurityGroupRequest { - return &CreateNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateNetworkSecurityGroupRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: 私有网络ID(Required) */ func (r *CreateNetworkSecurityGroupRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } /* param networkSecurityGroupName: 安全组名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Required) */ func (r *CreateNetworkSecurityGroupRequest) SetNetworkSecurityGroupName(networkSecurityGroupName string) { - r.NetworkSecurityGroupName = networkSecurityGroupName + r.NetworkSecurityGroupName = networkSecurityGroupName } /* param description: 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符(Optional) */ func (r *CreateNetworkSecurityGroupRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateNetworkSecurityGroupRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateNetworkSecurityGroupResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateNetworkSecurityGroupResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateNetworkSecurityGroupResult `json:"result"` } type CreateNetworkSecurityGroupResult struct { - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` -} \ No newline at end of file + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateRouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateRouteTable.go index 9cf289d88..7e0a36a84 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateRouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateRouteTable.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateRouteTableRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 路由表所属的私有网络ID */ + VpcId string `json:"vpcId"` - /* 路由表所属的私有网络ID */ - VpcId string `json:"vpcId"` + /* 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + RouteTableName string `json:"routeTableName"` - /* 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - RouteTableName string `json:"routeTableName"` - - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } /* @@ -45,21 +44,21 @@ type CreateRouteTableRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateRouteTableRequest( - regionId string, - vpcId string, - routeTableName string, + regionId string, + vpcId string, + routeTableName string, ) *CreateRouteTableRequest { return &CreateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, - RouteTableName: routeTableName, + RegionId: regionId, + VpcId: vpcId, + RouteTableName: routeTableName, } } @@ -70,71 +69,71 @@ func NewCreateRouteTableRequest( * param description: 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ func NewCreateRouteTableRequestWithAllParams( - regionId string, - vpcId string, - routeTableName string, - description *string, + regionId string, + vpcId string, + routeTableName string, + description *string, ) *CreateRouteTableRequest { - return &CreateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - RouteTableName: routeTableName, - Description: description, - } + return &CreateRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + RouteTableName: routeTableName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateRouteTableRequestWithoutParam() *CreateRouteTableRequest { - return &CreateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateRouteTableRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: 路由表所属的私有网络ID(Required) */ func (r *CreateRouteTableRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } /* param routeTableName: 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Required) */ func (r *CreateRouteTableRequest) SetRouteTableName(routeTableName string) { - r.RouteTableName = routeTableName + r.RouteTableName = routeTableName } /* param description: 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符(Optional) */ func (r *CreateRouteTableRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateRouteTableRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateRouteTableResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateRouteTableResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateRouteTableResult `json:"result"` } type CreateRouteTableResult struct { - RouteTableId string `json:"routeTableId"` -} \ No newline at end of file + RouteTableId string `json:"routeTableId"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateSubnet.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateSubnet.go index eb2523d43..aceed5090 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateSubnet.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateSubnet.go @@ -17,30 +17,29 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateSubnetRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 子网所属vpc的Id */ + VpcId string `json:"vpcId"` - /* 子网所属vpc的Id */ - VpcId string `json:"vpcId"` + /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + SubnetName string `json:"subnetName"` - /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - SubnetName string `json:"subnetName"` + /* 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果vpc含有cidr，则必须为vpc所在cidr的子网 */ + AddressPrefix string `json:"addressPrefix"` - /* 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果vpc含有cidr，则必须为vpc所在cidr的子网 */ - AddressPrefix string `json:"addressPrefix"` + /* 子网关联的路由表Id, 默认为vpc的默认路由表 (Optional) */ + RouteTableId *string `json:"routeTableId"` - /* 子网关联的路由表Id, 默认为vpc的默认路由表 (Optional) */ - RouteTableId *string `json:"routeTableId"` - - /* 子网描述信息,允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description *string `json:"description"` + /* 子网描述信息,允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description *string `json:"description"` } /* @@ -52,23 +51,23 @@ type CreateSubnetRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateSubnetRequest( - regionId string, - vpcId string, - subnetName string, - addressPrefix string, + regionId string, + vpcId string, + subnetName string, + addressPrefix string, ) *CreateSubnetRequest { return &CreateSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/subnets/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, - SubnetName: subnetName, - AddressPrefix: addressPrefix, + RegionId: regionId, + VpcId: vpcId, + SubnetName: subnetName, + AddressPrefix: addressPrefix, } } @@ -81,85 +80,85 @@ func NewCreateSubnetRequest( * param description: 子网描述信息,允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ func NewCreateSubnetRequestWithAllParams( - regionId string, - vpcId string, - subnetName string, - addressPrefix string, - routeTableId *string, - description *string, + regionId string, + vpcId string, + subnetName string, + addressPrefix string, + routeTableId *string, + description *string, ) *CreateSubnetRequest { - return &CreateSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - SubnetName: subnetName, - AddressPrefix: addressPrefix, - RouteTableId: routeTableId, - Description: description, - } + return &CreateSubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + SubnetName: subnetName, + AddressPrefix: addressPrefix, + RouteTableId: routeTableId, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateSubnetRequestWithoutParam() *CreateSubnetRequest { - return &CreateSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateSubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateSubnetRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: 子网所属vpc的Id(Required) */ func (r *CreateSubnetRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } /* param subnetName: 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Required) */ func (r *CreateSubnetRequest) SetSubnetName(subnetName string) { - r.SubnetName = subnetName + r.SubnetName = subnetName } /* param addressPrefix: 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果vpc含有cidr，则必须为vpc所在cidr的子网(Required) */ func (r *CreateSubnetRequest) SetAddressPrefix(addressPrefix string) { - r.AddressPrefix = addressPrefix + r.AddressPrefix = addressPrefix } /* param routeTableId: 子网关联的路由表Id, 默认为vpc的默认路由表(Optional) */ func (r *CreateSubnetRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = &routeTableId + r.RouteTableId = &routeTableId } /* param description: 子网描述信息,允许输入UTF-8编码下的全部字符，不超过256字符。(Optional) */ func (r *CreateSubnetRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateSubnetRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateSubnetResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateSubnetResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateSubnetResult `json:"result"` } type CreateSubnetResult struct { - SubnetId string `json:"subnetId"` -} \ No newline at end of file + SubnetId string `json:"subnetId"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpc.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpc.go index 60641f9d9..a59fda811 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpc.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpc.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateVpcRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + VpcName string `json:"vpcName"` - /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - VpcName string `json:"vpcName"` + /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ + AddressPrefix *string `json:"addressPrefix"` - /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ - AddressPrefix *string `json:"addressPrefix"` - - /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description *string `json:"description"` + /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description *string `json:"description"` } /* @@ -44,19 +43,19 @@ type CreateVpcRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateVpcRequest( - regionId string, - vpcName string, + regionId string, + vpcName string, ) *CreateVpcRequest { return &CreateVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcs/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcName: vpcName, + RegionId: regionId, + VpcName: vpcName, } } @@ -67,71 +66,71 @@ func NewCreateVpcRequest( * param description: vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ func NewCreateVpcRequestWithAllParams( - regionId string, - vpcName string, - addressPrefix *string, - description *string, + regionId string, + vpcName string, + addressPrefix *string, + description *string, ) *CreateVpcRequest { - return &CreateVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcName: vpcName, - AddressPrefix: addressPrefix, - Description: description, - } + return &CreateVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcName: vpcName, + AddressPrefix: addressPrefix, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateVpcRequestWithoutParam() *CreateVpcRequest { - return &CreateVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateVpcRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcName: 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Required) */ func (r *CreateVpcRequest) SetVpcName(vpcName string) { - r.VpcName = vpcName + r.VpcName = vpcName } /* param addressPrefix: 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间(Optional) */ func (r *CreateVpcRequest) SetAddressPrefix(addressPrefix string) { - r.AddressPrefix = &addressPrefix + r.AddressPrefix = &addressPrefix } /* param description: vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。(Optional) */ func (r *CreateVpcRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateVpcRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateVpcResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateVpcResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateVpcResult `json:"result"` } type CreateVpcResult struct { - VpcId string `json:"vpcId"` -} \ No newline at end of file + VpcId string `json:"vpcId"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpcPeering.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpcPeering.go index 518a33f57..b92b7e855 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpcPeering.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpcPeering.go @@ -17,28 +17,27 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type CreateVpcPeeringRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 */ + VpcPeeringName string `json:"vpcPeeringName"` - /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 */ - VpcPeeringName string `json:"vpcPeeringName"` + /* VpcPeering本端Vpc的Id */ + VpcId string `json:"vpcId"` - /* VpcPeering本端Vpc的Id */ - VpcId string `json:"vpcId"` + /* VpcPeering对端Vpc的Id */ + RemoteVpcId string `json:"remoteVpcId"` - /* VpcPeering对端Vpc的Id */ - RemoteVpcId string `json:"remoteVpcId"` - - /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - Description *string `json:"description"` + /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + Description *string `json:"description"` } /* @@ -50,23 +49,23 @@ type CreateVpcPeeringRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateVpcPeeringRequest( - regionId string, - vpcPeeringName string, - vpcId string, - remoteVpcId string, + regionId string, + vpcPeeringName string, + vpcId string, + remoteVpcId string, ) *CreateVpcPeeringRequest { return &CreateVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcPeerings/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcPeeringName: vpcPeeringName, - VpcId: vpcId, - RemoteVpcId: remoteVpcId, + RegionId: regionId, + VpcPeeringName: vpcPeeringName, + VpcId: vpcId, + RemoteVpcId: remoteVpcId, } } @@ -78,78 +77,78 @@ func NewCreateVpcPeeringRequest( * param description: VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ func NewCreateVpcPeeringRequestWithAllParams( - regionId string, - vpcPeeringName string, - vpcId string, - remoteVpcId string, - description *string, + regionId string, + vpcPeeringName string, + vpcId string, + remoteVpcId string, + description *string, ) *CreateVpcPeeringRequest { - return &CreateVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcPeeringName: vpcPeeringName, - VpcId: vpcId, - RemoteVpcId: remoteVpcId, - Description: description, - } + return &CreateVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcPeeringName: vpcPeeringName, + VpcId: vpcId, + RemoteVpcId: remoteVpcId, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateVpcPeeringRequestWithoutParam() *CreateVpcPeeringRequest { - return &CreateVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateVpcPeeringRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcPeeringName: VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符(Required) */ func (r *CreateVpcPeeringRequest) SetVpcPeeringName(vpcPeeringName string) { - r.VpcPeeringName = vpcPeeringName + r.VpcPeeringName = vpcPeeringName } /* param vpcId: VpcPeering本端Vpc的Id(Required) */ func (r *CreateVpcPeeringRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } /* param remoteVpcId: VpcPeering对端Vpc的Id(Required) */ func (r *CreateVpcPeeringRequest) SetRemoteVpcId(remoteVpcId string) { - r.RemoteVpcId = remoteVpcId + r.RemoteVpcId = remoteVpcId } /* param description: VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符(Optional) */ func (r *CreateVpcPeeringRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateVpcPeeringRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateVpcPeeringResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateVpcPeeringResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateVpcPeeringResult `json:"result"` } type CreateVpcPeeringResult struct { - VpcPeering vpc.VpcPeering `json:"vpcPeering"` -} \ No newline at end of file + VpcPeering vpc.VpcPeering `json:"vpcPeering"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteElasticIp.go index 0aa9c8bcc..5bab1d635 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteElasticIp.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteElasticIpRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* ElasticIp ID */ - ElasticIpId string `json:"elasticIpId"` + /* ElasticIp ID */ + ElasticIpId string `json:"elasticIpId"` } /* @@ -38,19 +37,19 @@ type DeleteElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteElasticIpRequest( - regionId string, - elasticIpId string, + regionId string, + elasticIpId string, ) *DeleteElasticIpRequest { return &DeleteElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/elasticIps/{elasticIpId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - ElasticIpId: elasticIpId, + RegionId: regionId, + ElasticIpId: elasticIpId, } } @@ -59,56 +58,56 @@ func NewDeleteElasticIpRequest( * param elasticIpId: ElasticIp ID (Required) */ func NewDeleteElasticIpRequestWithAllParams( - regionId string, - elasticIpId string, + regionId string, + elasticIpId string, ) *DeleteElasticIpRequest { - return &DeleteElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/{elasticIpId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ElasticIpId: elasticIpId, - } + return &DeleteElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/{elasticIpId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ElasticIpId: elasticIpId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteElasticIpRequestWithoutParam() *DeleteElasticIpRequest { - return &DeleteElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/{elasticIpId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/{elasticIpId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param elasticIpId: ElasticIp ID(Required) */ func (r *DeleteElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = elasticIpId + r.ElasticIpId = elasticIpId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteElasticIpResult `json:"result"` } type DeleteElasticIpResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkAcl.go index a4be188bb..bbea5dd4c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkAcl.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteNetworkAclRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` } /* @@ -38,19 +37,19 @@ type DeleteNetworkAclRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteNetworkAclRequest( - regionId string, - networkAclId string, + regionId string, + networkAclId string, ) *DeleteNetworkAclRequest { return &DeleteNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, + RegionId: regionId, + NetworkAclId: networkAclId, } } @@ -59,56 +58,56 @@ func NewDeleteNetworkAclRequest( * param networkAclId: networkAclId ID (Required) */ func NewDeleteNetworkAclRequestWithAllParams( - regionId string, - networkAclId string, + regionId string, + networkAclId string, ) *DeleteNetworkAclRequest { - return &DeleteNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - } + return &DeleteNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteNetworkAclRequestWithoutParam() *DeleteNetworkAclRequest { - return &DeleteNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteNetworkAclRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *DeleteNetworkAclRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteNetworkAclRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteNetworkAclResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteNetworkAclResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteNetworkAclResult `json:"result"` } type DeleteNetworkAclResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkInterface.go index 3e64d6fde..ab96d8b20 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkInterface.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteNetworkInterfaceRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` } /* @@ -38,19 +37,19 @@ type DeleteNetworkInterfaceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteNetworkInterfaceRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *DeleteNetworkInterfaceRequest { return &DeleteNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -59,56 +58,56 @@ func NewDeleteNetworkInterfaceRequest( * param networkInterfaceId: networkInterface ID (Required) */ func NewDeleteNetworkInterfaceRequestWithAllParams( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *DeleteNetworkInterfaceRequest { - return &DeleteNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - } + return &DeleteNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteNetworkInterfaceRequestWithoutParam() *DeleteNetworkInterfaceRequest { - return &DeleteNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteNetworkInterfaceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *DeleteNetworkInterfaceRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteNetworkInterfaceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteNetworkInterfaceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteNetworkInterfaceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteNetworkInterfaceResult `json:"result"` } type DeleteNetworkInterfaceResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkSecurityGroup.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkSecurityGroup.go index f48291b13..4f4f904bb 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkSecurityGroup.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkSecurityGroup.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteNetworkSecurityGroupRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* NetworkSecurityGroup ID */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + /* NetworkSecurityGroup ID */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` } /* @@ -38,19 +37,19 @@ type DeleteNetworkSecurityGroupRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteNetworkSecurityGroupRequest( - regionId string, - networkSecurityGroupId string, + regionId string, + networkSecurityGroupId string, ) *DeleteNetworkSecurityGroupRequest { return &DeleteNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, } } @@ -59,56 +58,56 @@ func NewDeleteNetworkSecurityGroupRequest( * param networkSecurityGroupId: NetworkSecurityGroup ID (Required) */ func NewDeleteNetworkSecurityGroupRequestWithAllParams( - regionId string, - networkSecurityGroupId string, + regionId string, + networkSecurityGroupId string, ) *DeleteNetworkSecurityGroupRequest { - return &DeleteNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - } + return &DeleteNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteNetworkSecurityGroupRequestWithoutParam() *DeleteNetworkSecurityGroupRequest { - return &DeleteNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteNetworkSecurityGroupRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkSecurityGroupId: NetworkSecurityGroup ID(Required) */ func (r *DeleteNetworkSecurityGroupRequest) SetNetworkSecurityGroupId(networkSecurityGroupId string) { - r.NetworkSecurityGroupId = networkSecurityGroupId + r.NetworkSecurityGroupId = networkSecurityGroupId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteNetworkSecurityGroupRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteNetworkSecurityGroupResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteNetworkSecurityGroupResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteNetworkSecurityGroupResult `json:"result"` } type DeleteNetworkSecurityGroupResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteRouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteRouteTable.go index e272e5b2e..3808cfb8d 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteRouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteRouteTable.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteRouteTableRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` } /* @@ -38,19 +37,19 @@ type DeleteRouteTableRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteRouteTableRequest( - regionId string, - routeTableId string, + regionId string, + routeTableId string, ) *DeleteRouteTableRequest { return &DeleteRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, + RegionId: regionId, + RouteTableId: routeTableId, } } @@ -59,56 +58,56 @@ func NewDeleteRouteTableRequest( * param routeTableId: RouteTable ID (Required) */ func NewDeleteRouteTableRequestWithAllParams( - regionId string, - routeTableId string, + regionId string, + routeTableId string, ) *DeleteRouteTableRequest { - return &DeleteRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - } + return &DeleteRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteRouteTableRequestWithoutParam() *DeleteRouteTableRequest { - return &DeleteRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteRouteTableRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *DeleteRouteTableRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteRouteTableRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteRouteTableResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteRouteTableResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteRouteTableResult `json:"result"` } type DeleteRouteTableResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteSubnet.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteSubnet.go index 15c2be6af..7e4b1f298 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteSubnet.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteSubnet.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteSubnetRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* Subnet ID */ - SubnetId string `json:"subnetId"` + /* Subnet ID */ + SubnetId string `json:"subnetId"` } /* @@ -38,19 +37,19 @@ type DeleteSubnetRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteSubnetRequest( - regionId string, - subnetId string, + regionId string, + subnetId string, ) *DeleteSubnetRequest { return &DeleteSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/subnets/{subnetId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - SubnetId: subnetId, + RegionId: regionId, + SubnetId: subnetId, } } @@ -59,56 +58,56 @@ func NewDeleteSubnetRequest( * param subnetId: Subnet ID (Required) */ func NewDeleteSubnetRequestWithAllParams( - regionId string, - subnetId string, + regionId string, + subnetId string, ) *DeleteSubnetRequest { - return &DeleteSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/{subnetId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - SubnetId: subnetId, - } + return &DeleteSubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/{subnetId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + SubnetId: subnetId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteSubnetRequestWithoutParam() *DeleteSubnetRequest { - return &DeleteSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/{subnetId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteSubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/{subnetId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteSubnetRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param subnetId: Subnet ID(Required) */ func (r *DeleteSubnetRequest) SetSubnetId(subnetId string) { - r.SubnetId = subnetId + r.SubnetId = subnetId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteSubnetRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteSubnetResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteSubnetResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteSubnetResult `json:"result"` } type DeleteSubnetResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpc.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpc.go index ef98f098d..4ab0333de 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpc.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpc.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteVpcRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* Vpc ID */ - VpcId string `json:"vpcId"` + /* Vpc ID */ + VpcId string `json:"vpcId"` } /* @@ -38,19 +37,19 @@ type DeleteVpcRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteVpcRequest( - regionId string, - vpcId string, + regionId string, + vpcId string, ) *DeleteVpcRequest { return &DeleteVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcs/{vpcId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, + RegionId: regionId, + VpcId: vpcId, } } @@ -59,56 +58,56 @@ func NewDeleteVpcRequest( * param vpcId: Vpc ID (Required) */ func NewDeleteVpcRequestWithAllParams( - regionId string, - vpcId string, + regionId string, + vpcId string, ) *DeleteVpcRequest { - return &DeleteVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/{vpcId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - } + return &DeleteVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/{vpcId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteVpcRequestWithoutParam() *DeleteVpcRequest { - return &DeleteVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/{vpcId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/{vpcId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteVpcRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: Vpc ID(Required) */ func (r *DeleteVpcRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteVpcRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteVpcResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteVpcResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteVpcResult `json:"result"` } type DeleteVpcResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpcPeering.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpcPeering.go index b77e471dd..a60833c70 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpcPeering.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpcPeering.go @@ -17,18 +17,17 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteVpcPeeringRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* vpcPeeringId ID */ - VpcPeeringId string `json:"vpcPeeringId"` + /* vpcPeeringId ID */ + VpcPeeringId string `json:"vpcPeeringId"` } /* @@ -38,19 +37,19 @@ type DeleteVpcPeeringRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteVpcPeeringRequest( - regionId string, - vpcPeeringId string, + regionId string, + vpcPeeringId string, ) *DeleteVpcPeeringRequest { return &DeleteVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcPeeringId: vpcPeeringId, + RegionId: regionId, + VpcPeeringId: vpcPeeringId, } } @@ -59,56 +58,56 @@ func NewDeleteVpcPeeringRequest( * param vpcPeeringId: vpcPeeringId ID (Required) */ func NewDeleteVpcPeeringRequestWithAllParams( - regionId string, - vpcPeeringId string, + regionId string, + vpcPeeringId string, ) *DeleteVpcPeeringRequest { - return &DeleteVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcPeeringId: vpcPeeringId, - } + return &DeleteVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcPeeringId: vpcPeeringId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteVpcPeeringRequestWithoutParam() *DeleteVpcPeeringRequest { - return &DeleteVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteVpcPeeringRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcPeeringId: vpcPeeringId ID(Required) */ func (r *DeleteVpcPeeringRequest) SetVpcPeeringId(vpcPeeringId string) { - r.VpcPeeringId = vpcPeeringId + r.VpcPeeringId = vpcPeeringId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteVpcPeeringRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteVpcPeeringResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteVpcPeeringResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteVpcPeeringResult `json:"result"` } type DeleteVpcPeeringResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIp.go index 6ecb5a97c..e5e942d6b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIp.go @@ -17,19 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeElasticIpRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* ElasticIp ID */ - ElasticIpId string `json:"elasticIpId"` + /* ElasticIp ID */ + ElasticIpId string `json:"elasticIpId"` } /* @@ -39,19 +38,19 @@ type DescribeElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeElasticIpRequest( - regionId string, - elasticIpId string, + regionId string, + elasticIpId string, ) *DescribeElasticIpRequest { return &DescribeElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/elasticIps/{elasticIpId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - ElasticIpId: elasticIpId, + RegionId: regionId, + ElasticIpId: elasticIpId, } } @@ -60,57 +59,57 @@ func NewDescribeElasticIpRequest( * param elasticIpId: ElasticIp ID (Required) */ func NewDescribeElasticIpRequestWithAllParams( - regionId string, - elasticIpId string, + regionId string, + elasticIpId string, ) *DescribeElasticIpRequest { - return &DescribeElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/{elasticIpId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ElasticIpId: elasticIpId, - } + return &DescribeElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/{elasticIpId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ElasticIpId: elasticIpId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeElasticIpRequestWithoutParam() *DescribeElasticIpRequest { - return &DescribeElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/{elasticIpId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/{elasticIpId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param elasticIpId: ElasticIp ID(Required) */ func (r *DescribeElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = elasticIpId + r.ElasticIpId = elasticIpId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeElasticIpResult `json:"result"` } type DescribeElasticIpResult struct { - ElasticIp vpc.ElasticIp `json:"elasticIp"` -} \ No newline at end of file + ElasticIp vpc.ElasticIp `json:"elasticIp"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIps.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIps.go index 94927eff2..9f5a2b448 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIps.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIps.go @@ -17,29 +17,28 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeElasticIpsRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` - - /* elasticIpIds - elasticip id数组条件，支持多个 -elasticIpAddress - eip的IP地址，支持单个 -chargeStatus - eip的费用支付状态,normal(正常状态) or overdue(预付费已到期) or arrear(欠费状态)，支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* elasticIpIds - elasticip id数组条件，支持多个 + elasticIpAddress - eip的IP地址，支持单个 + chargeStatus - eip的费用支付状态,normal(正常状态) or overdue(预付费已到期) or arrear(欠费状态)，支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -48,17 +47,17 @@ chargeStatus - eip的费用支付状态,normal(正常状态) or overdue(预付 * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeElasticIpsRequest( - regionId string, + regionId string, ) *DescribeElasticIpsRequest { return &DescribeElasticIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/elasticIps/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -70,54 +69,54 @@ func NewDescribeElasticIpsRequest( elasticIpAddress - eip的IP地址，支持单个 chargeStatus - eip的费用支付状态,normal(正常状态) or overdue(预付费已到期) or arrear(欠费状态)，支持单个 (Optional) - */ +*/ func NewDescribeElasticIpsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeElasticIpsRequest { - return &DescribeElasticIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeElasticIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeElasticIpsRequestWithoutParam() *DescribeElasticIpsRequest { - return &DescribeElasticIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeElasticIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeElasticIpsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeElasticIpsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeElasticIpsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: elasticIpIds - elasticip id数组条件，支持多个 @@ -125,22 +124,22 @@ elasticIpAddress - eip的IP地址，支持单个 chargeStatus - eip的费用支付状态,normal(正常状态) or overdue(预付费已到期) or arrear(欠费状态)，支持单个 (Optional) */ func (r *DescribeElasticIpsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeElasticIpsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeElasticIpsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeElasticIpsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeElasticIpsResult `json:"result"` } type DescribeElasticIpsResult struct { - ElasticIps []vpc.ElasticIp `json:"elasticIps"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + ElasticIps []vpc.ElasticIp `json:"elasticIps"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcl.go index 6692a7f70..ff7f522dc 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcl.go @@ -17,19 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeNetworkAclRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` } /* @@ -39,19 +38,19 @@ type DescribeNetworkAclRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeNetworkAclRequest( - regionId string, - networkAclId string, + regionId string, + networkAclId string, ) *DescribeNetworkAclRequest { return &DescribeNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, + RegionId: regionId, + NetworkAclId: networkAclId, } } @@ -60,57 +59,57 @@ func NewDescribeNetworkAclRequest( * param networkAclId: networkAclId ID (Required) */ func NewDescribeNetworkAclRequestWithAllParams( - regionId string, - networkAclId string, + regionId string, + networkAclId string, ) *DescribeNetworkAclRequest { - return &DescribeNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - } + return &DescribeNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeNetworkAclRequestWithoutParam() *DescribeNetworkAclRequest { - return &DescribeNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeNetworkAclRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *DescribeNetworkAclRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeNetworkAclRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeNetworkAclResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeNetworkAclResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeNetworkAclResult `json:"result"` } type DescribeNetworkAclResult struct { - NetworkAcl vpc.NetworkAcl `json:"networkAcl"` -} \ No newline at end of file + NetworkAcl vpc.NetworkAcl `json:"networkAcl"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcls.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcls.go index 5344e55ad..4a8f2c876 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcls.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcls.go @@ -17,29 +17,28 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeNetworkAclsRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` - - /* networkAclIds - 弹性网卡ID列表，支持多个 -networkAclNames - 弹性网卡名称列表，支持多个 -vpcId - 弹性网卡所属vpc Id，支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* networkAclIds - 弹性网卡ID列表，支持多个 + networkAclNames - 弹性网卡名称列表，支持多个 + vpcId - 弹性网卡所属vpc Id，支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -48,17 +47,17 @@ vpcId - 弹性网卡所属vpc Id，支持单个 * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeNetworkAclsRequest( - regionId string, + regionId string, ) *DescribeNetworkAclsRequest { return &DescribeNetworkAclsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -70,54 +69,54 @@ func NewDescribeNetworkAclsRequest( networkAclNames - 弹性网卡名称列表，支持多个 vpcId - 弹性网卡所属vpc Id，支持单个 (Optional) - */ +*/ func NewDescribeNetworkAclsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeNetworkAclsRequest { - return &DescribeNetworkAclsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeNetworkAclsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeNetworkAclsRequestWithoutParam() *DescribeNetworkAclsRequest { - return &DescribeNetworkAclsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeNetworkAclsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeNetworkAclsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeNetworkAclsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeNetworkAclsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: networkAclIds - 弹性网卡ID列表，支持多个 @@ -125,22 +124,22 @@ networkAclNames - 弹性网卡名称列表，支持多个 vpcId - 弹性网卡所属vpc Id，支持单个 (Optional) */ func (r *DescribeNetworkAclsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeNetworkAclsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeNetworkAclsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeNetworkAclsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeNetworkAclsResult `json:"result"` } type DescribeNetworkAclsResult struct { - NetworkAcls []vpc.NetworkAcl `json:"networkAcls"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + NetworkAcls []vpc.NetworkAcl `json:"networkAcls"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterface.go index 284b32b5d..c02ce6eac 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterface.go @@ -17,19 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeNetworkInterfaceRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` } /* @@ -39,19 +38,19 @@ type DescribeNetworkInterfaceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeNetworkInterfaceRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *DescribeNetworkInterfaceRequest { return &DescribeNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -60,57 +59,57 @@ func NewDescribeNetworkInterfaceRequest( * param networkInterfaceId: networkInterface ID (Required) */ func NewDescribeNetworkInterfaceRequestWithAllParams( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *DescribeNetworkInterfaceRequest { - return &DescribeNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - } + return &DescribeNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeNetworkInterfaceRequestWithoutParam() *DescribeNetworkInterfaceRequest { - return &DescribeNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeNetworkInterfaceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *DescribeNetworkInterfaceRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeNetworkInterfaceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeNetworkInterfaceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeNetworkInterfaceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeNetworkInterfaceResult `json:"result"` } type DescribeNetworkInterfaceResult struct { - NetworkInterface vpc.NetworkInterface `json:"networkInterface"` -} \ No newline at end of file + NetworkInterface vpc.NetworkInterface `json:"networkInterface"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterfaces.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterfaces.go index 2503ca0e1..899184d8e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterfaces.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterfaces.go @@ -17,31 +17,30 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeNetworkInterfacesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` - - /* networkInterfaceIds - 弹性网卡ID列表，支持多个 -networkInterfaceNames - 弹性网卡名称列表，支持多个 -vpcId - 弹性网卡所属vpc Id，支持单个 -subnetId - 弹性网卡所属子网Id，支持单个 -role - 网卡角色，取值范围：Primary（主网卡）、Secondary（辅助网卡），支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* networkInterfaceIds - 弹性网卡ID列表，支持多个 + networkInterfaceNames - 弹性网卡名称列表，支持多个 + vpcId - 弹性网卡所属vpc Id，支持单个 + subnetId - 弹性网卡所属子网Id，支持单个 + role - 网卡角色，取值范围：Primary（主网卡）、Secondary（辅助网卡），支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -50,17 +49,17 @@ role - 网卡角色，取值范围：Primary（主网卡）、Secondary（辅助 * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeNetworkInterfacesRequest( - regionId string, + regionId string, ) *DescribeNetworkInterfacesRequest { return &DescribeNetworkInterfacesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -74,54 +73,54 @@ vpcId - 弹性网卡所属vpc Id，支持单个 subnetId - 弹性网卡所属子网Id，支持单个 role - 网卡角色，取值范围：Primary（主网卡）、Secondary（辅助网卡），支持单个 (Optional) - */ +*/ func NewDescribeNetworkInterfacesRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeNetworkInterfacesRequest { - return &DescribeNetworkInterfacesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeNetworkInterfacesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeNetworkInterfacesRequestWithoutParam() *DescribeNetworkInterfacesRequest { - return &DescribeNetworkInterfacesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeNetworkInterfacesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeNetworkInterfacesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeNetworkInterfacesRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeNetworkInterfacesRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: networkInterfaceIds - 弹性网卡ID列表，支持多个 @@ -131,22 +130,22 @@ subnetId - 弹性网卡所属子网Id，支持单个 role - 网卡角色，取值范围：Primary（主网卡）、Secondary（辅助网卡），支持单个 (Optional) */ func (r *DescribeNetworkInterfacesRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeNetworkInterfacesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeNetworkInterfacesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeNetworkInterfacesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeNetworkInterfacesResult `json:"result"` } type DescribeNetworkInterfacesResult struct { - NetworkInterfaces []vpc.NetworkInterface `json:"networkInterfaces"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + NetworkInterfaces []vpc.NetworkInterface `json:"networkInterfaces"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroup.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroup.go index b7f29d797..e8efdfb5e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroup.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroup.go @@ -17,19 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeNetworkSecurityGroupRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* NetworkSecurityGroup ID */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + /* NetworkSecurityGroup ID */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` } /* @@ -39,19 +38,19 @@ type DescribeNetworkSecurityGroupRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeNetworkSecurityGroupRequest( - regionId string, - networkSecurityGroupId string, + regionId string, + networkSecurityGroupId string, ) *DescribeNetworkSecurityGroupRequest { return &DescribeNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, } } @@ -60,57 +59,57 @@ func NewDescribeNetworkSecurityGroupRequest( * param networkSecurityGroupId: NetworkSecurityGroup ID (Required) */ func NewDescribeNetworkSecurityGroupRequestWithAllParams( - regionId string, - networkSecurityGroupId string, + regionId string, + networkSecurityGroupId string, ) *DescribeNetworkSecurityGroupRequest { - return &DescribeNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - } + return &DescribeNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeNetworkSecurityGroupRequestWithoutParam() *DescribeNetworkSecurityGroupRequest { - return &DescribeNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeNetworkSecurityGroupRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkSecurityGroupId: NetworkSecurityGroup ID(Required) */ func (r *DescribeNetworkSecurityGroupRequest) SetNetworkSecurityGroupId(networkSecurityGroupId string) { - r.NetworkSecurityGroupId = networkSecurityGroupId + r.NetworkSecurityGroupId = networkSecurityGroupId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeNetworkSecurityGroupRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeNetworkSecurityGroupResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeNetworkSecurityGroupResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeNetworkSecurityGroupResult `json:"result"` } type DescribeNetworkSecurityGroupResult struct { - NetworkSecurityGroup vpc.NetworkSecurityGroup `json:"networkSecurityGroup"` -} \ No newline at end of file + NetworkSecurityGroup vpc.NetworkSecurityGroup `json:"networkSecurityGroup"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroups.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroups.go index e85cc7170..79cc3d503 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroups.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroups.go @@ -17,29 +17,28 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeNetworkSecurityGroupsRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` - - /* networkSecurityGroupIds - 安全组ID列表，支持多个 -networkSecurityGroupNames - 安全组名称列表，支持多个 -vpcId - 安全组所属vpc Id，支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* networkSecurityGroupIds - 安全组ID列表，支持多个 + networkSecurityGroupNames - 安全组名称列表，支持多个 + vpcId - 安全组所属vpc Id，支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -48,17 +47,17 @@ vpcId - 安全组所属vpc Id，支持单个 * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeNetworkSecurityGroupsRequest( - regionId string, + regionId string, ) *DescribeNetworkSecurityGroupsRequest { return &DescribeNetworkSecurityGroupsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -70,54 +69,54 @@ func NewDescribeNetworkSecurityGroupsRequest( networkSecurityGroupNames - 安全组名称列表，支持多个 vpcId - 安全组所属vpc Id，支持单个 (Optional) - */ +*/ func NewDescribeNetworkSecurityGroupsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeNetworkSecurityGroupsRequest { - return &DescribeNetworkSecurityGroupsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeNetworkSecurityGroupsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeNetworkSecurityGroupsRequestWithoutParam() *DescribeNetworkSecurityGroupsRequest { - return &DescribeNetworkSecurityGroupsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeNetworkSecurityGroupsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeNetworkSecurityGroupsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeNetworkSecurityGroupsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeNetworkSecurityGroupsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: networkSecurityGroupIds - 安全组ID列表，支持多个 @@ -125,22 +124,22 @@ networkSecurityGroupNames - 安全组名称列表，支持多个 vpcId - 安全组所属vpc Id，支持单个 (Optional) */ func (r *DescribeNetworkSecurityGroupsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeNetworkSecurityGroupsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeNetworkSecurityGroupsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeNetworkSecurityGroupsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeNetworkSecurityGroupsResult `json:"result"` } type DescribeNetworkSecurityGroupsResult struct { - NetworkSecurityGroups []vpc.NetworkSecurityGroup `json:"networkSecurityGroups"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + NetworkSecurityGroups []vpc.NetworkSecurityGroup `json:"networkSecurityGroups"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeQuota.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeQuota.go index 4b6544e0f..a56d7ec44 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeQuota.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeQuota.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DescribeQuotaRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡） */ + Type string `json:"type"` - /* 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡） */ - Type string `json:"type"` - - /* type为vpc、elastic_ip、network_interface不设置, type为subnet、security_group、vpcpeering设置为vpcId (Optional) */ - ParentResourceId *string `json:"parentResourceId"` + /* type为vpc、elastic_ip、network_interface不设置, type为subnet、security_group、vpcpeering设置为vpcId (Optional) */ + ParentResourceId *string `json:"parentResourceId"` } /* @@ -41,19 +40,19 @@ type DescribeQuotaRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeQuotaRequest( - regionId string, - type_ string, + regionId string, + type_ string, ) *DescribeQuotaRequest { return &DescribeQuotaRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/quotas/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - Type: type_, + RegionId: regionId, + Type: type_, } } @@ -63,64 +62,64 @@ func NewDescribeQuotaRequest( * param parentResourceId: type为vpc、elastic_ip、network_interface不设置, type为subnet、security_group、vpcpeering设置为vpcId (Optional) */ func NewDescribeQuotaRequestWithAllParams( - regionId string, - type_ string, - parentResourceId *string, + regionId string, + type_ string, + parentResourceId *string, ) *DescribeQuotaRequest { - return &DescribeQuotaRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/quotas/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - Type: type_, - ParentResourceId: parentResourceId, - } + return &DescribeQuotaRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/quotas/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + Type: type_, + ParentResourceId: parentResourceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeQuotaRequestWithoutParam() *DescribeQuotaRequest { - return &DescribeQuotaRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/quotas/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeQuotaRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/quotas/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeQuotaRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param type_: 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡）(Required) */ func (r *DescribeQuotaRequest) SetType(type_ string) { - r.Type = type_ + r.Type = type_ } /* param parentResourceId: type为vpc、elastic_ip、network_interface不设置, type为subnet、security_group、vpcpeering设置为vpcId(Optional) */ func (r *DescribeQuotaRequest) SetParentResourceId(parentResourceId string) { - r.ParentResourceId = &parentResourceId + r.ParentResourceId = &parentResourceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeQuotaRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeQuotaResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeQuotaResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeQuotaResult `json:"result"` } type DescribeQuotaResult struct { - Quota interface{} `json:"quota"` -} \ No newline at end of file + Quota interface{} `json:"quota"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTable.go index 5e6785914..e555d5a74 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTable.go @@ -17,19 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeRouteTableRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` } /* @@ -39,19 +38,19 @@ type DescribeRouteTableRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeRouteTableRequest( - regionId string, - routeTableId string, + regionId string, + routeTableId string, ) *DescribeRouteTableRequest { return &DescribeRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, + RegionId: regionId, + RouteTableId: routeTableId, } } @@ -60,57 +59,57 @@ func NewDescribeRouteTableRequest( * param routeTableId: RouteTable ID (Required) */ func NewDescribeRouteTableRequestWithAllParams( - regionId string, - routeTableId string, + regionId string, + routeTableId string, ) *DescribeRouteTableRequest { - return &DescribeRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - } + return &DescribeRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeRouteTableRequestWithoutParam() *DescribeRouteTableRequest { - return &DescribeRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeRouteTableRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *DescribeRouteTableRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeRouteTableRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeRouteTableResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeRouteTableResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeRouteTableResult `json:"result"` } type DescribeRouteTableResult struct { - RouteTable vpc.RouteTable `json:"routeTable"` -} \ No newline at end of file + RouteTable vpc.RouteTable `json:"routeTable"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTables.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTables.go index 801d94c8b..210076b5d 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTables.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTables.go @@ -17,29 +17,28 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeRouteTablesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` - - /* routeTableIds - 路由表ID列表，支持多个 -routeTableNames - 路由表名称列表，支持多个 -vpcId - 路由表所属vpc Id，支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* routeTableIds - 路由表ID列表，支持多个 + routeTableNames - 路由表名称列表，支持多个 + vpcId - 路由表所属vpc Id，支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -48,17 +47,17 @@ vpcId - 路由表所属vpc Id，支持单个 * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeRouteTablesRequest( - regionId string, + regionId string, ) *DescribeRouteTablesRequest { return &DescribeRouteTablesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -70,54 +69,54 @@ func NewDescribeRouteTablesRequest( routeTableNames - 路由表名称列表，支持多个 vpcId - 路由表所属vpc Id，支持单个 (Optional) - */ +*/ func NewDescribeRouteTablesRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeRouteTablesRequest { - return &DescribeRouteTablesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeRouteTablesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeRouteTablesRequestWithoutParam() *DescribeRouteTablesRequest { - return &DescribeRouteTablesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeRouteTablesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeRouteTablesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeRouteTablesRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeRouteTablesRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: routeTableIds - 路由表ID列表，支持多个 @@ -125,22 +124,22 @@ routeTableNames - 路由表名称列表，支持多个 vpcId - 路由表所属vpc Id，支持单个 (Optional) */ func (r *DescribeRouteTablesRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeRouteTablesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeRouteTablesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeRouteTablesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeRouteTablesResult `json:"result"` } type DescribeRouteTablesResult struct { - RouteTables []vpc.RouteTable `json:"routeTables"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + RouteTables []vpc.RouteTable `json:"routeTables"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnet.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnet.go index 2fee1a574..fe3b0bdc8 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnet.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnet.go @@ -17,19 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeSubnetRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* Subnet ID */ - SubnetId string `json:"subnetId"` + /* Subnet ID */ + SubnetId string `json:"subnetId"` } /* @@ -39,19 +38,19 @@ type DescribeSubnetRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeSubnetRequest( - regionId string, - subnetId string, + regionId string, + subnetId string, ) *DescribeSubnetRequest { return &DescribeSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/subnets/{subnetId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - SubnetId: subnetId, + RegionId: regionId, + SubnetId: subnetId, } } @@ -60,57 +59,57 @@ func NewDescribeSubnetRequest( * param subnetId: Subnet ID (Required) */ func NewDescribeSubnetRequestWithAllParams( - regionId string, - subnetId string, + regionId string, + subnetId string, ) *DescribeSubnetRequest { - return &DescribeSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/{subnetId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - SubnetId: subnetId, - } + return &DescribeSubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/{subnetId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + SubnetId: subnetId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeSubnetRequestWithoutParam() *DescribeSubnetRequest { - return &DescribeSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/{subnetId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeSubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/{subnetId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeSubnetRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param subnetId: Subnet ID(Required) */ func (r *DescribeSubnetRequest) SetSubnetId(subnetId string) { - r.SubnetId = subnetId + r.SubnetId = subnetId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeSubnetRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeSubnetResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeSubnetResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeSubnetResult `json:"result"` } type DescribeSubnetResult struct { - Subnet vpc.Subnet `json:"subnet"` -} \ No newline at end of file + Subnet vpc.Subnet `json:"subnet"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnets.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnets.go index 6bb8ce98d..bfe08e656 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnets.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnets.go @@ -17,31 +17,30 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeSubnetsRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` - - /* subnetIds - subnet ID列表，支持多个 -subnetNames - subnet名称列表，支持多个 -routeTableId - 子网关联路由表Id，支持单个 -aclId - 子网关联acl Id，支持单个 -vpcId - 子网所属VPC Id，支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* subnetIds - subnet ID列表，支持多个 + subnetNames - subnet名称列表，支持多个 + routeTableId - 子网关联路由表Id，支持单个 + aclId - 子网关联acl Id，支持单个 + vpcId - 子网所属VPC Id，支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -50,17 +49,17 @@ vpcId - 子网所属VPC Id，支持单个 * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeSubnetsRequest( - regionId string, + regionId string, ) *DescribeSubnetsRequest { return &DescribeSubnetsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/subnets/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -74,54 +73,54 @@ routeTableId - 子网关联路由表Id，支持单个 aclId - 子网关联acl Id，支持单个 vpcId - 子网所属VPC Id，支持单个 (Optional) - */ +*/ func NewDescribeSubnetsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeSubnetsRequest { - return &DescribeSubnetsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeSubnetsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeSubnetsRequestWithoutParam() *DescribeSubnetsRequest { - return &DescribeSubnetsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeSubnetsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeSubnetsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeSubnetsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeSubnetsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: subnetIds - subnet ID列表，支持多个 @@ -131,22 +130,22 @@ aclId - 子网关联acl Id，支持单个 vpcId - 子网所属VPC Id，支持单个 (Optional) */ func (r *DescribeSubnetsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeSubnetsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeSubnetsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeSubnetsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeSubnetsResult `json:"result"` } type DescribeSubnetsResult struct { - Subnets []vpc.Subnet `json:"subnets"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + Subnets []vpc.Subnet `json:"subnets"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpc.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpc.go index d406b724c..d955b69e2 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpc.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpc.go @@ -17,19 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeVpcRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* Vpc ID */ - VpcId string `json:"vpcId"` + /* Vpc ID */ + VpcId string `json:"vpcId"` } /* @@ -39,19 +38,19 @@ type DescribeVpcRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeVpcRequest( - regionId string, - vpcId string, + regionId string, + vpcId string, ) *DescribeVpcRequest { return &DescribeVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcs/{vpcId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, + RegionId: regionId, + VpcId: vpcId, } } @@ -60,57 +59,57 @@ func NewDescribeVpcRequest( * param vpcId: Vpc ID (Required) */ func NewDescribeVpcRequestWithAllParams( - regionId string, - vpcId string, + regionId string, + vpcId string, ) *DescribeVpcRequest { - return &DescribeVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/{vpcId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - } + return &DescribeVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/{vpcId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeVpcRequestWithoutParam() *DescribeVpcRequest { - return &DescribeVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/{vpcId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/{vpcId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeVpcRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: Vpc ID(Required) */ func (r *DescribeVpcRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeVpcRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeVpcResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeVpcResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeVpcResult `json:"result"` } type DescribeVpcResult struct { - Vpc vpc.Vpc `json:"vpc"` -} \ No newline at end of file + Vpc vpc.Vpc `json:"vpc"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeering.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeering.go index e0230599a..889e215f4 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeering.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeering.go @@ -17,19 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeVpcPeeringRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` - - /* vpcPeeringId ID */ - VpcPeeringId string `json:"vpcPeeringId"` + /* vpcPeeringId ID */ + VpcPeeringId string `json:"vpcPeeringId"` } /* @@ -39,19 +38,19 @@ type DescribeVpcPeeringRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeVpcPeeringRequest( - regionId string, - vpcPeeringId string, + regionId string, + vpcPeeringId string, ) *DescribeVpcPeeringRequest { return &DescribeVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcPeeringId: vpcPeeringId, + RegionId: regionId, + VpcPeeringId: vpcPeeringId, } } @@ -60,57 +59,57 @@ func NewDescribeVpcPeeringRequest( * param vpcPeeringId: vpcPeeringId ID (Required) */ func NewDescribeVpcPeeringRequestWithAllParams( - regionId string, - vpcPeeringId string, + regionId string, + vpcPeeringId string, ) *DescribeVpcPeeringRequest { - return &DescribeVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcPeeringId: vpcPeeringId, - } + return &DescribeVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcPeeringId: vpcPeeringId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeVpcPeeringRequestWithoutParam() *DescribeVpcPeeringRequest { - return &DescribeVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeVpcPeeringRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcPeeringId: vpcPeeringId ID(Required) */ func (r *DescribeVpcPeeringRequest) SetVpcPeeringId(vpcPeeringId string) { - r.VpcPeeringId = vpcPeeringId + r.VpcPeeringId = vpcPeeringId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeVpcPeeringRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeVpcPeeringResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeVpcPeeringResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeVpcPeeringResult `json:"result"` } type DescribeVpcPeeringResult struct { - VpcPeering vpc.VpcPeering `json:"vpcPeering"` -} \ No newline at end of file + VpcPeering vpc.VpcPeering `json:"vpcPeering"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeerings.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeerings.go index 391f01b16..7cc33b59c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeerings.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeerings.go @@ -17,30 +17,29 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeVpcPeeringsRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` - - /* vpcPeeringIds - vpcPeering ID，支持多个 -vpcPeeringNames - vpcPeering名称列表，支持多个 -vpcId - vpcPeering本端Vpc Id，支持单个 -remoteVpcId - vpcPeering对端Vpc Id，支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* vpcPeeringIds - vpcPeering ID，支持多个 + vpcPeeringNames - vpcPeering名称列表，支持多个 + vpcId - vpcPeering本端Vpc Id，支持单个 + remoteVpcId - vpcPeering对端Vpc Id，支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -49,17 +48,17 @@ remoteVpcId - vpcPeering对端Vpc Id，支持单个 * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeVpcPeeringsRequest( - regionId string, + regionId string, ) *DescribeVpcPeeringsRequest { return &DescribeVpcPeeringsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcPeerings/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -72,54 +71,54 @@ vpcPeeringNames - vpcPeering名称列表，支持多个 vpcId - vpcPeering本端Vpc Id，支持单个 remoteVpcId - vpcPeering对端Vpc Id，支持单个 (Optional) - */ +*/ func NewDescribeVpcPeeringsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeVpcPeeringsRequest { - return &DescribeVpcPeeringsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeVpcPeeringsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeVpcPeeringsRequestWithoutParam() *DescribeVpcPeeringsRequest { - return &DescribeVpcPeeringsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeVpcPeeringsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeVpcPeeringsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeVpcPeeringsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeVpcPeeringsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: vpcPeeringIds - vpcPeering ID，支持多个 @@ -128,22 +127,22 @@ vpcId - vpcPeering本端Vpc Id，支持单个 remoteVpcId - vpcPeering对端Vpc Id，支持单个 (Optional) */ func (r *DescribeVpcPeeringsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeVpcPeeringsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeVpcPeeringsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeVpcPeeringsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeVpcPeeringsResult `json:"result"` } type DescribeVpcPeeringsResult struct { - VpcPeerings []vpc.VpcPeering `json:"vpcPeerings"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + VpcPeerings []vpc.VpcPeering `json:"vpcPeerings"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcs.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcs.go index 8faac163c..8eea9237e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcs.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcs.go @@ -17,28 +17,27 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeVpcsRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` - - /* vpcIds - vpc ID列表，支持多个 -vpcNames - vpc名称列表,支持多个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* vpcIds - vpc ID列表，支持多个 + vpcNames - vpc名称列表,支持多个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -47,17 +46,17 @@ vpcNames - vpc名称列表,支持多个 * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeVpcsRequest( - regionId string, + regionId string, ) *DescribeVpcsRequest { return &DescribeVpcsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcs/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -68,76 +67,76 @@ func NewDescribeVpcsRequest( * param filters: vpcIds - vpc ID列表，支持多个 vpcNames - vpc名称列表,支持多个 (Optional) - */ +*/ func NewDescribeVpcsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeVpcsRequest { - return &DescribeVpcsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeVpcsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeVpcsRequestWithoutParam() *DescribeVpcsRequest { - return &DescribeVpcsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeVpcsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeVpcsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeVpcsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeVpcsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: vpcIds - vpc ID列表，支持多个 vpcNames - vpc名称列表,支持多个 (Optional) */ func (r *DescribeVpcsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeVpcsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeVpcsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeVpcsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeVpcsResult `json:"result"` } type DescribeVpcsResult struct { - Vpcs []vpc.Vpc `json:"vpcs"` - TotalCount int `json:"totalCount"` -} \ No newline at end of file + Vpcs []vpc.Vpc `json:"vpcs"` + TotalCount int `json:"totalCount"` +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateElasticIp.go index 35e7dc50e..3b1202670 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateElasticIp.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DisassociateElasticIpRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* 指定解绑的弹性Ip Id (Optional) */ + ElasticIpId *string `json:"elasticIpId"` - /* 指定解绑的弹性Ip Id (Optional) */ - ElasticIpId *string `json:"elasticIpId"` - - /* 指定解绑的弹性Ip地址 (Optional) */ - ElasticIpAddress *string `json:"elasticIpAddress"` + /* 指定解绑的弹性Ip地址 (Optional) */ + ElasticIpAddress *string `json:"elasticIpAddress"` } /* @@ -44,19 +43,19 @@ type DisassociateElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDisassociateElasticIpRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *DisassociateElasticIpRequest { return &DisassociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:disassociateElasticIp", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -67,70 +66,70 @@ func NewDisassociateElasticIpRequest( * param elasticIpAddress: 指定解绑的弹性Ip地址 (Optional) */ func NewDisassociateElasticIpRequestWithAllParams( - regionId string, - networkInterfaceId string, - elasticIpId *string, - elasticIpAddress *string, + regionId string, + networkInterfaceId string, + elasticIpId *string, + elasticIpAddress *string, ) *DisassociateElasticIpRequest { - return &DisassociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:disassociateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - ElasticIpId: elasticIpId, - ElasticIpAddress: elasticIpAddress, - } + return &DisassociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:disassociateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + ElasticIpId: elasticIpId, + ElasticIpAddress: elasticIpAddress, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDisassociateElasticIpRequestWithoutParam() *DisassociateElasticIpRequest { - return &DisassociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:disassociateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &DisassociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:disassociateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DisassociateElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *DisassociateElasticIpRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } /* param elasticIpId: 指定解绑的弹性Ip Id(Optional) */ func (r *DisassociateElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = &elasticIpId + r.ElasticIpId = &elasticIpId } /* param elasticIpAddress: 指定解绑的弹性Ip地址(Optional) */ func (r *DisassociateElasticIpRequest) SetElasticIpAddress(elasticIpAddress string) { - r.ElasticIpAddress = &elasticIpAddress + r.ElasticIpAddress = &elasticIpAddress } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DisassociateElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DisassociateElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DisassociateElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DisassociateElasticIpResult `json:"result"` } type DisassociateElasticIpResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateNetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateNetworkAcl.go index 41874c7bb..0127d46d3 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateNetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateNetworkAcl.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DisassociateNetworkAclRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` - - /* networkAcl要解绑的子网ID */ - SubnetId string `json:"subnetId"` + /* networkAcl要解绑的子网ID */ + SubnetId string `json:"subnetId"` } /* @@ -42,21 +41,21 @@ type DisassociateNetworkAclRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDisassociateNetworkAclRequest( - regionId string, - networkAclId string, - subnetId string, + regionId string, + networkAclId string, + subnetId string, ) *DisassociateNetworkAclRequest { return &DisassociateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}:disassociateNetworkAcl", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, - SubnetId: subnetId, + RegionId: regionId, + NetworkAclId: networkAclId, + SubnetId: subnetId, } } @@ -66,63 +65,63 @@ func NewDisassociateNetworkAclRequest( * param subnetId: networkAcl要解绑的子网ID (Required) */ func NewDisassociateNetworkAclRequestWithAllParams( - regionId string, - networkAclId string, - subnetId string, + regionId string, + networkAclId string, + subnetId string, ) *DisassociateNetworkAclRequest { - return &DisassociateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:disassociateNetworkAcl", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - SubnetId: subnetId, - } + return &DisassociateNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:disassociateNetworkAcl", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + SubnetId: subnetId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDisassociateNetworkAclRequestWithoutParam() *DisassociateNetworkAclRequest { - return &DisassociateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:disassociateNetworkAcl", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &DisassociateNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:disassociateNetworkAcl", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DisassociateNetworkAclRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *DisassociateNetworkAclRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } /* param subnetId: networkAcl要解绑的子网ID(Required) */ func (r *DisassociateNetworkAclRequest) SetSubnetId(subnetId string) { - r.SubnetId = subnetId + r.SubnetId = subnetId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DisassociateNetworkAclRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DisassociateNetworkAclResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DisassociateNetworkAclResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DisassociateNetworkAclResult `json:"result"` } type DisassociateNetworkAclResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateRouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateRouteTable.go index 65d7f1c65..059a13d29 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateRouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateRouteTable.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DisassociateRouteTableRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` - - /* 路由表要解绑的子网ID，解绑后子网绑定默认路由表 */ - SubnetId string `json:"subnetId"` + /* 路由表要解绑的子网ID，解绑后子网绑定默认路由表 */ + SubnetId string `json:"subnetId"` } /* @@ -42,21 +41,21 @@ type DisassociateRouteTableRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDisassociateRouteTableRequest( - regionId string, - routeTableId string, - subnetId string, + regionId string, + routeTableId string, + subnetId string, ) *DisassociateRouteTableRequest { return &DisassociateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}:disassociateRouteTable", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, - SubnetId: subnetId, + RegionId: regionId, + RouteTableId: routeTableId, + SubnetId: subnetId, } } @@ -66,63 +65,63 @@ func NewDisassociateRouteTableRequest( * param subnetId: 路由表要解绑的子网ID，解绑后子网绑定默认路由表 (Required) */ func NewDisassociateRouteTableRequestWithAllParams( - regionId string, - routeTableId string, - subnetId string, + regionId string, + routeTableId string, + subnetId string, ) *DisassociateRouteTableRequest { - return &DisassociateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:disassociateRouteTable", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - SubnetId: subnetId, - } + return &DisassociateRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:disassociateRouteTable", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + SubnetId: subnetId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDisassociateRouteTableRequestWithoutParam() *DisassociateRouteTableRequest { - return &DisassociateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:disassociateRouteTable", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &DisassociateRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:disassociateRouteTable", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DisassociateRouteTableRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *DisassociateRouteTableRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } /* param subnetId: 路由表要解绑的子网ID，解绑后子网绑定默认路由表(Required) */ func (r *DisassociateRouteTableRequest) SetSubnetId(subnetId string) { - r.SubnetId = subnetId + r.SubnetId = subnetId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DisassociateRouteTableRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DisassociateRouteTableResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DisassociateRouteTableResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DisassociateRouteTableResult `json:"result"` } type DisassociateRouteTableResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyElasticIp.go index 146229ba0..49f5a1bad 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyElasticIp.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyElasticIpRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* ElasticIp ID */ + ElasticIpId string `json:"elasticIpId"` - /* ElasticIp ID */ - ElasticIpId string `json:"elasticIpId"` - - /* 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] */ - BandwidthMbps int `json:"bandwidthMbps"` + /* 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] */ + BandwidthMbps int `json:"bandwidthMbps"` } /* @@ -42,21 +41,21 @@ type ModifyElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyElasticIpRequest( - regionId string, - elasticIpId string, - bandwidthMbps int, + regionId string, + elasticIpId string, + bandwidthMbps int, ) *ModifyElasticIpRequest { return &ModifyElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/elasticIps/{elasticIpId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - ElasticIpId: elasticIpId, - BandwidthMbps: bandwidthMbps, + RegionId: regionId, + ElasticIpId: elasticIpId, + BandwidthMbps: bandwidthMbps, } } @@ -66,63 +65,63 @@ func NewModifyElasticIpRequest( * param bandwidthMbps: 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] (Required) */ func NewModifyElasticIpRequestWithAllParams( - regionId string, - elasticIpId string, - bandwidthMbps int, + regionId string, + elasticIpId string, + bandwidthMbps int, ) *ModifyElasticIpRequest { - return &ModifyElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/{elasticIpId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ElasticIpId: elasticIpId, - BandwidthMbps: bandwidthMbps, - } + return &ModifyElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/{elasticIpId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ElasticIpId: elasticIpId, + BandwidthMbps: bandwidthMbps, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyElasticIpRequestWithoutParam() *ModifyElasticIpRequest { - return &ModifyElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/{elasticIpId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifyElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/{elasticIpId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param elasticIpId: ElasticIp ID(Required) */ func (r *ModifyElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = elasticIpId + r.ElasticIpId = elasticIpId } /* param bandwidthMbps: 弹性公网IP的限速（单位：Mbps），取值范围为[1-200](Required) */ func (r *ModifyElasticIpRequest) SetBandwidthMbps(bandwidthMbps int) { - r.BandwidthMbps = bandwidthMbps + r.BandwidthMbps = bandwidthMbps } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyElasticIpResult `json:"result"` } type ModifyElasticIpResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAcl.go index c091d48a3..d13c78064 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAcl.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyNetworkAclRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` + /* networkAcl名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ + NetworkAclName *string `json:"networkAclName"` - /* networkAcl名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ - NetworkAclName *string `json:"networkAclName"` - - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } /* @@ -44,19 +43,19 @@ type ModifyNetworkAclRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyNetworkAclRequest( - regionId string, - networkAclId string, + regionId string, + networkAclId string, ) *ModifyNetworkAclRequest { return &ModifyNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, + RegionId: regionId, + NetworkAclId: networkAclId, } } @@ -67,70 +66,70 @@ func NewModifyNetworkAclRequest( * param description: 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ func NewModifyNetworkAclRequestWithAllParams( - regionId string, - networkAclId string, - networkAclName *string, - description *string, + regionId string, + networkAclId string, + networkAclName *string, + description *string, ) *ModifyNetworkAclRequest { - return &ModifyNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - NetworkAclName: networkAclName, - Description: description, - } + return &ModifyNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + NetworkAclName: networkAclName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyNetworkAclRequestWithoutParam() *ModifyNetworkAclRequest { - return &ModifyNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifyNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyNetworkAclRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *ModifyNetworkAclRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } /* param networkAclName: networkAcl名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符(Optional) */ func (r *ModifyNetworkAclRequest) SetNetworkAclName(networkAclName string) { - r.NetworkAclName = &networkAclName + r.NetworkAclName = &networkAclName } /* param description: 描述,允许输入UTF-8编码下的全部字符，不超过256字符(Optional) */ func (r *ModifyNetworkAclRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyNetworkAclRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyNetworkAclResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyNetworkAclResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyNetworkAclResult `json:"result"` } type ModifyNetworkAclResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAclRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAclRules.go index 21f44d284..36e18b8ea 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAclRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAclRules.go @@ -17,22 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type ModifyNetworkAclRulesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` - - /* networkAcl规则列表 */ - ModifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec `json:"modifyNetworkAclRuleSpecs"` + /* networkAcl规则列表 */ + ModifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec `json:"modifyNetworkAclRuleSpecs"` } /* @@ -43,21 +42,21 @@ type ModifyNetworkAclRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyNetworkAclRulesRequest( - regionId string, - networkAclId string, - modifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec, + regionId string, + networkAclId string, + modifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec, ) *ModifyNetworkAclRulesRequest { return &ModifyNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}:modifyNetworkAclRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, - ModifyNetworkAclRuleSpecs: modifyNetworkAclRuleSpecs, + RegionId: regionId, + NetworkAclId: networkAclId, + ModifyNetworkAclRuleSpecs: modifyNetworkAclRuleSpecs, } } @@ -67,63 +66,63 @@ func NewModifyNetworkAclRulesRequest( * param modifyNetworkAclRuleSpecs: networkAcl规则列表 (Required) */ func NewModifyNetworkAclRulesRequestWithAllParams( - regionId string, - networkAclId string, - modifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec, + regionId string, + networkAclId string, + modifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec, ) *ModifyNetworkAclRulesRequest { - return &ModifyNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:modifyNetworkAclRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - ModifyNetworkAclRuleSpecs: modifyNetworkAclRuleSpecs, - } + return &ModifyNetworkAclRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:modifyNetworkAclRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + ModifyNetworkAclRuleSpecs: modifyNetworkAclRuleSpecs, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyNetworkAclRulesRequestWithoutParam() *ModifyNetworkAclRulesRequest { - return &ModifyNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:modifyNetworkAclRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyNetworkAclRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:modifyNetworkAclRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyNetworkAclRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *ModifyNetworkAclRulesRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } /* param modifyNetworkAclRuleSpecs: networkAcl规则列表(Required) */ func (r *ModifyNetworkAclRulesRequest) SetModifyNetworkAclRuleSpecs(modifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec) { - r.ModifyNetworkAclRuleSpecs = modifyNetworkAclRuleSpecs + r.ModifyNetworkAclRuleSpecs = modifyNetworkAclRuleSpecs } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyNetworkAclRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyNetworkAclRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyNetworkAclRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyNetworkAclRulesResult `json:"result"` } type ModifyNetworkAclRulesResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkInterface.go index 071bfebe4..0d1392c5e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkInterface.go @@ -17,27 +17,26 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyNetworkInterfaceRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* 弹性网卡名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ + NetworkInterfaceName *string `json:"networkInterfaceName"` - /* 弹性网卡名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ - NetworkInterfaceName *string `json:"networkInterfaceName"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` - - /* 以覆盖原有安全组的方式更新的安全组。如果更新安全组ID列表，最多5个安全组 (Optional) */ - SecurityGroups []string `json:"securityGroups"` + /* 以覆盖原有安全组的方式更新的安全组。如果更新安全组ID列表，最多5个安全组 (Optional) */ + SecurityGroups []string `json:"securityGroups"` } /* @@ -47,19 +46,19 @@ type ModifyNetworkInterfaceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyNetworkInterfaceRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *ModifyNetworkInterfaceRequest { return &ModifyNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -71,77 +70,77 @@ func NewModifyNetworkInterfaceRequest( * param securityGroups: 以覆盖原有安全组的方式更新的安全组。如果更新安全组ID列表，最多5个安全组 (Optional) */ func NewModifyNetworkInterfaceRequestWithAllParams( - regionId string, - networkInterfaceId string, - networkInterfaceName *string, - description *string, - securityGroups []string, + regionId string, + networkInterfaceId string, + networkInterfaceName *string, + description *string, + securityGroups []string, ) *ModifyNetworkInterfaceRequest { - return &ModifyNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - NetworkInterfaceName: networkInterfaceName, - Description: description, - SecurityGroups: securityGroups, - } + return &ModifyNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + NetworkInterfaceName: networkInterfaceName, + Description: description, + SecurityGroups: securityGroups, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyNetworkInterfaceRequestWithoutParam() *ModifyNetworkInterfaceRequest { - return &ModifyNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifyNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyNetworkInterfaceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *ModifyNetworkInterfaceRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } /* param networkInterfaceName: 弹性网卡名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符(Optional) */ func (r *ModifyNetworkInterfaceRequest) SetNetworkInterfaceName(networkInterfaceName string) { - r.NetworkInterfaceName = &networkInterfaceName + r.NetworkInterfaceName = &networkInterfaceName } /* param description: 描述,允许输入UTF-8编码下的全部字符，不超过256字符(Optional) */ func (r *ModifyNetworkInterfaceRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } /* param securityGroups: 以覆盖原有安全组的方式更新的安全组。如果更新安全组ID列表，最多5个安全组(Optional) */ func (r *ModifyNetworkInterfaceRequest) SetSecurityGroups(securityGroups []string) { - r.SecurityGroups = securityGroups + r.SecurityGroups = securityGroups } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyNetworkInterfaceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyNetworkInterfaceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyNetworkInterfaceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyNetworkInterfaceResult `json:"result"` } type ModifyNetworkInterfaceResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroup.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroup.go index eccec066c..dd851e76e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroup.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroup.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyNetworkSecurityGroupRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* NetworkSecurityGroup ID */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` - /* NetworkSecurityGroup ID */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + /* 安全组的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + NetworkSecurityGroupName *string `json:"networkSecurityGroupName"` - /* 安全组的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - NetworkSecurityGroupName *string `json:"networkSecurityGroupName"` - - /* 安全组的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ - Description *string `json:"description"` + /* 安全组的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ + Description *string `json:"description"` } /* @@ -44,19 +43,19 @@ type ModifyNetworkSecurityGroupRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyNetworkSecurityGroupRequest( - regionId string, - networkSecurityGroupId string, + regionId string, + networkSecurityGroupId string, ) *ModifyNetworkSecurityGroupRequest { return &ModifyNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, } } @@ -67,70 +66,70 @@ func NewModifyNetworkSecurityGroupRequest( * param description: 安全组的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ func NewModifyNetworkSecurityGroupRequestWithAllParams( - regionId string, - networkSecurityGroupId string, - networkSecurityGroupName *string, - description *string, + regionId string, + networkSecurityGroupId string, + networkSecurityGroupName *string, + description *string, ) *ModifyNetworkSecurityGroupRequest { - return &ModifyNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - NetworkSecurityGroupName: networkSecurityGroupName, - Description: description, - } + return &ModifyNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + NetworkSecurityGroupName: networkSecurityGroupName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyNetworkSecurityGroupRequestWithoutParam() *ModifyNetworkSecurityGroupRequest { - return &ModifyNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifyNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyNetworkSecurityGroupRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkSecurityGroupId: NetworkSecurityGroup ID(Required) */ func (r *ModifyNetworkSecurityGroupRequest) SetNetworkSecurityGroupId(networkSecurityGroupId string) { - r.NetworkSecurityGroupId = networkSecurityGroupId + r.NetworkSecurityGroupId = networkSecurityGroupId } /* param networkSecurityGroupName: 安全组的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符(Optional) */ func (r *ModifyNetworkSecurityGroupRequest) SetNetworkSecurityGroupName(networkSecurityGroupName string) { - r.NetworkSecurityGroupName = &networkSecurityGroupName + r.NetworkSecurityGroupName = &networkSecurityGroupName } /* param description: 安全组的描述，取值范围：0-256个UTF-8编码下的全部字符(Optional) */ func (r *ModifyNetworkSecurityGroupRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyNetworkSecurityGroupRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyNetworkSecurityGroupResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyNetworkSecurityGroupResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyNetworkSecurityGroupResult `json:"result"` } type ModifyNetworkSecurityGroupResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroupRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroupRules.go index 63b6949f8..9901c80c1 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroupRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroupRules.go @@ -17,22 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type ModifyNetworkSecurityGroupRulesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* NetworkSecurityGroup ID */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` - /* NetworkSecurityGroup ID */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` - - /* 安全组规则信息 */ - ModifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules `json:"modifySecurityGroupRuleSpecs"` + /* 安全组规则信息 */ + ModifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules `json:"modifySecurityGroupRuleSpecs"` } /* @@ -43,21 +42,21 @@ type ModifyNetworkSecurityGroupRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyNetworkSecurityGroupRulesRequest( - regionId string, - networkSecurityGroupId string, - modifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules, + regionId string, + networkSecurityGroupId string, + modifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules, ) *ModifyNetworkSecurityGroupRulesRequest { return &ModifyNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:modifyNetworkSecurityGroupRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - ModifySecurityGroupRuleSpecs: modifySecurityGroupRuleSpecs, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + ModifySecurityGroupRuleSpecs: modifySecurityGroupRuleSpecs, } } @@ -67,63 +66,63 @@ func NewModifyNetworkSecurityGroupRulesRequest( * param modifySecurityGroupRuleSpecs: 安全组规则信息 (Required) */ func NewModifyNetworkSecurityGroupRulesRequestWithAllParams( - regionId string, - networkSecurityGroupId string, - modifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules, + regionId string, + networkSecurityGroupId string, + modifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules, ) *ModifyNetworkSecurityGroupRulesRequest { - return &ModifyNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:modifyNetworkSecurityGroupRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - ModifySecurityGroupRuleSpecs: modifySecurityGroupRuleSpecs, - } + return &ModifyNetworkSecurityGroupRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:modifyNetworkSecurityGroupRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + ModifySecurityGroupRuleSpecs: modifySecurityGroupRuleSpecs, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyNetworkSecurityGroupRulesRequestWithoutParam() *ModifyNetworkSecurityGroupRulesRequest { - return &ModifyNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:modifyNetworkSecurityGroupRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyNetworkSecurityGroupRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:modifyNetworkSecurityGroupRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyNetworkSecurityGroupRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkSecurityGroupId: NetworkSecurityGroup ID(Required) */ func (r *ModifyNetworkSecurityGroupRulesRequest) SetNetworkSecurityGroupId(networkSecurityGroupId string) { - r.NetworkSecurityGroupId = networkSecurityGroupId + r.NetworkSecurityGroupId = networkSecurityGroupId } /* param modifySecurityGroupRuleSpecs: 安全组规则信息(Required) */ func (r *ModifyNetworkSecurityGroupRulesRequest) SetModifySecurityGroupRuleSpecs(modifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules) { - r.ModifySecurityGroupRuleSpecs = modifySecurityGroupRuleSpecs + r.ModifySecurityGroupRuleSpecs = modifySecurityGroupRuleSpecs } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyNetworkSecurityGroupRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyNetworkSecurityGroupRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyNetworkSecurityGroupRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyNetworkSecurityGroupRulesResult `json:"result"` } type ModifyNetworkSecurityGroupRulesResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTable.go index e97386635..f6bc71406 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTable.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyRouteTableRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` + /* 路由表的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + RouteTableName *string `json:"routeTableName"` - /* 路由表的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - RouteTableName *string `json:"routeTableName"` - - /* 路由表的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ - Description *string `json:"description"` + /* 路由表的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ + Description *string `json:"description"` } /* @@ -44,19 +43,19 @@ type ModifyRouteTableRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyRouteTableRequest( - regionId string, - routeTableId string, + regionId string, + routeTableId string, ) *ModifyRouteTableRequest { return &ModifyRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, + RegionId: regionId, + RouteTableId: routeTableId, } } @@ -67,70 +66,70 @@ func NewModifyRouteTableRequest( * param description: 路由表的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ func NewModifyRouteTableRequestWithAllParams( - regionId string, - routeTableId string, - routeTableName *string, - description *string, + regionId string, + routeTableId string, + routeTableName *string, + description *string, ) *ModifyRouteTableRequest { - return &ModifyRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - RouteTableName: routeTableName, - Description: description, - } + return &ModifyRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + RouteTableName: routeTableName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyRouteTableRequestWithoutParam() *ModifyRouteTableRequest { - return &ModifyRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifyRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyRouteTableRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *ModifyRouteTableRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } /* param routeTableName: 路由表的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符(Optional) */ func (r *ModifyRouteTableRequest) SetRouteTableName(routeTableName string) { - r.RouteTableName = &routeTableName + r.RouteTableName = &routeTableName } /* param description: 路由表的描述，取值范围：0-256个UTF-8编码下的全部字符(Optional) */ func (r *ModifyRouteTableRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyRouteTableRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyRouteTableResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyRouteTableResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyRouteTableResult `json:"result"` } type ModifyRouteTableResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTableRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTableRules.go index 7a1479c9c..346f7c0c9 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTableRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTableRules.go @@ -17,22 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type ModifyRouteTableRulesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` - - /* 路由表规则信息 */ - ModifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules `json:"modifyRouteTableRuleSpecs"` + /* 路由表规则信息 */ + ModifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules `json:"modifyRouteTableRuleSpecs"` } /* @@ -43,21 +42,21 @@ type ModifyRouteTableRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyRouteTableRulesRequest( - regionId string, - routeTableId string, - modifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules, + regionId string, + routeTableId string, + modifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules, ) *ModifyRouteTableRulesRequest { return &ModifyRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}:modifyRouteTableRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, - ModifyRouteTableRuleSpecs: modifyRouteTableRuleSpecs, + RegionId: regionId, + RouteTableId: routeTableId, + ModifyRouteTableRuleSpecs: modifyRouteTableRuleSpecs, } } @@ -67,63 +66,63 @@ func NewModifyRouteTableRulesRequest( * param modifyRouteTableRuleSpecs: 路由表规则信息 (Required) */ func NewModifyRouteTableRulesRequestWithAllParams( - regionId string, - routeTableId string, - modifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules, + regionId string, + routeTableId string, + modifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules, ) *ModifyRouteTableRulesRequest { - return &ModifyRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:modifyRouteTableRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - ModifyRouteTableRuleSpecs: modifyRouteTableRuleSpecs, - } + return &ModifyRouteTableRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:modifyRouteTableRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + ModifyRouteTableRuleSpecs: modifyRouteTableRuleSpecs, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyRouteTableRulesRequestWithoutParam() *ModifyRouteTableRulesRequest { - return &ModifyRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:modifyRouteTableRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyRouteTableRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:modifyRouteTableRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyRouteTableRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *ModifyRouteTableRulesRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } /* param modifyRouteTableRuleSpecs: 路由表规则信息(Required) */ func (r *ModifyRouteTableRulesRequest) SetModifyRouteTableRuleSpecs(modifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules) { - r.ModifyRouteTableRuleSpecs = modifyRouteTableRuleSpecs + r.ModifyRouteTableRuleSpecs = modifyRouteTableRuleSpecs } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyRouteTableRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyRouteTableRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyRouteTableRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyRouteTableRulesResult `json:"result"` } type ModifyRouteTableRulesResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifySubnet.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifySubnet.go index 1465afc76..ee0996b7a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifySubnet.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifySubnet.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifySubnetRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* Subnet ID */ + SubnetId string `json:"subnetId"` - /* Subnet ID */ - SubnetId string `json:"subnetId"` + /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + SubnetName *string `json:"subnetName"` - /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - SubnetName *string `json:"subnetName"` - - /* 子网描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description *string `json:"description"` + /* 子网描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description *string `json:"description"` } /* @@ -44,19 +43,19 @@ type ModifySubnetRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifySubnetRequest( - regionId string, - subnetId string, + regionId string, + subnetId string, ) *ModifySubnetRequest { return &ModifySubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/subnets/{subnetId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - SubnetId: subnetId, + RegionId: regionId, + SubnetId: subnetId, } } @@ -67,70 +66,70 @@ func NewModifySubnetRequest( * param description: 子网描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ func NewModifySubnetRequestWithAllParams( - regionId string, - subnetId string, - subnetName *string, - description *string, + regionId string, + subnetId string, + subnetName *string, + description *string, ) *ModifySubnetRequest { - return &ModifySubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/{subnetId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - SubnetId: subnetId, - SubnetName: subnetName, - Description: description, - } + return &ModifySubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/{subnetId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + SubnetId: subnetId, + SubnetName: subnetName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifySubnetRequestWithoutParam() *ModifySubnetRequest { - return &ModifySubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/{subnetId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifySubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/{subnetId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifySubnetRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param subnetId: Subnet ID(Required) */ func (r *ModifySubnetRequest) SetSubnetId(subnetId string) { - r.SubnetId = subnetId + r.SubnetId = subnetId } /* param subnetName: 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Optional) */ func (r *ModifySubnetRequest) SetSubnetName(subnetName string) { - r.SubnetName = &subnetName + r.SubnetName = &subnetName } /* param description: 子网描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。(Optional) */ func (r *ModifySubnetRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifySubnetRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifySubnetResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifySubnetResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifySubnetResult `json:"result"` } type ModifySubnetResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpc.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpc.go index c66845701..ee817110a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpc.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpc.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyVpcRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* Vpc ID */ + VpcId string `json:"vpcId"` - /* Vpc ID */ - VpcId string `json:"vpcId"` + /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + VpcName *string `json:"vpcName"` - /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - VpcName *string `json:"vpcName"` - - /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description *string `json:"description"` + /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description *string `json:"description"` } /* @@ -44,19 +43,19 @@ type ModifyVpcRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyVpcRequest( - regionId string, - vpcId string, + regionId string, + vpcId string, ) *ModifyVpcRequest { return &ModifyVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcs/{vpcId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, + RegionId: regionId, + VpcId: vpcId, } } @@ -67,70 +66,70 @@ func NewModifyVpcRequest( * param description: vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ func NewModifyVpcRequestWithAllParams( - regionId string, - vpcId string, - vpcName *string, - description *string, + regionId string, + vpcId string, + vpcName *string, + description *string, ) *ModifyVpcRequest { - return &ModifyVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/{vpcId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - VpcName: vpcName, - Description: description, - } + return &ModifyVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/{vpcId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + VpcName: vpcName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyVpcRequestWithoutParam() *ModifyVpcRequest { - return &ModifyVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/{vpcId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifyVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/{vpcId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyVpcRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: Vpc ID(Required) */ func (r *ModifyVpcRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } /* param vpcName: 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Optional) */ func (r *ModifyVpcRequest) SetVpcName(vpcName string) { - r.VpcName = &vpcName + r.VpcName = &vpcName } /* param description: vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。(Optional) */ func (r *ModifyVpcRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyVpcRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyVpcResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyVpcResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyVpcResult `json:"result"` } type ModifyVpcResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpcPeering.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpcPeering.go index 804b6c5b8..965e946c1 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpcPeering.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpcPeering.go @@ -17,24 +17,23 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyVpcPeeringRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* vpcPeeringId ID */ + VpcPeeringId string `json:"vpcPeeringId"` - /* vpcPeeringId ID */ - VpcPeeringId string `json:"vpcPeeringId"` + /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + VpcPeeringName *string `json:"vpcPeeringName"` - /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - VpcPeeringName *string `json:"vpcPeeringName"` - - /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - Description *string `json:"description"` + /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + Description *string `json:"description"` } /* @@ -44,19 +43,19 @@ type ModifyVpcPeeringRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyVpcPeeringRequest( - regionId string, - vpcPeeringId string, + regionId string, + vpcPeeringId string, ) *ModifyVpcPeeringRequest { return &ModifyVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", Method: "PUT", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcPeeringId: vpcPeeringId, + RegionId: regionId, + VpcPeeringId: vpcPeeringId, } } @@ -67,70 +66,70 @@ func NewModifyVpcPeeringRequest( * param description: VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ func NewModifyVpcPeeringRequestWithAllParams( - regionId string, - vpcPeeringId string, - vpcPeeringName *string, - description *string, + regionId string, + vpcPeeringId string, + vpcPeeringName *string, + description *string, ) *ModifyVpcPeeringRequest { - return &ModifyVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", - Method: "PUT", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcPeeringId: vpcPeeringId, - VpcPeeringName: vpcPeeringName, - Description: description, - } + return &ModifyVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", + Method: "PUT", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcPeeringId: vpcPeeringId, + VpcPeeringName: vpcPeeringName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyVpcPeeringRequestWithoutParam() *ModifyVpcPeeringRequest { - return &ModifyVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", - Method: "PUT", - Header: nil, - Version: "v1", - }, - } + return &ModifyVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", + Method: "PUT", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyVpcPeeringRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcPeeringId: vpcPeeringId ID(Required) */ func (r *ModifyVpcPeeringRequest) SetVpcPeeringId(vpcPeeringId string) { - r.VpcPeeringId = vpcPeeringId + r.VpcPeeringId = vpcPeeringId } /* param vpcPeeringName: VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符(Optional) */ func (r *ModifyVpcPeeringRequest) SetVpcPeeringName(vpcPeeringName string) { - r.VpcPeeringName = &vpcPeeringName + r.VpcPeeringName = &vpcPeeringName } /* param description: VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符(Optional) */ func (r *ModifyVpcPeeringRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyVpcPeeringRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyVpcPeeringResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyVpcPeeringResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyVpcPeeringResult `json:"result"` } type ModifyVpcPeeringResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkAclRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkAclRules.go index 3bea0a0b7..538642733 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkAclRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkAclRules.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type RemoveNetworkAclRulesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` - - /* networkAcl规则ID列表 */ - RuleIds []string `json:"ruleIds"` + /* networkAcl规则ID列表 */ + RuleIds []string `json:"ruleIds"` } /* @@ -42,21 +41,21 @@ type RemoveNetworkAclRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewRemoveNetworkAclRulesRequest( - regionId string, - networkAclId string, - ruleIds []string, + regionId string, + networkAclId string, + ruleIds []string, ) *RemoveNetworkAclRulesRequest { return &RemoveNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}:removeNetworkAclRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, - RuleIds: ruleIds, + RegionId: regionId, + NetworkAclId: networkAclId, + RuleIds: ruleIds, } } @@ -66,63 +65,63 @@ func NewRemoveNetworkAclRulesRequest( * param ruleIds: networkAcl规则ID列表 (Required) */ func NewRemoveNetworkAclRulesRequestWithAllParams( - regionId string, - networkAclId string, - ruleIds []string, + regionId string, + networkAclId string, + ruleIds []string, ) *RemoveNetworkAclRulesRequest { - return &RemoveNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:removeNetworkAclRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - RuleIds: ruleIds, - } + return &RemoveNetworkAclRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:removeNetworkAclRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + RuleIds: ruleIds, + } } /* This constructor has better compatible ability when API parameters changed */ func NewRemoveNetworkAclRulesRequestWithoutParam() *RemoveNetworkAclRulesRequest { - return &RemoveNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:removeNetworkAclRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &RemoveNetworkAclRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:removeNetworkAclRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *RemoveNetworkAclRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *RemoveNetworkAclRulesRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } /* param ruleIds: networkAcl规则ID列表(Required) */ func (r *RemoveNetworkAclRulesRequest) SetRuleIds(ruleIds []string) { - r.RuleIds = ruleIds + r.RuleIds = ruleIds } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r RemoveNetworkAclRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type RemoveNetworkAclRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result RemoveNetworkAclRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result RemoveNetworkAclRulesResult `json:"result"` } type RemoveNetworkAclRulesResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkSecurityGroupRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkSecurityGroupRules.go index abb2c3977..4a1f0eaf3 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkSecurityGroupRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkSecurityGroupRules.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type RemoveNetworkSecurityGroupRulesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* NetworkSecurityGroup ID */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` - /* NetworkSecurityGroup ID */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` - - /* 安全组规则Id列表 */ - RuleIds []string `json:"ruleIds"` + /* 安全组规则Id列表 */ + RuleIds []string `json:"ruleIds"` } /* @@ -42,21 +41,21 @@ type RemoveNetworkSecurityGroupRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewRemoveNetworkSecurityGroupRulesRequest( - regionId string, - networkSecurityGroupId string, - ruleIds []string, + regionId string, + networkSecurityGroupId string, + ruleIds []string, ) *RemoveNetworkSecurityGroupRulesRequest { return &RemoveNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:removeNetworkSecurityGroupRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - RuleIds: ruleIds, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + RuleIds: ruleIds, } } @@ -66,63 +65,63 @@ func NewRemoveNetworkSecurityGroupRulesRequest( * param ruleIds: 安全组规则Id列表 (Required) */ func NewRemoveNetworkSecurityGroupRulesRequestWithAllParams( - regionId string, - networkSecurityGroupId string, - ruleIds []string, + regionId string, + networkSecurityGroupId string, + ruleIds []string, ) *RemoveNetworkSecurityGroupRulesRequest { - return &RemoveNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:removeNetworkSecurityGroupRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - RuleIds: ruleIds, - } + return &RemoveNetworkSecurityGroupRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:removeNetworkSecurityGroupRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + RuleIds: ruleIds, + } } /* This constructor has better compatible ability when API parameters changed */ func NewRemoveNetworkSecurityGroupRulesRequestWithoutParam() *RemoveNetworkSecurityGroupRulesRequest { - return &RemoveNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:removeNetworkSecurityGroupRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &RemoveNetworkSecurityGroupRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:removeNetworkSecurityGroupRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *RemoveNetworkSecurityGroupRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkSecurityGroupId: NetworkSecurityGroup ID(Required) */ func (r *RemoveNetworkSecurityGroupRulesRequest) SetNetworkSecurityGroupId(networkSecurityGroupId string) { - r.NetworkSecurityGroupId = networkSecurityGroupId + r.NetworkSecurityGroupId = networkSecurityGroupId } /* param ruleIds: 安全组规则Id列表(Required) */ func (r *RemoveNetworkSecurityGroupRulesRequest) SetRuleIds(ruleIds []string) { - r.RuleIds = ruleIds + r.RuleIds = ruleIds } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r RemoveNetworkSecurityGroupRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type RemoveNetworkSecurityGroupRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result RemoveNetworkSecurityGroupRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result RemoveNetworkSecurityGroupRulesResult `json:"result"` } type RemoveNetworkSecurityGroupRulesResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveRouteTableRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveRouteTableRules.go index a307b98db..3a0425b77 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveRouteTableRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveRouteTableRules.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type RemoveRouteTableRulesRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` - - /* 路由表规则Id列表 */ - RuleIds []string `json:"ruleIds"` + /* 路由表规则Id列表 */ + RuleIds []string `json:"ruleIds"` } /* @@ -42,21 +41,21 @@ type RemoveRouteTableRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewRemoveRouteTableRulesRequest( - regionId string, - routeTableId string, - ruleIds []string, + regionId string, + routeTableId string, + ruleIds []string, ) *RemoveRouteTableRulesRequest { return &RemoveRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}:removeRouteTableRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, - RuleIds: ruleIds, + RegionId: regionId, + RouteTableId: routeTableId, + RuleIds: ruleIds, } } @@ -66,63 +65,63 @@ func NewRemoveRouteTableRulesRequest( * param ruleIds: 路由表规则Id列表 (Required) */ func NewRemoveRouteTableRulesRequestWithAllParams( - regionId string, - routeTableId string, - ruleIds []string, + regionId string, + routeTableId string, + ruleIds []string, ) *RemoveRouteTableRulesRequest { - return &RemoveRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:removeRouteTableRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - RuleIds: ruleIds, - } + return &RemoveRouteTableRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:removeRouteTableRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + RuleIds: ruleIds, + } } /* This constructor has better compatible ability when API parameters changed */ func NewRemoveRouteTableRulesRequestWithoutParam() *RemoveRouteTableRulesRequest { - return &RemoveRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:removeRouteTableRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &RemoveRouteTableRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:removeRouteTableRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *RemoveRouteTableRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *RemoveRouteTableRulesRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } /* param ruleIds: 路由表规则Id列表(Required) */ func (r *RemoveRouteTableRulesRequest) SetRuleIds(ruleIds []string) { - r.RuleIds = ruleIds + r.RuleIds = ruleIds } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r RemoveRouteTableRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type RemoveRouteTableRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result RemoveRouteTableRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result RemoveRouteTableRulesResult `json:"result"` } type RemoveRouteTableRulesResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/UnassignSecondaryIps.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/UnassignSecondaryIps.go index 5d3e7260f..f8fec38b2 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/UnassignSecondaryIps.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/UnassignSecondaryIps.go @@ -17,21 +17,20 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type UnassignSecondaryIpsRequest struct { + core.JDCloudRequest - core.JDCloudRequest + /* Region ID */ + RegionId string `json:"regionId"` - /* Region ID */ - RegionId string `json:"regionId"` + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` - - /* 指定删除的secondaryIp地址 (Optional) */ - SecondaryIps []string `json:"secondaryIps"` + /* 指定删除的secondaryIp地址 (Optional) */ + SecondaryIps []string `json:"secondaryIps"` } /* @@ -41,19 +40,19 @@ type UnassignSecondaryIpsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewUnassignSecondaryIpsRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *UnassignSecondaryIpsRequest { return &UnassignSecondaryIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:unassignSecondaryIps", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -63,63 +62,63 @@ func NewUnassignSecondaryIpsRequest( * param secondaryIps: 指定删除的secondaryIp地址 (Optional) */ func NewUnassignSecondaryIpsRequestWithAllParams( - regionId string, - networkInterfaceId string, - secondaryIps []string, + regionId string, + networkInterfaceId string, + secondaryIps []string, ) *UnassignSecondaryIpsRequest { - return &UnassignSecondaryIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:unassignSecondaryIps", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - SecondaryIps: secondaryIps, - } + return &UnassignSecondaryIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:unassignSecondaryIps", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + SecondaryIps: secondaryIps, + } } /* This constructor has better compatible ability when API parameters changed */ func NewUnassignSecondaryIpsRequestWithoutParam() *UnassignSecondaryIpsRequest { - return &UnassignSecondaryIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:unassignSecondaryIps", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &UnassignSecondaryIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:unassignSecondaryIps", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *UnassignSecondaryIpsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *UnassignSecondaryIpsRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } /* param secondaryIps: 指定删除的secondaryIp地址(Optional) */ func (r *UnassignSecondaryIpsRequest) SetSecondaryIps(secondaryIps []string) { - r.SecondaryIps = secondaryIps + r.SecondaryIps = secondaryIps } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r UnassignSecondaryIpsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type UnassignSecondaryIpsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result UnassignSecondaryIpsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result UnassignSecondaryIpsResult `json:"result"` } type UnassignSecondaryIpsResult struct { -} \ No newline at end of file +} diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client/VpcClient.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client/VpcClient.go index a81ad2155..9d21939b6 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client/VpcClient.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client/VpcClient.go @@ -17,1199 +17,1198 @@ package client import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis" - "encoding/json" - "errors" + "encoding/json" + "errors" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis" ) type VpcClient struct { - core.JDCloudClient + core.JDCloudClient } func NewVpcClient(credential *core.Credential) *VpcClient { - if credential == nil { - return nil - } + if credential == nil { + return nil + } - config := core.NewConfig() - config.SetEndpoint("vpc.jdcloud-api.com") + config := core.NewConfig() + config.SetEndpoint("vpc.jdcloud-api.com") - return &VpcClient{ - core.JDCloudClient{ - Credential: *credential, - Config: *config, - ServiceName: "vpc", - Revision: "0.5.1", - Logger: core.NewDefaultLogger(core.LogInfo), - }} + return &VpcClient{ + core.JDCloudClient{ + Credential: *credential, + Config: *config, + ServiceName: "vpc", + Revision: "0.5.1", + Logger: core.NewDefaultLogger(core.LogInfo), + }} } func (c *VpcClient) SetConfig(config *core.Config) { - c.Config = *config + c.Config = *config } func (c *VpcClient) SetLogger(logger core.Logger) { - c.Logger = logger + c.Logger = logger } /* 删除弹性Ip */ func (c *VpcClient) DeleteElasticIp(request *vpc.DeleteElasticIpRequest) (*vpc.DeleteElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改VpcPeering接口 */ func (c *VpcClient) ModifyVpcPeering(request *vpc.ModifyVpcPeeringRequest) (*vpc.ModifyVpcPeeringResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyVpcPeeringResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyVpcPeeringResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改弹性IP */ func (c *VpcClient) ModifyElasticIp(request *vpc.ModifyElasticIpRequest) (*vpc.ModifyElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改networkAcl接口 */ func (c *VpcClient) ModifyNetworkAclRules(request *vpc.ModifyNetworkAclRulesRequest) (*vpc.ModifyNetworkAclRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyNetworkAclRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyNetworkAclRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除networkAcl接口 */ func (c *VpcClient) DeleteNetworkAcl(request *vpc.DeleteNetworkAclRequest) (*vpc.DeleteNetworkAclResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteNetworkAclResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteNetworkAclResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除子网 */ func (c *VpcClient) DeleteSubnet(request *vpc.DeleteSubnetRequest) (*vpc.DeleteSubnetResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteSubnetResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteSubnetResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询子网列表 */ func (c *VpcClient) DescribeSubnets(request *vpc.DescribeSubnetsRequest) (*vpc.DescribeSubnetsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeSubnetsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeSubnetsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询弹性网卡列表 */ func (c *VpcClient) DescribeNetworkInterfaces(request *vpc.DescribeNetworkInterfacesRequest) (*vpc.DescribeNetworkInterfacesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeNetworkInterfacesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeNetworkInterfacesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 移除安全组规则 */ func (c *VpcClient) RemoveNetworkSecurityGroupRules(request *vpc.RemoveNetworkSecurityGroupRulesRequest) (*vpc.RemoveNetworkSecurityGroupRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.RemoveNetworkSecurityGroupRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.RemoveNetworkSecurityGroupRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改安全组属性 */ func (c *VpcClient) ModifyNetworkSecurityGroup(request *vpc.ModifyNetworkSecurityGroupRequest) (*vpc.ModifyNetworkSecurityGroupResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyNetworkSecurityGroupResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyNetworkSecurityGroupResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 添加安全组规则 */ func (c *VpcClient) AddNetworkSecurityGroupRules(request *vpc.AddNetworkSecurityGroupRulesRequest) (*vpc.AddNetworkSecurityGroupRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AddNetworkSecurityGroupRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AddNetworkSecurityGroupRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建networkAcl接口 */ func (c *VpcClient) CreateNetworkAcl(request *vpc.CreateNetworkAclRequest) (*vpc.CreateNetworkAclResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateNetworkAclResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateNetworkAclResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询配额信息 */ func (c *VpcClient) DescribeQuota(request *vpc.DescribeQuotaRequest) (*vpc.DescribeQuotaResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeQuotaResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeQuotaResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建路由表 */ func (c *VpcClient) CreateRouteTable(request *vpc.CreateRouteTableRequest) (*vpc.CreateRouteTableResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateRouteTableResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateRouteTableResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除安全组 */ func (c *VpcClient) DeleteNetworkSecurityGroup(request *vpc.DeleteNetworkSecurityGroupRequest) (*vpc.DeleteNetworkSecurityGroupResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteNetworkSecurityGroupResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteNetworkSecurityGroupResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询路由表信息详情 */ func (c *VpcClient) DescribeRouteTable(request *vpc.DescribeRouteTableRequest) (*vpc.DescribeRouteTableResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeRouteTableResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeRouteTableResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除私有网络 */ func (c *VpcClient) DeleteVpc(request *vpc.DeleteVpcRequest) (*vpc.DeleteVpcResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteVpcResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteVpcResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询VpcPeering资源列表 */ func (c *VpcClient) DescribeVpcPeerings(request *vpc.DescribeVpcPeeringsRequest) (*vpc.DescribeVpcPeeringsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeVpcPeeringsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeVpcPeeringsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询Acl列表 */ func (c *VpcClient) DescribeNetworkAcls(request *vpc.DescribeNetworkAclsRequest) (*vpc.DescribeNetworkAclsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeNetworkAclsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeNetworkAclsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询子网信息详情 */ func (c *VpcClient) DescribeSubnet(request *vpc.DescribeSubnetRequest) (*vpc.DescribeSubnetResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeSubnetResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeSubnetResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询安全组信息详情 */ func (c *VpcClient) DescribeNetworkSecurityGroup(request *vpc.DescribeNetworkSecurityGroupRequest) (*vpc.DescribeNetworkSecurityGroupResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeNetworkSecurityGroupResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeNetworkSecurityGroupResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询安全组列表 */ func (c *VpcClient) DescribeNetworkSecurityGroups(request *vpc.DescribeNetworkSecurityGroupsRequest) (*vpc.DescribeNetworkSecurityGroupsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeNetworkSecurityGroupsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeNetworkSecurityGroupsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询Vpc信息详情 */ func (c *VpcClient) DescribeVpc(request *vpc.DescribeVpcRequest) (*vpc.DescribeVpcResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeVpcResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeVpcResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给子网解绑NetworkAcl接口 */ func (c *VpcClient) DisassociateNetworkAcl(request *vpc.DisassociateNetworkAclRequest) (*vpc.DisassociateNetworkAclResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DisassociateNetworkAclResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DisassociateNetworkAclResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 移除networkAcl规则 */ func (c *VpcClient) RemoveNetworkAclRules(request *vpc.RemoveNetworkAclRulesRequest) (*vpc.RemoveNetworkAclRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.RemoveNetworkAclRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.RemoveNetworkAclRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 路由表绑定子网接口 */ func (c *VpcClient) AssociateRouteTable(request *vpc.AssociateRouteTableRequest) (*vpc.AssociateRouteTableResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AssociateRouteTableResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AssociateRouteTableResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询私有网络列表 */ func (c *VpcClient) DescribeVpcs(request *vpc.DescribeVpcsRequest) (*vpc.DescribeVpcsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeVpcsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeVpcsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建安全组 */ func (c *VpcClient) CreateNetworkSecurityGroup(request *vpc.CreateNetworkSecurityGroupRequest) (*vpc.CreateNetworkSecurityGroupResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateNetworkSecurityGroupResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateNetworkSecurityGroupResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建子网 */ func (c *VpcClient) CreateSubnet(request *vpc.CreateSubnetRequest) (*vpc.CreateSubnetResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateSubnetResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateSubnetResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除路由表 */ func (c *VpcClient) DeleteRouteTable(request *vpc.DeleteRouteTableRequest) (*vpc.DeleteRouteTableResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteRouteTableResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteRouteTableResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询VpcPeering资源详情 */ func (c *VpcClient) DescribeVpcPeering(request *vpc.DescribeVpcPeeringRequest) (*vpc.DescribeVpcPeeringResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeVpcPeeringResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeVpcPeeringResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 移除路由表规则 */ func (c *VpcClient) RemoveRouteTableRules(request *vpc.RemoveRouteTableRulesRequest) (*vpc.RemoveRouteTableRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.RemoveRouteTableRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.RemoveRouteTableRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建VpcPeering接口 */ func (c *VpcClient) CreateVpcPeering(request *vpc.CreateVpcPeeringRequest) (*vpc.CreateVpcPeeringResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateVpcPeeringResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateVpcPeeringResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给网卡分配secondaryIp接口 */ func (c *VpcClient) AssignSecondaryIps(request *vpc.AssignSecondaryIpsRequest) (*vpc.AssignSecondaryIpsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AssignSecondaryIpsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AssignSecondaryIpsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询路由表列表 */ func (c *VpcClient) DescribeRouteTables(request *vpc.DescribeRouteTablesRequest) (*vpc.DescribeRouteTablesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeRouteTablesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeRouteTablesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改弹性网卡接口 */ func (c *VpcClient) ModifyNetworkInterface(request *vpc.ModifyNetworkInterfaceRequest) (*vpc.ModifyNetworkInterfaceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyNetworkInterfaceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyNetworkInterfaceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询弹性ip列表 */ func (c *VpcClient) DescribeElasticIps(request *vpc.DescribeElasticIpsRequest) (*vpc.DescribeElasticIpsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeElasticIpsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeElasticIpsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改安全组规则 */ func (c *VpcClient) ModifyNetworkSecurityGroupRules(request *vpc.ModifyNetworkSecurityGroupRulesRequest) (*vpc.ModifyNetworkSecurityGroupRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyNetworkSecurityGroupRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyNetworkSecurityGroupRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改networkAcl接口 */ func (c *VpcClient) ModifyNetworkAcl(request *vpc.ModifyNetworkAclRequest) (*vpc.ModifyNetworkAclResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyNetworkAclResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyNetworkAclResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询弹性网卡信息详情 */ func (c *VpcClient) DescribeNetworkInterface(request *vpc.DescribeNetworkInterfaceRequest) (*vpc.DescribeNetworkInterfaceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeNetworkInterfaceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeNetworkInterfaceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给网卡解绑弹性Ip接口 */ func (c *VpcClient) DisassociateElasticIp(request *vpc.DisassociateElasticIpRequest) (*vpc.DisassociateElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DisassociateElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DisassociateElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除VpcPeering接口 */ func (c *VpcClient) DeleteVpcPeering(request *vpc.DeleteVpcPeeringRequest) (*vpc.DeleteVpcPeeringResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteVpcPeeringResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteVpcPeeringResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建网卡接口，只能创建辅助网卡 */ func (c *VpcClient) CreateNetworkInterface(request *vpc.CreateNetworkInterfaceRequest) (*vpc.CreateNetworkInterfaceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateNetworkInterfaceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateNetworkInterfaceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建私有网络 */ func (c *VpcClient) CreateVpc(request *vpc.CreateVpcRequest) (*vpc.CreateVpcResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateVpcResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateVpcResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改路由表规则 */ func (c *VpcClient) ModifyRouteTableRules(request *vpc.ModifyRouteTableRulesRequest) (*vpc.ModifyRouteTableRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyRouteTableRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyRouteTableRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 添加路由表规则 */ func (c *VpcClient) AddRouteTableRules(request *vpc.AddRouteTableRulesRequest) (*vpc.AddRouteTableRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AddRouteTableRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AddRouteTableRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* ElasticIp资源信息详情 */ func (c *VpcClient) DescribeElasticIp(request *vpc.DescribeElasticIpRequest) (*vpc.DescribeElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给网卡删除secondaryIp接口 */ func (c *VpcClient) UnassignSecondaryIps(request *vpc.UnassignSecondaryIpsRequest) (*vpc.UnassignSecondaryIpsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.UnassignSecondaryIpsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.UnassignSecondaryIpsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改路由表属性 */ func (c *VpcClient) ModifyRouteTable(request *vpc.ModifyRouteTableRequest) (*vpc.ModifyRouteTableResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyRouteTableResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyRouteTableResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给网卡绑定弹性Ip接口 */ func (c *VpcClient) AssociateElasticIp(request *vpc.AssociateElasticIpRequest) (*vpc.AssociateElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AssociateElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AssociateElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给路由表解绑子网接口 */ func (c *VpcClient) DisassociateRouteTable(request *vpc.DisassociateRouteTableRequest) (*vpc.DisassociateRouteTableResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DisassociateRouteTableResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DisassociateRouteTableResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改私有网络接口 */ func (c *VpcClient) ModifyVpc(request *vpc.ModifyVpcRequest) (*vpc.ModifyVpcResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyVpcResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyVpcResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给子网绑定networkAcl接口 */ func (c *VpcClient) AssociateNetworkAcl(request *vpc.AssociateNetworkAclRequest) (*vpc.AssociateNetworkAclResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AssociateNetworkAclResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AssociateNetworkAclResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改子网接口 */ func (c *VpcClient) ModifySubnet(request *vpc.ModifySubnetRequest) (*vpc.ModifySubnetResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifySubnetResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifySubnetResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建一个或者多个弹性Ip */ func (c *VpcClient) CreateElasticIps(request *vpc.CreateElasticIpsRequest) (*vpc.CreateElasticIpsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateElasticIpsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateElasticIpsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除弹性网卡接口 */ func (c *VpcClient) DeleteNetworkInterface(request *vpc.DeleteNetworkInterfaceRequest) (*vpc.DeleteNetworkInterfaceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteNetworkInterfaceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteNetworkInterfaceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询networkAcl资源详情 */ func (c *VpcClient) DescribeNetworkAcl(request *vpc.DescribeNetworkAclRequest) (*vpc.DescribeNetworkAclResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeNetworkAclResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeNetworkAclResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 添加networkAcl规则接口 */ func (c *VpcClient) AddNetworkAclRules(request *vpc.AddNetworkAclRulesRequest) (*vpc.AddNetworkAclRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AddNetworkAclRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AddNetworkAclRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } - diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRuleSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRuleSpec.go index 8a4a6f079..673f47b4e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRuleSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRuleSpec.go @@ -16,30 +16,29 @@ package models - type AddNetworkAclRuleSpec struct { - /* 规则限定协议。取值范围：All,TCP,UDP,ICMP */ - Protocol string `json:"protocol"` + /* 规则限定协议。取值范围：All,TCP,UDP,ICMP */ + Protocol string `json:"protocol"` - /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - FromPort *int `json:"fromPort"` + /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + FromPort *int `json:"fromPort"` - /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - ToPort *int `json:"toPort"` + /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + ToPort *int `json:"toPort"` - /* networkAcl规则方向。ingress：入规则; egress：出规则 */ - Direction string `json:"direction"` + /* networkAcl规则方向。ingress：入规则; egress：出规则 */ + Direction string `json:"direction"` - /* 匹配地址前缀 */ - AddressPrefix string `json:"addressPrefix"` + /* 匹配地址前缀 */ + AddressPrefix string `json:"addressPrefix"` - /* 访问控制策略：allow:允许，deny：拒绝 */ - RuleAction string `json:"ruleAction"` + /* 访问控制策略：allow:允许，deny：拒绝 */ + RuleAction string `json:"ruleAction"` - /* 规则匹配优先级，取值范围为[1,32768]，优先级数字越小优先级越高 */ - Priority int `json:"priority"` + /* 规则匹配优先级，取值范围为[1,32768]，优先级数字越小优先级越高 */ + Priority int `json:"priority"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRulesSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRulesSpec.go index 1ab41cf86..c06ce58fb 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRulesSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRulesSpec.go @@ -16,9 +16,8 @@ package models - type AddNetworkAclRulesSpec struct { - /* networkAcl规则列表 */ - NetworkAclRuleSpecs []AddNetworkAclRuleSpec `json:"networkAclRuleSpecs"` + /* networkAcl规则列表 */ + NetworkAclRuleSpecs []AddNetworkAclRuleSpec `json:"networkAclRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkSecurityGroupRulesSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkSecurityGroupRulesSpec.go index 1c4473104..38ca435f6 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkSecurityGroupRulesSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkSecurityGroupRulesSpec.go @@ -16,9 +16,8 @@ package models - type AddNetworkSecurityGroupRulesSpec struct { - /* 安全组规则信息 */ - NetworkSecurityGroupRuleSpecs []AddSecurityGroupRules `json:"networkSecurityGroupRuleSpecs"` + /* 安全组规则信息 */ + NetworkSecurityGroupRuleSpecs []AddSecurityGroupRules `json:"networkSecurityGroupRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRules.go index d6c3fac30..985399bd0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRules.go @@ -16,18 +16,17 @@ package models - type AddRouteTableRules struct { - /* 下一跳类型, 取值范围:instance:云主机, internet:公网, vpc_peering:vpc对等连接, bgw:边界网关 */ - NextHopType string `json:"nextHopType"` + /* 下一跳类型, 取值范围:instance:云主机, internet:公网, vpc_peering:vpc对等连接, bgw:边界网关 */ + NextHopType string `json:"nextHopType"` - /* 下一跳id */ - NextHopId string `json:"nextHopId"` + /* 下一跳id */ + NextHopId string `json:"nextHopId"` - /* 匹配地址前缀, internet类型路由跟其他类型的路由，addressPrefix不允许重复 */ - AddressPrefix string `json:"addressPrefix"` + /* 匹配地址前缀, internet类型路由跟其他类型的路由，addressPrefix不允许重复 */ + AddressPrefix string `json:"addressPrefix"` - /* 规则匹配优先级，取值范围[1,255]，默认为100。当路由规则子网掩码不同时，路由最长匹配优先；当路由规则子网掩码相同时, 按照优先级匹配转发, 优先级数字越小优先级越高，路由规则子网掩码相同、优先级相同、下一跳不同时，形成等价路由，不同下一跳负载均担。 (Optional) */ - Priority *int `json:"priority"` + /* 规则匹配优先级，取值范围[1,255]，默认为100。当路由规则子网掩码不同时，路由最长匹配优先；当路由规则子网掩码相同时, 按照优先级匹配转发, 优先级数字越小优先级越高，路由规则子网掩码相同、优先级相同、下一跳不同时，形成等价路由，不同下一跳负载均担。 (Optional) */ + Priority *int `json:"priority"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRulesSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRulesSpec.go index 599703cd7..9618ecdaa 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRulesSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRulesSpec.go @@ -16,9 +16,8 @@ package models - type AddRouteTableRulesSpec struct { - /* 安全组规则信息 */ - RouteTableRuleSpecs []AddRouteTableRules `json:"routeTableRuleSpecs"` + /* 安全组规则信息 */ + RouteTableRuleSpecs []AddRouteTableRules `json:"routeTableRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddSecurityGroupRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddSecurityGroupRules.go index f9b279022..6a2affa09 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddSecurityGroupRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddSecurityGroupRules.go @@ -16,24 +16,23 @@ package models - type AddSecurityGroupRules struct { - /* 规则限定协议。300:All; 6:TCP; 17:UDP; 1:ICMP */ - Protocol int `json:"protocol"` + /* 规则限定协议。300:All; 6:TCP; 17:UDP; 1:ICMP */ + Protocol int `json:"protocol"` - /* 安全组规则方向。0：入规则; 1：出规则 */ - Direction int `json:"direction"` + /* 安全组规则方向。0：入规则; 1：出规则 */ + Direction int `json:"direction"` - /* 匹配地址前缀 */ - AddressPrefix string `json:"addressPrefix"` + /* 匹配地址前缀 */ + AddressPrefix string `json:"addressPrefix"` - /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - FromPort *int `json:"fromPort"` + /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + FromPort *int `json:"fromPort"` - /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - ToPort *int `json:"toPort"` + /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + ToPort *int `json:"toPort"` - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssignSecondaryIpsSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssignSecondaryIpsSpec.go index fb151872b..34edf0d88 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssignSecondaryIpsSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssignSecondaryIpsSpec.go @@ -16,15 +16,14 @@ package models - type AssignSecondaryIpsSpec struct { - /* secondary ip被其他接口占用时，是否抢占。false：非抢占重分配，true：抢占重分配，默认抢占重分配。默认值：true (Optional) */ - Force bool `json:"force"` + /* secondary ip被其他接口占用时，是否抢占。false：非抢占重分配，true：抢占重分配，默认抢占重分配。默认值：true (Optional) */ + Force bool `json:"force"` - /* 指定分配的secondaryIp地址 (Optional) */ - SecondaryIps []string `json:"secondaryIps"` + /* 指定分配的secondaryIp地址 (Optional) */ + SecondaryIps []string `json:"secondaryIps"` - /* 指定自动分配的secondaryIp个数 (Optional) */ - SecondaryIpCount int `json:"secondaryIpCount"` + /* 指定自动分配的secondaryIp个数 (Optional) */ + SecondaryIpCount int `json:"secondaryIpCount"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateElasticIpSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateElasticIpSpec.go index fea484c08..c5261f225 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateElasticIpSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateElasticIpSpec.go @@ -16,15 +16,14 @@ package models - type AssociateElasticIpSpec struct { - /* 绑定的弹性Ip Id (Optional) */ - ElasticIpId string `json:"elasticIpId"` + /* 绑定的弹性Ip Id (Optional) */ + ElasticIpId string `json:"elasticIpId"` - /* 绑定弹性Ip到指定的privateIp (Optional) */ - PrivateIpAddress string `json:"privateIpAddress"` + /* 绑定弹性Ip到指定的privateIp (Optional) */ + PrivateIpAddress string `json:"privateIpAddress"` - /* 绑定的弹性Ip地址 (Optional) */ - ElasticIpAddress string `json:"elasticIpAddress"` + /* 绑定的弹性Ip地址 (Optional) */ + ElasticIpAddress string `json:"elasticIpAddress"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateRouteTableSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateRouteTableSpec.go index 77cbe3c90..7063e1bf6 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateRouteTableSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateRouteTableSpec.go @@ -16,9 +16,8 @@ package models - type AssociateRouteTableSpec struct { - /* 路由表要绑定的子网ID列表, subnet已被其他路由表绑定时，自动解绑。 */ - SubnetIds []string `json:"subnetIds"` + /* 路由表要绑定的子网ID列表, subnet已被其他路由表绑定时，自动解绑。 */ + SubnetIds []string `json:"subnetIds"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateElasticIpSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateElasticIpSpec.go index 681f0f2e7..43acc99bb 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateElasticIpSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateElasticIpSpec.go @@ -16,15 +16,14 @@ package models - type CreateElasticIpSpec struct { - /* 购买弹性ip数量；取值范围：[1,100] */ - MaxCount int `json:"maxCount"` + /* 购买弹性ip数量；取值范围：[1,100] */ + MaxCount int `json:"maxCount"` - /* 指定弹性ip地址进行创建，当申请创建多个弹性ip时，必须为空 (Optional) */ - ElasticIpAddress string `json:"elasticIpAddress"` + /* 指定弹性ip地址进行创建，当申请创建多个弹性ip时，必须为空 (Optional) */ + ElasticIpAddress string `json:"elasticIpAddress"` - /* 弹性ip规格 */ - ElasticIpSpec ElasticIpSpec `json:"elasticIpSpec"` + /* 弹性ip规格 */ + ElasticIpSpec ElasticIpSpec `json:"elasticIpSpec"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateVpcPeeringSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateVpcPeeringSpec.go index 5733faa74..e3d85603d 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateVpcPeeringSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateVpcPeeringSpec.go @@ -16,18 +16,17 @@ package models - type CreateVpcPeeringSpec struct { - /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 */ - VpcPeeringName string `json:"vpcPeeringName"` + /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 */ + VpcPeeringName string `json:"vpcPeeringName"` - /* VpcPeering本端Vpc的Id */ - VpcId string `json:"vpcId"` + /* VpcPeering本端Vpc的Id */ + VpcId string `json:"vpcId"` - /* VpcPeering对端Vpc的Id */ - RemoteVpcId string `json:"remoteVpcId"` + /* VpcPeering对端Vpc的Id */ + RemoteVpcId string `json:"remoteVpcId"` - /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - Description string `json:"description"` + /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateElasticIpSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateElasticIpSpec.go index c9512a325..d49fb0006 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateElasticIpSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateElasticIpSpec.go @@ -16,12 +16,11 @@ package models - type DisassociateElasticIpSpec struct { - /* 指定解绑的弹性Ip Id (Optional) */ - ElasticIpId string `json:"elasticIpId"` + /* 指定解绑的弹性Ip Id (Optional) */ + ElasticIpId string `json:"elasticIpId"` - /* 指定解绑的弹性Ip地址 (Optional) */ - ElasticIpAddress string `json:"elasticIpAddress"` + /* 指定解绑的弹性Ip地址 (Optional) */ + ElasticIpAddress string `json:"elasticIpAddress"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateRouteTableSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateRouteTableSpec.go index 86aad64ef..7f1310bb0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateRouteTableSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateRouteTableSpec.go @@ -16,9 +16,8 @@ package models - type DisassociateRouteTableSpec struct { - /* 路由表要解绑的子网ID，解绑后子网绑定默认路由表 */ - SubnetId string `json:"subnetId"` + /* 路由表要解绑的子网ID，解绑后子网绑定默认路由表 */ + SubnetId string `json:"subnetId"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIp.go index 11822a39d..364daa165 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIp.go @@ -20,36 +20,36 @@ import charge "github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models" type ElasticIp struct { - /* 弹性IP的Id (Optional) */ - ElasticIpId string `json:"elasticIpId"` + /* 弹性IP的Id (Optional) */ + ElasticIpId string `json:"elasticIpId"` - /* 弹性IP地址 (Optional) */ - ElasticIpAddress string `json:"elasticIpAddress"` + /* 弹性IP地址 (Optional) */ + ElasticIpAddress string `json:"elasticIpAddress"` - /* 弹性ip的限速（单位：Mbps) (Optional) */ - BandwidthMbps int `json:"bandwidthMbps"` + /* 弹性ip的限速（单位：Mbps) (Optional) */ + BandwidthMbps int `json:"bandwidthMbps"` - /* IP服务商，取值为bgp或no_bgp (Optional) */ - Provider string `json:"provider"` + /* IP服务商，取值为bgp或no_bgp (Optional) */ + Provider string `json:"provider"` - /* 私有IP的IPV4地址 (Optional) */ - PrivateIpAddress string `json:"privateIpAddress"` + /* 私有IP的IPV4地址 (Optional) */ + PrivateIpAddress string `json:"privateIpAddress"` - /* 配置弹性网卡Id (Optional) */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* 配置弹性网卡Id (Optional) */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* 实例Id (Optional) */ - InstanceId string `json:"instanceId"` + /* 实例Id (Optional) */ + InstanceId string `json:"instanceId"` - /* 实例类型 (Optional) */ - InstanceType string `json:"instanceType"` + /* 实例类型 (Optional) */ + InstanceType string `json:"instanceType"` - /* 计费配置 (Optional) */ - Charge charge.Charge `json:"charge"` + /* 计费配置 (Optional) */ + Charge charge.Charge `json:"charge"` - /* 弹性ip创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 弹性ip创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` - /* 弹性ip可用区属性，如果为空，表示全可用区 (Optional) */ - Az string `json:"az"` + /* 弹性ip可用区属性，如果为空，表示全可用区 (Optional) */ + Az string `json:"az"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIpSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIpSpec.go index bc641a734..21de49bfb 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIpSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIpSpec.go @@ -20,12 +20,12 @@ import charge "github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models" type ElasticIpSpec struct { - /* 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] */ - BandwidthMbps int `json:"bandwidthMbps"` + /* 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] */ + BandwidthMbps int `json:"bandwidthMbps"` - /* IP服务商，取值为bgp或no_bgp，cn-north-1：bgp；cn-south-1：[bgp，no_bgp]；cn-east-1：[bgp，no_bgp]；cn-east-2：bgp */ - Provider string `json:"provider"` + /* IP服务商，取值为bgp或no_bgp，cn-north-1：bgp；cn-south-1：[bgp，no_bgp]；cn-east-1：[bgp，no_bgp]；cn-east-2：bgp */ + Provider string `json:"provider"` - /* 计费配置 (Optional) */ - ChargeSpec *charge.ChargeSpec `json:"chargeSpec"` + /* 计费配置 (Optional) */ + ChargeSpec *charge.ChargeSpec `json:"chargeSpec"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyElasticIpSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyElasticIpSpec.go index d4c8823f7..551e2255f 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyElasticIpSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyElasticIpSpec.go @@ -16,9 +16,8 @@ package models - type ModifyElasticIpSpec struct { - /* 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] */ - BandwidthMbps int `json:"bandwidthMbps"` + /* 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] */ + BandwidthMbps int `json:"bandwidthMbps"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpec.go index 7e8a9aa32..37521223c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpec.go @@ -16,30 +16,29 @@ package models - type ModifyNetworkAclRuleSpec struct { - /* networkAcl规则ID */ - RuleId string `json:"ruleId"` + /* networkAcl规则ID */ + RuleId string `json:"ruleId"` - /* 规则限定协议。取值范围：All,TCP,UDP,ICMP (Optional) */ - Protocol *string `json:"protocol"` + /* 规则限定协议。取值范围：All,TCP,UDP,ICMP (Optional) */ + Protocol *string `json:"protocol"` - /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - FromPort *int `json:"fromPort"` + /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + FromPort *int `json:"fromPort"` - /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - ToPort *int `json:"toPort"` + /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + ToPort *int `json:"toPort"` - /* 匹配地址前缀 (Optional) */ - AddressPrefix *string `json:"addressPrefix"` + /* 匹配地址前缀 (Optional) */ + AddressPrefix *string `json:"addressPrefix"` - /* 访问控制策略：allow:允许，deny：拒绝 (Optional) */ - RuleAction *string `json:"ruleAction"` + /* 访问控制策略：allow:允许，deny：拒绝 (Optional) */ + RuleAction *string `json:"ruleAction"` - /* 规则匹配优先级，取值范围为[1,32768]，优先级数字越小优先级越高 (Optional) */ - Priority *int `json:"priority"` + /* 规则匹配优先级，取值范围为[1,32768]，优先级数字越小优先级越高 (Optional) */ + Priority *int `json:"priority"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpecs.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpecs.go index 9864bdb22..3ec056e19 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpecs.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpecs.go @@ -16,9 +16,8 @@ package models - type ModifyNetworkAclRuleSpecs struct { - /* networkAcl规则列表 */ - ModifyNetworkAclRuleSpecs []ModifyNetworkAclRuleSpec `json:"modifyNetworkAclRuleSpecs"` + /* networkAcl规则列表 */ + ModifyNetworkAclRuleSpecs []ModifyNetworkAclRuleSpec `json:"modifyNetworkAclRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRulesSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRulesSpec.go index 13df02392..221d6626c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRulesSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRulesSpec.go @@ -16,9 +16,8 @@ package models - type ModifyNetworkAclRulesSpec struct { - /* networkAcl规则列表 */ - ModifyNetworkAclRuleSpecs []ModifyNetworkAclRuleSpec `json:"modifyNetworkAclRuleSpecs"` + /* networkAcl规则列表 */ + ModifyNetworkAclRuleSpecs []ModifyNetworkAclRuleSpec `json:"modifyNetworkAclRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclSpec.go index 4c2170648..501c35d3f 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclSpec.go @@ -16,12 +16,11 @@ package models - type ModifyNetworkAclSpec struct { - /* networkAcl名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ - NetworkAclName string `json:"networkAclName"` + /* networkAcl名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ + NetworkAclName string `json:"networkAclName"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkInterfaceSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkInterfaceSpec.go index 292bfe914..8a9b4868f 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkInterfaceSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkInterfaceSpec.go @@ -16,15 +16,14 @@ package models - type ModifyNetworkInterfaceSpec struct { - /* 弹性网卡名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ - NetworkInterfaceName string `json:"networkInterfaceName"` + /* 弹性网卡名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ + NetworkInterfaceName string `json:"networkInterfaceName"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` - /* 以覆盖原有安全组的方式更新的安全组。如果更新安全组ID列表，最多5个安全组 (Optional) */ - SecurityGroups []string `json:"securityGroups"` + /* 以覆盖原有安全组的方式更新的安全组。如果更新安全组ID列表，最多5个安全组 (Optional) */ + SecurityGroups []string `json:"securityGroups"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkSecurityGroupSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkSecurityGroupSpec.go index 335009736..1537edc11 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkSecurityGroupSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkSecurityGroupSpec.go @@ -16,12 +16,11 @@ package models - type ModifyNetworkSecurityGroupSpec struct { - /* 安全组的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - NetworkSecurityGroupName string `json:"networkSecurityGroupName"` + /* 安全组的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + NetworkSecurityGroupName string `json:"networkSecurityGroupName"` - /* 安全组的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ - Description string `json:"description"` + /* 安全组的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyQuotaSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyQuotaSpec.go index ec25778c1..5592a222a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyQuotaSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyQuotaSpec.go @@ -16,15 +16,14 @@ package models - type ModifyQuotaSpec struct { - /* 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡） */ - Type string `json:"type"` + /* 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡） */ + Type string `json:"type"` - /* type为vpc、elastic_ip、network_interface不设置, type为subnet、security_group、vpcpeering设置为vpcId (Optional) */ - ParentResourceId string `json:"parentResourceId"` + /* type为vpc、elastic_ip、network_interface不设置, type为subnet、security_group、vpcpeering设置为vpcId (Optional) */ + ParentResourceId string `json:"parentResourceId"` - /* 配额大小 */ - MaxLimit int `json:"maxLimit"` + /* 配额大小 */ + MaxLimit int `json:"maxLimit"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRules.go index 8b79e5a38..c65695b5a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRules.go @@ -16,21 +16,20 @@ package models - type ModifyRouteTableRules struct { - /* 路由表规则的ID */ - RuleId string `json:"ruleId"` + /* 路由表规则的ID */ + RuleId string `json:"ruleId"` - /* 规则匹配优先级，取值范围[1,255]。当路由规则子网掩码不同时，路由最长匹配优先；当路由规则子网掩码相同时, 按照优先级匹配转发, 优先级数字越小优先级越高，路由规则子网掩码相同、优先级相同、下一跳不同时，形成等价路由，不同下一跳负载均担。 (Optional) */ - Priority *int `json:"priority"` + /* 规则匹配优先级，取值范围[1,255]。当路由规则子网掩码不同时，路由最长匹配优先；当路由规则子网掩码相同时, 按照优先级匹配转发, 优先级数字越小优先级越高，路由规则子网掩码相同、优先级相同、下一跳不同时，形成等价路由，不同下一跳负载均担。 (Optional) */ + Priority *int `json:"priority"` - /* 下一跳类型, 取值范围:instance:云主机, internet:公网, vpc_peering:vpc对等连接, bgw:边界网关 (Optional) */ - NextHopType *string `json:"nextHopType"` + /* 下一跳类型, 取值范围:instance:云主机, internet:公网, vpc_peering:vpc对等连接, bgw:边界网关 (Optional) */ + NextHopType *string `json:"nextHopType"` - /* 下一跳id (Optional) */ - NextHopId *string `json:"nextHopId"` + /* 下一跳id (Optional) */ + NextHopId *string `json:"nextHopId"` - /* 路由表规则前缀, internet类型路由跟其他类型的路由，addressPrefix不允许重复 (Optional) */ - AddressPrefix *string `json:"addressPrefix"` + /* 路由表规则前缀, internet类型路由跟其他类型的路由，addressPrefix不允许重复 (Optional) */ + AddressPrefix *string `json:"addressPrefix"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRulesSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRulesSpec.go index d8894b0dc..080b506e0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRulesSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRulesSpec.go @@ -16,9 +16,8 @@ package models - type ModifyRouteTableRulesSpec struct { - /* 路由表规则信息 */ - ModifyRouteTableRuleSpecs []ModifyRouteTableRules `json:"modifyRouteTableRuleSpecs"` + /* 路由表规则信息 */ + ModifyRouteTableRuleSpecs []ModifyRouteTableRules `json:"modifyRouteTableRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableSpec.go index 3a1c902dc..992b6f898 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableSpec.go @@ -16,12 +16,11 @@ package models - type ModifyRouteTableSpec struct { - /* 路由表的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - RouteTableName string `json:"routeTableName"` + /* 路由表的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + RouteTableName string `json:"routeTableName"` - /* 路由表的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ - Description string `json:"description"` + /* 路由表的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRuleSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRuleSpec.go index f59fc26b5..91d05e07b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRuleSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRuleSpec.go @@ -16,9 +16,8 @@ package models - type ModifySecurityGroupRuleSpec struct { - /* 安全组规则信息 */ - ModifySecurityGroupRuleSpecs []ModifySecurityGroupRules `json:"modifySecurityGroupRuleSpecs"` + /* 安全组规则信息 */ + ModifySecurityGroupRuleSpecs []ModifySecurityGroupRules `json:"modifySecurityGroupRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRules.go index 38d47fc7e..df0def62a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRules.go @@ -16,24 +16,23 @@ package models - type ModifySecurityGroupRules struct { - /* 安全组规则的ID。 */ - RuleId string `json:"ruleId"` + /* 安全组规则的ID。 */ + RuleId string `json:"ruleId"` - /* 规则限定协议。300:All; 6:TCP; 17:UDP; 1:ICMP (Optional) */ - Protocol *int `json:"protocol"` + /* 规则限定协议。300:All; 6:TCP; 17:UDP; 1:ICMP (Optional) */ + Protocol *int `json:"protocol"` - /* 安全组规则的起始端口。取值范围：1-65535 (Optional) */ - FromPort *int `json:"fromPort"` + /* 安全组规则的起始端口。取值范围：1-65535 (Optional) */ + FromPort *int `json:"fromPort"` - /* 安全组规则的终端口。取值范围：1-65535 (Optional) */ - ToPort *int `json:"toPort"` + /* 安全组规则的终端口。取值范围：1-65535 (Optional) */ + ToPort *int `json:"toPort"` - /* 安全组规则前缀，取值范围：正确的CIDR (Optional) */ - AddressPrefix *string `json:"addressPrefix"` + /* 安全组规则前缀，取值范围：正确的CIDR (Optional) */ + AddressPrefix *string `json:"addressPrefix"` - /* 安全组规则的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ - Description *string `json:"description"` + /* 安全组规则的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ + Description *string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySubnetSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySubnetSpec.go index aac57100f..998384538 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySubnetSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySubnetSpec.go @@ -16,12 +16,11 @@ package models - type ModifySubnetSpec struct { - /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - SubnetName string `json:"subnetName"` + /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + SubnetName string `json:"subnetName"` - /* 子网描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* 子网描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcPeeringSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcPeeringSpec.go index 056f0f1f5..63732ab3f 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcPeeringSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcPeeringSpec.go @@ -16,12 +16,11 @@ package models - type ModifyVpcPeeringSpec struct { - /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - VpcPeeringName string `json:"vpcPeeringName"` + /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + VpcPeeringName string `json:"vpcPeeringName"` - /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - Description string `json:"description"` + /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcSpec.go index 9c4419843..bfc73b0f1 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcSpec.go @@ -16,12 +16,11 @@ package models - type ModifyVpcSpec struct { - /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - VpcName string `json:"vpcName"` + /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + VpcName string `json:"vpcName"` - /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAcl.go index 422ed1611..f4ccb1ca1 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAcl.go @@ -16,27 +16,26 @@ package models - type NetworkAcl struct { - /* networkAcl ID (Optional) */ - NetworkAclId string `json:"networkAclId"` + /* networkAcl ID (Optional) */ + NetworkAclId string `json:"networkAclId"` - /* networkAcl名称 (Optional) */ - NetworkAclName string `json:"networkAclName"` + /* networkAcl名称 (Optional) */ + NetworkAclName string `json:"networkAclName"` - /* 私有网络 ID (Optional) */ - VpcId string `json:"vpcId"` + /* 私有网络 ID (Optional) */ + VpcId string `json:"vpcId"` - /* networkAcl规则列表 (Optional) */ - NetworkAclRules []NetworkAclRule `json:"networkAclRules"` + /* networkAcl规则列表 (Optional) */ + NetworkAclRules []NetworkAclRule `json:"networkAclRules"` - /* networkAcl绑定的子网列表 (Optional) */ - SubnetIds []string `json:"subnetIds"` + /* networkAcl绑定的子网列表 (Optional) */ + SubnetIds []string `json:"subnetIds"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` - /* networkAcl创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* networkAcl创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclRule.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclRule.go index 2cd5027b6..9c3ebcc00 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclRule.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclRule.go @@ -16,36 +16,35 @@ package models - type NetworkAclRule struct { - /* networkAcl规则ID (Optional) */ - RuleId string `json:"ruleId"` + /* networkAcl规则ID (Optional) */ + RuleId string `json:"ruleId"` - /* 规则限定协议。取值范围：All,TCP,UDP,ICMP (Optional) */ - Protocol string `json:"protocol"` + /* 规则限定协议。取值范围：All,TCP,UDP,ICMP (Optional) */ + Protocol string `json:"protocol"` - /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - FromPort int `json:"fromPort"` + /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + FromPort int `json:"fromPort"` - /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - ToPort int `json:"toPort"` + /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + ToPort int `json:"toPort"` - /* networkAcl规则方向。ingress：入规则; egress：出规则 (Optional) */ - Direction string `json:"direction"` + /* networkAcl规则方向。ingress：入规则; egress：出规则 (Optional) */ + Direction string `json:"direction"` - /* 匹配地址前缀 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 匹配地址前缀 (Optional) */ + AddressPrefix string `json:"addressPrefix"` - /* 访问控制策略：allow:允许，deny：拒绝 (Optional) */ - RuleAction string `json:"ruleAction"` + /* 访问控制策略：allow:允许，deny：拒绝 (Optional) */ + RuleAction string `json:"ruleAction"` - /* 规则匹配优先级，取值范围为[1,32768]，优先级数字越小优先级越高 (Optional) */ - Priority int `json:"priority"` + /* 规则匹配优先级，取值范围为[1,32768]，优先级数字越小优先级越高 (Optional) */ + Priority int `json:"priority"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` - /* networkAclRule创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* networkAclRule创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclSpec.go index 9710fddec..c0c12ce09 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclSpec.go @@ -16,15 +16,14 @@ package models - type NetworkAclSpec struct { - /* 私有网络id */ - VpcId string `json:"vpcId"` + /* 私有网络id */ + VpcId string `json:"vpcId"` - /* networkAcl名称 */ - NetworkAclName string `json:"networkAclName"` + /* networkAcl名称 */ + NetworkAclName string `json:"networkAclName"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterface.go index b9fc7244b..750933236 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterface.go @@ -16,57 +16,56 @@ package models - type NetworkInterface struct { - /* 弹性网卡名称 (Optional) */ - NetworkInterfaceName string `json:"networkInterfaceName"` + /* 弹性网卡名称 (Optional) */ + NetworkInterfaceName string `json:"networkInterfaceName"` - /* 弹性网卡ID (Optional) */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* 弹性网卡ID (Optional) */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* 可用区名称 (Optional) */ - Az string `json:"az"` + /* 可用区名称 (Optional) */ + Az string `json:"az"` - /* 网卡角色，取值范围：Primary（主网卡）、Secondary（辅助网卡） (Optional) */ - Role string `json:"role"` + /* 网卡角色，取值范围：Primary（主网卡）、Secondary（辅助网卡） (Optional) */ + Role string `json:"role"` - /* 以太网地址 (Optional) */ - MacAddress string `json:"macAddress"` + /* 以太网地址 (Optional) */ + MacAddress string `json:"macAddress"` - /* 虚拟网络ID (Optional) */ - VpcId string `json:"vpcId"` + /* 虚拟网络ID (Optional) */ + VpcId string `json:"vpcId"` - /* 子网ID (Optional) */ - SubnetId string `json:"subnetId"` + /* 子网ID (Optional) */ + SubnetId string `json:"subnetId"` - /* 安全组ID列表 (Optional) */ - NetworkSecurityGroupIds []string `json:"networkSecurityGroupIds"` + /* 安全组ID列表 (Optional) */ + NetworkSecurityGroupIds []string `json:"networkSecurityGroupIds"` - /* 源和目标IP地址校验，取值为0或者1 (Optional) */ - SanityCheck int `json:"sanityCheck"` + /* 源和目标IP地址校验，取值为0或者1 (Optional) */ + SanityCheck int `json:"sanityCheck"` - /* 网卡主IP (Optional) */ - PrimaryIp NetworkInterfacePrivateIp `json:"primaryIp"` + /* 网卡主IP (Optional) */ + PrimaryIp NetworkInterfacePrivateIp `json:"primaryIp"` - /* 网卡附属IP列表 (Optional) */ - SecondaryIps []NetworkInterfacePrivateIp `json:"secondaryIps"` + /* 网卡附属IP列表 (Optional) */ + SecondaryIps []NetworkInterfacePrivateIp `json:"secondaryIps"` - /* 关联实例类型，取值范围：vm (Optional) */ - InstanceType string `json:"instanceType"` + /* 关联实例类型，取值范围：vm (Optional) */ + InstanceType string `json:"instanceType"` - /* 关联实例ID (Optional) */ - InstanceId string `json:"instanceId"` + /* 关联实例ID (Optional) */ + InstanceId string `json:"instanceId"` - /* 实例所属的账号 (Optional) */ - InstanceOwnerId string `json:"instanceOwnerId"` + /* 实例所属的账号 (Optional) */ + InstanceOwnerId string `json:"instanceOwnerId"` - /* 网卡在实例上的设备索引号，取值范围：[0,8]，0：辅助网卡未绑定设备，1：主网卡，2-8：辅助网卡已绑定设备 (Optional) */ - DeviceIndex int `json:"deviceIndex"` + /* 网卡在实例上的设备索引号，取值范围：[0,8]，0：辅助网卡未绑定设备，1：主网卡，2-8：辅助网卡已绑定设备 (Optional) */ + DeviceIndex int `json:"deviceIndex"` - /* 网卡描述信息 (Optional) */ - Description string `json:"description"` + /* 网卡描述信息 (Optional) */ + Description string `json:"description"` - /* 弹性网卡创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 弹性网卡创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfacePrivateIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfacePrivateIp.go index ba235e86a..762b3ed22 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfacePrivateIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfacePrivateIp.go @@ -16,15 +16,14 @@ package models - type NetworkInterfacePrivateIp struct { - /* 私有IP的IPV4地址 (Optional) */ - PrivateIpAddress string `json:"privateIpAddress"` + /* 私有IP的IPV4地址 (Optional) */ + PrivateIpAddress string `json:"privateIpAddress"` - /* 弹性IP实例ID (Optional) */ - ElasticIpId string `json:"elasticIpId"` + /* 弹性IP实例ID (Optional) */ + ElasticIpId string `json:"elasticIpId"` - /* 弹性IP实例地址 (Optional) */ - ElasticIpAddress string `json:"elasticIpAddress"` + /* 弹性IP实例地址 (Optional) */ + ElasticIpAddress string `json:"elasticIpAddress"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfaceSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfaceSpec.go index 75c2909e6..3211c8ac6 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfaceSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfaceSpec.go @@ -16,33 +16,32 @@ package models - type NetworkInterfaceSpec struct { - /* 子网ID */ - SubnetId string `json:"subnetId"` + /* 子网ID */ + SubnetId string `json:"subnetId"` - /* 可用区，用户的默认可用区 (Optional) */ - Az *string `json:"az"` + /* 可用区，用户的默认可用区 (Optional) */ + Az *string `json:"az"` - /* 网卡名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - NetworkInterfaceName *string `json:"networkInterfaceName"` + /* 网卡名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + NetworkInterfaceName *string `json:"networkInterfaceName"` - /* 网卡主IP，如果不指定，会自动从子网中分配 (Optional) */ - PrimaryIpAddress *string `json:"primaryIpAddress"` + /* 网卡主IP，如果不指定，会自动从子网中分配 (Optional) */ + PrimaryIpAddress *string `json:"primaryIpAddress"` - /* SecondaryIp列表 (Optional) */ - SecondaryIpAddresses []string `json:"secondaryIpAddresses"` + /* SecondaryIp列表 (Optional) */ + SecondaryIpAddresses []string `json:"secondaryIpAddresses"` - /* 自动分配的SecondaryIp数量 (Optional) */ - SecondaryIpCount *int `json:"secondaryIpCount"` + /* 自动分配的SecondaryIp数量 (Optional) */ + SecondaryIpCount *int `json:"secondaryIpCount"` - /* 要绑定的安全组ID列表，最多指定5个安全组 (Optional) */ - SecurityGroups []string `json:"securityGroups"` + /* 要绑定的安全组ID列表，最多指定5个安全组 (Optional) */ + SecurityGroups []string `json:"securityGroups"` - /* 源和目标IP地址校验，取值为0或者1,默认为1 (Optional) */ - SanityCheck *int `json:"sanityCheck"` + /* 源和目标IP地址校验，取值为0或者1,默认为1 (Optional) */ + SanityCheck *int `json:"sanityCheck"` - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroup.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroup.go index 406631dfe..e56ce9a29 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroup.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroup.go @@ -16,24 +16,23 @@ package models - type NetworkSecurityGroup struct { - /* 安全组ID (Optional) */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + /* 安全组ID (Optional) */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` - /* 安全组名称 (Optional) */ - NetworkSecurityGroupName string `json:"networkSecurityGroupName"` + /* 安全组名称 (Optional) */ + NetworkSecurityGroupName string `json:"networkSecurityGroupName"` - /* 安全组描述信息 (Optional) */ - Description string `json:"description"` + /* 安全组描述信息 (Optional) */ + Description string `json:"description"` - /* 安全组所在vpc的Id (Optional) */ - VpcId string `json:"vpcId"` + /* 安全组所在vpc的Id (Optional) */ + VpcId string `json:"vpcId"` - /* 安全组规则信息 (Optional) */ - SecurityGroupRules []SecurityGroupRule `json:"securityGroupRules"` + /* 安全组规则信息 (Optional) */ + SecurityGroupRules []SecurityGroupRule `json:"securityGroupRules"` - /* 安全组创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 安全组创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroupSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroupSpec.go index b38e540b4..c585ade17 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroupSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroupSpec.go @@ -16,15 +16,14 @@ package models - type NetworkSecurityGroupSpec struct { - /* 私有网络ID */ - VpcId string `json:"vpcId"` + /* 私有网络ID */ + VpcId string `json:"vpcId"` - /* 安全组名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - NetworkSecurityGroupName string `json:"networkSecurityGroupName"` + /* 安全组名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + NetworkSecurityGroupName string `json:"networkSecurityGroupName"` - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Quota.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Quota.go index cb0f4081f..047723759 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Quota.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Quota.go @@ -16,18 +16,17 @@ package models - type Quota struct { - /* 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡） (Optional) */ - Type string `json:"type"` + /* 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡） (Optional) */ + Type string `json:"type"` - /* vpc、elastic_ip、network_interface为空, subnet、security_group、vpcpeering为vpcId (Optional) */ - ParentResourceId string `json:"parentResourceId"` + /* vpc、elastic_ip、network_interface为空, subnet、security_group、vpcpeering为vpcId (Optional) */ + ParentResourceId string `json:"parentResourceId"` - /* 配额大小 (Optional) */ - MaxLimit int `json:"maxLimit"` + /* 配额大小 (Optional) */ + MaxLimit int `json:"maxLimit"` - /* 已存在的资源数量 (Optional) */ - Count int `json:"count"` + /* 已存在的资源数量 (Optional) */ + Count int `json:"count"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTable.go index b7bf11e18..70d8b5d54 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTable.go @@ -16,30 +16,29 @@ package models - type RouteTable struct { - /* 路由表ID (Optional) */ - RouteTableId string `json:"routeTableId"` + /* 路由表ID (Optional) */ + RouteTableId string `json:"routeTableId"` - /* 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - RouteTableName string `json:"routeTableName"` + /* 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + RouteTableName string `json:"routeTableName"` - /* 路由表类型，default：默认路由表，custom：自定义路由表 (Optional) */ - RouteTableType string `json:"routeTableType"` + /* 路由表类型，default：默认路由表，custom：自定义路由表 (Optional) */ + RouteTableType string `json:"routeTableType"` - /* 路由表描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* 路由表描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` - /* 私有网络ID (Optional) */ - VpcId string `json:"vpcId"` + /* 私有网络ID (Optional) */ + VpcId string `json:"vpcId"` - /* 路由表规则信息 (Optional) */ - RouteTableRules []RouteTableRule `json:"routeTableRules"` + /* 路由表规则信息 (Optional) */ + RouteTableRules []RouteTableRule `json:"routeTableRules"` - /* 路由表绑定的子网列表 (Optional) */ - SubnetIds []string `json:"subnetIds"` + /* 路由表绑定的子网列表 (Optional) */ + SubnetIds []string `json:"subnetIds"` - /* 路由表创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 路由表创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableRule.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableRule.go index 049d9b766..9d282f6ba 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableRule.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableRule.go @@ -16,21 +16,20 @@ package models - type RouteTableRule struct { - /* 路由表规则ID (Optional) */ - RuleId string `json:"ruleId"` + /* 路由表规则ID (Optional) */ + RuleId string `json:"ruleId"` - /* 规则匹配优先级，取值范围[1,255]，默认为100。当路由规则子网掩码不同时，路由最长匹配优先；当路由规则子网掩码相同时, 按照优先级匹配转发, 优先级数字越小优先级越高，路由规则子网掩码相同、优先级相同、下一跳不同时，形成等价路由，不同下一跳负载均担。 (Optional) */ - Priority int `json:"priority"` + /* 规则匹配优先级，取值范围[1,255]，默认为100。当路由规则子网掩码不同时，路由最长匹配优先；当路由规则子网掩码相同时, 按照优先级匹配转发, 优先级数字越小优先级越高，路由规则子网掩码相同、优先级相同、下一跳不同时，形成等价路由，不同下一跳负载均担。 (Optional) */ + Priority int `json:"priority"` - /* 下一跳类型, 取值范围:local:本地, instance:云主机, internet:公网, vpc_peering:vpc对等连接, bgw:边界网关 (Optional) */ - NextHopType string `json:"nextHopType"` + /* 下一跳类型, 取值范围:local:本地, instance:云主机, internet:公网, vpc_peering:vpc对等连接, bgw:边界网关 (Optional) */ + NextHopType string `json:"nextHopType"` - /* 下一跳id (Optional) */ - NextHopId string `json:"nextHopId"` + /* 下一跳id (Optional) */ + NextHopId string `json:"nextHopId"` - /* 匹配地址前缀, internet类型路由跟其他类型的路由，addressPrefix不允许重复 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 匹配地址前缀, internet类型路由跟其他类型的路由，addressPrefix不允许重复 (Optional) */ + AddressPrefix string `json:"addressPrefix"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableSpec.go index c91f16c6c..871a63bc0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableSpec.go @@ -16,15 +16,14 @@ package models - type RouteTableSpec struct { - /* 路由表所属的私有网络ID */ - VpcId string `json:"vpcId"` + /* 路由表所属的私有网络ID */ + VpcId string `json:"vpcId"` - /* 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - RouteTableName string `json:"routeTableName"` + /* 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + RouteTableName string `json:"routeTableName"` - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SecurityGroupRule.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SecurityGroupRule.go index 74ba05afd..76aefe6e2 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SecurityGroupRule.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SecurityGroupRule.go @@ -16,33 +16,32 @@ package models - type SecurityGroupRule struct { - /* 安全组规则ID (Optional) */ - RuleId string `json:"ruleId"` + /* 安全组规则ID (Optional) */ + RuleId string `json:"ruleId"` - /* 安全组规则方向。0：入规则; 1：出规则 (Optional) */ - Direction int `json:"direction"` + /* 安全组规则方向。0：入规则; 1：出规则 (Optional) */ + Direction int `json:"direction"` - /* 规则限定协议。300:All; 6:TCP; 17:UDP; 1:ICMP (Optional) */ - Protocol int `json:"protocol"` + /* 规则限定协议。300:All; 6:TCP; 17:UDP; 1:ICMP (Optional) */ + Protocol int `json:"protocol"` - /* 匹配地址前缀 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 匹配地址前缀 (Optional) */ + AddressPrefix string `json:"addressPrefix"` - /* 匹配地址协议版本。4：IPv4 (Optional) */ - IpVersion int `json:"ipVersion"` + /* 匹配地址协议版本。4：IPv4 (Optional) */ + IpVersion int `json:"ipVersion"` - /* 规则限定起始传输层端口, 默认1 ，若protocal不是传输层协议，恒为0 (Optional) */ - FromPort int `json:"fromPort"` + /* 规则限定起始传输层端口, 默认1 ，若protocal不是传输层协议，恒为0 (Optional) */ + FromPort int `json:"fromPort"` - /* 规则限定终止传输层端口, 默认1 ，若protocal不是传输层协议，恒为0 (Optional) */ - ToPort int `json:"toPort"` + /* 规则限定终止传输层端口, 默认1 ，若protocal不是传输层协议，恒为0 (Optional) */ + ToPort int `json:"toPort"` - /* 安全组规则创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 安全组规则创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Segment.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Segment.go index 875486ad1..9a9bba890 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Segment.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Segment.go @@ -16,30 +16,29 @@ package models - type Segment struct { - /* 网段的Id (Optional) */ - SegmentId string `json:"segmentId"` + /* 网段的Id (Optional) */ + SegmentId string `json:"segmentId"` - /* 网段名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - SegmentName string `json:"segmentName"` + /* 网段名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + SegmentName string `json:"segmentName"` - /* 网段描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* 网段描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` - /* 网络地址段 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 网络地址段 (Optional) */ + AddressPrefix string `json:"addressPrefix"` - /* 网段可用ip数量 (Optional) */ - AvailableIpCount int `json:"availableIpCount"` + /* 网段可用ip数量 (Optional) */ + AvailableIpCount int `json:"availableIpCount"` - /* IP服务商，取值为bgp或no_bgp，cn-north-1：bgp；cn-south-1：[bgp，no_bgp]；cn-east-1：[bgp，no_bgp]；cn-east-2：bgp (Optional) */ - Provider string `json:"provider"` + /* IP服务商，取值为bgp或no_bgp，cn-north-1：bgp；cn-south-1：[bgp，no_bgp]；cn-east-1：[bgp，no_bgp]；cn-east-2：bgp (Optional) */ + Provider string `json:"provider"` - /* 网段的起始地址 (Optional) */ - StartIp string `json:"startIp"` + /* 网段的起始地址 (Optional) */ + StartIp string `json:"startIp"` - /* 网段的结束地址 (Optional) */ - EndIp string `json:"endIp"` + /* 网段的结束地址 (Optional) */ + EndIp string `json:"endIp"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Subnet.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Subnet.go index 9bd241dae..902ed9c94 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Subnet.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Subnet.go @@ -16,39 +16,38 @@ package models - type Subnet struct { - /* Subnet的Id (Optional) */ - SubnetId string `json:"subnetId"` + /* Subnet的Id (Optional) */ + SubnetId string `json:"subnetId"` - /* 子网名称 (Optional) */ - SubnetName string `json:"subnetName"` + /* 子网名称 (Optional) */ + SubnetName string `json:"subnetName"` - /* 子网所属VPC的Id (Optional) */ - VpcId string `json:"vpcId"` + /* 子网所属VPC的Id (Optional) */ + VpcId string `json:"vpcId"` - /* 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果VPC含有Cidr，则必须为VPC所在Cidr的子网 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果VPC含有Cidr，则必须为VPC所在Cidr的子网 (Optional) */ + AddressPrefix string `json:"addressPrefix"` - /* 子网可用ip数量 (Optional) */ - AvailableIpCount int `json:"availableIpCount"` + /* 子网可用ip数量 (Optional) */ + AvailableIpCount int `json:"availableIpCount"` - /* 子网描述信息 (Optional) */ - Description string `json:"description"` + /* 子网描述信息 (Optional) */ + Description string `json:"description"` - /* 子网关联的路由表Id (Optional) */ - RouteTableId string `json:"routeTableId"` + /* 子网关联的路由表Id (Optional) */ + RouteTableId string `json:"routeTableId"` - /* 子网关联的acl Id (Optional) */ - AclId string `json:"aclId"` + /* 子网关联的acl Id (Optional) */ + AclId string `json:"aclId"` - /* 子网的起始地址，子网第1个地位为路由器网关保留，第2个地址为dhcp服务保留 (Optional) */ - StartIp string `json:"startIp"` + /* 子网的起始地址，子网第1个地位为路由器网关保留，第2个地址为dhcp服务保留 (Optional) */ + StartIp string `json:"startIp"` - /* 子网的结束地址，子网第1个地位为路由器网关保留，第2个地址为dhcp服务保留 (Optional) */ - EndIp string `json:"endIp"` + /* 子网的结束地址，子网第1个地位为路由器网关保留，第2个地址为dhcp服务保留 (Optional) */ + EndIp string `json:"endIp"` - /* 子网创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 子网创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SubnetSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SubnetSpec.go index 611a18910..07fb7eb64 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SubnetSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SubnetSpec.go @@ -16,21 +16,20 @@ package models - type SubnetSpec struct { - /* 子网所属vpc的Id */ - VpcId string `json:"vpcId"` + /* 子网所属vpc的Id */ + VpcId string `json:"vpcId"` - /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - SubnetName string `json:"subnetName"` + /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + SubnetName string `json:"subnetName"` - /* 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果vpc含有cidr，则必须为vpc所在cidr的子网 */ - AddressPrefix string `json:"addressPrefix"` + /* 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果vpc含有cidr，则必须为vpc所在cidr的子网 */ + AddressPrefix string `json:"addressPrefix"` - /* 子网关联的路由表Id, 默认为vpc的默认路由表 (Optional) */ - RouteTableId string `json:"routeTableId"` + /* 子网关联的路由表Id, 默认为vpc的默认路由表 (Optional) */ + RouteTableId string `json:"routeTableId"` - /* 子网描述信息,允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* 子网描述信息,允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/UnassignSecondaryIpsSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/UnassignSecondaryIpsSpec.go index ba3a12e19..3f34882cd 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/UnassignSecondaryIpsSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/UnassignSecondaryIpsSpec.go @@ -16,9 +16,8 @@ package models - type UnassignSecondaryIpsSpec struct { - /* 指定删除的secondaryIp地址 (Optional) */ - SecondaryIps []string `json:"secondaryIps"` + /* 指定删除的secondaryIp地址 (Optional) */ + SecondaryIps []string `json:"secondaryIps"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Vpc.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Vpc.go index 896b3341b..151d884ef 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Vpc.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Vpc.go @@ -16,30 +16,29 @@ package models - type Vpc struct { - /* Vpc的Id (Optional) */ - VpcId string `json:"vpcId"` + /* Vpc的Id (Optional) */ + VpcId string `json:"vpcId"` - /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ + AddressPrefix string `json:"addressPrefix"` - /* VPC 描述，取值范围：1~120个字符 (Optional) */ - Description string `json:"description"` + /* VPC 描述，取值范围：1~120个字符 (Optional) */ + Description string `json:"description"` - /* 私有网络名称，取值范围：1-60个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - VpcName string `json:"vpcName"` + /* 私有网络名称，取值范围：1-60个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + VpcName string `json:"vpcName"` - /* 同一vpc下的acl id 列表 (Optional) */ - AclIds []string `json:"aclIds"` + /* 同一vpc下的acl id 列表 (Optional) */ + AclIds []string `json:"aclIds"` - /* (Optional) */ - RouteTableIds []string `json:"routeTableIds"` + /* (Optional) */ + RouteTableIds []string `json:"routeTableIds"` - /* 私有网络包含的子网列表 (Optional) */ - Subnets []Subnet `json:"subnets"` + /* 私有网络包含的子网列表 (Optional) */ + Subnets []Subnet `json:"subnets"` - /* vpc创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* vpc创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeering.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeering.go index e6245b759..e5436fd35 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeering.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeering.go @@ -16,27 +16,26 @@ package models - type VpcPeering struct { - /* VpcPeering的Id (Optional) */ - VpcPeeringId string `json:"vpcPeeringId"` + /* VpcPeering的Id (Optional) */ + VpcPeeringId string `json:"vpcPeeringId"` - /* VpcPeering名称，同账号下不允许重名，取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - VpcPeeringName string `json:"vpcPeeringName"` + /* VpcPeering名称，同账号下不允许重名，取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + VpcPeeringName string `json:"vpcPeeringName"` - /* 状态，取值为Connected，Disconnected，Initiated (Optional) */ - VpcPeeringState string `json:"vpcPeeringState"` + /* 状态，取值为Connected，Disconnected，Initiated (Optional) */ + VpcPeeringState string `json:"vpcPeeringState"` - /* VpcPeering 描述，可为空值，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - Description string `json:"description"` + /* VpcPeering 描述，可为空值，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + Description string `json:"description"` - /* 发起VpcPeering的Vpc信息 (Optional) */ - VpcInfo VpcPeeringVpcInfo `json:"vpcInfo"` + /* 发起VpcPeering的Vpc信息 (Optional) */ + VpcInfo VpcPeeringVpcInfo `json:"vpcInfo"` - /* 对端的Vpc信息 (Optional) */ - RemoteVpcInfo VpcPeeringVpcInfo `json:"remoteVpcInfo"` + /* 对端的Vpc信息 (Optional) */ + RemoteVpcInfo VpcPeeringVpcInfo `json:"remoteVpcInfo"` - /* VpcPeering创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* VpcPeering创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeeringVpcInfo.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeeringVpcInfo.go index 4581b43e9..a3a8da0ca 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeeringVpcInfo.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeeringVpcInfo.go @@ -16,15 +16,14 @@ package models - type VpcPeeringVpcInfo struct { - /* 子网所属VPC的Id (Optional) */ - VpcId string `json:"vpcId"` + /* 子网所属VPC的Id (Optional) */ + VpcId string `json:"vpcId"` - /* 私有网络名称，取值范围：1-60个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - VpcName string `json:"vpcName"` + /* 私有网络名称，取值范围：1-60个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + VpcName string `json:"vpcName"` - /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ - AddressPrefix []string `json:"addressPrefix"` + /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ + AddressPrefix []string `json:"addressPrefix"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcSpec.go index f9f4f9e1b..b0a1e6396 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcSpec.go @@ -16,15 +16,14 @@ package models - type VpcSpec struct { - /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - VpcName string `json:"vpcName"` + /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + VpcName string `json:"vpcName"` - /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ + AddressPrefix string `json:"addressPrefix"` - /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/masterzen/simplexml/dom/document.go b/vendor/github.com/masterzen/simplexml/dom/document.go index e871c35a3..783587df7 100644 --- a/vendor/github.com/masterzen/simplexml/dom/document.go +++ b/vendor/github.com/masterzen/simplexml/dom/document.go @@ -6,14 +6,14 @@ import ( ) type Document struct { - root *Element + root *Element PrettyPrint bool Indentation string - DocType bool + DocType bool } func CreateDocument() *Document { - return &Document{ PrettyPrint: false, Indentation: " ", DocType: true } + return &Document{PrettyPrint: false, Indentation: " ", DocType: true} } func (doc *Document) SetRoot(node *Element) { @@ -26,10 +26,10 @@ func (doc *Document) String() string { if doc.DocType { fmt.Fprintln(&b, ``) } - + if doc.root != nil { doc.root.Bytes(&b, doc.PrettyPrint, doc.Indentation, 0) } - + return string(b.Bytes()) -} \ No newline at end of file +} diff --git a/vendor/github.com/masterzen/simplexml/dom/element.go b/vendor/github.com/masterzen/simplexml/dom/element.go index 1ea16cc97..c5708bbc1 100644 --- a/vendor/github.com/masterzen/simplexml/dom/element.go +++ b/vendor/github.com/masterzen/simplexml/dom/element.go @@ -1,9 +1,9 @@ package dom import ( + "bytes" "encoding/xml" "fmt" - "bytes" ) type Attr struct { @@ -12,20 +12,20 @@ type Attr struct { } type Element struct { - name xml.Name - children []*Element - parent *Element - content string + name xml.Name + children []*Element + parent *Element + content string attributes []*Attr namespaces []*Namespace - document *Document + document *Document } func CreateElement(n string) *Element { - element := &Element { name: xml.Name { Local: n } } + element := &Element{name: xml.Name{Local: n}} element.children = make([]*Element, 0, 5) element.attributes = make([]*Attr, 0, 10) - element.namespaces = make([]*Namespace, 0, 10) + element.namespaces = make([]*Namespace, 0, 10) return element } @@ -59,7 +59,7 @@ func (node *Element) RemoveChild(child *Element) *Element { func (node *Element) SetAttr(name string, value string) *Element { // namespaces? - attr := &Attr{ Name: xml.Name { Local: name }, Value: value } + attr := &Attr{Name: xml.Name{Local: name}, Value: value} node.attributes = append(node.attributes, attr) return node } @@ -67,18 +67,18 @@ func (node *Element) SetAttr(name string, value string) *Element { func (node *Element) SetParent(parent *Element) *Element { node.parent = parent return node -} +} func (node *Element) SetContent(content string) *Element { node.content = content return node -} +} // Add a namespace declaration to this node func (node *Element) DeclareNamespace(ns Namespace) *Element { // check if we already have it prefix := node.namespacePrefix(ns.Uri) - if prefix == ns.Prefix { + if prefix == ns.Prefix { return node } // add it @@ -94,7 +94,7 @@ func (node *Element) SetNamespace(prefix string, uri string) { resolved := node.namespacePrefix(uri) if resolved == "" { // we couldn't find the namespace, let's declare it at this node - node.namespaces = append(node.namespaces, &Namespace { Prefix: prefix, Uri: uri }) + node.namespaces = append(node.namespaces, &Namespace{Prefix: prefix, Uri: uri}) } node.name.Space = uri } @@ -102,19 +102,19 @@ func (node *Element) SetNamespace(prefix string, uri string) { func (node *Element) Bytes(out *bytes.Buffer, indent bool, indentType string, level int) { empty := len(node.children) == 0 && node.content == "" content := node.content != "" -// children := len(node.children) > 0 -// ns := len(node.namespaces) > 0 -// attrs := len(node.attributes) > 0 - + // children := len(node.children) > 0 + // ns := len(node.namespaces) > 0 + // attrs := len(node.attributes) > 0 + indentStr := "" nextLine := "" if indent { nextLine = "\n" for i := 0; i < level; i++ { - indentStr += indentType + indentStr += indentType } } - + if node.name.Local != "" { if len(node.name.Space) > 0 { // first find if ns has been declared, otherwise @@ -124,7 +124,7 @@ func (node *Element) Bytes(out *bytes.Buffer, indent bool, indentType string, le fmt.Fprintf(out, "%s<%s", indentStr, node.name.Local) } } - + // declared namespaces for _, v := range node.namespaces { prefix := node.namespacePrefix(v.Uri) @@ -140,7 +140,7 @@ func (node *Element) Bytes(out *bytes.Buffer, indent bool, indentType string, le fmt.Fprintf(out, ` %s="%s"`, v.Name.Local, v.Value) } } - + // close tag if empty { fmt.Fprintf(out, "/>%s", nextLine) @@ -148,20 +148,20 @@ func (node *Element) Bytes(out *bytes.Buffer, indent bool, indentType string, le if content { out.WriteRune('>') } else { - fmt.Fprintf(out, ">%s", nextLine) + fmt.Fprintf(out, ">%s", nextLine) } } - + if len(node.children) > 0 { for _, child := range node.children { - child.Bytes(out, indent, indentType, level + 1) + child.Bytes(out, indent, indentType, level+1) } } else if node.content != "" { //val := []byte(node.content) //xml.EscapeText(out, val) out.WriteString(node.content) } - + if !empty && len(node.name.Local) > 0 { var indentation string if content { @@ -192,9 +192,8 @@ func (node *Element) namespacePrefix(uri string) string { return node.parent.namespacePrefix(uri) } - func (node *Element) String() string { var b bytes.Buffer node.Bytes(&b, false, "", 0) return string(b.Bytes()) -} \ No newline at end of file +} diff --git a/vendor/github.com/masterzen/winrm/ntlm.go b/vendor/github.com/masterzen/winrm/ntlm.go index 08de8a522..20debcb31 100644 --- a/vendor/github.com/masterzen/winrm/ntlm.go +++ b/vendor/github.com/masterzen/winrm/ntlm.go @@ -23,11 +23,10 @@ func (c ClientNTLM) Post(client *Client, request *soap.SoapMessage) (string, err return c.clientRequest.Post(client, request) } - func NewClientNTLMWithDial(dial func(network, addr string) (net.Conn, error)) *ClientNTLM { return &ClientNTLM{ clientRequest{ - dial:dial, + dial: dial, }, } -} \ No newline at end of file +} diff --git a/vendor/github.com/mattn/go-tty/tty_plan9.go b/vendor/github.com/mattn/go-tty/tty_plan9.go index 8aed66806..2c31c33d2 100644 --- a/vendor/github.com/mattn/go-tty/tty_plan9.go +++ b/vendor/github.com/mattn/go-tty/tty_plan9.go @@ -2,9 +2,9 @@ package tty import ( "bufio" + "errors" "os" "syscall" - "errors" ) type TTY struct { diff --git a/vendor/github.com/mattn/go-tty/tty_windows.go b/vendor/github.com/mattn/go-tty/tty_windows.go index eb3e248d1..22b538cdf 100644 --- a/vendor/github.com/mattn/go-tty/tty_windows.go +++ b/vendor/github.com/mattn/go-tty/tty_windows.go @@ -4,8 +4,8 @@ package tty import ( "context" - "os" "errors" + "os" "syscall" "unsafe" diff --git a/vendor/github.com/mitchellh/go-vnc/client_auth.go b/vendor/github.com/mitchellh/go-vnc/client_auth.go index 4ae7be9fc..601e470ed 100644 --- a/vendor/github.com/mitchellh/go-vnc/client_auth.go +++ b/vendor/github.com/mitchellh/go-vnc/client_auth.go @@ -46,7 +46,7 @@ func (p *PasswordAuth) Handshake(c net.Conn) error { crypted, err := p.encrypt(p.Password, randomValue) - if (err != nil) { + if err != nil { return err } @@ -97,7 +97,7 @@ func (p *PasswordAuth) reverseBits(b byte) byte { } func (p *PasswordAuth) encrypt(key string, bytes []byte) ([]byte, error) { - keyBytes := []byte{0,0,0,0,0,0,0,0} + keyBytes := []byte{0, 0, 0, 0, 0, 0, 0, 0} if len(key) > 8 { key = key[:8] diff --git a/vendor/github.com/modern-go/concurrent/log.go b/vendor/github.com/modern-go/concurrent/log.go index 9756fcc75..4899eed02 100644 --- a/vendor/github.com/modern-go/concurrent/log.go +++ b/vendor/github.com/modern-go/concurrent/log.go @@ -1,13 +1,13 @@ package concurrent import ( - "os" - "log" "io/ioutil" + "log" + "os" ) // ErrorLogger is used to print out error, can be set to writer other than stderr var ErrorLogger = log.New(os.Stderr, "", 0) // InfoLogger is used to print informational message, default to off -var InfoLogger = log.New(ioutil.Discard, "", 0) \ No newline at end of file +var InfoLogger = log.New(ioutil.Discard, "", 0) diff --git a/vendor/github.com/modern-go/concurrent/unbounded_executor.go b/vendor/github.com/modern-go/concurrent/unbounded_executor.go index 05a77dceb..5ea18eb7b 100644 --- a/vendor/github.com/modern-go/concurrent/unbounded_executor.go +++ b/vendor/github.com/modern-go/concurrent/unbounded_executor.go @@ -3,11 +3,11 @@ package concurrent import ( "context" "fmt" + "reflect" "runtime" "runtime/debug" "sync" "time" - "reflect" ) // HandlePanic logs goroutine panic by default diff --git a/vendor/github.com/modern-go/reflect2/reflect2.go b/vendor/github.com/modern-go/reflect2/reflect2.go index 63b49c799..4fe9a5965 100644 --- a/vendor/github.com/modern-go/reflect2/reflect2.go +++ b/vendor/github.com/modern-go/reflect2/reflect2.go @@ -136,7 +136,7 @@ type frozenConfig struct { func (cfg Config) Froze() *frozenConfig { return &frozenConfig{ useSafeImplementation: cfg.UseSafeImplementation, - cache: concurrent.NewMap(), + cache: concurrent.NewMap(), } } @@ -291,8 +291,8 @@ func UnsafeCastString(str string) []byte { stringHeader := (*reflect.StringHeader)(unsafe.Pointer(&str)) sliceHeader := &reflect.SliceHeader{ Data: stringHeader.Data, - Cap: stringHeader.Len, - Len: stringHeader.Len, + Cap: stringHeader.Len, + Len: stringHeader.Len, } return *(*[]byte)(unsafe.Pointer(sliceHeader)) } diff --git a/vendor/github.com/nu7hatch/gouuid/uuid.go b/vendor/github.com/nu7hatch/gouuid/uuid.go index ac9623b72..ca960aa96 100644 --- a/vendor/github.com/nu7hatch/gouuid/uuid.go +++ b/vendor/github.com/nu7hatch/gouuid/uuid.go @@ -16,7 +16,7 @@ import ( "regexp" ) -// The UUID reserved variants. +// The UUID reserved variants. const ( ReservedNCS byte = 0x80 ReservedRFC4122 byte = 0x40 diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_access_key.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_access_key.go index 27d8a6215..e02ac7800 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_access_key.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_access_key.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type AccessKeyApiService service // CreateAccessKeyOpts Optional parameters for the method 'CreateAccessKey' type CreateAccessKeyOpts struct { - CreateAccessKeyRequest optional.Interface + CreateAccessKeyRequest optional.Interface } /* CreateAccessKey Method for CreateAccessKey * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateAccessKeyOpts - Optional Parameters: - * @param "CreateAccessKeyRequest" (optional.Interface of CreateAccessKeyRequest) - + * @param "CreateAccessKeyRequest" (optional.Interface of CreateAccessKeyRequest) - @return CreateAccessKeyResponse */ func (a *AccessKeyApiService) CreateAccessKey(ctx _context.Context, localVarOptionals *CreateAccessKeyOpts) (CreateAccessKeyResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *AccessKeyApiService) CreateAccessKey(ctx _context.Context, localVarOpti // DeleteAccessKeyOpts Optional parameters for the method 'DeleteAccessKey' type DeleteAccessKeyOpts struct { - DeleteAccessKeyRequest optional.Interface + DeleteAccessKeyRequest optional.Interface } /* DeleteAccessKey Method for DeleteAccessKey * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteAccessKeyOpts - Optional Parameters: - * @param "DeleteAccessKeyRequest" (optional.Interface of DeleteAccessKeyRequest) - + * @param "DeleteAccessKeyRequest" (optional.Interface of DeleteAccessKeyRequest) - @return DeleteAccessKeyResponse */ func (a *AccessKeyApiService) DeleteAccessKey(ctx _context.Context, localVarOptionals *DeleteAccessKeyOpts) (DeleteAccessKeyResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *AccessKeyApiService) DeleteAccessKey(ctx _context.Context, localVarOpti // ReadAccessKeysOpts Optional parameters for the method 'ReadAccessKeys' type ReadAccessKeysOpts struct { - ReadAccessKeysRequest optional.Interface + ReadAccessKeysRequest optional.Interface } /* ReadAccessKeys Method for ReadAccessKeys * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadAccessKeysOpts - Optional Parameters: - * @param "ReadAccessKeysRequest" (optional.Interface of ReadAccessKeysRequest) - + * @param "ReadAccessKeysRequest" (optional.Interface of ReadAccessKeysRequest) - @return ReadAccessKeysResponse */ func (a *AccessKeyApiService) ReadAccessKeys(ctx _context.Context, localVarOptionals *ReadAccessKeysOpts) (ReadAccessKeysResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *AccessKeyApiService) ReadAccessKeys(ctx _context.Context, localVarOptio // ReadSecretAccessKeyOpts Optional parameters for the method 'ReadSecretAccessKey' type ReadSecretAccessKeyOpts struct { - ReadSecretAccessKeyRequest optional.Interface + ReadSecretAccessKeyRequest optional.Interface } /* ReadSecretAccessKey Method for ReadSecretAccessKey * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadSecretAccessKeyOpts - Optional Parameters: - * @param "ReadSecretAccessKeyRequest" (optional.Interface of ReadSecretAccessKeyRequest) - + * @param "ReadSecretAccessKeyRequest" (optional.Interface of ReadSecretAccessKeyRequest) - @return ReadSecretAccessKeyResponse */ func (a *AccessKeyApiService) ReadSecretAccessKey(ctx _context.Context, localVarOptionals *ReadSecretAccessKeyOpts) (ReadSecretAccessKeyResponse, *_nethttp.Response, error) { @@ -472,14 +472,14 @@ func (a *AccessKeyApiService) ReadSecretAccessKey(ctx _context.Context, localVar // UpdateAccessKeyOpts Optional parameters for the method 'UpdateAccessKey' type UpdateAccessKeyOpts struct { - UpdateAccessKeyRequest optional.Interface + UpdateAccessKeyRequest optional.Interface } /* UpdateAccessKey Method for UpdateAccessKey * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateAccessKeyOpts - Optional Parameters: - * @param "UpdateAccessKeyRequest" (optional.Interface of UpdateAccessKeyRequest) - + * @param "UpdateAccessKeyRequest" (optional.Interface of UpdateAccessKeyRequest) - @return UpdateAccessKeyResponse */ func (a *AccessKeyApiService) UpdateAccessKey(ctx _context.Context, localVarOptionals *UpdateAccessKeyOpts) (UpdateAccessKeyResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_account.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_account.go index 0a6cfd046..2173ded68 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_account.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_account.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type AccountApiService service // CheckAuthenticationOpts Optional parameters for the method 'CheckAuthentication' type CheckAuthenticationOpts struct { - CheckAuthenticationRequest optional.Interface + CheckAuthenticationRequest optional.Interface } /* CheckAuthentication Method for CheckAuthentication * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CheckAuthenticationOpts - Optional Parameters: - * @param "CheckAuthenticationRequest" (optional.Interface of CheckAuthenticationRequest) - + * @param "CheckAuthenticationRequest" (optional.Interface of CheckAuthenticationRequest) - @return CheckAuthenticationResponse */ func (a *AccountApiService) CheckAuthentication(ctx _context.Context, localVarOptionals *CheckAuthenticationOpts) (CheckAuthenticationResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *AccountApiService) CheckAuthentication(ctx _context.Context, localVarOp // CreateAccountOpts Optional parameters for the method 'CreateAccount' type CreateAccountOpts struct { - CreateAccountRequest optional.Interface + CreateAccountRequest optional.Interface } /* CreateAccount Method for CreateAccount * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateAccountOpts - Optional Parameters: - * @param "CreateAccountRequest" (optional.Interface of CreateAccountRequest) - + * @param "CreateAccountRequest" (optional.Interface of CreateAccountRequest) - @return CreateAccountResponse */ func (a *AccountApiService) CreateAccount(ctx _context.Context, localVarOptionals *CreateAccountOpts) (CreateAccountResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *AccountApiService) CreateAccount(ctx _context.Context, localVarOptional // ReadAccountsOpts Optional parameters for the method 'ReadAccounts' type ReadAccountsOpts struct { - ReadAccountsRequest optional.Interface + ReadAccountsRequest optional.Interface } /* ReadAccounts Method for ReadAccounts * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadAccountsOpts - Optional Parameters: - * @param "ReadAccountsRequest" (optional.Interface of ReadAccountsRequest) - + * @param "ReadAccountsRequest" (optional.Interface of ReadAccountsRequest) - @return ReadAccountsResponse */ func (a *AccountApiService) ReadAccounts(ctx _context.Context, localVarOptionals *ReadAccountsOpts) (ReadAccountsResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *AccountApiService) ReadAccounts(ctx _context.Context, localVarOptionals // ResetAccountPasswordOpts Optional parameters for the method 'ResetAccountPassword' type ResetAccountPasswordOpts struct { - ResetAccountPasswordRequest optional.Interface + ResetAccountPasswordRequest optional.Interface } /* ResetAccountPassword Method for ResetAccountPassword * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ResetAccountPasswordOpts - Optional Parameters: - * @param "ResetAccountPasswordRequest" (optional.Interface of ResetAccountPasswordRequest) - + * @param "ResetAccountPasswordRequest" (optional.Interface of ResetAccountPasswordRequest) - @return ResetAccountPasswordResponse */ func (a *AccountApiService) ResetAccountPassword(ctx _context.Context, localVarOptionals *ResetAccountPasswordOpts) (ResetAccountPasswordResponse, *_nethttp.Response, error) { @@ -472,14 +472,14 @@ func (a *AccountApiService) ResetAccountPassword(ctx _context.Context, localVarO // SendResetPasswordEmailOpts Optional parameters for the method 'SendResetPasswordEmail' type SendResetPasswordEmailOpts struct { - SendResetPasswordEmailRequest optional.Interface + SendResetPasswordEmailRequest optional.Interface } /* SendResetPasswordEmail Method for SendResetPasswordEmail * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *SendResetPasswordEmailOpts - Optional Parameters: - * @param "SendResetPasswordEmailRequest" (optional.Interface of SendResetPasswordEmailRequest) - + * @param "SendResetPasswordEmailRequest" (optional.Interface of SendResetPasswordEmailRequest) - @return SendResetPasswordEmailResponse */ func (a *AccountApiService) SendResetPasswordEmail(ctx _context.Context, localVarOptionals *SendResetPasswordEmailOpts) (SendResetPasswordEmailResponse, *_nethttp.Response, error) { @@ -583,14 +583,14 @@ func (a *AccountApiService) SendResetPasswordEmail(ctx _context.Context, localVa // UpdateAccountOpts Optional parameters for the method 'UpdateAccount' type UpdateAccountOpts struct { - UpdateAccountRequest optional.Interface + UpdateAccountRequest optional.Interface } /* UpdateAccount Method for UpdateAccount * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateAccountOpts - Optional Parameters: - * @param "UpdateAccountRequest" (optional.Interface of UpdateAccountRequest) - + * @param "UpdateAccountRequest" (optional.Interface of UpdateAccountRequest) - @return UpdateAccountResponse */ func (a *AccountApiService) UpdateAccount(ctx _context.Context, localVarOptionals *UpdateAccountOpts) (UpdateAccountResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_api_log.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_api_log.go index 92d6d1c86..131eba298 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_api_log.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_api_log.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type ApiLogApiService service // ReadApiLogsOpts Optional parameters for the method 'ReadApiLogs' type ReadApiLogsOpts struct { - ReadApiLogsRequest optional.Interface + ReadApiLogsRequest optional.Interface } /* ReadApiLogs Method for ReadApiLogs * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadApiLogsOpts - Optional Parameters: - * @param "ReadApiLogsRequest" (optional.Interface of ReadApiLogsRequest) - + * @param "ReadApiLogsRequest" (optional.Interface of ReadApiLogsRequest) - @return ReadApiLogsResponse */ func (a *ApiLogApiService) ReadApiLogs(ctx _context.Context, localVarOptionals *ReadApiLogsOpts) (ReadApiLogsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_client_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_client_gateway.go index c71cbda03..164354f96 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_client_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_client_gateway.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type ClientGatewayApiService service // CreateClientGatewayOpts Optional parameters for the method 'CreateClientGateway' type CreateClientGatewayOpts struct { - CreateClientGatewayRequest optional.Interface + CreateClientGatewayRequest optional.Interface } /* CreateClientGateway Method for CreateClientGateway * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateClientGatewayOpts - Optional Parameters: - * @param "CreateClientGatewayRequest" (optional.Interface of CreateClientGatewayRequest) - + * @param "CreateClientGatewayRequest" (optional.Interface of CreateClientGatewayRequest) - @return CreateClientGatewayResponse */ func (a *ClientGatewayApiService) CreateClientGateway(ctx _context.Context, localVarOptionals *CreateClientGatewayOpts) (CreateClientGatewayResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *ClientGatewayApiService) CreateClientGateway(ctx _context.Context, loca // DeleteClientGatewayOpts Optional parameters for the method 'DeleteClientGateway' type DeleteClientGatewayOpts struct { - DeleteClientGatewayRequest optional.Interface + DeleteClientGatewayRequest optional.Interface } /* DeleteClientGateway Method for DeleteClientGateway * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteClientGatewayOpts - Optional Parameters: - * @param "DeleteClientGatewayRequest" (optional.Interface of DeleteClientGatewayRequest) - + * @param "DeleteClientGatewayRequest" (optional.Interface of DeleteClientGatewayRequest) - @return DeleteClientGatewayResponse */ func (a *ClientGatewayApiService) DeleteClientGateway(ctx _context.Context, localVarOptionals *DeleteClientGatewayOpts) (DeleteClientGatewayResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *ClientGatewayApiService) DeleteClientGateway(ctx _context.Context, loca // ReadClientGatewaysOpts Optional parameters for the method 'ReadClientGateways' type ReadClientGatewaysOpts struct { - ReadClientGatewaysRequest optional.Interface + ReadClientGatewaysRequest optional.Interface } /* ReadClientGateways Method for ReadClientGateways * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadClientGatewaysOpts - Optional Parameters: - * @param "ReadClientGatewaysRequest" (optional.Interface of ReadClientGatewaysRequest) - + * @param "ReadClientGatewaysRequest" (optional.Interface of ReadClientGatewaysRequest) - @return ReadClientGatewaysResponse */ func (a *ClientGatewayApiService) ReadClientGateways(ctx _context.Context, localVarOptionals *ReadClientGatewaysOpts) (ReadClientGatewaysResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_default.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_default.go index 4a962c857..97f637ef4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_default.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_default.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type DefaultApiService service // ReadConsumptionAccountOpts Optional parameters for the method 'ReadConsumptionAccount' type ReadConsumptionAccountOpts struct { - ReadConsumptionAccountRequest optional.Interface + ReadConsumptionAccountRequest optional.Interface } /* ReadConsumptionAccount Method for ReadConsumptionAccount * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadConsumptionAccountOpts - Optional Parameters: - * @param "ReadConsumptionAccountRequest" (optional.Interface of ReadConsumptionAccountRequest) - + * @param "ReadConsumptionAccountRequest" (optional.Interface of ReadConsumptionAccountRequest) - @return ReadConsumptionAccountResponse */ func (a *DefaultApiService) ReadConsumptionAccount(ctx _context.Context, localVarOptionals *ReadConsumptionAccountOpts) (ReadConsumptionAccountResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_dhcp_option.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_dhcp_option.go index d0743341e..a739acca3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_dhcp_option.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_dhcp_option.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type DhcpOptionApiService service // CreateDhcpOptionsOpts Optional parameters for the method 'CreateDhcpOptions' type CreateDhcpOptionsOpts struct { - CreateDhcpOptionsRequest optional.Interface + CreateDhcpOptionsRequest optional.Interface } /* CreateDhcpOptions Method for CreateDhcpOptions * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateDhcpOptionsOpts - Optional Parameters: - * @param "CreateDhcpOptionsRequest" (optional.Interface of CreateDhcpOptionsRequest) - + * @param "CreateDhcpOptionsRequest" (optional.Interface of CreateDhcpOptionsRequest) - @return CreateDhcpOptionsResponse */ func (a *DhcpOptionApiService) CreateDhcpOptions(ctx _context.Context, localVarOptionals *CreateDhcpOptionsOpts) (CreateDhcpOptionsResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *DhcpOptionApiService) CreateDhcpOptions(ctx _context.Context, localVarO // DeleteDhcpOptionsOpts Optional parameters for the method 'DeleteDhcpOptions' type DeleteDhcpOptionsOpts struct { - DeleteDhcpOptionsRequest optional.Interface + DeleteDhcpOptionsRequest optional.Interface } /* DeleteDhcpOptions Method for DeleteDhcpOptions * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteDhcpOptionsOpts - Optional Parameters: - * @param "DeleteDhcpOptionsRequest" (optional.Interface of DeleteDhcpOptionsRequest) - + * @param "DeleteDhcpOptionsRequest" (optional.Interface of DeleteDhcpOptionsRequest) - @return DeleteDhcpOptionsResponse */ func (a *DhcpOptionApiService) DeleteDhcpOptions(ctx _context.Context, localVarOptionals *DeleteDhcpOptionsOpts) (DeleteDhcpOptionsResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *DhcpOptionApiService) DeleteDhcpOptions(ctx _context.Context, localVarO // ReadDhcpOptionsOpts Optional parameters for the method 'ReadDhcpOptions' type ReadDhcpOptionsOpts struct { - ReadDhcpOptionsRequest optional.Interface + ReadDhcpOptionsRequest optional.Interface } /* ReadDhcpOptions Method for ReadDhcpOptions * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadDhcpOptionsOpts - Optional Parameters: - * @param "ReadDhcpOptionsRequest" (optional.Interface of ReadDhcpOptionsRequest) - + * @param "ReadDhcpOptionsRequest" (optional.Interface of ReadDhcpOptionsRequest) - @return ReadDhcpOptionsResponse */ func (a *DhcpOptionApiService) ReadDhcpOptions(ctx _context.Context, localVarOptionals *ReadDhcpOptionsOpts) (ReadDhcpOptionsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link.go index ff217653d..991c794f3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type DirectLinkApiService service // CreateDirectLinkOpts Optional parameters for the method 'CreateDirectLink' type CreateDirectLinkOpts struct { - CreateDirectLinkRequest optional.Interface + CreateDirectLinkRequest optional.Interface } /* CreateDirectLink Method for CreateDirectLink * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateDirectLinkOpts - Optional Parameters: - * @param "CreateDirectLinkRequest" (optional.Interface of CreateDirectLinkRequest) - + * @param "CreateDirectLinkRequest" (optional.Interface of CreateDirectLinkRequest) - @return CreateDirectLinkResponse */ func (a *DirectLinkApiService) CreateDirectLink(ctx _context.Context, localVarOptionals *CreateDirectLinkOpts) (CreateDirectLinkResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *DirectLinkApiService) CreateDirectLink(ctx _context.Context, localVarOp // DeleteDirectLinkOpts Optional parameters for the method 'DeleteDirectLink' type DeleteDirectLinkOpts struct { - DeleteDirectLinkRequest optional.Interface + DeleteDirectLinkRequest optional.Interface } /* DeleteDirectLink Method for DeleteDirectLink * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteDirectLinkOpts - Optional Parameters: - * @param "DeleteDirectLinkRequest" (optional.Interface of DeleteDirectLinkRequest) - + * @param "DeleteDirectLinkRequest" (optional.Interface of DeleteDirectLinkRequest) - @return DeleteDirectLinkResponse */ func (a *DirectLinkApiService) DeleteDirectLink(ctx _context.Context, localVarOptionals *DeleteDirectLinkOpts) (DeleteDirectLinkResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *DirectLinkApiService) DeleteDirectLink(ctx _context.Context, localVarOp // ReadDirectLinksOpts Optional parameters for the method 'ReadDirectLinks' type ReadDirectLinksOpts struct { - ReadDirectLinksRequest optional.Interface + ReadDirectLinksRequest optional.Interface } /* ReadDirectLinks Method for ReadDirectLinks * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadDirectLinksOpts - Optional Parameters: - * @param "ReadDirectLinksRequest" (optional.Interface of ReadDirectLinksRequest) - + * @param "ReadDirectLinksRequest" (optional.Interface of ReadDirectLinksRequest) - @return ReadDirectLinksResponse */ func (a *DirectLinkApiService) ReadDirectLinks(ctx _context.Context, localVarOptionals *ReadDirectLinksOpts) (ReadDirectLinksResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link_interface.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link_interface.go index a966fa0f6..dadd38427 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link_interface.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link_interface.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type DirectLinkInterfaceApiService service // CreateDirectLinkInterfaceOpts Optional parameters for the method 'CreateDirectLinkInterface' type CreateDirectLinkInterfaceOpts struct { - CreateDirectLinkInterfaceRequest optional.Interface + CreateDirectLinkInterfaceRequest optional.Interface } /* CreateDirectLinkInterface Method for CreateDirectLinkInterface * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateDirectLinkInterfaceOpts - Optional Parameters: - * @param "CreateDirectLinkInterfaceRequest" (optional.Interface of CreateDirectLinkInterfaceRequest) - + * @param "CreateDirectLinkInterfaceRequest" (optional.Interface of CreateDirectLinkInterfaceRequest) - @return CreateDirectLinkInterfaceResponse */ func (a *DirectLinkInterfaceApiService) CreateDirectLinkInterface(ctx _context.Context, localVarOptionals *CreateDirectLinkInterfaceOpts) (CreateDirectLinkInterfaceResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *DirectLinkInterfaceApiService) CreateDirectLinkInterface(ctx _context.C // DeleteDirectLinkInterfaceOpts Optional parameters for the method 'DeleteDirectLinkInterface' type DeleteDirectLinkInterfaceOpts struct { - DeleteDirectLinkInterfaceRequest optional.Interface + DeleteDirectLinkInterfaceRequest optional.Interface } /* DeleteDirectLinkInterface Method for DeleteDirectLinkInterface * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteDirectLinkInterfaceOpts - Optional Parameters: - * @param "DeleteDirectLinkInterfaceRequest" (optional.Interface of DeleteDirectLinkInterfaceRequest) - + * @param "DeleteDirectLinkInterfaceRequest" (optional.Interface of DeleteDirectLinkInterfaceRequest) - @return DeleteDirectLinkInterfaceResponse */ func (a *DirectLinkInterfaceApiService) DeleteDirectLinkInterface(ctx _context.Context, localVarOptionals *DeleteDirectLinkInterfaceOpts) (DeleteDirectLinkInterfaceResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *DirectLinkInterfaceApiService) DeleteDirectLinkInterface(ctx _context.C // ReadDirectLinkInterfacesOpts Optional parameters for the method 'ReadDirectLinkInterfaces' type ReadDirectLinkInterfacesOpts struct { - ReadDirectLinkInterfacesRequest optional.Interface + ReadDirectLinkInterfacesRequest optional.Interface } /* ReadDirectLinkInterfaces Method for ReadDirectLinkInterfaces * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadDirectLinkInterfacesOpts - Optional Parameters: - * @param "ReadDirectLinkInterfacesRequest" (optional.Interface of ReadDirectLinkInterfacesRequest) - + * @param "ReadDirectLinkInterfacesRequest" (optional.Interface of ReadDirectLinkInterfacesRequest) - @return ReadDirectLinkInterfacesResponse */ func (a *DirectLinkInterfaceApiService) ReadDirectLinkInterfaces(ctx _context.Context, localVarOptionals *ReadDirectLinkInterfacesOpts) (ReadDirectLinkInterfacesResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_flexible_gpu.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_flexible_gpu.go index de77c0b2f..4f444f61a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_flexible_gpu.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_flexible_gpu.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type FlexibleGpuApiService service // CreateFlexibleGpuOpts Optional parameters for the method 'CreateFlexibleGpu' type CreateFlexibleGpuOpts struct { - CreateFlexibleGpuRequest optional.Interface + CreateFlexibleGpuRequest optional.Interface } /* CreateFlexibleGpu Method for CreateFlexibleGpu * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateFlexibleGpuOpts - Optional Parameters: - * @param "CreateFlexibleGpuRequest" (optional.Interface of CreateFlexibleGpuRequest) - + * @param "CreateFlexibleGpuRequest" (optional.Interface of CreateFlexibleGpuRequest) - @return CreateFlexibleGpuResponse */ func (a *FlexibleGpuApiService) CreateFlexibleGpu(ctx _context.Context, localVarOptionals *CreateFlexibleGpuOpts) (CreateFlexibleGpuResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *FlexibleGpuApiService) CreateFlexibleGpu(ctx _context.Context, localVar // DeleteFlexibleGpuOpts Optional parameters for the method 'DeleteFlexibleGpu' type DeleteFlexibleGpuOpts struct { - DeleteFlexibleGpuRequest optional.Interface + DeleteFlexibleGpuRequest optional.Interface } /* DeleteFlexibleGpu Method for DeleteFlexibleGpu * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteFlexibleGpuOpts - Optional Parameters: - * @param "DeleteFlexibleGpuRequest" (optional.Interface of DeleteFlexibleGpuRequest) - + * @param "DeleteFlexibleGpuRequest" (optional.Interface of DeleteFlexibleGpuRequest) - @return DeleteFlexibleGpuResponse */ func (a *FlexibleGpuApiService) DeleteFlexibleGpu(ctx _context.Context, localVarOptionals *DeleteFlexibleGpuOpts) (DeleteFlexibleGpuResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *FlexibleGpuApiService) DeleteFlexibleGpu(ctx _context.Context, localVar // LinkFlexibleGpuOpts Optional parameters for the method 'LinkFlexibleGpu' type LinkFlexibleGpuOpts struct { - LinkFlexibleGpuRequest optional.Interface + LinkFlexibleGpuRequest optional.Interface } /* LinkFlexibleGpu Method for LinkFlexibleGpu * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkFlexibleGpuOpts - Optional Parameters: - * @param "LinkFlexibleGpuRequest" (optional.Interface of LinkFlexibleGpuRequest) - + * @param "LinkFlexibleGpuRequest" (optional.Interface of LinkFlexibleGpuRequest) - @return LinkFlexibleGpuResponse */ func (a *FlexibleGpuApiService) LinkFlexibleGpu(ctx _context.Context, localVarOptionals *LinkFlexibleGpuOpts) (LinkFlexibleGpuResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *FlexibleGpuApiService) LinkFlexibleGpu(ctx _context.Context, localVarOp // ReadFlexibleGpuCatalogOpts Optional parameters for the method 'ReadFlexibleGpuCatalog' type ReadFlexibleGpuCatalogOpts struct { - ReadFlexibleGpuCatalogRequest optional.Interface + ReadFlexibleGpuCatalogRequest optional.Interface } /* ReadFlexibleGpuCatalog Method for ReadFlexibleGpuCatalog * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadFlexibleGpuCatalogOpts - Optional Parameters: - * @param "ReadFlexibleGpuCatalogRequest" (optional.Interface of ReadFlexibleGpuCatalogRequest) - + * @param "ReadFlexibleGpuCatalogRequest" (optional.Interface of ReadFlexibleGpuCatalogRequest) - @return ReadFlexibleGpuCatalogResponse */ func (a *FlexibleGpuApiService) ReadFlexibleGpuCatalog(ctx _context.Context, localVarOptionals *ReadFlexibleGpuCatalogOpts) (ReadFlexibleGpuCatalogResponse, *_nethttp.Response, error) { @@ -460,14 +460,14 @@ func (a *FlexibleGpuApiService) ReadFlexibleGpuCatalog(ctx _context.Context, loc // ReadFlexibleGpusOpts Optional parameters for the method 'ReadFlexibleGpus' type ReadFlexibleGpusOpts struct { - ReadFlexibleGpusRequest optional.Interface + ReadFlexibleGpusRequest optional.Interface } /* ReadFlexibleGpus Method for ReadFlexibleGpus * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadFlexibleGpusOpts - Optional Parameters: - * @param "ReadFlexibleGpusRequest" (optional.Interface of ReadFlexibleGpusRequest) - + * @param "ReadFlexibleGpusRequest" (optional.Interface of ReadFlexibleGpusRequest) - @return ReadFlexibleGpusResponse */ func (a *FlexibleGpuApiService) ReadFlexibleGpus(ctx _context.Context, localVarOptionals *ReadFlexibleGpusOpts) (ReadFlexibleGpusResponse, *_nethttp.Response, error) { @@ -571,14 +571,14 @@ func (a *FlexibleGpuApiService) ReadFlexibleGpus(ctx _context.Context, localVarO // UnlinkFlexibleGpuOpts Optional parameters for the method 'UnlinkFlexibleGpu' type UnlinkFlexibleGpuOpts struct { - UnlinkFlexibleGpuRequest optional.Interface + UnlinkFlexibleGpuRequest optional.Interface } /* UnlinkFlexibleGpu Method for UnlinkFlexibleGpu * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkFlexibleGpuOpts - Optional Parameters: - * @param "UnlinkFlexibleGpuRequest" (optional.Interface of UnlinkFlexibleGpuRequest) - + * @param "UnlinkFlexibleGpuRequest" (optional.Interface of UnlinkFlexibleGpuRequest) - @return UnlinkFlexibleGpuResponse */ func (a *FlexibleGpuApiService) UnlinkFlexibleGpu(ctx _context.Context, localVarOptionals *UnlinkFlexibleGpuOpts) (UnlinkFlexibleGpuResponse, *_nethttp.Response, error) { @@ -682,14 +682,14 @@ func (a *FlexibleGpuApiService) UnlinkFlexibleGpu(ctx _context.Context, localVar // UpdateFlexibleGpuOpts Optional parameters for the method 'UpdateFlexibleGpu' type UpdateFlexibleGpuOpts struct { - UpdateFlexibleGpuRequest optional.Interface + UpdateFlexibleGpuRequest optional.Interface } /* UpdateFlexibleGpu Method for UpdateFlexibleGpu * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateFlexibleGpuOpts - Optional Parameters: - * @param "UpdateFlexibleGpuRequest" (optional.Interface of UpdateFlexibleGpuRequest) - + * @param "UpdateFlexibleGpuRequest" (optional.Interface of UpdateFlexibleGpuRequest) - @return UpdateFlexibleGpuResponse */ func (a *FlexibleGpuApiService) UpdateFlexibleGpu(ctx _context.Context, localVarOptionals *UpdateFlexibleGpuOpts) (UpdateFlexibleGpuResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_image.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_image.go index fbb23f3e4..0a1d0fdbe 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_image.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_image.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type ImageApiService service // CreateImageOpts Optional parameters for the method 'CreateImage' type CreateImageOpts struct { - CreateImageRequest optional.Interface + CreateImageRequest optional.Interface } /* CreateImage Method for CreateImage * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateImageOpts - Optional Parameters: - * @param "CreateImageRequest" (optional.Interface of CreateImageRequest) - + * @param "CreateImageRequest" (optional.Interface of CreateImageRequest) - @return CreateImageResponse */ func (a *ImageApiService) CreateImage(ctx _context.Context, localVarOptionals *CreateImageOpts) (CreateImageResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *ImageApiService) CreateImage(ctx _context.Context, localVarOptionals *C // CreateImageExportTaskOpts Optional parameters for the method 'CreateImageExportTask' type CreateImageExportTaskOpts struct { - CreateImageExportTaskRequest optional.Interface + CreateImageExportTaskRequest optional.Interface } /* CreateImageExportTask Method for CreateImageExportTask * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateImageExportTaskOpts - Optional Parameters: - * @param "CreateImageExportTaskRequest" (optional.Interface of CreateImageExportTaskRequest) - + * @param "CreateImageExportTaskRequest" (optional.Interface of CreateImageExportTaskRequest) - @return CreateImageExportTaskResponse */ func (a *ImageApiService) CreateImageExportTask(ctx _context.Context, localVarOptionals *CreateImageExportTaskOpts) (CreateImageExportTaskResponse, *_nethttp.Response, error) { @@ -280,14 +280,14 @@ func (a *ImageApiService) CreateImageExportTask(ctx _context.Context, localVarOp // DeleteImageOpts Optional parameters for the method 'DeleteImage' type DeleteImageOpts struct { - DeleteImageRequest optional.Interface + DeleteImageRequest optional.Interface } /* DeleteImage Method for DeleteImage * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteImageOpts - Optional Parameters: - * @param "DeleteImageRequest" (optional.Interface of DeleteImageRequest) - + * @param "DeleteImageRequest" (optional.Interface of DeleteImageRequest) - @return DeleteImageResponse */ func (a *ImageApiService) DeleteImage(ctx _context.Context, localVarOptionals *DeleteImageOpts) (DeleteImageResponse, *_nethttp.Response, error) { @@ -421,14 +421,14 @@ func (a *ImageApiService) DeleteImage(ctx _context.Context, localVarOptionals *D // ReadImageExportTasksOpts Optional parameters for the method 'ReadImageExportTasks' type ReadImageExportTasksOpts struct { - ReadImageExportTasksRequest optional.Interface + ReadImageExportTasksRequest optional.Interface } /* ReadImageExportTasks Method for ReadImageExportTasks * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadImageExportTasksOpts - Optional Parameters: - * @param "ReadImageExportTasksRequest" (optional.Interface of ReadImageExportTasksRequest) - + * @param "ReadImageExportTasksRequest" (optional.Interface of ReadImageExportTasksRequest) - @return ReadImageExportTasksResponse */ func (a *ImageApiService) ReadImageExportTasks(ctx _context.Context, localVarOptionals *ReadImageExportTasksOpts) (ReadImageExportTasksResponse, *_nethttp.Response, error) { @@ -532,14 +532,14 @@ func (a *ImageApiService) ReadImageExportTasks(ctx _context.Context, localVarOpt // ReadImagesOpts Optional parameters for the method 'ReadImages' type ReadImagesOpts struct { - ReadImagesRequest optional.Interface + ReadImagesRequest optional.Interface } /* ReadImages Method for ReadImages * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadImagesOpts - Optional Parameters: - * @param "ReadImagesRequest" (optional.Interface of ReadImagesRequest) - + * @param "ReadImagesRequest" (optional.Interface of ReadImagesRequest) - @return ReadImagesResponse */ func (a *ImageApiService) ReadImages(ctx _context.Context, localVarOptionals *ReadImagesOpts) (ReadImagesResponse, *_nethttp.Response, error) { @@ -673,14 +673,14 @@ func (a *ImageApiService) ReadImages(ctx _context.Context, localVarOptionals *Re // UpdateImageOpts Optional parameters for the method 'UpdateImage' type UpdateImageOpts struct { - UpdateImageRequest optional.Interface + UpdateImageRequest optional.Interface } /* UpdateImage Method for UpdateImage * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateImageOpts - Optional Parameters: - * @param "UpdateImageRequest" (optional.Interface of UpdateImageRequest) - + * @param "UpdateImageRequest" (optional.Interface of UpdateImageRequest) - @return UpdateImageResponse */ func (a *ImageApiService) UpdateImage(ctx _context.Context, localVarOptionals *UpdateImageOpts) (UpdateImageResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_internet_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_internet_service.go index c8926ae7c..c3fd524f8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_internet_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_internet_service.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type InternetServiceApiService service // CreateInternetServiceOpts Optional parameters for the method 'CreateInternetService' type CreateInternetServiceOpts struct { - CreateInternetServiceRequest optional.Interface + CreateInternetServiceRequest optional.Interface } /* CreateInternetService Method for CreateInternetService * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateInternetServiceOpts - Optional Parameters: - * @param "CreateInternetServiceRequest" (optional.Interface of CreateInternetServiceRequest) - + * @param "CreateInternetServiceRequest" (optional.Interface of CreateInternetServiceRequest) - @return CreateInternetServiceResponse */ func (a *InternetServiceApiService) CreateInternetService(ctx _context.Context, localVarOptionals *CreateInternetServiceOpts) (CreateInternetServiceResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *InternetServiceApiService) CreateInternetService(ctx _context.Context, // DeleteInternetServiceOpts Optional parameters for the method 'DeleteInternetService' type DeleteInternetServiceOpts struct { - DeleteInternetServiceRequest optional.Interface + DeleteInternetServiceRequest optional.Interface } /* DeleteInternetService Method for DeleteInternetService * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteInternetServiceOpts - Optional Parameters: - * @param "DeleteInternetServiceRequest" (optional.Interface of DeleteInternetServiceRequest) - + * @param "DeleteInternetServiceRequest" (optional.Interface of DeleteInternetServiceRequest) - @return DeleteInternetServiceResponse */ func (a *InternetServiceApiService) DeleteInternetService(ctx _context.Context, localVarOptionals *DeleteInternetServiceOpts) (DeleteInternetServiceResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *InternetServiceApiService) DeleteInternetService(ctx _context.Context, // LinkInternetServiceOpts Optional parameters for the method 'LinkInternetService' type LinkInternetServiceOpts struct { - LinkInternetServiceRequest optional.Interface + LinkInternetServiceRequest optional.Interface } /* LinkInternetService Method for LinkInternetService * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkInternetServiceOpts - Optional Parameters: - * @param "LinkInternetServiceRequest" (optional.Interface of LinkInternetServiceRequest) - + * @param "LinkInternetServiceRequest" (optional.Interface of LinkInternetServiceRequest) - @return LinkInternetServiceResponse */ func (a *InternetServiceApiService) LinkInternetService(ctx _context.Context, localVarOptionals *LinkInternetServiceOpts) (LinkInternetServiceResponse, *_nethttp.Response, error) { @@ -451,14 +451,14 @@ func (a *InternetServiceApiService) LinkInternetService(ctx _context.Context, lo // ReadInternetServicesOpts Optional parameters for the method 'ReadInternetServices' type ReadInternetServicesOpts struct { - ReadInternetServicesRequest optional.Interface + ReadInternetServicesRequest optional.Interface } /* ReadInternetServices Method for ReadInternetServices * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadInternetServicesOpts - Optional Parameters: - * @param "ReadInternetServicesRequest" (optional.Interface of ReadInternetServicesRequest) - + * @param "ReadInternetServicesRequest" (optional.Interface of ReadInternetServicesRequest) - @return ReadInternetServicesResponse */ func (a *InternetServiceApiService) ReadInternetServices(ctx _context.Context, localVarOptionals *ReadInternetServicesOpts) (ReadInternetServicesResponse, *_nethttp.Response, error) { @@ -592,14 +592,14 @@ func (a *InternetServiceApiService) ReadInternetServices(ctx _context.Context, l // UnlinkInternetServiceOpts Optional parameters for the method 'UnlinkInternetService' type UnlinkInternetServiceOpts struct { - UnlinkInternetServiceRequest optional.Interface + UnlinkInternetServiceRequest optional.Interface } /* UnlinkInternetService Method for UnlinkInternetService * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkInternetServiceOpts - Optional Parameters: - * @param "UnlinkInternetServiceRequest" (optional.Interface of UnlinkInternetServiceRequest) - + * @param "UnlinkInternetServiceRequest" (optional.Interface of UnlinkInternetServiceRequest) - @return UnlinkInternetServiceResponse */ func (a *InternetServiceApiService) UnlinkInternetService(ctx _context.Context, localVarOptionals *UnlinkInternetServiceOpts) (UnlinkInternetServiceResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_keypair.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_keypair.go index ca89255b9..c57263ff2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_keypair.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_keypair.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type KeypairApiService service // CreateKeypairOpts Optional parameters for the method 'CreateKeypair' type CreateKeypairOpts struct { - CreateKeypairRequest optional.Interface + CreateKeypairRequest optional.Interface } /* CreateKeypair Method for CreateKeypair * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateKeypairOpts - Optional Parameters: - * @param "CreateKeypairRequest" (optional.Interface of CreateKeypairRequest) - + * @param "CreateKeypairRequest" (optional.Interface of CreateKeypairRequest) - @return CreateKeypairResponse */ func (a *KeypairApiService) CreateKeypair(ctx _context.Context, localVarOptionals *CreateKeypairOpts) (CreateKeypairResponse, *_nethttp.Response, error) { @@ -179,14 +179,14 @@ func (a *KeypairApiService) CreateKeypair(ctx _context.Context, localVarOptional // DeleteKeypairOpts Optional parameters for the method 'DeleteKeypair' type DeleteKeypairOpts struct { - DeleteKeypairRequest optional.Interface + DeleteKeypairRequest optional.Interface } /* DeleteKeypair Method for DeleteKeypair * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteKeypairOpts - Optional Parameters: - * @param "DeleteKeypairRequest" (optional.Interface of DeleteKeypairRequest) - + * @param "DeleteKeypairRequest" (optional.Interface of DeleteKeypairRequest) - @return DeleteKeypairResponse */ func (a *KeypairApiService) DeleteKeypair(ctx _context.Context, localVarOptionals *DeleteKeypairOpts) (DeleteKeypairResponse, *_nethttp.Response, error) { @@ -320,14 +320,14 @@ func (a *KeypairApiService) DeleteKeypair(ctx _context.Context, localVarOptional // ReadKeypairsOpts Optional parameters for the method 'ReadKeypairs' type ReadKeypairsOpts struct { - ReadKeypairsRequest optional.Interface + ReadKeypairsRequest optional.Interface } /* ReadKeypairs Method for ReadKeypairs * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadKeypairsOpts - Optional Parameters: - * @param "ReadKeypairsRequest" (optional.Interface of ReadKeypairsRequest) - + * @param "ReadKeypairsRequest" (optional.Interface of ReadKeypairsRequest) - @return ReadKeypairsResponse */ func (a *KeypairApiService) ReadKeypairs(ctx _context.Context, localVarOptionals *ReadKeypairsOpts) (ReadKeypairsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_listener.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_listener.go index dbde0e860..27b9735be 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_listener.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_listener.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type ListenerApiService service // CreateListenerRuleOpts Optional parameters for the method 'CreateListenerRule' type CreateListenerRuleOpts struct { - CreateListenerRuleRequest optional.Interface + CreateListenerRuleRequest optional.Interface } /* CreateListenerRule Method for CreateListenerRule * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateListenerRuleOpts - Optional Parameters: - * @param "CreateListenerRuleRequest" (optional.Interface of CreateListenerRuleRequest) - + * @param "CreateListenerRuleRequest" (optional.Interface of CreateListenerRuleRequest) - @return CreateListenerRuleResponse */ func (a *ListenerApiService) CreateListenerRule(ctx _context.Context, localVarOptionals *CreateListenerRuleOpts) (CreateListenerRuleResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *ListenerApiService) CreateListenerRule(ctx _context.Context, localVarOp // CreateLoadBalancerListenersOpts Optional parameters for the method 'CreateLoadBalancerListeners' type CreateLoadBalancerListenersOpts struct { - CreateLoadBalancerListenersRequest optional.Interface + CreateLoadBalancerListenersRequest optional.Interface } /* CreateLoadBalancerListeners Method for CreateLoadBalancerListeners * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateLoadBalancerListenersOpts - Optional Parameters: - * @param "CreateLoadBalancerListenersRequest" (optional.Interface of CreateLoadBalancerListenersRequest) - + * @param "CreateLoadBalancerListenersRequest" (optional.Interface of CreateLoadBalancerListenersRequest) - @return CreateLoadBalancerListenersResponse */ func (a *ListenerApiService) CreateLoadBalancerListeners(ctx _context.Context, localVarOptionals *CreateLoadBalancerListenersOpts) (CreateLoadBalancerListenersResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *ListenerApiService) CreateLoadBalancerListeners(ctx _context.Context, l // DeleteListenerRuleOpts Optional parameters for the method 'DeleteListenerRule' type DeleteListenerRuleOpts struct { - DeleteListenerRuleRequest optional.Interface + DeleteListenerRuleRequest optional.Interface } /* DeleteListenerRule Method for DeleteListenerRule * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteListenerRuleOpts - Optional Parameters: - * @param "DeleteListenerRuleRequest" (optional.Interface of DeleteListenerRuleRequest) - + * @param "DeleteListenerRuleRequest" (optional.Interface of DeleteListenerRuleRequest) - @return DeleteListenerRuleResponse */ func (a *ListenerApiService) DeleteListenerRule(ctx _context.Context, localVarOptionals *DeleteListenerRuleOpts) (DeleteListenerRuleResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *ListenerApiService) DeleteListenerRule(ctx _context.Context, localVarOp // DeleteLoadBalancerListenersOpts Optional parameters for the method 'DeleteLoadBalancerListeners' type DeleteLoadBalancerListenersOpts struct { - DeleteLoadBalancerListenersRequest optional.Interface + DeleteLoadBalancerListenersRequest optional.Interface } /* DeleteLoadBalancerListeners Method for DeleteLoadBalancerListeners * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteLoadBalancerListenersOpts - Optional Parameters: - * @param "DeleteLoadBalancerListenersRequest" (optional.Interface of DeleteLoadBalancerListenersRequest) - + * @param "DeleteLoadBalancerListenersRequest" (optional.Interface of DeleteLoadBalancerListenersRequest) - @return DeleteLoadBalancerListenersResponse */ func (a *ListenerApiService) DeleteLoadBalancerListeners(ctx _context.Context, localVarOptionals *DeleteLoadBalancerListenersOpts) (DeleteLoadBalancerListenersResponse, *_nethttp.Response, error) { @@ -472,14 +472,14 @@ func (a *ListenerApiService) DeleteLoadBalancerListeners(ctx _context.Context, l // ReadListenerRulesOpts Optional parameters for the method 'ReadListenerRules' type ReadListenerRulesOpts struct { - ReadListenerRulesRequest optional.Interface + ReadListenerRulesRequest optional.Interface } /* ReadListenerRules Method for ReadListenerRules * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadListenerRulesOpts - Optional Parameters: - * @param "ReadListenerRulesRequest" (optional.Interface of ReadListenerRulesRequest) - + * @param "ReadListenerRulesRequest" (optional.Interface of ReadListenerRulesRequest) - @return ReadListenerRulesResponse */ func (a *ListenerApiService) ReadListenerRules(ctx _context.Context, localVarOptionals *ReadListenerRulesOpts) (ReadListenerRulesResponse, *_nethttp.Response, error) { @@ -583,14 +583,14 @@ func (a *ListenerApiService) ReadListenerRules(ctx _context.Context, localVarOpt // UpdateListenerRuleOpts Optional parameters for the method 'UpdateListenerRule' type UpdateListenerRuleOpts struct { - UpdateListenerRuleRequest optional.Interface + UpdateListenerRuleRequest optional.Interface } /* UpdateListenerRule Method for UpdateListenerRule * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateListenerRuleOpts - Optional Parameters: - * @param "UpdateListenerRuleRequest" (optional.Interface of UpdateListenerRuleRequest) - + * @param "UpdateListenerRuleRequest" (optional.Interface of UpdateListenerRuleRequest) - @return UpdateListenerRuleResponse */ func (a *ListenerApiService) UpdateListenerRule(ctx _context.Context, localVarOptionals *UpdateListenerRuleOpts) (UpdateListenerRuleResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer.go index 7305f5d21..75b074ace 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type LoadBalancerApiService service // CreateLoadBalancerOpts Optional parameters for the method 'CreateLoadBalancer' type CreateLoadBalancerOpts struct { - CreateLoadBalancerRequest optional.Interface + CreateLoadBalancerRequest optional.Interface } /* CreateLoadBalancer Method for CreateLoadBalancer * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateLoadBalancerOpts - Optional Parameters: - * @param "CreateLoadBalancerRequest" (optional.Interface of CreateLoadBalancerRequest) - + * @param "CreateLoadBalancerRequest" (optional.Interface of CreateLoadBalancerRequest) - @return CreateLoadBalancerResponse */ func (a *LoadBalancerApiService) CreateLoadBalancer(ctx _context.Context, localVarOptionals *CreateLoadBalancerOpts) (CreateLoadBalancerResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *LoadBalancerApiService) CreateLoadBalancer(ctx _context.Context, localV // CreateLoadBalancerTagsOpts Optional parameters for the method 'CreateLoadBalancerTags' type CreateLoadBalancerTagsOpts struct { - CreateLoadBalancerTagsRequest optional.Interface + CreateLoadBalancerTagsRequest optional.Interface } /* CreateLoadBalancerTags Method for CreateLoadBalancerTags * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateLoadBalancerTagsOpts - Optional Parameters: - * @param "CreateLoadBalancerTagsRequest" (optional.Interface of CreateLoadBalancerTagsRequest) - + * @param "CreateLoadBalancerTagsRequest" (optional.Interface of CreateLoadBalancerTagsRequest) - @return CreateLoadBalancerTagsResponse */ func (a *LoadBalancerApiService) CreateLoadBalancerTags(ctx _context.Context, localVarOptionals *CreateLoadBalancerTagsOpts) (CreateLoadBalancerTagsResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *LoadBalancerApiService) CreateLoadBalancerTags(ctx _context.Context, lo // DeleteLoadBalancerOpts Optional parameters for the method 'DeleteLoadBalancer' type DeleteLoadBalancerOpts struct { - DeleteLoadBalancerRequest optional.Interface + DeleteLoadBalancerRequest optional.Interface } /* DeleteLoadBalancer Method for DeleteLoadBalancer * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteLoadBalancerOpts - Optional Parameters: - * @param "DeleteLoadBalancerRequest" (optional.Interface of DeleteLoadBalancerRequest) - + * @param "DeleteLoadBalancerRequest" (optional.Interface of DeleteLoadBalancerRequest) - @return DeleteLoadBalancerResponse */ func (a *LoadBalancerApiService) DeleteLoadBalancer(ctx _context.Context, localVarOptionals *DeleteLoadBalancerOpts) (DeleteLoadBalancerResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *LoadBalancerApiService) DeleteLoadBalancer(ctx _context.Context, localV // DeleteLoadBalancerTagsOpts Optional parameters for the method 'DeleteLoadBalancerTags' type DeleteLoadBalancerTagsOpts struct { - DeleteLoadBalancerTagsRequest optional.Interface + DeleteLoadBalancerTagsRequest optional.Interface } /* DeleteLoadBalancerTags Method for DeleteLoadBalancerTags * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteLoadBalancerTagsOpts - Optional Parameters: - * @param "DeleteLoadBalancerTagsRequest" (optional.Interface of DeleteLoadBalancerTagsRequest) - + * @param "DeleteLoadBalancerTagsRequest" (optional.Interface of DeleteLoadBalancerTagsRequest) - @return DeleteLoadBalancerTagsResponse */ func (a *LoadBalancerApiService) DeleteLoadBalancerTags(ctx _context.Context, localVarOptionals *DeleteLoadBalancerTagsOpts) (DeleteLoadBalancerTagsResponse, *_nethttp.Response, error) { @@ -472,14 +472,14 @@ func (a *LoadBalancerApiService) DeleteLoadBalancerTags(ctx _context.Context, lo // DeregisterVmsInLoadBalancerOpts Optional parameters for the method 'DeregisterVmsInLoadBalancer' type DeregisterVmsInLoadBalancerOpts struct { - DeregisterVmsInLoadBalancerRequest optional.Interface + DeregisterVmsInLoadBalancerRequest optional.Interface } /* DeregisterVmsInLoadBalancer Method for DeregisterVmsInLoadBalancer * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeregisterVmsInLoadBalancerOpts - Optional Parameters: - * @param "DeregisterVmsInLoadBalancerRequest" (optional.Interface of DeregisterVmsInLoadBalancerRequest) - + * @param "DeregisterVmsInLoadBalancerRequest" (optional.Interface of DeregisterVmsInLoadBalancerRequest) - @return DeregisterVmsInLoadBalancerResponse */ func (a *LoadBalancerApiService) DeregisterVmsInLoadBalancer(ctx _context.Context, localVarOptionals *DeregisterVmsInLoadBalancerOpts) (DeregisterVmsInLoadBalancerResponse, *_nethttp.Response, error) { @@ -583,14 +583,14 @@ func (a *LoadBalancerApiService) DeregisterVmsInLoadBalancer(ctx _context.Contex // ReadLoadBalancerTagsOpts Optional parameters for the method 'ReadLoadBalancerTags' type ReadLoadBalancerTagsOpts struct { - ReadLoadBalancerTagsRequest optional.Interface + ReadLoadBalancerTagsRequest optional.Interface } /* ReadLoadBalancerTags Method for ReadLoadBalancerTags * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadLoadBalancerTagsOpts - Optional Parameters: - * @param "ReadLoadBalancerTagsRequest" (optional.Interface of ReadLoadBalancerTagsRequest) - + * @param "ReadLoadBalancerTagsRequest" (optional.Interface of ReadLoadBalancerTagsRequest) - @return ReadLoadBalancerTagsResponse */ func (a *LoadBalancerApiService) ReadLoadBalancerTags(ctx _context.Context, localVarOptionals *ReadLoadBalancerTagsOpts) (ReadLoadBalancerTagsResponse, *_nethttp.Response, error) { @@ -694,14 +694,14 @@ func (a *LoadBalancerApiService) ReadLoadBalancerTags(ctx _context.Context, loca // ReadLoadBalancersOpts Optional parameters for the method 'ReadLoadBalancers' type ReadLoadBalancersOpts struct { - ReadLoadBalancersRequest optional.Interface + ReadLoadBalancersRequest optional.Interface } /* ReadLoadBalancers Method for ReadLoadBalancers * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadLoadBalancersOpts - Optional Parameters: - * @param "ReadLoadBalancersRequest" (optional.Interface of ReadLoadBalancersRequest) - + * @param "ReadLoadBalancersRequest" (optional.Interface of ReadLoadBalancersRequest) - @return ReadLoadBalancersResponse */ func (a *LoadBalancerApiService) ReadLoadBalancers(ctx _context.Context, localVarOptionals *ReadLoadBalancersOpts) (ReadLoadBalancersResponse, *_nethttp.Response, error) { @@ -805,14 +805,14 @@ func (a *LoadBalancerApiService) ReadLoadBalancers(ctx _context.Context, localVa // ReadVmsHealthOpts Optional parameters for the method 'ReadVmsHealth' type ReadVmsHealthOpts struct { - ReadVmsHealthRequest optional.Interface + ReadVmsHealthRequest optional.Interface } /* ReadVmsHealth Method for ReadVmsHealth * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVmsHealthOpts - Optional Parameters: - * @param "ReadVmsHealthRequest" (optional.Interface of ReadVmsHealthRequest) - + * @param "ReadVmsHealthRequest" (optional.Interface of ReadVmsHealthRequest) - @return ReadVmsHealthResponse */ func (a *LoadBalancerApiService) ReadVmsHealth(ctx _context.Context, localVarOptionals *ReadVmsHealthOpts) (ReadVmsHealthResponse, *_nethttp.Response, error) { @@ -916,14 +916,14 @@ func (a *LoadBalancerApiService) ReadVmsHealth(ctx _context.Context, localVarOpt // RegisterVmsInLoadBalancerOpts Optional parameters for the method 'RegisterVmsInLoadBalancer' type RegisterVmsInLoadBalancerOpts struct { - RegisterVmsInLoadBalancerRequest optional.Interface + RegisterVmsInLoadBalancerRequest optional.Interface } /* RegisterVmsInLoadBalancer Method for RegisterVmsInLoadBalancer * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *RegisterVmsInLoadBalancerOpts - Optional Parameters: - * @param "RegisterVmsInLoadBalancerRequest" (optional.Interface of RegisterVmsInLoadBalancerRequest) - + * @param "RegisterVmsInLoadBalancerRequest" (optional.Interface of RegisterVmsInLoadBalancerRequest) - @return RegisterVmsInLoadBalancerResponse */ func (a *LoadBalancerApiService) RegisterVmsInLoadBalancer(ctx _context.Context, localVarOptionals *RegisterVmsInLoadBalancerOpts) (RegisterVmsInLoadBalancerResponse, *_nethttp.Response, error) { @@ -1027,14 +1027,14 @@ func (a *LoadBalancerApiService) RegisterVmsInLoadBalancer(ctx _context.Context, // UpdateLoadBalancerOpts Optional parameters for the method 'UpdateLoadBalancer' type UpdateLoadBalancerOpts struct { - UpdateLoadBalancerRequest optional.Interface + UpdateLoadBalancerRequest optional.Interface } /* UpdateLoadBalancer Method for UpdateLoadBalancer * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateLoadBalancerOpts - Optional Parameters: - * @param "UpdateLoadBalancerRequest" (optional.Interface of UpdateLoadBalancerRequest) - + * @param "UpdateLoadBalancerRequest" (optional.Interface of UpdateLoadBalancerRequest) - @return UpdateLoadBalancerResponse */ func (a *LoadBalancerApiService) UpdateLoadBalancer(ctx _context.Context, localVarOptionals *UpdateLoadBalancerOpts) (UpdateLoadBalancerResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer_policy.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer_policy.go index 67c50231e..a70717f70 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer_policy.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer_policy.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type LoadBalancerPolicyApiService service // CreateLoadBalancerPolicyOpts Optional parameters for the method 'CreateLoadBalancerPolicy' type CreateLoadBalancerPolicyOpts struct { - CreateLoadBalancerPolicyRequest optional.Interface + CreateLoadBalancerPolicyRequest optional.Interface } /* CreateLoadBalancerPolicy Method for CreateLoadBalancerPolicy * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateLoadBalancerPolicyOpts - Optional Parameters: - * @param "CreateLoadBalancerPolicyRequest" (optional.Interface of CreateLoadBalancerPolicyRequest) - + * @param "CreateLoadBalancerPolicyRequest" (optional.Interface of CreateLoadBalancerPolicyRequest) - @return CreateLoadBalancerPolicyResponse */ func (a *LoadBalancerPolicyApiService) CreateLoadBalancerPolicy(ctx _context.Context, localVarOptionals *CreateLoadBalancerPolicyOpts) (CreateLoadBalancerPolicyResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *LoadBalancerPolicyApiService) CreateLoadBalancerPolicy(ctx _context.Con // DeleteLoadBalancerPolicyOpts Optional parameters for the method 'DeleteLoadBalancerPolicy' type DeleteLoadBalancerPolicyOpts struct { - DeleteLoadBalancerPolicyRequest optional.Interface + DeleteLoadBalancerPolicyRequest optional.Interface } /* DeleteLoadBalancerPolicy Method for DeleteLoadBalancerPolicy * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteLoadBalancerPolicyOpts - Optional Parameters: - * @param "DeleteLoadBalancerPolicyRequest" (optional.Interface of DeleteLoadBalancerPolicyRequest) - + * @param "DeleteLoadBalancerPolicyRequest" (optional.Interface of DeleteLoadBalancerPolicyRequest) - @return DeleteLoadBalancerPolicyResponse */ func (a *LoadBalancerPolicyApiService) DeleteLoadBalancerPolicy(ctx _context.Context, localVarOptionals *DeleteLoadBalancerPolicyOpts) (DeleteLoadBalancerPolicyResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_location.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_location.go index f02b6f7c5..4b489e470 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_location.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_location.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type LocationApiService service // ReadLocationsOpts Optional parameters for the method 'ReadLocations' type ReadLocationsOpts struct { - ReadLocationsRequest optional.Interface + ReadLocationsRequest optional.Interface } /* ReadLocations Method for ReadLocations * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadLocationsOpts - Optional Parameters: - * @param "ReadLocationsRequest" (optional.Interface of ReadLocationsRequest) - + * @param "ReadLocationsRequest" (optional.Interface of ReadLocationsRequest) - @return ReadLocationsResponse */ func (a *LocationApiService) ReadLocations(ctx _context.Context, localVarOptionals *ReadLocationsOpts) (ReadLocationsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_nat_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_nat_service.go index 4397921d1..1ef049122 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_nat_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_nat_service.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type NatServiceApiService service // CreateNatServiceOpts Optional parameters for the method 'CreateNatService' type CreateNatServiceOpts struct { - CreateNatServiceRequest optional.Interface + CreateNatServiceRequest optional.Interface } /* CreateNatService Method for CreateNatService * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateNatServiceOpts - Optional Parameters: - * @param "CreateNatServiceRequest" (optional.Interface of CreateNatServiceRequest) - + * @param "CreateNatServiceRequest" (optional.Interface of CreateNatServiceRequest) - @return CreateNatServiceResponse */ func (a *NatServiceApiService) CreateNatService(ctx _context.Context, localVarOptionals *CreateNatServiceOpts) (CreateNatServiceResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *NatServiceApiService) CreateNatService(ctx _context.Context, localVarOp // DeleteNatServiceOpts Optional parameters for the method 'DeleteNatService' type DeleteNatServiceOpts struct { - DeleteNatServiceRequest optional.Interface + DeleteNatServiceRequest optional.Interface } /* DeleteNatService Method for DeleteNatService * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteNatServiceOpts - Optional Parameters: - * @param "DeleteNatServiceRequest" (optional.Interface of DeleteNatServiceRequest) - + * @param "DeleteNatServiceRequest" (optional.Interface of DeleteNatServiceRequest) - @return DeleteNatServiceResponse */ func (a *NatServiceApiService) DeleteNatService(ctx _context.Context, localVarOptionals *DeleteNatServiceOpts) (DeleteNatServiceResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *NatServiceApiService) DeleteNatService(ctx _context.Context, localVarOp // ReadNatServicesOpts Optional parameters for the method 'ReadNatServices' type ReadNatServicesOpts struct { - ReadNatServicesRequest optional.Interface + ReadNatServicesRequest optional.Interface } /* ReadNatServices Method for ReadNatServices * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadNatServicesOpts - Optional Parameters: - * @param "ReadNatServicesRequest" (optional.Interface of ReadNatServicesRequest) - + * @param "ReadNatServicesRequest" (optional.Interface of ReadNatServicesRequest) - @return ReadNatServicesResponse */ func (a *NatServiceApiService) ReadNatServices(ctx _context.Context, localVarOptionals *ReadNatServicesOpts) (ReadNatServicesResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_net.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_net.go index 80de3d5bf..1d468fa1b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_net.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_net.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type NetApiService service // CreateNetOpts Optional parameters for the method 'CreateNet' type CreateNetOpts struct { - CreateNetRequest optional.Interface + CreateNetRequest optional.Interface } /* CreateNet Method for CreateNet * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateNetOpts - Optional Parameters: - * @param "CreateNetRequest" (optional.Interface of CreateNetRequest) - + * @param "CreateNetRequest" (optional.Interface of CreateNetRequest) - @return CreateNetResponse */ func (a *NetApiService) CreateNet(ctx _context.Context, localVarOptionals *CreateNetOpts) (CreateNetResponse, *_nethttp.Response, error) { @@ -179,14 +179,14 @@ func (a *NetApiService) CreateNet(ctx _context.Context, localVarOptionals *Creat // DeleteNetOpts Optional parameters for the method 'DeleteNet' type DeleteNetOpts struct { - DeleteNetRequest optional.Interface + DeleteNetRequest optional.Interface } /* DeleteNet Method for DeleteNet * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteNetOpts - Optional Parameters: - * @param "DeleteNetRequest" (optional.Interface of DeleteNetRequest) - + * @param "DeleteNetRequest" (optional.Interface of DeleteNetRequest) - @return DeleteNetResponse */ func (a *NetApiService) DeleteNet(ctx _context.Context, localVarOptionals *DeleteNetOpts) (DeleteNetResponse, *_nethttp.Response, error) { @@ -320,14 +320,14 @@ func (a *NetApiService) DeleteNet(ctx _context.Context, localVarOptionals *Delet // ReadNetsOpts Optional parameters for the method 'ReadNets' type ReadNetsOpts struct { - ReadNetsRequest optional.Interface + ReadNetsRequest optional.Interface } /* ReadNets Method for ReadNets * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadNetsOpts - Optional Parameters: - * @param "ReadNetsRequest" (optional.Interface of ReadNetsRequest) - + * @param "ReadNetsRequest" (optional.Interface of ReadNetsRequest) - @return ReadNetsResponse */ func (a *NetApiService) ReadNets(ctx _context.Context, localVarOptionals *ReadNetsOpts) (ReadNetsResponse, *_nethttp.Response, error) { @@ -461,14 +461,14 @@ func (a *NetApiService) ReadNets(ctx _context.Context, localVarOptionals *ReadNe // UpdateNetOpts Optional parameters for the method 'UpdateNet' type UpdateNetOpts struct { - UpdateNetRequest optional.Interface + UpdateNetRequest optional.Interface } /* UpdateNet Method for UpdateNet * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateNetOpts - Optional Parameters: - * @param "UpdateNetRequest" (optional.Interface of UpdateNetRequest) - + * @param "UpdateNetRequest" (optional.Interface of UpdateNetRequest) - @return UpdateNetResponse */ func (a *NetApiService) UpdateNet(ctx _context.Context, localVarOptionals *UpdateNetOpts) (UpdateNetResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_net_access_point.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_net_access_point.go index e81f3ebe2..244c84473 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_net_access_point.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_net_access_point.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type NetAccessPointApiService service // CreateNetAccessPointOpts Optional parameters for the method 'CreateNetAccessPoint' type CreateNetAccessPointOpts struct { - CreateNetAccessPointRequest optional.Interface + CreateNetAccessPointRequest optional.Interface } /* CreateNetAccessPoint Method for CreateNetAccessPoint * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateNetAccessPointOpts - Optional Parameters: - * @param "CreateNetAccessPointRequest" (optional.Interface of CreateNetAccessPointRequest) - + * @param "CreateNetAccessPointRequest" (optional.Interface of CreateNetAccessPointRequest) - @return CreateNetAccessPointResponse */ func (a *NetAccessPointApiService) CreateNetAccessPoint(ctx _context.Context, localVarOptionals *CreateNetAccessPointOpts) (CreateNetAccessPointResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *NetAccessPointApiService) CreateNetAccessPoint(ctx _context.Context, lo // DeleteNetAccessPointOpts Optional parameters for the method 'DeleteNetAccessPoint' type DeleteNetAccessPointOpts struct { - DeleteNetAccessPointRequest optional.Interface + DeleteNetAccessPointRequest optional.Interface } /* DeleteNetAccessPoint Method for DeleteNetAccessPoint * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteNetAccessPointOpts - Optional Parameters: - * @param "DeleteNetAccessPointRequest" (optional.Interface of DeleteNetAccessPointRequest) - + * @param "DeleteNetAccessPointRequest" (optional.Interface of DeleteNetAccessPointRequest) - @return DeleteNetAccessPointResponse */ func (a *NetAccessPointApiService) DeleteNetAccessPoint(ctx _context.Context, localVarOptionals *DeleteNetAccessPointOpts) (DeleteNetAccessPointResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *NetAccessPointApiService) DeleteNetAccessPoint(ctx _context.Context, lo // ReadNetAccessPointServicesOpts Optional parameters for the method 'ReadNetAccessPointServices' type ReadNetAccessPointServicesOpts struct { - ReadNetAccessPointServicesRequest optional.Interface + ReadNetAccessPointServicesRequest optional.Interface } /* ReadNetAccessPointServices Method for ReadNetAccessPointServices * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadNetAccessPointServicesOpts - Optional Parameters: - * @param "ReadNetAccessPointServicesRequest" (optional.Interface of ReadNetAccessPointServicesRequest) - + * @param "ReadNetAccessPointServicesRequest" (optional.Interface of ReadNetAccessPointServicesRequest) - @return ReadNetAccessPointServicesResponse */ func (a *NetAccessPointApiService) ReadNetAccessPointServices(ctx _context.Context, localVarOptionals *ReadNetAccessPointServicesOpts) (ReadNetAccessPointServicesResponse, *_nethttp.Response, error) { @@ -349,14 +349,14 @@ func (a *NetAccessPointApiService) ReadNetAccessPointServices(ctx _context.Conte // ReadNetAccessPointsOpts Optional parameters for the method 'ReadNetAccessPoints' type ReadNetAccessPointsOpts struct { - ReadNetAccessPointsRequest optional.Interface + ReadNetAccessPointsRequest optional.Interface } /* ReadNetAccessPoints Method for ReadNetAccessPoints * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadNetAccessPointsOpts - Optional Parameters: - * @param "ReadNetAccessPointsRequest" (optional.Interface of ReadNetAccessPointsRequest) - + * @param "ReadNetAccessPointsRequest" (optional.Interface of ReadNetAccessPointsRequest) - @return ReadNetAccessPointsResponse */ func (a *NetAccessPointApiService) ReadNetAccessPoints(ctx _context.Context, localVarOptionals *ReadNetAccessPointsOpts) (ReadNetAccessPointsResponse, *_nethttp.Response, error) { @@ -460,14 +460,14 @@ func (a *NetAccessPointApiService) ReadNetAccessPoints(ctx _context.Context, loc // UpdateNetAccessPointOpts Optional parameters for the method 'UpdateNetAccessPoint' type UpdateNetAccessPointOpts struct { - UpdateNetAccessPointRequest optional.Interface + UpdateNetAccessPointRequest optional.Interface } /* UpdateNetAccessPoint Method for UpdateNetAccessPoint * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateNetAccessPointOpts - Optional Parameters: - * @param "UpdateNetAccessPointRequest" (optional.Interface of UpdateNetAccessPointRequest) - + * @param "UpdateNetAccessPointRequest" (optional.Interface of UpdateNetAccessPointRequest) - @return UpdateNetAccessPointResponse */ func (a *NetAccessPointApiService) UpdateNetAccessPoint(ctx _context.Context, localVarOptionals *UpdateNetAccessPointOpts) (UpdateNetAccessPointResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_net_peering.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_net_peering.go index 095341fb1..49602646c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_net_peering.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_net_peering.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type NetPeeringApiService service // AcceptNetPeeringOpts Optional parameters for the method 'AcceptNetPeering' type AcceptNetPeeringOpts struct { - AcceptNetPeeringRequest optional.Interface + AcceptNetPeeringRequest optional.Interface } /* AcceptNetPeering Method for AcceptNetPeering * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *AcceptNetPeeringOpts - Optional Parameters: - * @param "AcceptNetPeeringRequest" (optional.Interface of AcceptNetPeeringRequest) - + * @param "AcceptNetPeeringRequest" (optional.Interface of AcceptNetPeeringRequest) - @return AcceptNetPeeringResponse */ func (a *NetPeeringApiService) AcceptNetPeering(ctx _context.Context, localVarOptionals *AcceptNetPeeringOpts) (AcceptNetPeeringResponse, *_nethttp.Response, error) { @@ -179,14 +179,14 @@ func (a *NetPeeringApiService) AcceptNetPeering(ctx _context.Context, localVarOp // CreateNetPeeringOpts Optional parameters for the method 'CreateNetPeering' type CreateNetPeeringOpts struct { - CreateNetPeeringRequest optional.Interface + CreateNetPeeringRequest optional.Interface } /* CreateNetPeering Method for CreateNetPeering * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateNetPeeringOpts - Optional Parameters: - * @param "CreateNetPeeringRequest" (optional.Interface of CreateNetPeeringRequest) - + * @param "CreateNetPeeringRequest" (optional.Interface of CreateNetPeeringRequest) - @return CreateNetPeeringResponse */ func (a *NetPeeringApiService) CreateNetPeering(ctx _context.Context, localVarOptionals *CreateNetPeeringOpts) (CreateNetPeeringResponse, *_nethttp.Response, error) { @@ -320,14 +320,14 @@ func (a *NetPeeringApiService) CreateNetPeering(ctx _context.Context, localVarOp // DeleteNetPeeringOpts Optional parameters for the method 'DeleteNetPeering' type DeleteNetPeeringOpts struct { - DeleteNetPeeringRequest optional.Interface + DeleteNetPeeringRequest optional.Interface } /* DeleteNetPeering Method for DeleteNetPeering * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteNetPeeringOpts - Optional Parameters: - * @param "DeleteNetPeeringRequest" (optional.Interface of DeleteNetPeeringRequest) - + * @param "DeleteNetPeeringRequest" (optional.Interface of DeleteNetPeeringRequest) - @return DeleteNetPeeringResponse */ func (a *NetPeeringApiService) DeleteNetPeering(ctx _context.Context, localVarOptionals *DeleteNetPeeringOpts) (DeleteNetPeeringResponse, *_nethttp.Response, error) { @@ -471,14 +471,14 @@ func (a *NetPeeringApiService) DeleteNetPeering(ctx _context.Context, localVarOp // ReadNetPeeringsOpts Optional parameters for the method 'ReadNetPeerings' type ReadNetPeeringsOpts struct { - ReadNetPeeringsRequest optional.Interface + ReadNetPeeringsRequest optional.Interface } /* ReadNetPeerings Method for ReadNetPeerings * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadNetPeeringsOpts - Optional Parameters: - * @param "ReadNetPeeringsRequest" (optional.Interface of ReadNetPeeringsRequest) - + * @param "ReadNetPeeringsRequest" (optional.Interface of ReadNetPeeringsRequest) - @return ReadNetPeeringsResponse */ func (a *NetPeeringApiService) ReadNetPeerings(ctx _context.Context, localVarOptionals *ReadNetPeeringsOpts) (ReadNetPeeringsResponse, *_nethttp.Response, error) { @@ -612,14 +612,14 @@ func (a *NetPeeringApiService) ReadNetPeerings(ctx _context.Context, localVarOpt // RejectNetPeeringOpts Optional parameters for the method 'RejectNetPeering' type RejectNetPeeringOpts struct { - RejectNetPeeringRequest optional.Interface + RejectNetPeeringRequest optional.Interface } /* RejectNetPeering Method for RejectNetPeering * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *RejectNetPeeringOpts - Optional Parameters: - * @param "RejectNetPeeringRequest" (optional.Interface of RejectNetPeeringRequest) - + * @param "RejectNetPeeringRequest" (optional.Interface of RejectNetPeeringRequest) - @return RejectNetPeeringResponse */ func (a *NetPeeringApiService) RejectNetPeering(ctx _context.Context, localVarOptionals *RejectNetPeeringOpts) (RejectNetPeeringResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_nic.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_nic.go index 19b4daeb6..05fc1b55e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_nic.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_nic.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type NicApiService service // CreateNicOpts Optional parameters for the method 'CreateNic' type CreateNicOpts struct { - CreateNicRequest optional.Interface + CreateNicRequest optional.Interface } /* CreateNic Method for CreateNic * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateNicOpts - Optional Parameters: - * @param "CreateNicRequest" (optional.Interface of CreateNicRequest) - + * @param "CreateNicRequest" (optional.Interface of CreateNicRequest) - @return CreateNicResponse */ func (a *NicApiService) CreateNic(ctx _context.Context, localVarOptionals *CreateNicOpts) (CreateNicResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *NicApiService) CreateNic(ctx _context.Context, localVarOptionals *Creat // DeleteNicOpts Optional parameters for the method 'DeleteNic' type DeleteNicOpts struct { - DeleteNicRequest optional.Interface + DeleteNicRequest optional.Interface } /* DeleteNic Method for DeleteNic * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteNicOpts - Optional Parameters: - * @param "DeleteNicRequest" (optional.Interface of DeleteNicRequest) - + * @param "DeleteNicRequest" (optional.Interface of DeleteNicRequest) - @return DeleteNicResponse */ func (a *NicApiService) DeleteNic(ctx _context.Context, localVarOptionals *DeleteNicOpts) (DeleteNicResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *NicApiService) DeleteNic(ctx _context.Context, localVarOptionals *Delet // LinkNicOpts Optional parameters for the method 'LinkNic' type LinkNicOpts struct { - LinkNicRequest optional.Interface + LinkNicRequest optional.Interface } /* LinkNic Method for LinkNic * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkNicOpts - Optional Parameters: - * @param "LinkNicRequest" (optional.Interface of LinkNicRequest) - + * @param "LinkNicRequest" (optional.Interface of LinkNicRequest) - @return LinkNicResponse */ func (a *NicApiService) LinkNic(ctx _context.Context, localVarOptionals *LinkNicOpts) (LinkNicResponse, *_nethttp.Response, error) { @@ -451,14 +451,14 @@ func (a *NicApiService) LinkNic(ctx _context.Context, localVarOptionals *LinkNic // LinkPrivateIpsOpts Optional parameters for the method 'LinkPrivateIps' type LinkPrivateIpsOpts struct { - LinkPrivateIpsRequest optional.Interface + LinkPrivateIpsRequest optional.Interface } /* LinkPrivateIps Method for LinkPrivateIps * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkPrivateIpsOpts - Optional Parameters: - * @param "LinkPrivateIpsRequest" (optional.Interface of LinkPrivateIpsRequest) - + * @param "LinkPrivateIpsRequest" (optional.Interface of LinkPrivateIpsRequest) - @return LinkPrivateIpsResponse */ func (a *NicApiService) LinkPrivateIps(ctx _context.Context, localVarOptionals *LinkPrivateIpsOpts) (LinkPrivateIpsResponse, *_nethttp.Response, error) { @@ -592,14 +592,14 @@ func (a *NicApiService) LinkPrivateIps(ctx _context.Context, localVarOptionals * // ReadNicsOpts Optional parameters for the method 'ReadNics' type ReadNicsOpts struct { - ReadNicsRequest optional.Interface + ReadNicsRequest optional.Interface } /* ReadNics Method for ReadNics * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadNicsOpts - Optional Parameters: - * @param "ReadNicsRequest" (optional.Interface of ReadNicsRequest) - + * @param "ReadNicsRequest" (optional.Interface of ReadNicsRequest) - @return ReadNicsResponse */ func (a *NicApiService) ReadNics(ctx _context.Context, localVarOptionals *ReadNicsOpts) (ReadNicsResponse, *_nethttp.Response, error) { @@ -733,14 +733,14 @@ func (a *NicApiService) ReadNics(ctx _context.Context, localVarOptionals *ReadNi // UnlinkNicOpts Optional parameters for the method 'UnlinkNic' type UnlinkNicOpts struct { - UnlinkNicRequest optional.Interface + UnlinkNicRequest optional.Interface } /* UnlinkNic Method for UnlinkNic * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkNicOpts - Optional Parameters: - * @param "UnlinkNicRequest" (optional.Interface of UnlinkNicRequest) - + * @param "UnlinkNicRequest" (optional.Interface of UnlinkNicRequest) - @return UnlinkNicResponse */ func (a *NicApiService) UnlinkNic(ctx _context.Context, localVarOptionals *UnlinkNicOpts) (UnlinkNicResponse, *_nethttp.Response, error) { @@ -874,14 +874,14 @@ func (a *NicApiService) UnlinkNic(ctx _context.Context, localVarOptionals *Unlin // UnlinkPrivateIpsOpts Optional parameters for the method 'UnlinkPrivateIps' type UnlinkPrivateIpsOpts struct { - UnlinkPrivateIpsRequest optional.Interface + UnlinkPrivateIpsRequest optional.Interface } /* UnlinkPrivateIps Method for UnlinkPrivateIps * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkPrivateIpsOpts - Optional Parameters: - * @param "UnlinkPrivateIpsRequest" (optional.Interface of UnlinkPrivateIpsRequest) - + * @param "UnlinkPrivateIpsRequest" (optional.Interface of UnlinkPrivateIpsRequest) - @return UnlinkPrivateIpsResponse */ func (a *NicApiService) UnlinkPrivateIps(ctx _context.Context, localVarOptionals *UnlinkPrivateIpsOpts) (UnlinkPrivateIpsResponse, *_nethttp.Response, error) { @@ -1015,14 +1015,14 @@ func (a *NicApiService) UnlinkPrivateIps(ctx _context.Context, localVarOptionals // UpdateNicOpts Optional parameters for the method 'UpdateNic' type UpdateNicOpts struct { - UpdateNicRequest optional.Interface + UpdateNicRequest optional.Interface } /* UpdateNic Method for UpdateNic * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateNicOpts - Optional Parameters: - * @param "UpdateNicRequest" (optional.Interface of UpdateNicRequest) - + * @param "UpdateNicRequest" (optional.Interface of UpdateNicRequest) - @return UpdateNicResponse */ func (a *NicApiService) UpdateNic(ctx _context.Context, localVarOptionals *UpdateNicOpts) (UpdateNicResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_product_type.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_product_type.go index a524d0243..6be91b995 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_product_type.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_product_type.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type ProductTypeApiService service // ReadProductTypesOpts Optional parameters for the method 'ReadProductTypes' type ReadProductTypesOpts struct { - ReadProductTypesRequest optional.Interface + ReadProductTypesRequest optional.Interface } /* ReadProductTypes Method for ReadProductTypes * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadProductTypesOpts - Optional Parameters: - * @param "ReadProductTypesRequest" (optional.Interface of ReadProductTypesRequest) - + * @param "ReadProductTypesRequest" (optional.Interface of ReadProductTypesRequest) - @return ReadProductTypesResponse */ func (a *ProductTypeApiService) ReadProductTypes(ctx _context.Context, localVarOptionals *ReadProductTypesOpts) (ReadProductTypesResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_public_ip.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_public_ip.go index ae242126a..747d6b512 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_public_ip.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_public_ip.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type PublicIpApiService service // CreatePublicIpOpts Optional parameters for the method 'CreatePublicIp' type CreatePublicIpOpts struct { - CreatePublicIpRequest optional.Interface + CreatePublicIpRequest optional.Interface } /* CreatePublicIp Method for CreatePublicIp * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreatePublicIpOpts - Optional Parameters: - * @param "CreatePublicIpRequest" (optional.Interface of CreatePublicIpRequest) - + * @param "CreatePublicIpRequest" (optional.Interface of CreatePublicIpRequest) - @return CreatePublicIpResponse */ func (a *PublicIpApiService) CreatePublicIp(ctx _context.Context, localVarOptionals *CreatePublicIpOpts) (CreatePublicIpResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *PublicIpApiService) CreatePublicIp(ctx _context.Context, localVarOption // DeletePublicIpOpts Optional parameters for the method 'DeletePublicIp' type DeletePublicIpOpts struct { - DeletePublicIpRequest optional.Interface + DeletePublicIpRequest optional.Interface } /* DeletePublicIp Method for DeletePublicIp * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeletePublicIpOpts - Optional Parameters: - * @param "DeletePublicIpRequest" (optional.Interface of DeletePublicIpRequest) - + * @param "DeletePublicIpRequest" (optional.Interface of DeletePublicIpRequest) - @return DeletePublicIpResponse */ func (a *PublicIpApiService) DeletePublicIp(ctx _context.Context, localVarOptionals *DeletePublicIpOpts) (DeletePublicIpResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *PublicIpApiService) DeletePublicIp(ctx _context.Context, localVarOption // LinkPublicIpOpts Optional parameters for the method 'LinkPublicIp' type LinkPublicIpOpts struct { - LinkPublicIpRequest optional.Interface + LinkPublicIpRequest optional.Interface } /* LinkPublicIp Method for LinkPublicIp * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkPublicIpOpts - Optional Parameters: - * @param "LinkPublicIpRequest" (optional.Interface of LinkPublicIpRequest) - + * @param "LinkPublicIpRequest" (optional.Interface of LinkPublicIpRequest) - @return LinkPublicIpResponse */ func (a *PublicIpApiService) LinkPublicIp(ctx _context.Context, localVarOptionals *LinkPublicIpOpts) (LinkPublicIpResponse, *_nethttp.Response, error) { @@ -451,14 +451,14 @@ func (a *PublicIpApiService) LinkPublicIp(ctx _context.Context, localVarOptional // ReadPublicIpRangesOpts Optional parameters for the method 'ReadPublicIpRanges' type ReadPublicIpRangesOpts struct { - ReadPublicIpRangesRequest optional.Interface + ReadPublicIpRangesRequest optional.Interface } /* ReadPublicIpRanges Method for ReadPublicIpRanges * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadPublicIpRangesOpts - Optional Parameters: - * @param "ReadPublicIpRangesRequest" (optional.Interface of ReadPublicIpRangesRequest) - + * @param "ReadPublicIpRangesRequest" (optional.Interface of ReadPublicIpRangesRequest) - @return ReadPublicIpRangesResponse */ func (a *PublicIpApiService) ReadPublicIpRanges(ctx _context.Context, localVarOptionals *ReadPublicIpRangesOpts) (ReadPublicIpRangesResponse, *_nethttp.Response, error) { @@ -550,14 +550,14 @@ func (a *PublicIpApiService) ReadPublicIpRanges(ctx _context.Context, localVarOp // ReadPublicIpsOpts Optional parameters for the method 'ReadPublicIps' type ReadPublicIpsOpts struct { - ReadPublicIpsRequest optional.Interface + ReadPublicIpsRequest optional.Interface } /* ReadPublicIps Method for ReadPublicIps * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadPublicIpsOpts - Optional Parameters: - * @param "ReadPublicIpsRequest" (optional.Interface of ReadPublicIpsRequest) - + * @param "ReadPublicIpsRequest" (optional.Interface of ReadPublicIpsRequest) - @return ReadPublicIpsResponse */ func (a *PublicIpApiService) ReadPublicIps(ctx _context.Context, localVarOptionals *ReadPublicIpsOpts) (ReadPublicIpsResponse, *_nethttp.Response, error) { @@ -691,14 +691,14 @@ func (a *PublicIpApiService) ReadPublicIps(ctx _context.Context, localVarOptiona // UnlinkPublicIpOpts Optional parameters for the method 'UnlinkPublicIp' type UnlinkPublicIpOpts struct { - UnlinkPublicIpRequest optional.Interface + UnlinkPublicIpRequest optional.Interface } /* UnlinkPublicIp Method for UnlinkPublicIp * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkPublicIpOpts - Optional Parameters: - * @param "UnlinkPublicIpRequest" (optional.Interface of UnlinkPublicIpRequest) - + * @param "UnlinkPublicIpRequest" (optional.Interface of UnlinkPublicIpRequest) - @return UnlinkPublicIpResponse */ func (a *PublicIpApiService) UnlinkPublicIp(ctx _context.Context, localVarOptionals *UnlinkPublicIpOpts) (UnlinkPublicIpResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_quota.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_quota.go index f4d5e2669..29a3d0f69 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_quota.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_quota.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type QuotaApiService service // ReadQuotasOpts Optional parameters for the method 'ReadQuotas' type ReadQuotasOpts struct { - ReadQuotasRequest optional.Interface + ReadQuotasRequest optional.Interface } /* ReadQuotas Method for ReadQuotas * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadQuotasOpts - Optional Parameters: - * @param "ReadQuotasRequest" (optional.Interface of ReadQuotasRequest) - + * @param "ReadQuotasRequest" (optional.Interface of ReadQuotasRequest) - @return ReadQuotasResponse */ func (a *QuotaApiService) ReadQuotas(ctx _context.Context, localVarOptionals *ReadQuotasOpts) (ReadQuotasResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_region.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_region.go index fe7d3050a..24f5e0d34 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_region.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_region.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type RegionApiService service // ReadRegionsOpts Optional parameters for the method 'ReadRegions' type ReadRegionsOpts struct { - ReadRegionsRequest optional.Interface + ReadRegionsRequest optional.Interface } /* ReadRegions Method for ReadRegions * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadRegionsOpts - Optional Parameters: - * @param "ReadRegionsRequest" (optional.Interface of ReadRegionsRequest) - + * @param "ReadRegionsRequest" (optional.Interface of ReadRegionsRequest) - @return ReadRegionsResponse */ func (a *RegionApiService) ReadRegions(ctx _context.Context, localVarOptionals *ReadRegionsOpts) (ReadRegionsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_route.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_route.go index ec6c32a72..cff01ac2a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_route.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_route.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type RouteApiService service // CreateRouteOpts Optional parameters for the method 'CreateRoute' type CreateRouteOpts struct { - CreateRouteRequest optional.Interface + CreateRouteRequest optional.Interface } /* CreateRoute Method for CreateRoute * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateRouteOpts - Optional Parameters: - * @param "CreateRouteRequest" (optional.Interface of CreateRouteRequest) - + * @param "CreateRouteRequest" (optional.Interface of CreateRouteRequest) - @return CreateRouteResponse */ func (a *RouteApiService) CreateRoute(ctx _context.Context, localVarOptionals *CreateRouteOpts) (CreateRouteResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *RouteApiService) CreateRoute(ctx _context.Context, localVarOptionals *C // DeleteRouteOpts Optional parameters for the method 'DeleteRoute' type DeleteRouteOpts struct { - DeleteRouteRequest optional.Interface + DeleteRouteRequest optional.Interface } /* DeleteRoute Method for DeleteRoute * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteRouteOpts - Optional Parameters: - * @param "DeleteRouteRequest" (optional.Interface of DeleteRouteRequest) - + * @param "DeleteRouteRequest" (optional.Interface of DeleteRouteRequest) - @return DeleteRouteResponse */ func (a *RouteApiService) DeleteRoute(ctx _context.Context, localVarOptionals *DeleteRouteOpts) (DeleteRouteResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *RouteApiService) DeleteRoute(ctx _context.Context, localVarOptionals *D // UpdateRouteOpts Optional parameters for the method 'UpdateRoute' type UpdateRouteOpts struct { - UpdateRouteRequest optional.Interface + UpdateRouteRequest optional.Interface } /* UpdateRoute Method for UpdateRoute * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateRouteOpts - Optional Parameters: - * @param "UpdateRouteRequest" (optional.Interface of UpdateRouteRequest) - + * @param "UpdateRouteRequest" (optional.Interface of UpdateRouteRequest) - @return UpdateRouteResponse */ func (a *RouteApiService) UpdateRoute(ctx _context.Context, localVarOptionals *UpdateRouteOpts) (UpdateRouteResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_route_table.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_route_table.go index 520987695..544c38add 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_route_table.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_route_table.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type RouteTableApiService service // CreateRouteTableOpts Optional parameters for the method 'CreateRouteTable' type CreateRouteTableOpts struct { - CreateRouteTableRequest optional.Interface + CreateRouteTableRequest optional.Interface } /* CreateRouteTable Method for CreateRouteTable * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateRouteTableOpts - Optional Parameters: - * @param "CreateRouteTableRequest" (optional.Interface of CreateRouteTableRequest) - + * @param "CreateRouteTableRequest" (optional.Interface of CreateRouteTableRequest) - @return CreateRouteTableResponse */ func (a *RouteTableApiService) CreateRouteTable(ctx _context.Context, localVarOptionals *CreateRouteTableOpts) (CreateRouteTableResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *RouteTableApiService) CreateRouteTable(ctx _context.Context, localVarOp // DeleteRouteTableOpts Optional parameters for the method 'DeleteRouteTable' type DeleteRouteTableOpts struct { - DeleteRouteTableRequest optional.Interface + DeleteRouteTableRequest optional.Interface } /* DeleteRouteTable Method for DeleteRouteTable * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteRouteTableOpts - Optional Parameters: - * @param "DeleteRouteTableRequest" (optional.Interface of DeleteRouteTableRequest) - + * @param "DeleteRouteTableRequest" (optional.Interface of DeleteRouteTableRequest) - @return DeleteRouteTableResponse */ func (a *RouteTableApiService) DeleteRouteTable(ctx _context.Context, localVarOptionals *DeleteRouteTableOpts) (DeleteRouteTableResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *RouteTableApiService) DeleteRouteTable(ctx _context.Context, localVarOp // LinkRouteTableOpts Optional parameters for the method 'LinkRouteTable' type LinkRouteTableOpts struct { - LinkRouteTableRequest optional.Interface + LinkRouteTableRequest optional.Interface } /* LinkRouteTable Method for LinkRouteTable * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkRouteTableOpts - Optional Parameters: - * @param "LinkRouteTableRequest" (optional.Interface of LinkRouteTableRequest) - + * @param "LinkRouteTableRequest" (optional.Interface of LinkRouteTableRequest) - @return LinkRouteTableResponse */ func (a *RouteTableApiService) LinkRouteTable(ctx _context.Context, localVarOptionals *LinkRouteTableOpts) (LinkRouteTableResponse, *_nethttp.Response, error) { @@ -451,14 +451,14 @@ func (a *RouteTableApiService) LinkRouteTable(ctx _context.Context, localVarOpti // ReadRouteTablesOpts Optional parameters for the method 'ReadRouteTables' type ReadRouteTablesOpts struct { - ReadRouteTablesRequest optional.Interface + ReadRouteTablesRequest optional.Interface } /* ReadRouteTables Method for ReadRouteTables * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadRouteTablesOpts - Optional Parameters: - * @param "ReadRouteTablesRequest" (optional.Interface of ReadRouteTablesRequest) - + * @param "ReadRouteTablesRequest" (optional.Interface of ReadRouteTablesRequest) - @return ReadRouteTablesResponse */ func (a *RouteTableApiService) ReadRouteTables(ctx _context.Context, localVarOptionals *ReadRouteTablesOpts) (ReadRouteTablesResponse, *_nethttp.Response, error) { @@ -592,14 +592,14 @@ func (a *RouteTableApiService) ReadRouteTables(ctx _context.Context, localVarOpt // UnlinkRouteTableOpts Optional parameters for the method 'UnlinkRouteTable' type UnlinkRouteTableOpts struct { - UnlinkRouteTableRequest optional.Interface + UnlinkRouteTableRequest optional.Interface } /* UnlinkRouteTable Method for UnlinkRouteTable * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkRouteTableOpts - Optional Parameters: - * @param "UnlinkRouteTableRequest" (optional.Interface of UnlinkRouteTableRequest) - + * @param "UnlinkRouteTableRequest" (optional.Interface of UnlinkRouteTableRequest) - @return UnlinkRouteTableResponse */ func (a *RouteTableApiService) UnlinkRouteTable(ctx _context.Context, localVarOptionals *UnlinkRouteTableOpts) (UnlinkRouteTableResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group.go index fbb51be9d..c368ee2e9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type SecurityGroupApiService service // CreateSecurityGroupOpts Optional parameters for the method 'CreateSecurityGroup' type CreateSecurityGroupOpts struct { - CreateSecurityGroupRequest optional.Interface + CreateSecurityGroupRequest optional.Interface } /* CreateSecurityGroup Method for CreateSecurityGroup * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateSecurityGroupOpts - Optional Parameters: - * @param "CreateSecurityGroupRequest" (optional.Interface of CreateSecurityGroupRequest) - + * @param "CreateSecurityGroupRequest" (optional.Interface of CreateSecurityGroupRequest) - @return CreateSecurityGroupResponse */ func (a *SecurityGroupApiService) CreateSecurityGroup(ctx _context.Context, localVarOptionals *CreateSecurityGroupOpts) (CreateSecurityGroupResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *SecurityGroupApiService) CreateSecurityGroup(ctx _context.Context, loca // DeleteSecurityGroupOpts Optional parameters for the method 'DeleteSecurityGroup' type DeleteSecurityGroupOpts struct { - DeleteSecurityGroupRequest optional.Interface + DeleteSecurityGroupRequest optional.Interface } /* DeleteSecurityGroup Method for DeleteSecurityGroup * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteSecurityGroupOpts - Optional Parameters: - * @param "DeleteSecurityGroupRequest" (optional.Interface of DeleteSecurityGroupRequest) - + * @param "DeleteSecurityGroupRequest" (optional.Interface of DeleteSecurityGroupRequest) - @return DeleteSecurityGroupResponse */ func (a *SecurityGroupApiService) DeleteSecurityGroup(ctx _context.Context, localVarOptionals *DeleteSecurityGroupOpts) (DeleteSecurityGroupResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *SecurityGroupApiService) DeleteSecurityGroup(ctx _context.Context, loca // ReadSecurityGroupsOpts Optional parameters for the method 'ReadSecurityGroups' type ReadSecurityGroupsOpts struct { - ReadSecurityGroupsRequest optional.Interface + ReadSecurityGroupsRequest optional.Interface } /* ReadSecurityGroups Method for ReadSecurityGroups * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadSecurityGroupsOpts - Optional Parameters: - * @param "ReadSecurityGroupsRequest" (optional.Interface of ReadSecurityGroupsRequest) - + * @param "ReadSecurityGroupsRequest" (optional.Interface of ReadSecurityGroupsRequest) - @return ReadSecurityGroupsResponse */ func (a *SecurityGroupApiService) ReadSecurityGroups(ctx _context.Context, localVarOptionals *ReadSecurityGroupsOpts) (ReadSecurityGroupsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group_rule.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group_rule.go index 2acf7a106..38a570e92 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group_rule.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group_rule.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type SecurityGroupRuleApiService service // CreateSecurityGroupRuleOpts Optional parameters for the method 'CreateSecurityGroupRule' type CreateSecurityGroupRuleOpts struct { - CreateSecurityGroupRuleRequest optional.Interface + CreateSecurityGroupRuleRequest optional.Interface } /* CreateSecurityGroupRule Method for CreateSecurityGroupRule * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateSecurityGroupRuleOpts - Optional Parameters: - * @param "CreateSecurityGroupRuleRequest" (optional.Interface of CreateSecurityGroupRuleRequest) - + * @param "CreateSecurityGroupRuleRequest" (optional.Interface of CreateSecurityGroupRuleRequest) - @return CreateSecurityGroupRuleResponse */ func (a *SecurityGroupRuleApiService) CreateSecurityGroupRule(ctx _context.Context, localVarOptionals *CreateSecurityGroupRuleOpts) (CreateSecurityGroupRuleResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *SecurityGroupRuleApiService) CreateSecurityGroupRule(ctx _context.Conte // DeleteSecurityGroupRuleOpts Optional parameters for the method 'DeleteSecurityGroupRule' type DeleteSecurityGroupRuleOpts struct { - DeleteSecurityGroupRuleRequest optional.Interface + DeleteSecurityGroupRuleRequest optional.Interface } /* DeleteSecurityGroupRule Method for DeleteSecurityGroupRule * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteSecurityGroupRuleOpts - Optional Parameters: - * @param "DeleteSecurityGroupRuleRequest" (optional.Interface of DeleteSecurityGroupRuleRequest) - + * @param "DeleteSecurityGroupRuleRequest" (optional.Interface of DeleteSecurityGroupRuleRequest) - @return DeleteSecurityGroupRuleResponse */ func (a *SecurityGroupRuleApiService) DeleteSecurityGroupRule(ctx _context.Context, localVarOptionals *DeleteSecurityGroupRuleOpts) (DeleteSecurityGroupRuleResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_server_certificate.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_server_certificate.go index 12aabc4a5..fc0c32b5b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_server_certificate.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_server_certificate.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type ServerCertificateApiService service // CreateServerCertificateOpts Optional parameters for the method 'CreateServerCertificate' type CreateServerCertificateOpts struct { - CreateServerCertificateRequest optional.Interface + CreateServerCertificateRequest optional.Interface } /* CreateServerCertificate Method for CreateServerCertificate * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateServerCertificateOpts - Optional Parameters: - * @param "CreateServerCertificateRequest" (optional.Interface of CreateServerCertificateRequest) - + * @param "CreateServerCertificateRequest" (optional.Interface of CreateServerCertificateRequest) - @return CreateServerCertificateResponse */ func (a *ServerCertificateApiService) CreateServerCertificate(ctx _context.Context, localVarOptionals *CreateServerCertificateOpts) (CreateServerCertificateResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *ServerCertificateApiService) CreateServerCertificate(ctx _context.Conte // DeleteServerCertificateOpts Optional parameters for the method 'DeleteServerCertificate' type DeleteServerCertificateOpts struct { - DeleteServerCertificateRequest optional.Interface + DeleteServerCertificateRequest optional.Interface } /* DeleteServerCertificate Method for DeleteServerCertificate * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteServerCertificateOpts - Optional Parameters: - * @param "DeleteServerCertificateRequest" (optional.Interface of DeleteServerCertificateRequest) - + * @param "DeleteServerCertificateRequest" (optional.Interface of DeleteServerCertificateRequest) - @return DeleteServerCertificateResponse */ func (a *ServerCertificateApiService) DeleteServerCertificate(ctx _context.Context, localVarOptionals *DeleteServerCertificateOpts) (DeleteServerCertificateResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *ServerCertificateApiService) DeleteServerCertificate(ctx _context.Conte // ReadServerCertificatesOpts Optional parameters for the method 'ReadServerCertificates' type ReadServerCertificatesOpts struct { - ReadServerCertificatesRequest optional.Interface + ReadServerCertificatesRequest optional.Interface } /* ReadServerCertificates Method for ReadServerCertificates * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadServerCertificatesOpts - Optional Parameters: - * @param "ReadServerCertificatesRequest" (optional.Interface of ReadServerCertificatesRequest) - + * @param "ReadServerCertificatesRequest" (optional.Interface of ReadServerCertificatesRequest) - @return ReadServerCertificatesResponse */ func (a *ServerCertificateApiService) ReadServerCertificates(ctx _context.Context, localVarOptionals *ReadServerCertificatesOpts) (ReadServerCertificatesResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *ServerCertificateApiService) ReadServerCertificates(ctx _context.Contex // UpdateServerCertificateOpts Optional parameters for the method 'UpdateServerCertificate' type UpdateServerCertificateOpts struct { - UpdateServerCertificateRequest optional.Interface + UpdateServerCertificateRequest optional.Interface } /* UpdateServerCertificate Method for UpdateServerCertificate * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateServerCertificateOpts - Optional Parameters: - * @param "UpdateServerCertificateRequest" (optional.Interface of UpdateServerCertificateRequest) - + * @param "UpdateServerCertificateRequest" (optional.Interface of UpdateServerCertificateRequest) - @return UpdateServerCertificateResponse */ func (a *ServerCertificateApiService) UpdateServerCertificate(ctx _context.Context, localVarOptionals *UpdateServerCertificateOpts) (UpdateServerCertificateResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_snapshot.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_snapshot.go index 425f82bb4..0600c23ba 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_snapshot.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_snapshot.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type SnapshotApiService service // CreateSnapshotOpts Optional parameters for the method 'CreateSnapshot' type CreateSnapshotOpts struct { - CreateSnapshotRequest optional.Interface + CreateSnapshotRequest optional.Interface } /* CreateSnapshot Method for CreateSnapshot * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateSnapshotOpts - Optional Parameters: - * @param "CreateSnapshotRequest" (optional.Interface of CreateSnapshotRequest) - + * @param "CreateSnapshotRequest" (optional.Interface of CreateSnapshotRequest) - @return CreateSnapshotResponse */ func (a *SnapshotApiService) CreateSnapshot(ctx _context.Context, localVarOptionals *CreateSnapshotOpts) (CreateSnapshotResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *SnapshotApiService) CreateSnapshot(ctx _context.Context, localVarOption // CreateSnapshotExportTaskOpts Optional parameters for the method 'CreateSnapshotExportTask' type CreateSnapshotExportTaskOpts struct { - CreateSnapshotExportTaskRequest optional.Interface + CreateSnapshotExportTaskRequest optional.Interface } /* CreateSnapshotExportTask Method for CreateSnapshotExportTask * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateSnapshotExportTaskOpts - Optional Parameters: - * @param "CreateSnapshotExportTaskRequest" (optional.Interface of CreateSnapshotExportTaskRequest) - + * @param "CreateSnapshotExportTaskRequest" (optional.Interface of CreateSnapshotExportTaskRequest) - @return CreateSnapshotExportTaskResponse */ func (a *SnapshotApiService) CreateSnapshotExportTask(ctx _context.Context, localVarOptionals *CreateSnapshotExportTaskOpts) (CreateSnapshotExportTaskResponse, *_nethttp.Response, error) { @@ -280,14 +280,14 @@ func (a *SnapshotApiService) CreateSnapshotExportTask(ctx _context.Context, loca // DeleteSnapshotOpts Optional parameters for the method 'DeleteSnapshot' type DeleteSnapshotOpts struct { - DeleteSnapshotRequest optional.Interface + DeleteSnapshotRequest optional.Interface } /* DeleteSnapshot Method for DeleteSnapshot * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteSnapshotOpts - Optional Parameters: - * @param "DeleteSnapshotRequest" (optional.Interface of DeleteSnapshotRequest) - + * @param "DeleteSnapshotRequest" (optional.Interface of DeleteSnapshotRequest) - @return DeleteSnapshotResponse */ func (a *SnapshotApiService) DeleteSnapshot(ctx _context.Context, localVarOptionals *DeleteSnapshotOpts) (DeleteSnapshotResponse, *_nethttp.Response, error) { @@ -421,14 +421,14 @@ func (a *SnapshotApiService) DeleteSnapshot(ctx _context.Context, localVarOption // ReadSnapshotExportTasksOpts Optional parameters for the method 'ReadSnapshotExportTasks' type ReadSnapshotExportTasksOpts struct { - ReadSnapshotExportTasksRequest optional.Interface + ReadSnapshotExportTasksRequest optional.Interface } /* ReadSnapshotExportTasks Method for ReadSnapshotExportTasks * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadSnapshotExportTasksOpts - Optional Parameters: - * @param "ReadSnapshotExportTasksRequest" (optional.Interface of ReadSnapshotExportTasksRequest) - + * @param "ReadSnapshotExportTasksRequest" (optional.Interface of ReadSnapshotExportTasksRequest) - @return ReadSnapshotExportTasksResponse */ func (a *SnapshotApiService) ReadSnapshotExportTasks(ctx _context.Context, localVarOptionals *ReadSnapshotExportTasksOpts) (ReadSnapshotExportTasksResponse, *_nethttp.Response, error) { @@ -532,14 +532,14 @@ func (a *SnapshotApiService) ReadSnapshotExportTasks(ctx _context.Context, local // ReadSnapshotsOpts Optional parameters for the method 'ReadSnapshots' type ReadSnapshotsOpts struct { - ReadSnapshotsRequest optional.Interface + ReadSnapshotsRequest optional.Interface } /* ReadSnapshots Method for ReadSnapshots * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadSnapshotsOpts - Optional Parameters: - * @param "ReadSnapshotsRequest" (optional.Interface of ReadSnapshotsRequest) - + * @param "ReadSnapshotsRequest" (optional.Interface of ReadSnapshotsRequest) - @return ReadSnapshotsResponse */ func (a *SnapshotApiService) ReadSnapshots(ctx _context.Context, localVarOptionals *ReadSnapshotsOpts) (ReadSnapshotsResponse, *_nethttp.Response, error) { @@ -673,14 +673,14 @@ func (a *SnapshotApiService) ReadSnapshots(ctx _context.Context, localVarOptiona // UpdateSnapshotOpts Optional parameters for the method 'UpdateSnapshot' type UpdateSnapshotOpts struct { - UpdateSnapshotRequest optional.Interface + UpdateSnapshotRequest optional.Interface } /* UpdateSnapshot Method for UpdateSnapshot * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateSnapshotOpts - Optional Parameters: - * @param "UpdateSnapshotRequest" (optional.Interface of UpdateSnapshotRequest) - + * @param "UpdateSnapshotRequest" (optional.Interface of UpdateSnapshotRequest) - @return UpdateSnapshotResponse */ func (a *SnapshotApiService) UpdateSnapshot(ctx _context.Context, localVarOptionals *UpdateSnapshotOpts) (UpdateSnapshotResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_subnet.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_subnet.go index 46b0f1e74..424d3ead7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_subnet.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_subnet.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type SubnetApiService service // CreateSubnetOpts Optional parameters for the method 'CreateSubnet' type CreateSubnetOpts struct { - CreateSubnetRequest optional.Interface + CreateSubnetRequest optional.Interface } /* CreateSubnet Method for CreateSubnet * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateSubnetOpts - Optional Parameters: - * @param "CreateSubnetRequest" (optional.Interface of CreateSubnetRequest) - + * @param "CreateSubnetRequest" (optional.Interface of CreateSubnetRequest) - @return CreateSubnetResponse */ func (a *SubnetApiService) CreateSubnet(ctx _context.Context, localVarOptionals *CreateSubnetOpts) (CreateSubnetResponse, *_nethttp.Response, error) { @@ -179,14 +179,14 @@ func (a *SubnetApiService) CreateSubnet(ctx _context.Context, localVarOptionals // DeleteSubnetOpts Optional parameters for the method 'DeleteSubnet' type DeleteSubnetOpts struct { - DeleteSubnetRequest optional.Interface + DeleteSubnetRequest optional.Interface } /* DeleteSubnet Method for DeleteSubnet * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteSubnetOpts - Optional Parameters: - * @param "DeleteSubnetRequest" (optional.Interface of DeleteSubnetRequest) - + * @param "DeleteSubnetRequest" (optional.Interface of DeleteSubnetRequest) - @return DeleteSubnetResponse */ func (a *SubnetApiService) DeleteSubnet(ctx _context.Context, localVarOptionals *DeleteSubnetOpts) (DeleteSubnetResponse, *_nethttp.Response, error) { @@ -320,14 +320,14 @@ func (a *SubnetApiService) DeleteSubnet(ctx _context.Context, localVarOptionals // ReadSubnetsOpts Optional parameters for the method 'ReadSubnets' type ReadSubnetsOpts struct { - ReadSubnetsRequest optional.Interface + ReadSubnetsRequest optional.Interface } /* ReadSubnets Method for ReadSubnets * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadSubnetsOpts - Optional Parameters: - * @param "ReadSubnetsRequest" (optional.Interface of ReadSubnetsRequest) - + * @param "ReadSubnetsRequest" (optional.Interface of ReadSubnetsRequest) - @return ReadSubnetsResponse */ func (a *SubnetApiService) ReadSubnets(ctx _context.Context, localVarOptionals *ReadSubnetsOpts) (ReadSubnetsResponse, *_nethttp.Response, error) { @@ -461,14 +461,14 @@ func (a *SubnetApiService) ReadSubnets(ctx _context.Context, localVarOptionals * // UpdateSubnetOpts Optional parameters for the method 'UpdateSubnet' type UpdateSubnetOpts struct { - UpdateSubnetRequest optional.Interface + UpdateSubnetRequest optional.Interface } /* UpdateSubnet Method for UpdateSubnet * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateSubnetOpts - Optional Parameters: - * @param "UpdateSubnetRequest" (optional.Interface of UpdateSubnetRequest) - + * @param "UpdateSubnetRequest" (optional.Interface of UpdateSubnetRequest) - @return UpdateSubnetResponse */ func (a *SubnetApiService) UpdateSubnet(ctx _context.Context, localVarOptionals *UpdateSubnetOpts) (UpdateSubnetResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_subregion.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_subregion.go index beeb86718..872c7521d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_subregion.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_subregion.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type SubregionApiService service // ReadSubregionsOpts Optional parameters for the method 'ReadSubregions' type ReadSubregionsOpts struct { - ReadSubregionsRequest optional.Interface + ReadSubregionsRequest optional.Interface } /* ReadSubregions Method for ReadSubregions * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadSubregionsOpts - Optional Parameters: - * @param "ReadSubregionsRequest" (optional.Interface of ReadSubregionsRequest) - + * @param "ReadSubregionsRequest" (optional.Interface of ReadSubregionsRequest) - @return ReadSubregionsResponse */ func (a *SubregionApiService) ReadSubregions(ctx _context.Context, localVarOptionals *ReadSubregionsOpts) (ReadSubregionsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_tag.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_tag.go index a27c17c0a..b50567b02 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_tag.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_tag.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type TagApiService service // CreateTagsOpts Optional parameters for the method 'CreateTags' type CreateTagsOpts struct { - CreateTagsRequest optional.Interface + CreateTagsRequest optional.Interface } /* CreateTags Method for CreateTags * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateTagsOpts - Optional Parameters: - * @param "CreateTagsRequest" (optional.Interface of CreateTagsRequest) - + * @param "CreateTagsRequest" (optional.Interface of CreateTagsRequest) - @return CreateTagsResponse */ func (a *TagApiService) CreateTags(ctx _context.Context, localVarOptionals *CreateTagsOpts) (CreateTagsResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *TagApiService) CreateTags(ctx _context.Context, localVarOptionals *Crea // DeleteTagsOpts Optional parameters for the method 'DeleteTags' type DeleteTagsOpts struct { - DeleteTagsRequest optional.Interface + DeleteTagsRequest optional.Interface } /* DeleteTags Method for DeleteTags * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteTagsOpts - Optional Parameters: - * @param "DeleteTagsRequest" (optional.Interface of DeleteTagsRequest) - + * @param "DeleteTagsRequest" (optional.Interface of DeleteTagsRequest) - @return DeleteTagsResponse */ func (a *TagApiService) DeleteTags(ctx _context.Context, localVarOptionals *DeleteTagsOpts) (DeleteTagsResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *TagApiService) DeleteTags(ctx _context.Context, localVarOptionals *Dele // ReadTagsOpts Optional parameters for the method 'ReadTags' type ReadTagsOpts struct { - ReadTagsRequest optional.Interface + ReadTagsRequest optional.Interface } /* ReadTags Method for ReadTags * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadTagsOpts - Optional Parameters: - * @param "ReadTagsRequest" (optional.Interface of ReadTagsRequest) - + * @param "ReadTagsRequest" (optional.Interface of ReadTagsRequest) - @return ReadTagsResponse */ func (a *TagApiService) ReadTags(ctx _context.Context, localVarOptionals *ReadTagsOpts) (ReadTagsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_task.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_task.go index 7fb415f4f..3ec9d557a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_task.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_task.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type TaskApiService service // DeleteExportTaskOpts Optional parameters for the method 'DeleteExportTask' type DeleteExportTaskOpts struct { - DeleteExportTaskRequest optional.Interface + DeleteExportTaskRequest optional.Interface } /* DeleteExportTask Method for DeleteExportTask * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteExportTaskOpts - Optional Parameters: - * @param "DeleteExportTaskRequest" (optional.Interface of DeleteExportTaskRequest) - + * @param "DeleteExportTaskRequest" (optional.Interface of DeleteExportTaskRequest) - @return DeleteExportTaskResponse */ func (a *TaskApiService) DeleteExportTask(ctx _context.Context, localVarOptionals *DeleteExportTaskOpts) (DeleteExportTaskResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_virtual_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_virtual_gateway.go index 72bbeee8e..87f11ea48 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_virtual_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_virtual_gateway.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type VirtualGatewayApiService service // CreateVirtualGatewayOpts Optional parameters for the method 'CreateVirtualGateway' type CreateVirtualGatewayOpts struct { - CreateVirtualGatewayRequest optional.Interface + CreateVirtualGatewayRequest optional.Interface } /* CreateVirtualGateway Method for CreateVirtualGateway * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateVirtualGatewayOpts - Optional Parameters: - * @param "CreateVirtualGatewayRequest" (optional.Interface of CreateVirtualGatewayRequest) - + * @param "CreateVirtualGatewayRequest" (optional.Interface of CreateVirtualGatewayRequest) - @return CreateVirtualGatewayResponse */ func (a *VirtualGatewayApiService) CreateVirtualGateway(ctx _context.Context, localVarOptionals *CreateVirtualGatewayOpts) (CreateVirtualGatewayResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *VirtualGatewayApiService) CreateVirtualGateway(ctx _context.Context, lo // DeleteVirtualGatewayOpts Optional parameters for the method 'DeleteVirtualGateway' type DeleteVirtualGatewayOpts struct { - DeleteVirtualGatewayRequest optional.Interface + DeleteVirtualGatewayRequest optional.Interface } /* DeleteVirtualGateway Method for DeleteVirtualGateway * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteVirtualGatewayOpts - Optional Parameters: - * @param "DeleteVirtualGatewayRequest" (optional.Interface of DeleteVirtualGatewayRequest) - + * @param "DeleteVirtualGatewayRequest" (optional.Interface of DeleteVirtualGatewayRequest) - @return DeleteVirtualGatewayResponse */ func (a *VirtualGatewayApiService) DeleteVirtualGateway(ctx _context.Context, localVarOptionals *DeleteVirtualGatewayOpts) (DeleteVirtualGatewayResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *VirtualGatewayApiService) DeleteVirtualGateway(ctx _context.Context, lo // LinkVirtualGatewayOpts Optional parameters for the method 'LinkVirtualGateway' type LinkVirtualGatewayOpts struct { - LinkVirtualGatewayRequest optional.Interface + LinkVirtualGatewayRequest optional.Interface } /* LinkVirtualGateway Method for LinkVirtualGateway * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkVirtualGatewayOpts - Optional Parameters: - * @param "LinkVirtualGatewayRequest" (optional.Interface of LinkVirtualGatewayRequest) - + * @param "LinkVirtualGatewayRequest" (optional.Interface of LinkVirtualGatewayRequest) - @return LinkVirtualGatewayResponse */ func (a *VirtualGatewayApiService) LinkVirtualGateway(ctx _context.Context, localVarOptionals *LinkVirtualGatewayOpts) (LinkVirtualGatewayResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *VirtualGatewayApiService) LinkVirtualGateway(ctx _context.Context, loca // ReadVirtualGatewaysOpts Optional parameters for the method 'ReadVirtualGateways' type ReadVirtualGatewaysOpts struct { - ReadVirtualGatewaysRequest optional.Interface + ReadVirtualGatewaysRequest optional.Interface } /* ReadVirtualGateways Method for ReadVirtualGateways * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVirtualGatewaysOpts - Optional Parameters: - * @param "ReadVirtualGatewaysRequest" (optional.Interface of ReadVirtualGatewaysRequest) - + * @param "ReadVirtualGatewaysRequest" (optional.Interface of ReadVirtualGatewaysRequest) - @return ReadVirtualGatewaysResponse */ func (a *VirtualGatewayApiService) ReadVirtualGateways(ctx _context.Context, localVarOptionals *ReadVirtualGatewaysOpts) (ReadVirtualGatewaysResponse, *_nethttp.Response, error) { @@ -472,14 +472,14 @@ func (a *VirtualGatewayApiService) ReadVirtualGateways(ctx _context.Context, loc // UnlinkVirtualGatewayOpts Optional parameters for the method 'UnlinkVirtualGateway' type UnlinkVirtualGatewayOpts struct { - UnlinkVirtualGatewayRequest optional.Interface + UnlinkVirtualGatewayRequest optional.Interface } /* UnlinkVirtualGateway Method for UnlinkVirtualGateway * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkVirtualGatewayOpts - Optional Parameters: - * @param "UnlinkVirtualGatewayRequest" (optional.Interface of UnlinkVirtualGatewayRequest) - + * @param "UnlinkVirtualGatewayRequest" (optional.Interface of UnlinkVirtualGatewayRequest) - @return UnlinkVirtualGatewayResponse */ func (a *VirtualGatewayApiService) UnlinkVirtualGateway(ctx _context.Context, localVarOptionals *UnlinkVirtualGatewayOpts) (UnlinkVirtualGatewayResponse, *_nethttp.Response, error) { @@ -583,14 +583,14 @@ func (a *VirtualGatewayApiService) UnlinkVirtualGateway(ctx _context.Context, lo // UpdateRoutePropagationOpts Optional parameters for the method 'UpdateRoutePropagation' type UpdateRoutePropagationOpts struct { - UpdateRoutePropagationRequest optional.Interface + UpdateRoutePropagationRequest optional.Interface } /* UpdateRoutePropagation Method for UpdateRoutePropagation * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateRoutePropagationOpts - Optional Parameters: - * @param "UpdateRoutePropagationRequest" (optional.Interface of UpdateRoutePropagationRequest) - + * @param "UpdateRoutePropagationRequest" (optional.Interface of UpdateRoutePropagationRequest) - @return UpdateRoutePropagationResponse */ func (a *VirtualGatewayApiService) UpdateRoutePropagation(ctx _context.Context, localVarOptionals *UpdateRoutePropagationOpts) (UpdateRoutePropagationResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_vm.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_vm.go index a64fcef23..8ad85136d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_vm.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_vm.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type VmApiService service // CreateVmsOpts Optional parameters for the method 'CreateVms' type CreateVmsOpts struct { - CreateVmsRequest optional.Interface + CreateVmsRequest optional.Interface } /* CreateVms Method for CreateVms * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateVmsOpts - Optional Parameters: - * @param "CreateVmsRequest" (optional.Interface of CreateVmsRequest) - + * @param "CreateVmsRequest" (optional.Interface of CreateVmsRequest) - @return CreateVmsResponse */ func (a *VmApiService) CreateVms(ctx _context.Context, localVarOptionals *CreateVmsOpts) (CreateVmsResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *VmApiService) CreateVms(ctx _context.Context, localVarOptionals *Create // DeleteVmsOpts Optional parameters for the method 'DeleteVms' type DeleteVmsOpts struct { - DeleteVmsRequest optional.Interface + DeleteVmsRequest optional.Interface } /* DeleteVms Method for DeleteVms * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteVmsOpts - Optional Parameters: - * @param "DeleteVmsRequest" (optional.Interface of DeleteVmsRequest) - + * @param "DeleteVmsRequest" (optional.Interface of DeleteVmsRequest) - @return DeleteVmsResponse */ func (a *VmApiService) DeleteVms(ctx _context.Context, localVarOptionals *DeleteVmsOpts) (DeleteVmsResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *VmApiService) DeleteVms(ctx _context.Context, localVarOptionals *Delete // ReadAdminPasswordOpts Optional parameters for the method 'ReadAdminPassword' type ReadAdminPasswordOpts struct { - ReadAdminPasswordRequest optional.Interface + ReadAdminPasswordRequest optional.Interface } /* ReadAdminPassword Method for ReadAdminPassword * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadAdminPasswordOpts - Optional Parameters: - * @param "ReadAdminPasswordRequest" (optional.Interface of ReadAdminPasswordRequest) - + * @param "ReadAdminPasswordRequest" (optional.Interface of ReadAdminPasswordRequest) - @return ReadAdminPasswordResponse */ func (a *VmApiService) ReadAdminPassword(ctx _context.Context, localVarOptionals *ReadAdminPasswordOpts) (ReadAdminPasswordResponse, *_nethttp.Response, error) { @@ -451,14 +451,14 @@ func (a *VmApiService) ReadAdminPassword(ctx _context.Context, localVarOptionals // ReadConsoleOutputOpts Optional parameters for the method 'ReadConsoleOutput' type ReadConsoleOutputOpts struct { - ReadConsoleOutputRequest optional.Interface + ReadConsoleOutputRequest optional.Interface } /* ReadConsoleOutput Method for ReadConsoleOutput * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadConsoleOutputOpts - Optional Parameters: - * @param "ReadConsoleOutputRequest" (optional.Interface of ReadConsoleOutputRequest) - + * @param "ReadConsoleOutputRequest" (optional.Interface of ReadConsoleOutputRequest) - @return ReadConsoleOutputResponse */ func (a *VmApiService) ReadConsoleOutput(ctx _context.Context, localVarOptionals *ReadConsoleOutputOpts) (ReadConsoleOutputResponse, *_nethttp.Response, error) { @@ -592,14 +592,14 @@ func (a *VmApiService) ReadConsoleOutput(ctx _context.Context, localVarOptionals // ReadVmTypesOpts Optional parameters for the method 'ReadVmTypes' type ReadVmTypesOpts struct { - ReadVmTypesRequest optional.Interface + ReadVmTypesRequest optional.Interface } /* ReadVmTypes Method for ReadVmTypes * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVmTypesOpts - Optional Parameters: - * @param "ReadVmTypesRequest" (optional.Interface of ReadVmTypesRequest) - + * @param "ReadVmTypesRequest" (optional.Interface of ReadVmTypesRequest) - @return ReadVmTypesResponse */ func (a *VmApiService) ReadVmTypes(ctx _context.Context, localVarOptionals *ReadVmTypesOpts) (ReadVmTypesResponse, *_nethttp.Response, error) { @@ -691,14 +691,14 @@ func (a *VmApiService) ReadVmTypes(ctx _context.Context, localVarOptionals *Read // ReadVmsOpts Optional parameters for the method 'ReadVms' type ReadVmsOpts struct { - ReadVmsRequest optional.Interface + ReadVmsRequest optional.Interface } /* ReadVms Method for ReadVms * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVmsOpts - Optional Parameters: - * @param "ReadVmsRequest" (optional.Interface of ReadVmsRequest) - + * @param "ReadVmsRequest" (optional.Interface of ReadVmsRequest) - @return ReadVmsResponse */ func (a *VmApiService) ReadVms(ctx _context.Context, localVarOptionals *ReadVmsOpts) (ReadVmsResponse, *_nethttp.Response, error) { @@ -832,14 +832,14 @@ func (a *VmApiService) ReadVms(ctx _context.Context, localVarOptionals *ReadVmsO // ReadVmsStateOpts Optional parameters for the method 'ReadVmsState' type ReadVmsStateOpts struct { - ReadVmsStateRequest optional.Interface + ReadVmsStateRequest optional.Interface } /* ReadVmsState Method for ReadVmsState * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVmsStateOpts - Optional Parameters: - * @param "ReadVmsStateRequest" (optional.Interface of ReadVmsStateRequest) - + * @param "ReadVmsStateRequest" (optional.Interface of ReadVmsStateRequest) - @return ReadVmsStateResponse */ func (a *VmApiService) ReadVmsState(ctx _context.Context, localVarOptionals *ReadVmsStateOpts) (ReadVmsStateResponse, *_nethttp.Response, error) { @@ -973,14 +973,14 @@ func (a *VmApiService) ReadVmsState(ctx _context.Context, localVarOptionals *Rea // RebootVmsOpts Optional parameters for the method 'RebootVms' type RebootVmsOpts struct { - RebootVmsRequest optional.Interface + RebootVmsRequest optional.Interface } /* RebootVms Method for RebootVms * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *RebootVmsOpts - Optional Parameters: - * @param "RebootVmsRequest" (optional.Interface of RebootVmsRequest) - + * @param "RebootVmsRequest" (optional.Interface of RebootVmsRequest) - @return RebootVmsResponse */ func (a *VmApiService) RebootVms(ctx _context.Context, localVarOptionals *RebootVmsOpts) (RebootVmsResponse, *_nethttp.Response, error) { @@ -1114,14 +1114,14 @@ func (a *VmApiService) RebootVms(ctx _context.Context, localVarOptionals *Reboot // StartVmsOpts Optional parameters for the method 'StartVms' type StartVmsOpts struct { - StartVmsRequest optional.Interface + StartVmsRequest optional.Interface } /* StartVms Method for StartVms * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *StartVmsOpts - Optional Parameters: - * @param "StartVmsRequest" (optional.Interface of StartVmsRequest) - + * @param "StartVmsRequest" (optional.Interface of StartVmsRequest) - @return StartVmsResponse */ func (a *VmApiService) StartVms(ctx _context.Context, localVarOptionals *StartVmsOpts) (StartVmsResponse, *_nethttp.Response, error) { @@ -1255,14 +1255,14 @@ func (a *VmApiService) StartVms(ctx _context.Context, localVarOptionals *StartVm // StopVmsOpts Optional parameters for the method 'StopVms' type StopVmsOpts struct { - StopVmsRequest optional.Interface + StopVmsRequest optional.Interface } /* StopVms Method for StopVms * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *StopVmsOpts - Optional Parameters: - * @param "StopVmsRequest" (optional.Interface of StopVmsRequest) - + * @param "StopVmsRequest" (optional.Interface of StopVmsRequest) - @return StopVmsResponse */ func (a *VmApiService) StopVms(ctx _context.Context, localVarOptionals *StopVmsOpts) (StopVmsResponse, *_nethttp.Response, error) { @@ -1396,14 +1396,14 @@ func (a *VmApiService) StopVms(ctx _context.Context, localVarOptionals *StopVmsO // UpdateVmOpts Optional parameters for the method 'UpdateVm' type UpdateVmOpts struct { - UpdateVmRequest optional.Interface + UpdateVmRequest optional.Interface } /* UpdateVm Method for UpdateVm * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateVmOpts - Optional Parameters: - * @param "UpdateVmRequest" (optional.Interface of UpdateVmRequest) - + * @param "UpdateVmRequest" (optional.Interface of UpdateVmRequest) - @return UpdateVmResponse */ func (a *VmApiService) UpdateVm(ctx _context.Context, localVarOptionals *UpdateVmOpts) (UpdateVmResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_volume.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_volume.go index 3de2dff76..47d352cda 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_volume.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_volume.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type VolumeApiService service // CreateVolumeOpts Optional parameters for the method 'CreateVolume' type CreateVolumeOpts struct { - CreateVolumeRequest optional.Interface + CreateVolumeRequest optional.Interface } /* CreateVolume Method for CreateVolume * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateVolumeOpts - Optional Parameters: - * @param "CreateVolumeRequest" (optional.Interface of CreateVolumeRequest) - + * @param "CreateVolumeRequest" (optional.Interface of CreateVolumeRequest) - @return CreateVolumeResponse */ func (a *VolumeApiService) CreateVolume(ctx _context.Context, localVarOptionals *CreateVolumeOpts) (CreateVolumeResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *VolumeApiService) CreateVolume(ctx _context.Context, localVarOptionals // DeleteVolumeOpts Optional parameters for the method 'DeleteVolume' type DeleteVolumeOpts struct { - DeleteVolumeRequest optional.Interface + DeleteVolumeRequest optional.Interface } /* DeleteVolume Method for DeleteVolume * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteVolumeOpts - Optional Parameters: - * @param "DeleteVolumeRequest" (optional.Interface of DeleteVolumeRequest) - + * @param "DeleteVolumeRequest" (optional.Interface of DeleteVolumeRequest) - @return DeleteVolumeResponse */ func (a *VolumeApiService) DeleteVolume(ctx _context.Context, localVarOptionals *DeleteVolumeOpts) (DeleteVolumeResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *VolumeApiService) DeleteVolume(ctx _context.Context, localVarOptionals // LinkVolumeOpts Optional parameters for the method 'LinkVolume' type LinkVolumeOpts struct { - LinkVolumeRequest optional.Interface + LinkVolumeRequest optional.Interface } /* LinkVolume Method for LinkVolume * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkVolumeOpts - Optional Parameters: - * @param "LinkVolumeRequest" (optional.Interface of LinkVolumeRequest) - + * @param "LinkVolumeRequest" (optional.Interface of LinkVolumeRequest) - @return LinkVolumeResponse */ func (a *VolumeApiService) LinkVolume(ctx _context.Context, localVarOptionals *LinkVolumeOpts) (LinkVolumeResponse, *_nethttp.Response, error) { @@ -451,14 +451,14 @@ func (a *VolumeApiService) LinkVolume(ctx _context.Context, localVarOptionals *L // ReadVolumesOpts Optional parameters for the method 'ReadVolumes' type ReadVolumesOpts struct { - ReadVolumesRequest optional.Interface + ReadVolumesRequest optional.Interface } /* ReadVolumes Method for ReadVolumes * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVolumesOpts - Optional Parameters: - * @param "ReadVolumesRequest" (optional.Interface of ReadVolumesRequest) - + * @param "ReadVolumesRequest" (optional.Interface of ReadVolumesRequest) - @return ReadVolumesResponse */ func (a *VolumeApiService) ReadVolumes(ctx _context.Context, localVarOptionals *ReadVolumesOpts) (ReadVolumesResponse, *_nethttp.Response, error) { @@ -592,14 +592,14 @@ func (a *VolumeApiService) ReadVolumes(ctx _context.Context, localVarOptionals * // UnlinkVolumeOpts Optional parameters for the method 'UnlinkVolume' type UnlinkVolumeOpts struct { - UnlinkVolumeRequest optional.Interface + UnlinkVolumeRequest optional.Interface } /* UnlinkVolume Method for UnlinkVolume * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkVolumeOpts - Optional Parameters: - * @param "UnlinkVolumeRequest" (optional.Interface of UnlinkVolumeRequest) - + * @param "UnlinkVolumeRequest" (optional.Interface of UnlinkVolumeRequest) - @return UnlinkVolumeResponse */ func (a *VolumeApiService) UnlinkVolume(ctx _context.Context, localVarOptionals *UnlinkVolumeOpts) (UnlinkVolumeResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_vpn_connection.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_vpn_connection.go index 82e77ce62..f6bc2f5ed 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_vpn_connection.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_vpn_connection.go @@ -12,10 +12,10 @@ package osc import ( _context "context" + "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" - "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type VpnConnectionApiService service // CreateVpnConnectionOpts Optional parameters for the method 'CreateVpnConnection' type CreateVpnConnectionOpts struct { - CreateVpnConnectionRequest optional.Interface + CreateVpnConnectionRequest optional.Interface } /* CreateVpnConnection Method for CreateVpnConnection * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateVpnConnectionOpts - Optional Parameters: - * @param "CreateVpnConnectionRequest" (optional.Interface of CreateVpnConnectionRequest) - + * @param "CreateVpnConnectionRequest" (optional.Interface of CreateVpnConnectionRequest) - @return CreateVpnConnectionResponse */ func (a *VpnConnectionApiService) CreateVpnConnection(ctx _context.Context, localVarOptionals *CreateVpnConnectionOpts) (CreateVpnConnectionResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *VpnConnectionApiService) CreateVpnConnection(ctx _context.Context, loca // CreateVpnConnectionRouteOpts Optional parameters for the method 'CreateVpnConnectionRoute' type CreateVpnConnectionRouteOpts struct { - CreateVpnConnectionRouteRequest optional.Interface + CreateVpnConnectionRouteRequest optional.Interface } /* CreateVpnConnectionRoute Method for CreateVpnConnectionRoute * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateVpnConnectionRouteOpts - Optional Parameters: - * @param "CreateVpnConnectionRouteRequest" (optional.Interface of CreateVpnConnectionRouteRequest) - + * @param "CreateVpnConnectionRouteRequest" (optional.Interface of CreateVpnConnectionRouteRequest) - @return CreateVpnConnectionRouteResponse */ func (a *VpnConnectionApiService) CreateVpnConnectionRoute(ctx _context.Context, localVarOptionals *CreateVpnConnectionRouteOpts) (CreateVpnConnectionRouteResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *VpnConnectionApiService) CreateVpnConnectionRoute(ctx _context.Context, // DeleteVpnConnectionOpts Optional parameters for the method 'DeleteVpnConnection' type DeleteVpnConnectionOpts struct { - DeleteVpnConnectionRequest optional.Interface + DeleteVpnConnectionRequest optional.Interface } /* DeleteVpnConnection Method for DeleteVpnConnection * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteVpnConnectionOpts - Optional Parameters: - * @param "DeleteVpnConnectionRequest" (optional.Interface of DeleteVpnConnectionRequest) - + * @param "DeleteVpnConnectionRequest" (optional.Interface of DeleteVpnConnectionRequest) - @return DeleteVpnConnectionResponse */ func (a *VpnConnectionApiService) DeleteVpnConnection(ctx _context.Context, localVarOptionals *DeleteVpnConnectionOpts) (DeleteVpnConnectionResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *VpnConnectionApiService) DeleteVpnConnection(ctx _context.Context, loca // DeleteVpnConnectionRouteOpts Optional parameters for the method 'DeleteVpnConnectionRoute' type DeleteVpnConnectionRouteOpts struct { - DeleteVpnConnectionRouteRequest optional.Interface + DeleteVpnConnectionRouteRequest optional.Interface } /* DeleteVpnConnectionRoute Method for DeleteVpnConnectionRoute * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteVpnConnectionRouteOpts - Optional Parameters: - * @param "DeleteVpnConnectionRouteRequest" (optional.Interface of DeleteVpnConnectionRouteRequest) - + * @param "DeleteVpnConnectionRouteRequest" (optional.Interface of DeleteVpnConnectionRouteRequest) - @return DeleteVpnConnectionRouteResponse */ func (a *VpnConnectionApiService) DeleteVpnConnectionRoute(ctx _context.Context, localVarOptionals *DeleteVpnConnectionRouteOpts) (DeleteVpnConnectionRouteResponse, *_nethttp.Response, error) { @@ -472,14 +472,14 @@ func (a *VpnConnectionApiService) DeleteVpnConnectionRoute(ctx _context.Context, // ReadVpnConnectionsOpts Optional parameters for the method 'ReadVpnConnections' type ReadVpnConnectionsOpts struct { - ReadVpnConnectionsRequest optional.Interface + ReadVpnConnectionsRequest optional.Interface } /* ReadVpnConnections Method for ReadVpnConnections * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVpnConnectionsOpts - Optional Parameters: - * @param "ReadVpnConnectionsRequest" (optional.Interface of ReadVpnConnectionsRequest) - + * @param "ReadVpnConnectionsRequest" (optional.Interface of ReadVpnConnectionsRequest) - @return ReadVpnConnectionsResponse */ func (a *VpnConnectionApiService) ReadVpnConnections(ctx _context.Context, localVarOptionals *ReadVpnConnectionsOpts) (ReadVpnConnectionsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/client.go b/vendor/github.com/outscale/osc-sdk-go/osc/client.go index 9215de2aa..2780a67e3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/client.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/client.go @@ -32,9 +32,9 @@ import ( "time" "unicode/utf8" - "golang.org/x/oauth2" - awsv4 "github.com/aws/aws-sdk-go/aws/signer/v4" awscredentials "github.com/aws/aws-sdk-go/aws/credentials" + awsv4 "github.com/aws/aws-sdk-go/aws/signer/v4" + "golang.org/x/oauth2" ) var ( @@ -273,13 +273,12 @@ func parameterToJson(obj interface{}) (string, error) { return string(jsonBuf), err } - // callAPI do the request. func (c *APIClient) callAPI(request *http.Request) (*http.Response, error) { if c.cfg.Debug { - dump, err := httputil.DumpRequestOut(request, true) + dump, err := httputil.DumpRequestOut(request, true) if err != nil { - return nil, err + return nil, err } log.Printf("\n%s\n", string(dump)) } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/configuration.go b/vendor/github.com/outscale/osc-sdk-go/osc/configuration.go index 3c805f2cc..aa455dec7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/configuration.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/configuration.go @@ -58,8 +58,8 @@ type APIKey struct { // AWSv4 provides AWS Signature to a request passed via context using ContextAWSv4 // https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html type AWSv4 struct { - AccessKey string - SecretKey string + AccessKey string + SecretKey string } // ServerVariable stores the information about a server variable @@ -71,9 +71,9 @@ type ServerVariable struct { // ServerConfiguration stores the information about a server type ServerConfiguration struct { - Url string + Url string Description string - Variables map[string]ServerVariable + Variables map[string]ServerVariable } // Configuration stores the configuration of the API client @@ -95,13 +95,13 @@ func NewConfiguration() *Configuration { DefaultHeader: make(map[string]string), UserAgent: "OpenAPI-Generator/1.0.0/go", Debug: false, - Servers: []ServerConfiguration{ + Servers: []ServerConfiguration{ { - Url: "https://api.{region}.outscale.com/api/v1", + Url: "https://api.{region}.outscale.com/api/v1", Description: "No description provided", Variables: map[string]ServerVariable{ "region": ServerVariable{ - Description: "No description provided", + Description: "No description provided", DefaultValue: "eu-west-2", EnumValues: []string{ "eu-west-2", @@ -112,11 +112,11 @@ func NewConfiguration() *Configuration { }, }, { - Url: "https://api.{region}.outscale.hk/api/v1", + Url: "https://api.{region}.outscale.hk/api/v1", Description: "No description provided", Variables: map[string]ServerVariable{ "region": ServerVariable{ - Description: "No description provided", + Description: "No description provided", DefaultValue: "cn-southeast-1", EnumValues: []string{ "cn-southeast-1", @@ -137,7 +137,7 @@ func (c *Configuration) AddDefaultHeader(key string, value string) { // ServerUrl returns URL based on server settings func (c *Configuration) ServerUrl(index int, variables map[string]string) (string, error) { if index < 0 || len(c.Servers) <= index { - return "", fmt.Errorf("Index %v out of range %v", index, len(c.Servers) - 1) + return "", fmt.Errorf("Index %v out of range %v", index, len(c.Servers)-1) } server := c.Servers[index] url := server.Url diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_request.go index 0d15eb937..9868d6b83 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_request.go @@ -9,6 +9,7 @@ */ package osc + // AcceptNetPeeringRequest struct for AcceptNetPeeringRequest type AcceptNetPeeringRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_response.go index 528d1c6f1..20c913967 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_response.go @@ -9,8 +9,9 @@ */ package osc + // AcceptNetPeeringResponse struct for AcceptNetPeeringResponse type AcceptNetPeeringResponse struct { - NetPeering NetPeering `json:"NetPeering,omitempty"` + NetPeering NetPeering `json:"NetPeering,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_accepter_net.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_accepter_net.go index cfcbb5c17..01dbfec2b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_accepter_net.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_accepter_net.go @@ -9,6 +9,7 @@ */ package osc + // AccepterNet Information about the accepter Net. type AccepterNet struct { // The account ID of the owner of the accepter Net. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key.go index 712cbdea9..421e0db2d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key.go @@ -9,6 +9,7 @@ */ package osc + // AccessKey Information about the access key. type AccessKey struct { // The ID of the access key. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key_secret_key.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key_secret_key.go index 4d0d5b0c8..ca541ab20 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key_secret_key.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key_secret_key.go @@ -9,6 +9,7 @@ */ package osc + // AccessKeySecretKey Information about the secret access key. type AccessKeySecretKey struct { // The ID of the secret access key. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_access_log.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_access_log.go index 4a975e903..30eb632eb 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_access_log.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_access_log.go @@ -9,6 +9,7 @@ */ package osc + // AccessLog Information about access logs. type AccessLog struct { // If `true`, access logs are enabled for your load balancer. If `false`, they are not. If you set this to `true` in your request, the `OsuBucketName` parameter is required. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_account.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_account.go index a3257231f..edfc316bf 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_account.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_account.go @@ -9,6 +9,7 @@ */ package osc + // Account Information about the account. type Account struct { // The ID of the account. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_application_sticky_cookie_policy.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_application_sticky_cookie_policy.go index 784e6f62a..35541353c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_application_sticky_cookie_policy.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_application_sticky_cookie_policy.go @@ -9,6 +9,7 @@ */ package osc + // ApplicationStickyCookiePolicy Information about the stickiness policy. type ApplicationStickyCookiePolicy struct { // The name of the application cookie used for stickiness. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_backend_vm_health.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_backend_vm_health.go index ccea28f0e..50e772df8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_backend_vm_health.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_backend_vm_health.go @@ -9,6 +9,7 @@ */ package osc + // BackendVmHealth Information about the health of a back-end VM. type BackendVmHealth struct { // The description of the state of the back-end VM. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_created.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_created.go index 8c50aad87..d7edb6fa7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_created.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_created.go @@ -9,6 +9,7 @@ */ package osc + // BlockDeviceMappingCreated Information about the created block device mapping. type BlockDeviceMappingCreated struct { Bsu BsuCreated `json:"Bsu,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_image.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_image.go index 19022c8f1..b8099b564 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_image.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_image.go @@ -9,6 +9,7 @@ */ package osc + // BlockDeviceMappingImage One or more parameters used to automatically set up volumes when the VM is created. type BlockDeviceMappingImage struct { Bsu BsuToCreate `json:"Bsu,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_creation.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_creation.go index cf94c343e..0b2ac2ef2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_creation.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_creation.go @@ -9,6 +9,7 @@ */ package osc + // BlockDeviceMappingVmCreation Information about the block device mapping. type BlockDeviceMappingVmCreation struct { Bsu BsuToCreate `json:"Bsu,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_update.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_update.go index 9826946fe..294276709 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_update.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_update.go @@ -9,6 +9,7 @@ */ package osc + // BlockDeviceMappingVmUpdate Information about the block device mapping. type BlockDeviceMappingVmUpdate struct { Bsu BsuToUpdateVm `json:"Bsu,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_created.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_created.go index eec864400..d78e06753 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_created.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_created.go @@ -9,6 +9,7 @@ */ package osc + // BsuCreated Information about the created BSU volume. type BsuCreated struct { // Set to `true` by default, which means that the volume is deleted when the VM is terminated. If set to `false`, the volume is not deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_create.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_create.go index 01efd3ca6..2fdd0a64e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_create.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_create.go @@ -9,6 +9,7 @@ */ package osc + // BsuToCreate Information about the BSU volume to create. type BsuToCreate struct { // Set to `true` by default, which means that the volume is deleted when the VM is terminated. If set to `false`, the volume is not deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_update_vm.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_update_vm.go index 0cf108bd0..10e29dccf 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_update_vm.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_update_vm.go @@ -9,6 +9,7 @@ */ package osc + // BsuToUpdateVm Information about the BSU volume. type BsuToUpdateVm struct { // If `true`, the volume is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_request.go index 1fb388941..45349a428 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_request.go @@ -9,6 +9,7 @@ */ package osc + // CheckAuthenticationRequest struct for CheckAuthenticationRequest type CheckAuthenticationRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_response.go index 88f391e54..aa03886d1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_response.go @@ -9,6 +9,7 @@ */ package osc + // CheckAuthenticationResponse struct for CheckAuthenticationResponse type CheckAuthenticationResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_client_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_client_gateway.go index 239e8729b..82e380d70 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_client_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_client_gateway.go @@ -9,6 +9,7 @@ */ package osc + // ClientGateway Information about the client gateway. type ClientGateway struct { // An Autonomous System Number (ASN) used by the Border Gateway Protocol (BGP) to find the path to your client gateway through the Internet. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_consumption_entry.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_consumption_entry.go index 27b00fd7b..09a5f6884 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_consumption_entry.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_consumption_entry.go @@ -9,6 +9,7 @@ */ package osc + // ConsumptionEntry Information about the resources consumed during the specified time period. type ConsumptionEntry struct { // The category of the resource (for example, `network`). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_request.go index af959341c..d48ba615f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateAccessKeyRequest struct for CreateAccessKeyRequest type CreateAccessKeyRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_response.go index 1f4ff06d3..8647f2d8c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateAccessKeyResponse struct for CreateAccessKeyResponse type CreateAccessKeyResponse struct { - AccessKey AccessKeySecretKey `json:"AccessKey,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + AccessKey AccessKeySecretKey `json:"AccessKey,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_request.go index 9415bcd0f..e3c4fbf1a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateAccountRequest struct for CreateAccountRequest type CreateAccountRequest struct { // The city of the account owner. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_response.go index 54bbe3855..ef38f9140 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateAccountResponse struct for CreateAccountResponse type CreateAccountResponse struct { - Account Account `json:"Account,omitempty"` + Account Account `json:"Account,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_request.go index f6c5f8567..9cfddf13f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateClientGatewayRequest struct for CreateClientGatewayRequest type CreateClientGatewayRequest struct { // An Autonomous System Number (ASN) used by the Border Gateway Protocol (BGP) to find the path to your client gateway through the Internet. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_response.go index 5902b3150..c69615df8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateClientGatewayResponse struct for CreateClientGatewayResponse type CreateClientGatewayResponse struct { - ClientGateway ClientGateway `json:"ClientGateway,omitempty"` + ClientGateway ClientGateway `json:"ClientGateway,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_request.go index 99976a536..64bb22288 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateDhcpOptionsRequest struct for CreateDhcpOptionsRequest type CreateDhcpOptionsRequest struct { // Specify a domain name (for example, MyCompany.com). You can specify only one domain name. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_response.go index 473617ef4..ae9a83b16 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateDhcpOptionsResponse struct for CreateDhcpOptionsResponse type CreateDhcpOptionsResponse struct { - DhcpOptionsSet DhcpOptionsSet `json:"DhcpOptionsSet,omitempty"` + DhcpOptionsSet DhcpOptionsSet `json:"DhcpOptionsSet,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_request.go index fe8db75bd..228db9163 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_request.go @@ -9,10 +9,11 @@ */ package osc + // CreateDirectLinkInterfaceRequest struct for CreateDirectLinkInterfaceRequest type CreateDirectLinkInterfaceRequest struct { // The ID of the existing DirectLink for which you want to create the DirectLink interface. - DirectLinkId string `json:"DirectLinkId"` + DirectLinkId string `json:"DirectLinkId"` DirectLinkInterface DirectLinkInterface `json:"DirectLinkInterface"` // If `true`, checks whether you have the required permissions to perform the action. DryRun bool `json:"DryRun,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_response.go index fdd0f8832..8e5168de4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateDirectLinkInterfaceResponse struct for CreateDirectLinkInterfaceResponse type CreateDirectLinkInterfaceResponse struct { DirectLinkInterface DirectLinkInterfaces `json:"DirectLinkInterface,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_request.go index e43e61c1b..cd6205001 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateDirectLinkRequest struct for CreateDirectLinkRequest type CreateDirectLinkRequest struct { // The bandwidth of the DirectLink (`1Gbps` \\| `10Gbps`). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_response.go index f14c4e864..32c15c64c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateDirectLinkResponse struct for CreateDirectLinkResponse type CreateDirectLinkResponse struct { - DirectLink DirectLink `json:"DirectLink,omitempty"` + DirectLink DirectLink `json:"DirectLink,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_request.go index 9c07974bd..80aa22c0b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateFlexibleGpuRequest struct for CreateFlexibleGpuRequest type CreateFlexibleGpuRequest struct { // If `true`, the fGPU is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_response.go index 827c1ded4..0307bd2be 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateFlexibleGpuResponse struct for CreateFlexibleGpuResponse type CreateFlexibleGpuResponse struct { - FlexibleGpu FlexibleGpu `json:"FlexibleGpu,omitempty"` + FlexibleGpu FlexibleGpu `json:"FlexibleGpu,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_request.go index 7b22f1f29..9d185ec18 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_request.go @@ -9,11 +9,12 @@ */ package osc + // CreateImageExportTaskRequest struct for CreateImageExportTaskRequest type CreateImageExportTaskRequest struct { // If `true`, checks whether you have the required permissions to perform the action. DryRun bool `json:"DryRun,omitempty"` // The ID of the OMI to export. - ImageId string `json:"ImageId"` + ImageId string `json:"ImageId"` OsuExport OsuExport `json:"OsuExport"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_response.go index beb5e698a..142de276c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_response.go @@ -9,6 +9,7 @@ */ package osc + // CreateImageExportTaskResponse struct for CreateImageExportTaskResponse type CreateImageExportTaskResponse struct { ImageExportTask ImageExportTask `json:"ImageExportTask,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_request.go index 2bed38490..9b32c2f29 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateImageRequest struct for CreateImageRequest type CreateImageRequest struct { // The architecture of the OMI (by default, `i386`). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_response.go index 1739ed62b..c54bd7cbf 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateImageResponse struct for CreateImageResponse type CreateImageResponse struct { - Image Image `json:"Image,omitempty"` + Image Image `json:"Image,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_request.go index 949a9e193..be67cf957 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateInternetServiceRequest struct for CreateInternetServiceRequest type CreateInternetServiceRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_response.go index 41dbf8ab8..ddd55366f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_response.go @@ -9,6 +9,7 @@ */ package osc + // CreateInternetServiceResponse struct for CreateInternetServiceResponse type CreateInternetServiceResponse struct { InternetService InternetService `json:"InternetService,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_request.go index daebb80bc..4b3be79a8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateKeypairRequest struct for CreateKeypairRequest type CreateKeypairRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_response.go index 0d159ba3b..8da997651 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateKeypairResponse struct for CreateKeypairResponse type CreateKeypairResponse struct { - Keypair KeypairCreated `json:"Keypair,omitempty"` + Keypair KeypairCreated `json:"Keypair,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_request.go index a4b0c28c6..b20421b67 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_request.go @@ -9,11 +9,12 @@ */ package osc + // CreateListenerRuleRequest struct for CreateListenerRuleRequest type CreateListenerRuleRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` - Listener LoadBalancerLight `json:"Listener"` + DryRun bool `json:"DryRun,omitempty"` + Listener LoadBalancerLight `json:"Listener"` ListenerRule ListenerRuleForCreation `json:"ListenerRule"` // The IDs of the backend VMs. VmIds []string `json:"VmIds"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_response.go index 835b9c96c..2405e2ef6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateListenerRuleResponse struct for CreateListenerRuleResponse type CreateListenerRuleResponse struct { - ListenerRule ListenerRule `json:"ListenerRule,omitempty"` + ListenerRule ListenerRule `json:"ListenerRule,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_request.go index c63ba97a4..fe40a3796 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateLoadBalancerListenersRequest struct for CreateLoadBalancerListenersRequest type CreateLoadBalancerListenersRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_response.go index ef74adc8e..f04880bec 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateLoadBalancerListenersResponse struct for CreateLoadBalancerListenersResponse type CreateLoadBalancerListenersResponse struct { - LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` + LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_request.go index 9c85ca467..2b0e55751 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateLoadBalancerPolicyRequest struct for CreateLoadBalancerPolicyRequest type CreateLoadBalancerPolicyRequest struct { // The name of the application cookie used for stickiness. This parameter is required if you create a stickiness policy based on an application-generated cookie. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_response.go index 3c4df543f..78a05bf85 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateLoadBalancerPolicyResponse struct for CreateLoadBalancerPolicyResponse type CreateLoadBalancerPolicyResponse struct { - LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` + LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_request.go index 3265cee83..c05619770 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateLoadBalancerRequest struct for CreateLoadBalancerRequest type CreateLoadBalancerRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_response.go index d14bda34b..9a4cbc6d7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateLoadBalancerResponse struct for CreateLoadBalancerResponse type CreateLoadBalancerResponse struct { - LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` + LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_request.go index f0ec7c1be..5aac1ac3e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateLoadBalancerTagsRequest struct for CreateLoadBalancerTagsRequest type CreateLoadBalancerTagsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_response.go index 244ca999a..adc5303d7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_response.go @@ -9,6 +9,7 @@ */ package osc + // CreateLoadBalancerTagsResponse struct for CreateLoadBalancerTagsResponse type CreateLoadBalancerTagsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_request.go index c0605e147..f8d71f3ce 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateNatServiceRequest struct for CreateNatServiceRequest type CreateNatServiceRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_response.go index 8dc10b983..760649f73 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateNatServiceResponse struct for CreateNatServiceResponse type CreateNatServiceResponse struct { - NatService NatService `json:"NatService,omitempty"` + NatService NatService `json:"NatService,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_request.go index dd6a75255..5bf8e1334 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateNetAccessPointRequest struct for CreateNetAccessPointRequest type CreateNetAccessPointRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_response.go index a39569024..7a688e7f4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateNetAccessPointResponse struct for CreateNetAccessPointResponse type CreateNetAccessPointResponse struct { - NetAccessPoint NetAccessPoint `json:"NetAccessPoint,omitempty"` + NetAccessPoint NetAccessPoint `json:"NetAccessPoint,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_request.go index ffad16ce6..56f96026c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateNetPeeringRequest struct for CreateNetPeeringRequest type CreateNetPeeringRequest struct { // The ID of the Net you want to connect with. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_response.go index b9973efa6..cd393be7a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateNetPeeringResponse struct for CreateNetPeeringResponse type CreateNetPeeringResponse struct { - NetPeering NetPeering `json:"NetPeering,omitempty"` + NetPeering NetPeering `json:"NetPeering,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_request.go index a490e8858..b915b70ff 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateNetRequest struct for CreateNetRequest type CreateNetRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_response.go index ff6b8555e..e2014495c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateNetResponse struct for CreateNetResponse type CreateNetResponse struct { - Net Net `json:"Net,omitempty"` + Net Net `json:"Net,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_request.go index af0295f4f..21b9117cf 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateNicRequest struct for CreateNicRequest type CreateNicRequest struct { // A description for the NIC. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_response.go index b5838f677..339b0e4f1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateNicResponse struct for CreateNicResponse type CreateNicResponse struct { - Nic Nic `json:"Nic,omitempty"` + Nic Nic `json:"Nic,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_request.go index 81c51cf06..db2697007 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_request.go @@ -9,6 +9,7 @@ */ package osc + // CreatePublicIpRequest struct for CreatePublicIpRequest type CreatePublicIpRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_response.go index da0b34a0b..e8c0307a1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_response.go @@ -9,8 +9,9 @@ */ package osc + // CreatePublicIpResponse struct for CreatePublicIpResponse type CreatePublicIpResponse struct { - PublicIp PublicIp `json:"PublicIp,omitempty"` + PublicIp PublicIp `json:"PublicIp,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_request.go index b0052bdc4..92c2e2040 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateRouteRequest struct for CreateRouteRequest type CreateRouteRequest struct { // The IP range used for the destination match, in CIDR notation (for example, 10.0.0.0/24). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_response.go index 3fa1fc52a..5a6ebd9ab 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateRouteResponse struct for CreateRouteResponse type CreateRouteResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - RouteTable RouteTable `json:"RouteTable,omitempty"` + RouteTable RouteTable `json:"RouteTable,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_request.go index 10cff5e4f..22277ebc3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateRouteTableRequest struct for CreateRouteTableRequest type CreateRouteTableRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_response.go index eeaa66e0d..23dca7026 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateRouteTableResponse struct for CreateRouteTableResponse type CreateRouteTableResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - RouteTable RouteTable `json:"RouteTable,omitempty"` + RouteTable RouteTable `json:"RouteTable,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_request.go index e710c4b61..86b23122c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateSecurityGroupRequest struct for CreateSecurityGroupRequest type CreateSecurityGroupRequest struct { // A description for the security group, with a maximum length of 255 [ASCII printable characters](https://en.wikipedia.org/wiki/ASCII#Printable_characters). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_response.go index 531d79135..b90dbec4f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateSecurityGroupResponse struct for CreateSecurityGroupResponse type CreateSecurityGroupResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - SecurityGroup SecurityGroup `json:"SecurityGroup,omitempty"` + SecurityGroup SecurityGroup `json:"SecurityGroup,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_request.go index d15eab5c6..7044c0eea 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateSecurityGroupRuleRequest struct for CreateSecurityGroupRuleRequest type CreateSecurityGroupRuleRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_response.go index b65525365..2a50744d6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateSecurityGroupRuleResponse struct for CreateSecurityGroupRuleResponse type CreateSecurityGroupRuleResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - SecurityGroup SecurityGroup `json:"SecurityGroup,omitempty"` + SecurityGroup SecurityGroup `json:"SecurityGroup,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_request.go index 00749d1a6..9c1c86f3e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateServerCertificateRequest struct for CreateServerCertificateRequest type CreateServerCertificateRequest struct { // The PEM-encoded X509 certificate. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_response.go index fdf33ad53..7aef1ffd7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateServerCertificateResponse struct for CreateServerCertificateResponse type CreateServerCertificateResponse struct { - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` ServerCertificate ServerCertificate `json:"ServerCertificate,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_request.go index 90a3baacd..fd1f8aab0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_request.go @@ -9,10 +9,11 @@ */ package osc + // CreateSnapshotExportTaskRequest struct for CreateSnapshotExportTaskRequest type CreateSnapshotExportTaskRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` OsuExport OsuExport `json:"OsuExport"` // The ID of the snapshot to export. SnapshotId string `json:"SnapshotId"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_response.go index c161e6f68..d3d0a681b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateSnapshotExportTaskResponse struct for CreateSnapshotExportTaskResponse type CreateSnapshotExportTaskResponse struct { - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` SnapshotExportTask SnapshotExportTask `json:"SnapshotExportTask,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_request.go index 61051edac..dbb262419 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateSnapshotRequest struct for CreateSnapshotRequest type CreateSnapshotRequest struct { // A description for the snapshot. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_response.go index 5a8be9f4d..a4c3800c9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateSnapshotResponse struct for CreateSnapshotResponse type CreateSnapshotResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - Snapshot Snapshot `json:"Snapshot,omitempty"` + Snapshot Snapshot `json:"Snapshot,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_request.go index 2c2a651b8..be32f3ced 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateSubnetRequest struct for CreateSubnetRequest type CreateSubnetRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_response.go index ff6b9c4f7..4eef1c987 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateSubnetResponse struct for CreateSubnetResponse type CreateSubnetResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - Subnet Subnet `json:"Subnet,omitempty"` + Subnet Subnet `json:"Subnet,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_request.go index d35314659..96c3f7d17 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateTagsRequest struct for CreateTagsRequest type CreateTagsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_response.go index 94561dc09..3972ca092 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_response.go @@ -9,6 +9,7 @@ */ package osc + // CreateTagsResponse struct for CreateTagsResponse type CreateTagsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_request.go index 7a5a2cb68..00104f34d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateVirtualGatewayRequest struct for CreateVirtualGatewayRequest type CreateVirtualGatewayRequest struct { // The type of VPN connection supported by the virtual gateway (only `ipsec.1` is supported). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_response.go index f03a7f47a..8823e46c9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateVirtualGatewayResponse struct for CreateVirtualGatewayResponse type CreateVirtualGatewayResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - VirtualGateway VirtualGateway `json:"VirtualGateway,omitempty"` + VirtualGateway VirtualGateway `json:"VirtualGateway,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_request.go index 2b2706599..5a4c1f99d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateVmsRequest struct for CreateVmsRequest type CreateVmsRequest struct { // One or more block device mappings. @@ -34,8 +35,8 @@ type CreateVmsRequest struct { // One or more NICs. If you specify this parameter, you must define one NIC as the primary network interface of the VM with `0` as its device number. Nics []NicForVmCreation `json:"Nics,omitempty"` // The performance of the VM (`standard` \\| `high` \\| `highest`). - Performance string `json:"Performance,omitempty"` - Placement Placement `json:"Placement,omitempty"` + Performance string `json:"Performance,omitempty"` + Placement Placement `json:"Placement,omitempty"` // One or more private IP addresses of the VM. PrivateIps []string `json:"PrivateIps,omitempty"` // One or more IDs of security group for the VMs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_response.go index 4f7d09ac6..92f66c4a0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_response.go @@ -9,6 +9,7 @@ */ package osc + // CreateVmsResponse struct for CreateVmsResponse type CreateVmsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_request.go index ba49f2fdc..11f6b16a7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_request.go @@ -9,13 +9,14 @@ */ package osc + // CreateVolumeRequest struct for CreateVolumeRequest type CreateVolumeRequest struct { // If `true`, checks whether you have the required permissions to perform the action. DryRun bool `json:"DryRun,omitempty"` // The number of I/O operations per second (IOPS). This parameter must be specified only if you create an `io1` volume. The maximum number of IOPS allowed for `io1` volumes is `13000`. Iops int32 `json:"Iops,omitempty"` - // The size of the volume, in gibibytes (GiB). The maximum allowed size for a volume is 14,901 GiB. This parameter is required if the volume is not created from a snapshot (`SnapshotId` unspecified). + // The size of the volume, in gibibytes (GiB). The maximum allowed size for a volume is 14,901 GiB. This parameter is required if the volume is not created from a snapshot (`SnapshotId` unspecified). Size int32 `json:"Size,omitempty"` // The ID of the snapshot from which you want to create the volume. SnapshotId string `json:"SnapshotId,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_response.go index e93991d65..0af0f1c88 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateVolumeResponse struct for CreateVolumeResponse type CreateVolumeResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - Volume Volume `json:"Volume,omitempty"` + Volume Volume `json:"Volume,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_request.go index 43192e11d..b764148e4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateVpnConnectionRequest struct for CreateVpnConnectionRequest type CreateVpnConnectionRequest struct { // The ID of the client gateway. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_response.go index edc880b27..fafd91c1f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_response.go @@ -9,8 +9,9 @@ */ package osc + // CreateVpnConnectionResponse struct for CreateVpnConnectionResponse type CreateVpnConnectionResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - VpnConnection VpnConnection `json:"VpnConnection,omitempty"` + VpnConnection VpnConnection `json:"VpnConnection,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_request.go index 8c1b49a4d..bfdd3a7ca 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_request.go @@ -9,6 +9,7 @@ */ package osc + // CreateVpnConnectionRouteRequest struct for CreateVpnConnectionRouteRequest type CreateVpnConnectionRouteRequest struct { // The network prefix of the route, in CIDR notation (for example, 10.12.0.0/16). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_response.go index e8dc059af..1e8b0e54a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_response.go @@ -9,6 +9,7 @@ */ package osc + // CreateVpnConnectionRouteResponse struct for CreateVpnConnectionRouteResponse type CreateVpnConnectionRouteResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_request.go index 99553ffb7..dd5df9a61 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteAccessKeyRequest struct for DeleteAccessKeyRequest type DeleteAccessKeyRequest struct { // The ID of the access key you want to delete. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_response.go index 2d50c9662..450599c1f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteAccessKeyResponse struct for DeleteAccessKeyResponse type DeleteAccessKeyResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_request.go index 309b076c4..09895776a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteClientGatewayRequest struct for DeleteClientGatewayRequest type DeleteClientGatewayRequest struct { // The ID of the client gateway you want to delete. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_response.go index 319c16231..5187a0604 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteClientGatewayResponse struct for DeleteClientGatewayResponse type DeleteClientGatewayResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_request.go index 75581c7ba..ebf6271a3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteDhcpOptionsRequest struct for DeleteDhcpOptionsRequest type DeleteDhcpOptionsRequest struct { // The ID of the DHCP options set you want to delete. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_response.go index ffefbbc47..cc89a6045 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteDhcpOptionsResponse struct for DeleteDhcpOptionsResponse type DeleteDhcpOptionsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_request.go index 1c65e6aee..89713f11e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteDirectLinkInterfaceRequest struct for DeleteDirectLinkInterfaceRequest type DeleteDirectLinkInterfaceRequest struct { // The ID of the DirectLink interface you want to delete. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_response.go index b9ae1f0e2..6e561f5e5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteDirectLinkInterfaceResponse struct for DeleteDirectLinkInterfaceResponse type DeleteDirectLinkInterfaceResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_request.go index dd009eeb5..dafd54f58 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteDirectLinkRequest struct for DeleteDirectLinkRequest type DeleteDirectLinkRequest struct { // The ID of the DirectLink you want to delete. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_response.go index 47187438a..139200c7b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteDirectLinkResponse struct for DeleteDirectLinkResponse type DeleteDirectLinkResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_request.go index b1215b918..e81af97aa 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteExportTaskRequest struct for DeleteExportTaskRequest type DeleteExportTaskRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_response.go index f7e7b338d..f1942edee 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteExportTaskResponse struct for DeleteExportTaskResponse type DeleteExportTaskResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_request.go index 28e1fb8f6..2239c81c5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteFlexibleGpuRequest struct for DeleteFlexibleGpuRequest type DeleteFlexibleGpuRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_response.go index ef1e03324..b4d85f964 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteFlexibleGpuResponse struct for DeleteFlexibleGpuResponse type DeleteFlexibleGpuResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_request.go index 7c6ee45c8..d434d7499 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteImageRequest struct for DeleteImageRequest type DeleteImageRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_response.go index 4e29417ff..2baa022d9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteImageResponse struct for DeleteImageResponse type DeleteImageResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_request.go index 226ed22e9..5bd148893 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteInternetServiceRequest struct for DeleteInternetServiceRequest type DeleteInternetServiceRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_response.go index c07193626..22bb5ad89 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteInternetServiceResponse struct for DeleteInternetServiceResponse type DeleteInternetServiceResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_request.go index 7dd851641..dfaff10b9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteKeypairRequest struct for DeleteKeypairRequest type DeleteKeypairRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_response.go index b20f180d7..a1bba53fc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteKeypairResponse struct for DeleteKeypairResponse type DeleteKeypairResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_request.go index 1d7b4c287..90e9adea2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteListenerRuleRequest struct for DeleteListenerRuleRequest type DeleteListenerRuleRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_response.go index 9a23d5f28..6d502401b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteListenerRuleResponse struct for DeleteListenerRuleResponse type DeleteListenerRuleResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_request.go index 40573dc43..e84cfae10 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteLoadBalancerListenersRequest struct for DeleteLoadBalancerListenersRequest type DeleteLoadBalancerListenersRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_response.go index 10ea0e571..36cbf9831 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_response.go @@ -9,8 +9,9 @@ */ package osc + // DeleteLoadBalancerListenersResponse struct for DeleteLoadBalancerListenersResponse type DeleteLoadBalancerListenersResponse struct { - LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` + LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_request.go index ecfb4e386..3f0627add 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteLoadBalancerPolicyRequest struct for DeleteLoadBalancerPolicyRequest type DeleteLoadBalancerPolicyRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_response.go index 0c28364a5..fefba3719 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_response.go @@ -9,8 +9,9 @@ */ package osc + // DeleteLoadBalancerPolicyResponse struct for DeleteLoadBalancerPolicyResponse type DeleteLoadBalancerPolicyResponse struct { - LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` + LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_request.go index 1e2d6939c..3a8e3aee9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteLoadBalancerRequest struct for DeleteLoadBalancerRequest type DeleteLoadBalancerRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_response.go index b7054838d..dab6476c7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteLoadBalancerResponse struct for DeleteLoadBalancerResponse type DeleteLoadBalancerResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_request.go index a409b268f..95aea7791 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteLoadBalancerTagsRequest struct for DeleteLoadBalancerTagsRequest type DeleteLoadBalancerTagsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_response.go index eedd85a98..403e3a35d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteLoadBalancerTagsResponse struct for DeleteLoadBalancerTagsResponse type DeleteLoadBalancerTagsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_request.go index 143759494..0cc4a27ca 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteNatServiceRequest struct for DeleteNatServiceRequest type DeleteNatServiceRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_response.go index c151dac60..cc878d647 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteNatServiceResponse struct for DeleteNatServiceResponse type DeleteNatServiceResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_request.go index f9ea156fa..d1426bb52 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteNetAccessPointRequest struct for DeleteNetAccessPointRequest type DeleteNetAccessPointRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_response.go index e3b147c99..04a3a2bc0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteNetAccessPointResponse struct for DeleteNetAccessPointResponse type DeleteNetAccessPointResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_request.go index 5ac93be99..75d4bd1d9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteNetPeeringRequest struct for DeleteNetPeeringRequest type DeleteNetPeeringRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_response.go index 159bbc1d8..8e3c73028 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteNetPeeringResponse struct for DeleteNetPeeringResponse type DeleteNetPeeringResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_request.go index 950b866a4..6d5f5ae42 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteNetRequest struct for DeleteNetRequest type DeleteNetRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_response.go index b7bfe6c3e..d5ce257db 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteNetResponse struct for DeleteNetResponse type DeleteNetResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_request.go index ad5b3d582..1480783c6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteNicRequest struct for DeleteNicRequest type DeleteNicRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_response.go index d711a0e91..1e91242f4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteNicResponse struct for DeleteNicResponse type DeleteNicResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_request.go index cb9718ee8..520add590 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_request.go @@ -9,6 +9,7 @@ */ package osc + // DeletePublicIpRequest struct for DeletePublicIpRequest type DeletePublicIpRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_response.go index 7c4b7af21..8a925a26b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_response.go @@ -9,6 +9,7 @@ */ package osc + // DeletePublicIpResponse struct for DeletePublicIpResponse type DeletePublicIpResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_request.go index 2a463b88a..1a902d1fb 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteRouteRequest struct for DeleteRouteRequest type DeleteRouteRequest struct { // The exact IP range for the route. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_response.go index ec04f297d..87638f505 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_response.go @@ -9,8 +9,9 @@ */ package osc + // DeleteRouteResponse struct for DeleteRouteResponse type DeleteRouteResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - RouteTable RouteTable `json:"RouteTable,omitempty"` + RouteTable RouteTable `json:"RouteTable,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_request.go index e8d76f9d5..c90cad99f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteRouteTableRequest struct for DeleteRouteTableRequest type DeleteRouteTableRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_response.go index d754c800a..9ac983827 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteRouteTableResponse struct for DeleteRouteTableResponse type DeleteRouteTableResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_request.go index c2edb84b7..52027b48b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteSecurityGroupRequest struct for DeleteSecurityGroupRequest type DeleteSecurityGroupRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_response.go index c35c0c283..d285e56f1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteSecurityGroupResponse struct for DeleteSecurityGroupResponse type DeleteSecurityGroupResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_request.go index 91db2207b..258d5ca84 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteSecurityGroupRuleRequest struct for DeleteSecurityGroupRuleRequest type DeleteSecurityGroupRuleRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_response.go index d3d2d93ed..5b943cb73 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_response.go @@ -9,8 +9,9 @@ */ package osc + // DeleteSecurityGroupRuleResponse struct for DeleteSecurityGroupRuleResponse type DeleteSecurityGroupRuleResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - SecurityGroup SecurityGroup `json:"SecurityGroup,omitempty"` + SecurityGroup SecurityGroup `json:"SecurityGroup,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_request.go index 538779b32..5e76da1f6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteServerCertificateRequest struct for DeleteServerCertificateRequest type DeleteServerCertificateRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_response.go index 75c26bfd0..45459ea68 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteServerCertificateResponse struct for DeleteServerCertificateResponse type DeleteServerCertificateResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_request.go index 459cf8a6b..c59bd55de 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteSnapshotRequest struct for DeleteSnapshotRequest type DeleteSnapshotRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_response.go index ac983ec16..8d165507b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteSnapshotResponse struct for DeleteSnapshotResponse type DeleteSnapshotResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_request.go index 143a6d158..cf1d1f2d9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteSubnetRequest struct for DeleteSubnetRequest type DeleteSubnetRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_response.go index 1b5fdc7da..1edc3c945 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteSubnetResponse struct for DeleteSubnetResponse type DeleteSubnetResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_request.go index 874b8ceea..989b8db80 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteTagsRequest struct for DeleteTagsRequest type DeleteTagsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_response.go index 2734559ac..924bc720d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteTagsResponse struct for DeleteTagsResponse type DeleteTagsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_request.go index b888be624..020b5f0b2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteVirtualGatewayRequest struct for DeleteVirtualGatewayRequest type DeleteVirtualGatewayRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_response.go index cf01e5d1c..750f2c091 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteVirtualGatewayResponse struct for DeleteVirtualGatewayResponse type DeleteVirtualGatewayResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_request.go index f50ee3c81..bcd603ee8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteVmsRequest struct for DeleteVmsRequest type DeleteVmsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_response.go index ccc18e15e..472eda75c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteVmsResponse struct for DeleteVmsResponse type DeleteVmsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_request.go index cca6ba82f..8c125a6b4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteVolumeRequest struct for DeleteVolumeRequest type DeleteVolumeRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_response.go index 0c47d60f2..c41612e50 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteVolumeResponse struct for DeleteVolumeResponse type DeleteVolumeResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_request.go index c3d9cb01a..8267d85d7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteVpnConnectionRequest struct for DeleteVpnConnectionRequest type DeleteVpnConnectionRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_response.go index e5e20226a..58665983d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteVpnConnectionResponse struct for DeleteVpnConnectionResponse type DeleteVpnConnectionResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_request.go index 666f6fece..dd0165fe0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_request.go @@ -9,6 +9,7 @@ */ package osc + // DeleteVpnConnectionRouteRequest struct for DeleteVpnConnectionRouteRequest type DeleteVpnConnectionRouteRequest struct { // The network prefix of the route to delete, in CIDR notation (for example, 10.12.0.0/16). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_response.go index bdabdd069..d5a323041 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_response.go @@ -9,6 +9,7 @@ */ package osc + // DeleteVpnConnectionRouteResponse struct for DeleteVpnConnectionRouteResponse type DeleteVpnConnectionRouteResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_request.go index 7afef29af..082bd440b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_request.go @@ -9,6 +9,7 @@ */ package osc + // DeregisterVmsInLoadBalancerRequest struct for DeregisterVmsInLoadBalancerRequest type DeregisterVmsInLoadBalancerRequest struct { // One or more IDs of back-end VMs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_response.go index 9ae642da4..4fd34afa9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_response.go @@ -9,6 +9,7 @@ */ package osc + // DeregisterVmsInLoadBalancerResponse struct for DeregisterVmsInLoadBalancerResponse type DeregisterVmsInLoadBalancerResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_dhcp_options_set.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_dhcp_options_set.go index 09869d17f..db243dfaf 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_dhcp_options_set.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_dhcp_options_set.go @@ -9,6 +9,7 @@ */ package osc + // DhcpOptionsSet Information about the DHCP options set. type DhcpOptionsSet struct { // If `true`, the DHCP options set is a default one. If `false`, it is not. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link.go index bb603d95e..6ff7b969b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link.go @@ -9,6 +9,7 @@ */ package osc + // DirectLink Information about the DirectLink. type DirectLink struct { // The account ID of the owner of the DirectLink. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interface.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interface.go index bef2c2c2d..76af141f9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interface.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interface.go @@ -9,6 +9,7 @@ */ package osc + // DirectLinkInterface Information about the DirectLink interface. type DirectLinkInterface struct { // The BGP (Border Gateway Protocol) ASN (Autonomous System Number) on the customer's side of the DirectLink interface. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interfaces.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interfaces.go index a0f5de011..f4a473029 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interfaces.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interfaces.go @@ -9,6 +9,7 @@ */ package osc + // DirectLinkInterfaces Information about the DirectLink interfaces. type DirectLinkInterfaces struct { // The account ID of the owner of the DirectLink interface. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_error_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_error_response.go index 43b8ac32a..66a4f7d3a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_error_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_error_response.go @@ -9,9 +9,10 @@ */ package osc + // ErrorResponse struct for ErrorResponse type ErrorResponse struct { // One or more errors. - Errors []Errors `json:"Errors,omitempty"` + Errors []Errors `json:"Errors,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_errors.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_errors.go index b5ed8c3ee..296e85db2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_errors.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_errors.go @@ -9,6 +9,7 @@ */ package osc + // Errors Information about the errors. type Errors struct { // The code of the error. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_access_keys.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_access_keys.go index d8117cc26..856e6ce92 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_access_keys.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_access_keys.go @@ -9,6 +9,7 @@ */ package osc + // FiltersAccessKeys One or more filters. type FiltersAccessKeys struct { // The IDs of the access keys. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_api_log.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_api_log.go index 0466f6ebd..e0ba75ca6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_api_log.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_api_log.go @@ -9,6 +9,7 @@ */ package osc + // FiltersApiLog One or more filters. type FiltersApiLog struct { // One or more API keys used for the query. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_client_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_client_gateway.go index a09ce2bf6..0ef52a39e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_client_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_client_gateway.go @@ -9,6 +9,7 @@ */ package osc + // FiltersClientGateway One or more filters. type FiltersClientGateway struct { // The Border Gateway Protocol (BGP) Autonomous System Numbers (ASNs) of the connections. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_dhcp_options.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_dhcp_options.go index 8fd0189ab..aa8da6f41 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_dhcp_options.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_dhcp_options.go @@ -9,6 +9,7 @@ */ package osc + // FiltersDhcpOptions One or more filters. type FiltersDhcpOptions struct { // If `true`, lists all default DHCP options set. If `false`, lists all non-default DHCP options set. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link.go index e1222851f..60e1c8df7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link.go @@ -9,6 +9,7 @@ */ package osc + // FiltersDirectLink One or more filters. type FiltersDirectLink struct { // The IDs of the DirectLinks. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link_interface.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link_interface.go index 2599daf85..b0f6feceb 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link_interface.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link_interface.go @@ -9,6 +9,7 @@ */ package osc + // FiltersDirectLinkInterface One or more filters. type FiltersDirectLinkInterface struct { // The IDs of the DirectLinks. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_export_task.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_export_task.go index 75f8a96bc..97e110b70 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_export_task.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_export_task.go @@ -9,6 +9,7 @@ */ package osc + // FiltersExportTask One or more filters. type FiltersExportTask struct { // The keys of the tags associated with the export tasks. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_flexible_gpu.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_flexible_gpu.go index 483b52417..5fbe791ff 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_flexible_gpu.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_flexible_gpu.go @@ -9,6 +9,7 @@ */ package osc + // FiltersFlexibleGpu One or more filters. type FiltersFlexibleGpu struct { // Indicates whether the fGPU is deleted when terminating the VM. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_image.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_image.go index 7e786c91f..d249bf9b9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_image.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_image.go @@ -9,6 +9,7 @@ */ package osc + // FiltersImage One or more filters. type FiltersImage struct { // The account aliases of the owners of the OMIs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_internet_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_internet_service.go index 841d6f91f..b2e0b09ae 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_internet_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_internet_service.go @@ -9,6 +9,7 @@ */ package osc + // FiltersInternetService One or more filters. type FiltersInternetService struct { // The IDs of the Internet services. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_keypair.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_keypair.go index e2eaf4ba5..4bcca3435 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_keypair.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_keypair.go @@ -9,6 +9,7 @@ */ package osc + // FiltersKeypair One or more filters. type FiltersKeypair struct { // The fingerprints of the keypairs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_listener_rule.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_listener_rule.go index 1db3cf9c9..a0571ecca 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_listener_rule.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_listener_rule.go @@ -9,6 +9,7 @@ */ package osc + // FiltersListenerRule One or more filters. type FiltersListenerRule struct { // The names of the listener rules. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_load_balancer.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_load_balancer.go index 2252a10a5..9bbbc7a38 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_load_balancer.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_load_balancer.go @@ -9,6 +9,7 @@ */ package osc + // FiltersLoadBalancer One or more filters. type FiltersLoadBalancer struct { // The names of the load balancers. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nat_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nat_service.go index ade73e775..0c2b6bafc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nat_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nat_service.go @@ -9,6 +9,7 @@ */ package osc + // FiltersNatService One or more filters. type FiltersNatService struct { // The IDs of the NAT services. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net.go index 66d1ec7ba..bb976eb40 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net.go @@ -9,6 +9,7 @@ */ package osc + // FiltersNet One or more filters. type FiltersNet struct { // The IDs of the DHCP options sets. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_access_point.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_access_point.go index 44d7b8259..1fdddfb43 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_access_point.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_access_point.go @@ -9,6 +9,7 @@ */ package osc + // FiltersNetAccessPoint One or more filters. type FiltersNetAccessPoint struct { // The IDs of the Net access points. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_peering.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_peering.go index 4fa0f330a..9b7e92ecd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_peering.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_peering.go @@ -9,6 +9,7 @@ */ package osc + // FiltersNetPeering One or more filters. type FiltersNetPeering struct { // The account IDs of the owners of the peer Nets. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nic.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nic.go index 843badb36..3461f4538 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nic.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nic.go @@ -9,6 +9,7 @@ */ package osc + // FiltersNic One or more filters. type FiltersNic struct { // The device numbers the NICs are attached to. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_product_type.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_product_type.go index 79087b3cd..0e5a35590 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_product_type.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_product_type.go @@ -9,6 +9,7 @@ */ package osc + // FiltersProductType One or more filters. type FiltersProductType struct { // The IDs of the product types. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_public_ip.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_public_ip.go index 7b7b1f2d0..5d711c6f3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_public_ip.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_public_ip.go @@ -9,6 +9,7 @@ */ package osc + // FiltersPublicIp One or more filters. type FiltersPublicIp struct { // The IDs representing the associations of EIPs with VMs or NICs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_quota.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_quota.go index dbc8a8248..e9ec5461f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_quota.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_quota.go @@ -9,6 +9,7 @@ */ package osc + // FiltersQuota One or more filters. type FiltersQuota struct { // The group names of the quotas. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_route_table.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_route_table.go index 5a94ea3c6..21efba812 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_route_table.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_route_table.go @@ -9,6 +9,7 @@ */ package osc + // FiltersRouteTable One or more filters. type FiltersRouteTable struct { // The IDs of the route tables involved in the associations. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_security_group.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_security_group.go index 3a6f8b608..4184013ac 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_security_group.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_security_group.go @@ -9,6 +9,7 @@ */ package osc + // FiltersSecurityGroup One or more filters. type FiltersSecurityGroup struct { // The account IDs of the owners of the security groups. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_server_certificate.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_server_certificate.go index 5c0a0f02a..70b80249b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_server_certificate.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_server_certificate.go @@ -9,6 +9,7 @@ */ package osc + // FiltersServerCertificate One or more filters. type FiltersServerCertificate struct { // The path to the server certificate. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_service.go index 87fd79a30..1a02926d7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_service.go @@ -9,6 +9,7 @@ */ package osc + // FiltersService One or more filters. type FiltersService struct { // The IDs of the services. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_snapshot.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_snapshot.go index 03640ee12..8797bdcb0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_snapshot.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_snapshot.go @@ -9,6 +9,7 @@ */ package osc + // FiltersSnapshot One or more filters. type FiltersSnapshot struct { // The account aliases of the owners of the snapshots. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subnet.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subnet.go index 96a941927..86dfd0441 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subnet.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subnet.go @@ -9,6 +9,7 @@ */ package osc + // FiltersSubnet One or more filters. type FiltersSubnet struct { // The number of available IPs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subregion.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subregion.go index a1092e32a..5dccb27ed 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subregion.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subregion.go @@ -9,6 +9,7 @@ */ package osc + // FiltersSubregion One or more filters. type FiltersSubregion struct { // The names of the Subregions. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_tag.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_tag.go index 8df7bd600..843167a66 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_tag.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_tag.go @@ -9,6 +9,7 @@ */ package osc + // FiltersTag One or more filters. type FiltersTag struct { // The keys of the tags that are assigned to the resources. You can use this filter alongside the `Values` filter. In that case, you filter the resources corresponding to each tag, regardless of the other filter. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_virtual_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_virtual_gateway.go index 1132543b0..aecce6712 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_virtual_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_virtual_gateway.go @@ -9,6 +9,7 @@ */ package osc + // FiltersVirtualGateway One or more filters. type FiltersVirtualGateway struct { // The types of the virtual gateways (only `ipsec.1` is supported). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm.go index 7b869ba81..4e4d277f2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm.go @@ -9,6 +9,7 @@ */ package osc + // FiltersVm One or more filters. type FiltersVm struct { // The keys of the tags associated with the VMs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm_type.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm_type.go index 0612f5a35..373bc355a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm_type.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm_type.go @@ -9,6 +9,7 @@ */ package osc + // FiltersVmType One or more filters. type FiltersVmType struct { // Indicates whether the VM is optimized for BSU I/O. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vms_state.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vms_state.go index 944ff76a7..52bc3e3ca 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vms_state.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vms_state.go @@ -9,6 +9,7 @@ */ package osc + // FiltersVmsState One or more filters. type FiltersVmsState struct { // The names of the Subregions of the VMs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_volume.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_volume.go index 3d5f0b954..96041d2f6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_volume.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_volume.go @@ -9,6 +9,7 @@ */ package osc + // FiltersVolume One or more filters. type FiltersVolume struct { // The dates and times at which the volumes were created. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vpn_connection.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vpn_connection.go index d5c5c8577..cf09cc44a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vpn_connection.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vpn_connection.go @@ -9,6 +9,7 @@ */ package osc + // FiltersVpnConnection One or more filters. type FiltersVpnConnection struct { // The Border Gateway Protocol (BGP) Autonomous System Numbers (ASNs) of the connections. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu.go index 6a4b7d3e9..8e5a03911 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu.go @@ -9,6 +9,7 @@ */ package osc + // FlexibleGpu Information about the flexible GPU (fGPU). type FlexibleGpu struct { // If `true`, the fGPU is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu_catalog.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu_catalog.go index 80ec6c799..ad902f4e6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu_catalog.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu_catalog.go @@ -9,6 +9,7 @@ */ package osc + // FlexibleGpuCatalog Information about the flexible GPU (fGPU) that is available in the public catalog. type FlexibleGpuCatalog struct { // The generations of VMs that the fGPU is compatible with. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_health_check.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_health_check.go index bcf742a49..33521a03d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_health_check.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_health_check.go @@ -9,6 +9,7 @@ */ package osc + // HealthCheck Information about the health check configuration. type HealthCheck struct { // The number of seconds between two pings (between `5` and `600` both included). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_image.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_image.go index 848263a02..6e406ad89 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_image.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_image.go @@ -9,6 +9,7 @@ */ package osc + // Image Information about the OMI. type Image struct { // The account alias of the owner of the OMI. @@ -30,7 +31,7 @@ type Image struct { // The name of the OMI. ImageName string `json:"ImageName,omitempty"` // The type of the OMI. - ImageType string `json:"ImageType,omitempty"` + ImageType string `json:"ImageType,omitempty"` PermissionsToLaunch PermissionsOnResource `json:"PermissionsToLaunch,omitempty"` // The product code associated with the OMI (`0001` Linux/Unix \\| `0002` Windows \\| `0004` Linux/Oracle \\| `0005` Windows 10). ProductCodes []string `json:"ProductCodes,omitempty"` @@ -39,7 +40,7 @@ type Image struct { // The type of root device used by the OMI (always `bsu`). RootDeviceType string `json:"RootDeviceType,omitempty"` // The state of the OMI (`pending` \\| `available` \\| `failed`). - State string `json:"State,omitempty"` + State string `json:"State,omitempty"` StateComment StateComment `json:"StateComment,omitempty"` // One or more tags associated with the OMI. Tags []ResourceTag `json:"Tags,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_image_export_task.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_image_export_task.go index d4f8b2a72..4abf7ad52 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_image_export_task.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_image_export_task.go @@ -9,12 +9,13 @@ */ package osc + // ImageExportTask Information about the OMI export task. type ImageExportTask struct { // If the OMI export task fails, an error message appears. Comment string `json:"Comment,omitempty"` // The ID of the OMI to be exported. - ImageId string `json:"ImageId,omitempty"` + ImageId string `json:"ImageId,omitempty"` OsuExport OsuExport `json:"OsuExport,omitempty"` // The progress of the OMI export task, as a percentage. Progress int32 `json:"Progress,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_internet_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_internet_service.go index b91df98f7..e65e1f3d5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_internet_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_internet_service.go @@ -9,6 +9,7 @@ */ package osc + // InternetService Information about the Internet service. type InternetService struct { // The ID of the Internet service. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair.go index e0e4dc9c3..aed14dc68 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair.go @@ -9,6 +9,7 @@ */ package osc + // Keypair Information about the keypair. type Keypair struct { // If you create a keypair, the SHA-1 digest of the DER encoded private key.
If you import a keypair, the MD5 public key fingerprint as specified in section 4 of RFC 4716. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair_created.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair_created.go index 63a470f19..7b06394d2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair_created.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair_created.go @@ -9,6 +9,7 @@ */ package osc + // KeypairCreated Information about the created keypair. type KeypairCreated struct { // If you create a keypair, the SHA-1 digest of the DER encoded private key.
If you import a keypair, the MD5 public key fingerprint as specified in section 4 of RFC 4716. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_request.go index 5d6292648..d9e4514ad 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_request.go @@ -9,6 +9,7 @@ */ package osc + // LinkFlexibleGpuRequest struct for LinkFlexibleGpuRequest type LinkFlexibleGpuRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_response.go index fd8a2ad7e..4cd0d6c15 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_response.go @@ -9,6 +9,7 @@ */ package osc + // LinkFlexibleGpuResponse struct for LinkFlexibleGpuResponse type LinkFlexibleGpuResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_request.go index 8afa27971..fda038a04 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_request.go @@ -9,6 +9,7 @@ */ package osc + // LinkInternetServiceRequest struct for LinkInternetServiceRequest type LinkInternetServiceRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_response.go index 687a974e5..c5d3dd007 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_response.go @@ -9,6 +9,7 @@ */ package osc + // LinkInternetServiceResponse struct for LinkInternetServiceResponse type LinkInternetServiceResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic.go index 5fbf239d8..9e71b6843 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic.go @@ -9,6 +9,7 @@ */ package osc + // LinkNic Information about the NIC attachment. type LinkNic struct { // If `true`, the volume is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_light.go index f64cfffc4..74855d07a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_light.go @@ -9,6 +9,7 @@ */ package osc + // LinkNicLight Information about the network interface card (NIC). type LinkNicLight struct { // If `true`, the volume is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_request.go index 95debcd66..65dbcc55a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_request.go @@ -9,6 +9,7 @@ */ package osc + // LinkNicRequest struct for LinkNicRequest type LinkNicRequest struct { // The index of the VM device for the NIC attachment (between 1 and 7, both included). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_response.go index c8646f162..4073d84f8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_response.go @@ -9,9 +9,10 @@ */ package osc + // LinkNicResponse struct for LinkNicResponse type LinkNicResponse struct { // The ID of the NIC attachment. - LinkNicId string `json:"LinkNicId,omitempty"` + LinkNicId string `json:"LinkNicId,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_to_update.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_to_update.go index 16949cd36..4f5999dfc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_to_update.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_to_update.go @@ -9,6 +9,7 @@ */ package osc + // LinkNicToUpdate Information about the NIC attachment. If you are modifying the `DeleteOnVmDeletion` attribute, you must specify the ID of the NIC attachment. type LinkNicToUpdate struct { // If `true`, the NIC is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_request.go index 6524fc4fb..5d49959d6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_request.go @@ -9,6 +9,7 @@ */ package osc + // LinkPrivateIpsRequest struct for LinkPrivateIpsRequest type LinkPrivateIpsRequest struct { // If `true`, allows an IP address that is already assigned to another NIC in the same Subnet to be assigned to the NIC you specified. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_response.go index 60a588d1e..b76960932 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_response.go @@ -9,6 +9,7 @@ */ package osc + // LinkPrivateIpsResponse struct for LinkPrivateIpsResponse type LinkPrivateIpsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip.go index acfae2040..c5c5d6fc1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip.go @@ -9,6 +9,7 @@ */ package osc + // LinkPublicIp Information about the EIP association. type LinkPublicIp struct { // (Required in a Net) The ID representing the association of the EIP with the VM or the NIC. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_light_for_vm.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_light_for_vm.go index 7a462c402..2e48deab4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_light_for_vm.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_light_for_vm.go @@ -9,6 +9,7 @@ */ package osc + // LinkPublicIpLightForVm Information about the EIP associated with the NIC. type LinkPublicIpLightForVm struct { // The name of the public DNS. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_request.go index a649669a9..73494dda8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_request.go @@ -9,6 +9,7 @@ */ package osc + // LinkPublicIpRequest struct for LinkPublicIpRequest type LinkPublicIpRequest struct { // - If `true`, allows the EIP to be associated with the VM or NIC that you specify even if it is already associated with another VM or NIC.
- If `false`, prevents the EIP from being associated with the VM or NIC that you specify if it is already associated with another VM or NIC.

(By default, `true` in the public Cloud, `false` in a Net.) diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_response.go index b9eadf074..38e6f29e0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_response.go @@ -9,9 +9,10 @@ */ package osc + // LinkPublicIpResponse struct for LinkPublicIpResponse type LinkPublicIpResponse struct { // (Net only) The ID representing the association of the EIP with the VM or the NIC. - LinkPublicIpId string `json:"LinkPublicIpId,omitempty"` + LinkPublicIpId string `json:"LinkPublicIpId,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table.go index 4afb63e82..be327e09e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table.go @@ -9,6 +9,7 @@ */ package osc + // LinkRouteTable One or more associations between the route table and the Subnets. type LinkRouteTable struct { // The ID of the association between the route table and the Subnet. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_request.go index 0f27ec754..80082017e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_request.go @@ -9,6 +9,7 @@ */ package osc + // LinkRouteTableRequest struct for LinkRouteTableRequest type LinkRouteTableRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_response.go index aadc31e97..bce8df88d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_response.go @@ -9,9 +9,10 @@ */ package osc + // LinkRouteTableResponse struct for LinkRouteTableResponse type LinkRouteTableResponse struct { // The ID of the association between the route table and the Subnet. - LinkRouteTableId string `json:"LinkRouteTableId,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + LinkRouteTableId string `json:"LinkRouteTableId,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_request.go index 974e030aa..dd07a1e60 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_request.go @@ -9,6 +9,7 @@ */ package osc + // LinkVirtualGatewayRequest struct for LinkVirtualGatewayRequest type LinkVirtualGatewayRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_response.go index 52a10fdd3..1b8ca2c92 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_response.go @@ -9,8 +9,9 @@ */ package osc + // LinkVirtualGatewayResponse struct for LinkVirtualGatewayResponse type LinkVirtualGatewayResponse struct { NetToVirtualGatewayLink NetToVirtualGatewayLink `json:"NetToVirtualGatewayLink,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_request.go index 47389d70d..7236f918f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_request.go @@ -9,6 +9,7 @@ */ package osc + // LinkVolumeRequest struct for LinkVolumeRequest type LinkVolumeRequest struct { // The name of the device. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_response.go index 3e2c84228..9450b718b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_response.go @@ -9,6 +9,7 @@ */ package osc + // LinkVolumeResponse struct for LinkVolumeResponse type LinkVolumeResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_linked_volume.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_linked_volume.go index 85197c519..ca7b82300 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_linked_volume.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_linked_volume.go @@ -9,6 +9,7 @@ */ package osc + // LinkedVolume Information about volume attachment. type LinkedVolume struct { // If `true`, the volume is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener.go index f4300651c..c7f748876 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener.go @@ -9,6 +9,7 @@ */ package osc + // Listener Information about the listener. type Listener struct { // The port on which the back-end VM is listening (between `1` and `65535`, both included). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_for_creation.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_for_creation.go index be9873327..1ee9debca 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_for_creation.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_for_creation.go @@ -9,6 +9,7 @@ */ package osc + // ListenerForCreation Information about the listener to create. type ListenerForCreation struct { // The port on which the back-end VM is listening (between `1` and `65535`, both included). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule.go index 0680a441c..8a6220c96 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule.go @@ -9,6 +9,7 @@ */ package osc + // ListenerRule Information about the listener rule. type ListenerRule struct { // The type of action for the rule (always `forward`). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule_for_creation.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule_for_creation.go index c2e101dd4..3ad4ceec9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule_for_creation.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule_for_creation.go @@ -9,11 +9,12 @@ */ package osc + // ListenerRuleForCreation Information about the listener rule. type ListenerRuleForCreation struct { // The type of action for the rule (always `forward`). Action string `json:"Action,omitempty"` - // A host-name pattern for the rule, with a maximum length of 128 characters. This host-name pattern supports maximum three wildcards, and must not contain any special characters except [-.?]. + // A host-name pattern for the rule, with a maximum length of 128 characters. This host-name pattern supports maximum three wildcards, and must not contain any special characters except [-.?]. HostNamePattern string `json:"HostNamePattern,omitempty"` // The ID of the listener. ListenerRuleId string `json:"ListenerRuleId,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer.go index 4d630f911..bf0a3e640 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer.go @@ -9,6 +9,7 @@ */ package osc + // LoadBalancer Information about the load balancer. type LoadBalancer struct { AccessLog AccessLog `json:"AccessLog,omitempty"` @@ -17,7 +18,7 @@ type LoadBalancer struct { // One or more IDs of back-end VMs for the load balancer. BackendVmIds []string `json:"BackendVmIds,omitempty"` // The DNS name of the load balancer. - DnsName string `json:"DnsName,omitempty"` + DnsName string `json:"DnsName,omitempty"` HealthCheck HealthCheck `json:"HealthCheck,omitempty"` // The listeners for the load balancer. Listeners []Listener `json:"Listeners,omitempty"` @@ -30,7 +31,7 @@ type LoadBalancer struct { // The ID of the Net for the load balancer. NetId string `json:"NetId,omitempty"` // One or more IDs of security groups for the load balancers. Valid only for load balancers in a Net. - SecurityGroups []string `json:"SecurityGroups,omitempty"` + SecurityGroups []string `json:"SecurityGroups,omitempty"` SourceSecurityGroup SourceSecurityGroup `json:"SourceSecurityGroup,omitempty"` // The IDs of the Subnets for the load balancer. Subnets []string `json:"Subnets,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_light.go index 4e26a7837..4178165bf 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_light.go @@ -9,6 +9,7 @@ */ package osc + // LoadBalancerLight Information about the load balancer. type LoadBalancerLight struct { // The name of the load balancer to which the listener is attached. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_sticky_cookie_policy.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_sticky_cookie_policy.go index b2ddce319..5ea9c2d5c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_sticky_cookie_policy.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_sticky_cookie_policy.go @@ -9,6 +9,7 @@ */ package osc + // LoadBalancerStickyCookiePolicy Information about the stickiness policy. type LoadBalancerStickyCookiePolicy struct { // The name of the stickiness policy. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_tag.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_tag.go index a3e7f1a77..70810f19d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_tag.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_tag.go @@ -9,6 +9,7 @@ */ package osc + // LoadBalancerTag Information about the load balancer tag. type LoadBalancerTag struct { // The key of the tag. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_location.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_location.go index c313c307f..7aba46725 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_location.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_location.go @@ -9,6 +9,7 @@ */ package osc + // Location Information about the DirectLink location. type Location struct { // The location code, to be set as the `Location` parameter of the *CreateDirectLink* method when creating a DirectLink. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_log.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_log.go index c66ab68c5..460ec11e6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_log.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_log.go @@ -9,6 +9,7 @@ */ package osc + // Log Information about the log. type Log struct { // The account ID. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_maintenance_event.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_maintenance_event.go index 45f28272c..e8622bf1d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_maintenance_event.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_maintenance_event.go @@ -9,6 +9,7 @@ */ package osc + // MaintenanceEvent Information about the maintenance event. type MaintenanceEvent struct { // The code of the event (`system-reboot` \\| `system-maintenance`). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_nat_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_nat_service.go index 585c802dc..0113ce414 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_nat_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_nat_service.go @@ -9,6 +9,7 @@ */ package osc + // NatService Information about the NAT service. type NatService struct { // The ID of the NAT service. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_net.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_net.go index cf1a00de5..71cef5918 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_net.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_net.go @@ -9,6 +9,7 @@ */ package osc + // Net Information about the Net. type Net struct { // The ID of the DHCP options set (or `default` if you want to associate the default one). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_access_point.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_access_point.go index 43e4bda18..f92db31ba 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_access_point.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_access_point.go @@ -9,6 +9,7 @@ */ package osc + // NetAccessPoint Information about the Net access point. type NetAccessPoint struct { // The ID of the Net access point. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering.go index 793090927..36c52f75e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering.go @@ -9,13 +9,14 @@ */ package osc + // NetPeering Information about the Net peering connection. type NetPeering struct { AccepterNet AccepterNet `json:"AccepterNet,omitempty"` // The ID of the Net peering connection. - NetPeeringId string `json:"NetPeeringId,omitempty"` - SourceNet SourceNet `json:"SourceNet,omitempty"` - State NetPeeringState `json:"State,omitempty"` + NetPeeringId string `json:"NetPeeringId,omitempty"` + SourceNet SourceNet `json:"SourceNet,omitempty"` + State NetPeeringState `json:"State,omitempty"` // One or more tags associated with the Net peering connection. Tags []ResourceTag `json:"Tags,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering_state.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering_state.go index d0a2127d7..71716e2fd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering_state.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering_state.go @@ -9,6 +9,7 @@ */ package osc + // NetPeeringState Information about the state of the Net peering connection. type NetPeeringState struct { // Additional information about the state of the Net peering connection. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_to_virtual_gateway_link.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_to_virtual_gateway_link.go index 8d763657d..82912a601 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_to_virtual_gateway_link.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_to_virtual_gateway_link.go @@ -9,6 +9,7 @@ */ package osc + // NetToVirtualGatewayLink Information about the attachment. type NetToVirtualGatewayLink struct { // The ID of the Net to which the virtual gateway is attached. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_nic.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_nic.go index ad30cfabd..c74d045e7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_nic.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_nic.go @@ -9,6 +9,7 @@ */ package osc + // Nic Information about the NIC. type Nic struct { // The account ID of the owner of the NIC. @@ -16,9 +17,9 @@ type Nic struct { // The description of the NIC. Description string `json:"Description,omitempty"` // (Net only) If `true`, the source/destination check is enabled. If `false`, it is disabled. This value must be `false` for a NAT VM to perform network address translation (NAT) in a Net. - IsSourceDestChecked bool `json:"IsSourceDestChecked,omitempty"` - LinkNic LinkNic `json:"LinkNic,omitempty"` - LinkPublicIp LinkPublicIp `json:"LinkPublicIp,omitempty"` + IsSourceDestChecked bool `json:"IsSourceDestChecked,omitempty"` + LinkNic LinkNic `json:"LinkNic,omitempty"` + LinkPublicIp LinkPublicIp `json:"LinkPublicIp,omitempty"` // The Media Access Control (MAC) address of the NIC. MacAddress string `json:"MacAddress,omitempty"` // The ID of the Net for the NIC. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_for_vm_creation.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_for_vm_creation.go index 85072cade..cee61867b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_for_vm_creation.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_for_vm_creation.go @@ -9,6 +9,7 @@ */ package osc + // NicForVmCreation Information about the network interface card (NIC) when creating a virtual machine (VM). type NicForVmCreation struct { // If `true`, the NIC is deleted when the VM is terminated. You can specify `true` only if you create a NIC when creating a VM. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_light.go index c6579b177..2f02f6296 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_light.go @@ -9,6 +9,7 @@ */ package osc + // NicLight Information about the network interface card (NIC). type NicLight struct { // The account ID of the owner of the NIC. @@ -16,9 +17,9 @@ type NicLight struct { // The description of the NIC. Description string `json:"Description,omitempty"` // (Net only) If `true`, the source/destination check is enabled. If `false`, it is disabled. This value must be `false` for a NAT VM to perform network address translation (NAT) in a Net. - IsSourceDestChecked bool `json:"IsSourceDestChecked,omitempty"` - LinkNic LinkNicLight `json:"LinkNic,omitempty"` - LinkPublicIp LinkPublicIpLightForVm `json:"LinkPublicIp,omitempty"` + IsSourceDestChecked bool `json:"IsSourceDestChecked,omitempty"` + LinkNic LinkNicLight `json:"LinkNic,omitempty"` + LinkPublicIp LinkPublicIpLightForVm `json:"LinkPublicIp,omitempty"` // The Media Access Control (MAC) address of the NIC. MacAddress string `json:"MacAddress,omitempty"` // The ID of the Net for the NIC. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_api_key.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_api_key.go index 804dddb2a..2118dc251 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_api_key.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_api_key.go @@ -9,6 +9,7 @@ */ package osc + // OsuApiKey Information about the OSU API key. type OsuApiKey struct { // The API key of the OSU account that enables you to access the bucket. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_export.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_export.go index 13fd23a99..718c575fd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_export.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_export.go @@ -9,11 +9,12 @@ */ package osc + // OsuExport Information about the OSU export. type OsuExport struct { // The format of the export disk (`qcow2` \\| `vdi` \\| `vmdk`). - DiskImageFormat string `json:"DiskImageFormat"` - OsuApiKey OsuApiKey `json:"OsuApiKey,omitempty"` + DiskImageFormat string `json:"DiskImageFormat"` + OsuApiKey OsuApiKey `json:"OsuApiKey,omitempty"` // The name of the OSU bucket you want to export the object to. OsuBucket string `json:"OsuBucket"` // The URL of the manifest file. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource.go index 1ec0c4ed7..538a1d393 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource.go @@ -9,6 +9,7 @@ */ package osc + // PermissionsOnResource Information about the users who have permissions for the resource. type PermissionsOnResource struct { // The account ID of one or more users who have permissions for the resource. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource_creation.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource_creation.go index d92aafc9d..68b9cbd7c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource_creation.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource_creation.go @@ -9,8 +9,9 @@ */ package osc + // PermissionsOnResourceCreation Information about the permissions for the resource. type PermissionsOnResourceCreation struct { Additions PermissionsOnResource `json:"Additions,omitempty"` - Removals PermissionsOnResource `json:"Removals,omitempty"` + Removals PermissionsOnResource `json:"Removals,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_placement.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_placement.go index 7ef98b8ca..d440d5de8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_placement.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_placement.go @@ -9,6 +9,7 @@ */ package osc + // Placement Information about the placement of the VM. type Placement struct { // The name of the Subregion. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip.go index 363c7944f..9ddd2a27a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip.go @@ -9,10 +9,11 @@ */ package osc + // PrivateIp Information about the private IP. type PrivateIp struct { // If `true`, the IP address is the primary private IP address of the NIC. - IsPrimary bool `json:"IsPrimary,omitempty"` + IsPrimary bool `json:"IsPrimary,omitempty"` LinkPublicIp LinkPublicIp `json:"LinkPublicIp,omitempty"` // The name of the private DNS. PrivateDnsName string `json:"PrivateDnsName,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light.go index b5d56ec2a..ee553ed97 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light.go @@ -9,6 +9,7 @@ */ package osc + // PrivateIpLight Information about the private IP. type PrivateIpLight struct { // If `true`, the IP address is the primary private IP address of the NIC. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light_for_vm.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light_for_vm.go index a7882c9e9..119fd4a6a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light_for_vm.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light_for_vm.go @@ -9,10 +9,11 @@ */ package osc + // PrivateIpLightForVm Information about the private IP of the NIC. type PrivateIpLightForVm struct { // If `true`, the IP address is the primary private IP address of the NIC. - IsPrimary bool `json:"IsPrimary,omitempty"` + IsPrimary bool `json:"IsPrimary,omitempty"` LinkPublicIp LinkPublicIpLightForVm `json:"LinkPublicIp,omitempty"` // The name of the private DNS. PrivateDnsName string `json:"PrivateDnsName,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_product_type.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_product_type.go index 71ba02af3..aeeedac0b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_product_type.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_product_type.go @@ -9,6 +9,7 @@ */ package osc + // ProductType Information about the product type. type ProductType struct { // The description of the product type. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip.go index b0faefea8..bfb7472d4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip.go @@ -9,6 +9,7 @@ */ package osc + // PublicIp Information about the public IP. type PublicIp struct { // (Required in a Net) The ID representing the association of the EIP with the VM or the NIC. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip_light.go index 6de057037..e2296e535 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip_light.go @@ -9,6 +9,7 @@ */ package osc + // PublicIpLight Information about the public IP. type PublicIpLight struct { // The External IP address (EIP) associated with the NAT service. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_quota.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_quota.go index c17176799..4e9af3b23 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_quota.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_quota.go @@ -9,6 +9,7 @@ */ package osc + // Quota Information about the quota. type Quota struct { // The account ID of the owner of the quotas. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_quota_types.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_quota_types.go index 0e16c8b75..8d58eed1f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_quota_types.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_quota_types.go @@ -9,6 +9,7 @@ */ package osc + // QuotaTypes One or more quotas. type QuotaTypes struct { // The resource ID if it is a resource-specific quota, `global` if it is not. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_request.go index 6fc2df8bc..2e5d6501d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadAccessKeysRequest struct for ReadAccessKeysRequest type ReadAccessKeysRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersAccessKeys `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_response.go index af5f4e15d..eced4fe2a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadAccessKeysResponse struct for ReadAccessKeysResponse type ReadAccessKeysResponse struct { // A list of access keys. - AccessKeys []AccessKey `json:"AccessKeys,omitempty"` + AccessKeys []AccessKey `json:"AccessKeys,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_request.go index 3346eaf73..31f161bed 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_request.go @@ -9,6 +9,7 @@ */ package osc + // ReadAccountsRequest struct for ReadAccountsRequest type ReadAccountsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_response.go index 3eef8e3ad..7b1367607 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadAccountsResponse struct for ReadAccountsResponse type ReadAccountsResponse struct { // The list of the accounts. - Accounts []Account `json:"Accounts,omitempty"` + Accounts []Account `json:"Accounts,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_request.go index 1346b78a9..14e9d8fd0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_request.go @@ -9,6 +9,7 @@ */ package osc + // ReadAdminPasswordRequest struct for ReadAdminPasswordRequest type ReadAdminPasswordRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_response.go index d7bfae9f0..1004538b1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_response.go @@ -9,10 +9,11 @@ */ package osc + // ReadAdminPasswordResponse struct for ReadAdminPasswordResponse type ReadAdminPasswordResponse struct { // The password of the VM. After the first boot, returns an empty string. - AdminPassword string `json:"AdminPassword,omitempty"` + AdminPassword string `json:"AdminPassword,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` // The ID of the VM. VmId string `json:"VmId,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_request.go index 25456ff18..aa9949e61 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_request.go @@ -9,14 +9,15 @@ */ package osc + // ReadApiLogsRequest struct for ReadApiLogsRequest type ReadApiLogsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersApiLog `json:"Filters,omitempty"` // The token to request the next page of results. NextPageToken string `json:"NextPageToken,omitempty"` // The maximum number of items returned in a single page. By default, 100. ResultsPerPage int32 `json:"ResultsPerPage,omitempty"` - With With `json:"With,omitempty"` + With With `json:"With,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_response.go index 691a29138..4bb33f1cf 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_response.go @@ -9,11 +9,12 @@ */ package osc + // ReadApiLogsResponse struct for ReadApiLogsResponse type ReadApiLogsResponse struct { // Information displayed in one or more API logs. Logs []Log `json:"Logs,omitempty"` // The token to request the next page of results. - NextPageToken string `json:"NextPageToken,omitempty"` + NextPageToken string `json:"NextPageToken,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_request.go index b2368754b..f3e385e8c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadClientGatewaysRequest struct for ReadClientGatewaysRequest type ReadClientGatewaysRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersClientGateway `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_response.go index 9d226d352..7a22a5f83 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadClientGatewaysResponse struct for ReadClientGatewaysResponse type ReadClientGatewaysResponse struct { // Information about one or more client gateways. - ClientGateways []ClientGateway `json:"ClientGateways,omitempty"` + ClientGateways []ClientGateway `json:"ClientGateways,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_request.go index 8d543a76e..d14a41a5f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_request.go @@ -9,6 +9,7 @@ */ package osc + // ReadConsoleOutputRequest struct for ReadConsoleOutputRequest type ReadConsoleOutputRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_response.go index 4889c3baa..d399756f0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_response.go @@ -9,10 +9,11 @@ */ package osc + // ReadConsoleOutputResponse struct for ReadConsoleOutputResponse type ReadConsoleOutputResponse struct { // The Base64-encoded output of the console. If a command line tool is used, the output is decoded by the tool. - ConsoleOutput string `json:"ConsoleOutput,omitempty"` + ConsoleOutput string `json:"ConsoleOutput,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` // The ID of the VM. VmId string `json:"VmId,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_request.go index 33b4d673e..a33d66ae4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_request.go @@ -9,6 +9,7 @@ */ package osc + // ReadConsumptionAccountRequest struct for ReadConsumptionAccountRequest type ReadConsumptionAccountRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_response.go index 44de767f9..598eae0bb 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadConsumptionAccountResponse struct for ReadConsumptionAccountResponse type ReadConsumptionAccountResponse struct { // Information about the resources consumed during the specified time period. ConsumptionEntries []ConsumptionEntry `json:"ConsumptionEntries,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_request.go index f429878c8..35a8b2351 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadDhcpOptionsRequest struct for ReadDhcpOptionsRequest type ReadDhcpOptionsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersDhcpOptions `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_response.go index efed6445e..d5d68b11c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadDhcpOptionsResponse struct for ReadDhcpOptionsResponse type ReadDhcpOptionsResponse struct { // Information about one or more DHCP options sets. DhcpOptionsSets []DhcpOptionsSet `json:"DhcpOptionsSets,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_request.go index 9bf2f177f..3ea290f94 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadDirectLinkInterfacesRequest struct for ReadDirectLinkInterfacesRequest type ReadDirectLinkInterfacesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersDirectLinkInterface `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_response.go index 22ea50a6a..2bc6d4fb4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadDirectLinkInterfacesResponse struct for ReadDirectLinkInterfacesResponse type ReadDirectLinkInterfacesResponse struct { // Information about one or more DirectLink interfaces. DirectLinkInterfaces []DirectLinkInterfaces `json:"DirectLinkInterfaces,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_request.go index f032be38c..27a145503 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadDirectLinksRequest struct for ReadDirectLinksRequest type ReadDirectLinksRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersDirectLink `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_response.go index 5f65a6c62..848d425c6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadDirectLinksResponse struct for ReadDirectLinksResponse type ReadDirectLinksResponse struct { // Information about one or more DirectLinks. - DirectLinks []DirectLink `json:"DirectLinks,omitempty"` + DirectLinks []DirectLink `json:"DirectLinks,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_request.go index b00e6a540..b2b3b0b58 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_request.go @@ -9,6 +9,7 @@ */ package osc + // ReadFlexibleGpuCatalogRequest struct for ReadFlexibleGpuCatalogRequest type ReadFlexibleGpuCatalogRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_response.go index e23385976..718f1d665 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadFlexibleGpuCatalogResponse struct for ReadFlexibleGpuCatalogResponse type ReadFlexibleGpuCatalogResponse struct { // Information about one or more fGPUs available in the public catalog. FlexibleGpuCatalog []FlexibleGpuCatalog `json:"FlexibleGpuCatalog,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_request.go index 70403a755..6eb1f6d6e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadFlexibleGpusRequest struct for ReadFlexibleGpusRequest type ReadFlexibleGpusRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersFlexibleGpu `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_response.go index 158b0c591..941d8c4b6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadFlexibleGpusResponse struct for ReadFlexibleGpusResponse type ReadFlexibleGpusResponse struct { // Information about one or more fGPUs. - FlexibleGpus []FlexibleGpu `json:"FlexibleGpus,omitempty"` + FlexibleGpus []FlexibleGpu `json:"FlexibleGpus,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_request.go index e65f0312c..d9ecd36bd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadImageExportTasksRequest struct for ReadImageExportTasksRequest type ReadImageExportTasksRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersExportTask `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_response.go index 534578442..f5bd118cc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadImageExportTasksResponse struct for ReadImageExportTasksResponse type ReadImageExportTasksResponse struct { // Information about one or more image export tasks. ImageExportTasks []ImageExportTask `json:"ImageExportTasks,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_request.go index 2e73f8c26..cea571687 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadImagesRequest struct for ReadImagesRequest type ReadImagesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersImage `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_response.go index 6afd36125..b568b65a4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadImagesResponse struct for ReadImagesResponse type ReadImagesResponse struct { // Information about one or more OMIs. - Images []Image `json:"Images,omitempty"` + Images []Image `json:"Images,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_request.go index 07a0ef1c7..9e702c7ae 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadInternetServicesRequest struct for ReadInternetServicesRequest type ReadInternetServicesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersInternetService `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_response.go index b15201d46..ab993ee71 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadInternetServicesResponse struct for ReadInternetServicesResponse type ReadInternetServicesResponse struct { // Information about one or more Internet services. InternetServices []InternetService `json:"InternetServices,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_request.go index 322b85ca2..bcb88848b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadKeypairsRequest struct for ReadKeypairsRequest type ReadKeypairsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersKeypair `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_response.go index bc1065e5c..861d1f21f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadKeypairsResponse struct for ReadKeypairsResponse type ReadKeypairsResponse struct { // Information about one or more keypairs. - Keypairs []Keypair `json:"Keypairs,omitempty"` + Keypairs []Keypair `json:"Keypairs,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_request.go index 5f4652416..7d20fd16c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadListenerRulesRequest struct for ReadListenerRulesRequest type ReadListenerRulesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersListenerRule `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_response.go index 6d12c4b3d..f7723063b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadListenerRulesResponse struct for ReadListenerRulesResponse type ReadListenerRulesResponse struct { // The list of the rules to describe. - ListenerRules []ListenerRule `json:"ListenerRules,omitempty"` + ListenerRules []ListenerRule `json:"ListenerRules,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_request.go index 9819214db..419b80e8a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_request.go @@ -9,6 +9,7 @@ */ package osc + // ReadLoadBalancerTagsRequest struct for ReadLoadBalancerTagsRequest type ReadLoadBalancerTagsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_response.go index a1f27aca8..00f7594c5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadLoadBalancerTagsResponse struct for ReadLoadBalancerTagsResponse type ReadLoadBalancerTagsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_request.go index 6540d3dc2..c462cf3cd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadLoadBalancersRequest struct for ReadLoadBalancersRequest type ReadLoadBalancersRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersLoadBalancer `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_response.go index f58f851d1..e8f427511 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadLoadBalancersResponse struct for ReadLoadBalancersResponse type ReadLoadBalancersResponse struct { // Information about one or more load balancers. - LoadBalancers []LoadBalancer `json:"LoadBalancers,omitempty"` + LoadBalancers []LoadBalancer `json:"LoadBalancers,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_request.go index 082f71b0f..206f8128a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_request.go @@ -9,6 +9,7 @@ */ package osc + // ReadLocationsRequest struct for ReadLocationsRequest type ReadLocationsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_response.go index 13d36ff01..a8e6239dd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadLocationsResponse struct for ReadLocationsResponse type ReadLocationsResponse struct { // Information about one or more locations. - Locations []Location `json:"Locations,omitempty"` + Locations []Location `json:"Locations,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_request.go index 691547cdb..98baeaa96 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadNatServicesRequest struct for ReadNatServicesRequest type ReadNatServicesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersNatService `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_response.go index 5e29e9d76..8396d322c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadNatServicesResponse struct for ReadNatServicesResponse type ReadNatServicesResponse struct { // Information about one or more NAT services. - NatServices []NatService `json:"NatServices,omitempty"` + NatServices []NatService `json:"NatServices,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_request.go index cf85b68c0..2059825a7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadNetAccessPointServicesRequest struct for ReadNetAccessPointServicesRequest type ReadNetAccessPointServicesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersService `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_response.go index a231d1206..be78bf62e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadNetAccessPointServicesResponse struct for ReadNetAccessPointServicesResponse type ReadNetAccessPointServicesResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_request.go index 41fb30b78..015dfd6a1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadNetAccessPointsRequest struct for ReadNetAccessPointsRequest type ReadNetAccessPointsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersNetAccessPoint `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_response.go index 590c59491..5b1715afa 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadNetAccessPointsResponse struct for ReadNetAccessPointsResponse type ReadNetAccessPointsResponse struct { // One or more Net access points. NetAccessPoints []NetAccessPoint `json:"NetAccessPoints,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_request.go index 3d450b64e..5b9d6dd4b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadNetPeeringsRequest struct for ReadNetPeeringsRequest type ReadNetPeeringsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersNetPeering `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_response.go index f50fba5da..bff8a40e9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadNetPeeringsResponse struct for ReadNetPeeringsResponse type ReadNetPeeringsResponse struct { // Information about one or more Net peering connections. - NetPeerings []NetPeering `json:"NetPeerings,omitempty"` + NetPeerings []NetPeering `json:"NetPeerings,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_request.go index 673a9dcc4..46605fa7d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadNetsRequest struct for ReadNetsRequest type ReadNetsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersNet `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_response.go index e90011024..17297638c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadNetsResponse struct for ReadNetsResponse type ReadNetsResponse struct { // Information about the described Nets. - Nets []Net `json:"Nets,omitempty"` + Nets []Net `json:"Nets,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_request.go index 2c5d7623c..bcfcaf639 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadNicsRequest struct for ReadNicsRequest type ReadNicsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersNic `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_response.go index 5013cf15b..221127308 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadNicsResponse struct for ReadNicsResponse type ReadNicsResponse struct { // Information about one or more NICs. - Nics []Nic `json:"Nics,omitempty"` + Nics []Nic `json:"Nics,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_request.go index 9aef3c83a..ace76bc3e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadProductTypesRequest struct for ReadProductTypesRequest type ReadProductTypesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersProductType `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_response.go index 43bb09278..7eca9acdb 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadProductTypesResponse struct for ReadProductTypesResponse type ReadProductTypesResponse struct { // Information about one or more product types. - ProductTypes []ProductType `json:"ProductTypes,omitempty"` + ProductTypes []ProductType `json:"ProductTypes,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_request.go index ed4102c75..10c5bd714 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_request.go @@ -9,6 +9,7 @@ */ package osc + // ReadPublicIpRangesRequest struct for ReadPublicIpRangesRequest type ReadPublicIpRangesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_response.go index 5d9838e43..b0dd0d91e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadPublicIpRangesResponse struct for ReadPublicIpRangesResponse type ReadPublicIpRangesResponse struct { // The list of public IPv4 addresses used in the Region, in CIDR notation. - PublicIps []string `json:"PublicIps,omitempty"` + PublicIps []string `json:"PublicIps,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_request.go index a50d40fc1..5e75f7f8e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadPublicIpsRequest struct for ReadPublicIpsRequest type ReadPublicIpsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersPublicIp `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_response.go index 6901d6988..196dd0dd9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadPublicIpsResponse struct for ReadPublicIpsResponse type ReadPublicIpsResponse struct { // Information about one or more EIPs. - PublicIps []PublicIp `json:"PublicIps,omitempty"` + PublicIps []PublicIp `json:"PublicIps,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_request.go index 92497585d..4739ade7c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadQuotasRequest struct for ReadQuotasRequest type ReadQuotasRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersQuota `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_response.go index 7d522dfc6..5bffc1de8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadQuotasResponse struct for ReadQuotasResponse type ReadQuotasResponse struct { // Information about one or more quotas. - QuotaTypes []QuotaTypes `json:"QuotaTypes,omitempty"` + QuotaTypes []QuotaTypes `json:"QuotaTypes,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_request.go index 194146925..1aa0fe23f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_request.go @@ -9,6 +9,7 @@ */ package osc + // ReadRegionsRequest struct for ReadRegionsRequest type ReadRegionsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_response.go index 355093223..a39be1b85 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadRegionsResponse struct for ReadRegionsResponse type ReadRegionsResponse struct { // Information about one or more Regions. - Regions []Region `json:"Regions,omitempty"` + Regions []Region `json:"Regions,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_request.go index 31a506c5c..50c962841 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadRouteTablesRequest struct for ReadRouteTablesRequest type ReadRouteTablesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersRouteTable `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_response.go index eeee80bb4..399d863de 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadRouteTablesResponse struct for ReadRouteTablesResponse type ReadRouteTablesResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_request.go index 3fe92be33..127f01d8d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_request.go @@ -9,6 +9,7 @@ */ package osc + // ReadSecretAccessKeyRequest struct for ReadSecretAccessKeyRequest type ReadSecretAccessKeyRequest struct { // The ID of the access key. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_response.go index 40840c07c..9e5d7c07c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_response.go @@ -9,8 +9,9 @@ */ package osc + // ReadSecretAccessKeyResponse struct for ReadSecretAccessKeyResponse type ReadSecretAccessKeyResponse struct { - AccessKey AccessKeySecretKey `json:"AccessKey,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + AccessKey AccessKeySecretKey `json:"AccessKey,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_request.go index 7f604f458..17dae1b4d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadSecurityGroupsRequest struct for ReadSecurityGroupsRequest type ReadSecurityGroupsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersSecurityGroup `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_response.go index 0cc0c2d5c..bb3b714ca 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadSecurityGroupsResponse struct for ReadSecurityGroupsResponse type ReadSecurityGroupsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_request.go index 4f7f2db0c..8b59b8bd9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadServerCertificatesRequest struct for ReadServerCertificatesRequest type ReadServerCertificatesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersServerCertificate `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_response.go index 5596a5d7e..967d67035 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadServerCertificatesResponse struct for ReadServerCertificatesResponse type ReadServerCertificatesResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_request.go index e922fcaa3..79e2cd6bd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadSnapshotExportTasksRequest struct for ReadSnapshotExportTasksRequest type ReadSnapshotExportTasksRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersExportTask `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_response.go index fd851527f..7d08b5dec 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadSnapshotExportTasksResponse struct for ReadSnapshotExportTasksResponse type ReadSnapshotExportTasksResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_request.go index a92806009..3fd2c64c1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadSnapshotsRequest struct for ReadSnapshotsRequest type ReadSnapshotsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersSnapshot `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_response.go index 2b65bb8cd..0dd47b73a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadSnapshotsResponse struct for ReadSnapshotsResponse type ReadSnapshotsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_request.go index 6b1553a76..a56a8c14b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadSubnetsRequest struct for ReadSubnetsRequest type ReadSubnetsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersSubnet `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_response.go index e9b847431..2dd32e77b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadSubnetsResponse struct for ReadSubnetsResponse type ReadSubnetsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_request.go index 4f2cdfc34..62528299a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadSubregionsRequest struct for ReadSubregionsRequest type ReadSubregionsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersSubregion `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_response.go index 5531552fc..9d8c4d87b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadSubregionsResponse struct for ReadSubregionsResponse type ReadSubregionsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_request.go index d460d7da4..66b6ac885 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadTagsRequest struct for ReadTagsRequest type ReadTagsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersTag `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_response.go index e06c60d7f..3250c0fab 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadTagsResponse struct for ReadTagsResponse type ReadTagsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_request.go index d809d2837..32ff8cb1b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadVirtualGatewaysRequest struct for ReadVirtualGatewaysRequest type ReadVirtualGatewaysRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersVirtualGateway `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_response.go index 8dd105f4b..c47631878 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadVirtualGatewaysResponse struct for ReadVirtualGatewaysResponse type ReadVirtualGatewaysResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_request.go index 197fb489d..4aebe51af 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadVmTypesRequest struct for ReadVmTypesRequest type ReadVmTypesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersVmType `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_response.go index a7b3e416a..c934335ad 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadVmTypesResponse struct for ReadVmTypesResponse type ReadVmTypesResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_request.go index 8ccbcaac7..8da0b1bb3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_request.go @@ -9,6 +9,7 @@ */ package osc + // ReadVmsHealthRequest struct for ReadVmsHealthRequest type ReadVmsHealthRequest struct { // One or more IDs of back-end VMs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_response.go index 55b6c8d30..65905cfd3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_response.go @@ -9,9 +9,10 @@ */ package osc + // ReadVmsHealthResponse struct for ReadVmsHealthResponse type ReadVmsHealthResponse struct { // Information about the health of one or more back-end VMs. BackendVmHealth []BackendVmHealth `json:"BackendVmHealth,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_request.go index add0cc566..60535d913 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadVmsRequest struct for ReadVmsRequest type ReadVmsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersVm `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_response.go index 2df86700b..bbfaa70bb 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadVmsResponse struct for ReadVmsResponse type ReadVmsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_request.go index 99575900e..85f663cfd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_request.go @@ -9,11 +9,12 @@ */ package osc + // ReadVmsStateRequest struct for ReadVmsStateRequest type ReadVmsStateRequest struct { // If `true`, includes the status of all VMs. By default or if set to `false`, only includes the status of running VMs. AllVms bool `json:"AllVms,omitempty"` // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersVmsState `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_response.go index 3df7274ce..c53a5e823 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadVmsStateResponse struct for ReadVmsStateResponse type ReadVmsStateResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_request.go index 158f7be3a..188e687af 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadVolumesRequest struct for ReadVolumesRequest type ReadVolumesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersVolume `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_response.go index c0ba63fd1..59b3db56a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadVolumesResponse struct for ReadVolumesResponse type ReadVolumesResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_request.go index 6164410dd..eea7ed515 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_request.go @@ -9,9 +9,10 @@ */ package osc + // ReadVpnConnectionsRequest struct for ReadVpnConnectionsRequest type ReadVpnConnectionsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersVpnConnection `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_response.go index 0b23c3a40..eb9b81c19 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_response.go @@ -9,6 +9,7 @@ */ package osc + // ReadVpnConnectionsResponse struct for ReadVpnConnectionsResponse type ReadVpnConnectionsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_request.go index 82d90d551..ab5bd1f83 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_request.go @@ -9,6 +9,7 @@ */ package osc + // RebootVmsRequest struct for RebootVmsRequest type RebootVmsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_response.go index e5a9d523b..57ec5b839 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_response.go @@ -9,6 +9,7 @@ */ package osc + // RebootVmsResponse struct for RebootVmsResponse type RebootVmsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_region.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_region.go index 2de558c38..f331ad290 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_region.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_region.go @@ -9,6 +9,7 @@ */ package osc + // Region Information about the Region. type Region struct { // The hostname of the gateway to access the Region. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_request.go index b4c9ce25d..c33b93946 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_request.go @@ -9,6 +9,7 @@ */ package osc + // RegisterVmsInLoadBalancerRequest struct for RegisterVmsInLoadBalancerRequest type RegisterVmsInLoadBalancerRequest struct { // One or more IDs of back-end VMs.
Specifying the same ID several times has no effect as each back-end VM has equal weight. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_response.go index ddaed0248..71e12397f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_response.go @@ -9,6 +9,7 @@ */ package osc + // RegisterVmsInLoadBalancerResponse struct for RegisterVmsInLoadBalancerResponse type RegisterVmsInLoadBalancerResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_request.go index 3573c99ed..d161582ba 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_request.go @@ -9,6 +9,7 @@ */ package osc + // RejectNetPeeringRequest struct for RejectNetPeeringRequest type RejectNetPeeringRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_response.go index e4f46aace..e4f195980 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_response.go @@ -9,6 +9,7 @@ */ package osc + // RejectNetPeeringResponse struct for RejectNetPeeringResponse type RejectNetPeeringResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_request.go index f78314843..cb2ff1668 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_request.go @@ -9,6 +9,7 @@ */ package osc + // ResetAccountPasswordRequest struct for ResetAccountPasswordRequest type ResetAccountPasswordRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_response.go index 60629ecb7..6d4109102 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_response.go @@ -9,6 +9,7 @@ */ package osc + // ResetAccountPasswordResponse struct for ResetAccountPasswordResponse type ResetAccountPasswordResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_load_balancer_tag.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_load_balancer_tag.go index 56c35ed0c..d42825e07 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_load_balancer_tag.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_load_balancer_tag.go @@ -9,6 +9,7 @@ */ package osc + // ResourceLoadBalancerTag Information about the tag. type ResourceLoadBalancerTag struct { // The key of the tag, with a minimum of 1 character. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_tag.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_tag.go index 6ce6e9b6c..19949ae3b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_tag.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_tag.go @@ -9,6 +9,7 @@ */ package osc + // ResourceTag Information about the tag. type ResourceTag struct { // The key of the tag, with a minimum of 1 character. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_response_context.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_response_context.go index 46dc375a7..0d5e787e7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_response_context.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_response_context.go @@ -9,6 +9,7 @@ */ package osc + // ResponseContext Information about the context of the response. type ResponseContext struct { // The ID of the request. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_route.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_route.go index 562c017cf..cea2c469c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_route.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_route.go @@ -9,6 +9,7 @@ */ package osc + // Route Information about the route. type Route struct { // The method used to create the route. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_route_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_route_light.go index 59e0644f2..b32b90a33 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_route_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_route_light.go @@ -9,6 +9,7 @@ */ package osc + // RouteLight Information about the route. type RouteLight struct { // The IP range used for the destination match, in CIDR notation (for example, 10.0.0.0/24). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_route_propagating_virtual_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_route_propagating_virtual_gateway.go index 224f62146..dcc9a9aac 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_route_propagating_virtual_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_route_propagating_virtual_gateway.go @@ -9,6 +9,7 @@ */ package osc + // RoutePropagatingVirtualGateway Information about the route propagating virtual gateway. type RoutePropagatingVirtualGateway struct { // The ID of the virtual gateway. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_route_table.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_route_table.go index 2ea0b2759..44fc78832 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_route_table.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_route_table.go @@ -9,6 +9,7 @@ */ package osc + // RouteTable Information about the route table. type RouteTable struct { // One or more associations between the route table and Subnets. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group.go index d0aefbbd3..d8e495435 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group.go @@ -9,6 +9,7 @@ */ package osc + // SecurityGroup Information about the security group. type SecurityGroup struct { // The account ID of a user that has been granted permission. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_light.go index 5a7cb0fc2..767012794 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_light.go @@ -9,6 +9,7 @@ */ package osc + // SecurityGroupLight Information about the security group. type SecurityGroupLight struct { // The ID of the security group. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_rule.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_rule.go index 6d975108d..1f733ba3e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_rule.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_rule.go @@ -9,6 +9,7 @@ */ package osc + // SecurityGroupRule Information about the security group rule. type SecurityGroupRule struct { // The beginning of the port range for the TCP and UDP protocols, or an ICMP type number. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_groups_member.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_groups_member.go index 9eca329e0..5a78406c1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_groups_member.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_groups_member.go @@ -9,6 +9,7 @@ */ package osc + // SecurityGroupsMember Information about the member of a security group. type SecurityGroupsMember struct { // The account ID of a user. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_request.go index 0459cd77a..3e217f079 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_request.go @@ -9,6 +9,7 @@ */ package osc + // SendResetPasswordEmailRequest struct for SendResetPasswordEmailRequest type SendResetPasswordEmailRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_response.go index 625e58a38..f07d52e9a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_response.go @@ -9,6 +9,7 @@ */ package osc + // SendResetPasswordEmailResponse struct for SendResetPasswordEmailResponse type SendResetPasswordEmailResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_server_certificate.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_server_certificate.go index 1f61a246c..cb1b63e20 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_server_certificate.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_server_certificate.go @@ -9,6 +9,7 @@ */ package osc + // ServerCertificate Information about the server certificate. type ServerCertificate struct { // The date at which the server certificate expires. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_service.go index 504cf3239..0c2ce505b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_service.go @@ -9,6 +9,7 @@ */ package osc + // Service Information about the service. type Service struct { // The list of network prefixes used by the service, in CIDR notation. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot.go index 665d84b2b..28d8267db 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot.go @@ -9,6 +9,7 @@ */ package osc + // Snapshot Information about the snapshot. type Snapshot struct { // The account alias of the owner of the snapshot. @@ -16,7 +17,7 @@ type Snapshot struct { // The account ID of the owner of the snapshot. AccountId string `json:"AccountId,omitempty"` // The description of the snapshot. - Description string `json:"Description,omitempty"` + Description string `json:"Description,omitempty"` PermissionsToCreateVolume PermissionsOnResource `json:"PermissionsToCreateVolume,omitempty"` // The progress of the snapshot, as a percentage. Progress int32 `json:"Progress,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot_export_task.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot_export_task.go index ebf594750..dd0f87c35 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot_export_task.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot_export_task.go @@ -9,10 +9,11 @@ */ package osc + // SnapshotExportTask Information about the snapshot export task. type SnapshotExportTask struct { // If the snapshot export task fails, an error message appears. - Comment string `json:"Comment,omitempty"` + Comment string `json:"Comment,omitempty"` OsuExport OsuExport `json:"OsuExport,omitempty"` // The progress of the snapshot export task, as a percentage. Progress int32 `json:"Progress,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_source_net.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_source_net.go index 79aa9e5bc..5616aac50 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_source_net.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_source_net.go @@ -9,6 +9,7 @@ */ package osc + // SourceNet Information about the source Net. type SourceNet struct { // The account ID of the owner of the source Net. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_source_security_group.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_source_security_group.go index f5a1adf35..bda00cbe9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_source_security_group.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_source_security_group.go @@ -9,6 +9,7 @@ */ package osc + // SourceSecurityGroup Information about the source security group of the load balancer, which you can use as part of your inbound rules for your registered VMs.
To only allow traffic from load balancers, add a security group rule that specifies this source security group as the inbound source. type SourceSecurityGroup struct { // The account ID of the owner of the security group. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_request.go index 0cf05367f..5f91fd202 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_request.go @@ -9,6 +9,7 @@ */ package osc + // StartVmsRequest struct for StartVmsRequest type StartVmsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_response.go index e6440ed58..8fe1adc14 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_response.go @@ -9,6 +9,7 @@ */ package osc + // StartVmsResponse struct for StartVmsResponse type StartVmsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_state_comment.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_state_comment.go index 05254a9b8..8d1b4fa5f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_state_comment.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_state_comment.go @@ -9,6 +9,7 @@ */ package osc + // StateComment Information about the change of state. type StateComment struct { // The code of the change of state. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_request.go index 0532ec13c..01538d175 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_request.go @@ -9,6 +9,7 @@ */ package osc + // StopVmsRequest struct for StopVmsRequest type StopVmsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_response.go index 2ac9ef674..9262f994f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_response.go @@ -9,6 +9,7 @@ */ package osc + // StopVmsResponse struct for StopVmsResponse type StopVmsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_subnet.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_subnet.go index 989fa39fc..8316f9445 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_subnet.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_subnet.go @@ -9,6 +9,7 @@ */ package osc + // Subnet Information about the Subnet. type Subnet struct { // The number of available IP addresses in the Subnets. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_subregion.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_subregion.go index d92460d1f..fe606f03a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_subregion.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_subregion.go @@ -9,6 +9,7 @@ */ package osc + // Subregion Information about the Subregion. type Subregion struct { // The name of the Region containing the Subregion. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_tag.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_tag.go index c0ba9f64b..8e15c66f9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_tag.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_tag.go @@ -9,6 +9,7 @@ */ package osc + // Tag Information about the tag. type Tag struct { // The key of the tag, with a minimum of 1 character. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_request.go index cf15ac076..bac1b783e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_request.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkFlexibleGpuRequest struct for UnlinkFlexibleGpuRequest type UnlinkFlexibleGpuRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_response.go index bf7340332..388243f68 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_response.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkFlexibleGpuResponse struct for UnlinkFlexibleGpuResponse type UnlinkFlexibleGpuResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_request.go index d39a88974..b52c446e1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_request.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkInternetServiceRequest struct for UnlinkInternetServiceRequest type UnlinkInternetServiceRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_response.go index 7d2561bb8..670ef18f6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_response.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkInternetServiceResponse struct for UnlinkInternetServiceResponse type UnlinkInternetServiceResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_request.go index e6306b312..7bc07b1ca 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_request.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkNicRequest struct for UnlinkNicRequest type UnlinkNicRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_response.go index 6cf3ebe2a..ac9709bd7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_response.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkNicResponse struct for UnlinkNicResponse type UnlinkNicResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_request.go index 0e98f8701..20935e014 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_request.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkPrivateIpsRequest struct for UnlinkPrivateIpsRequest type UnlinkPrivateIpsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_response.go index 8b12bc8a0..b72bbdc3f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_response.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkPrivateIpsResponse struct for UnlinkPrivateIpsResponse type UnlinkPrivateIpsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_request.go index 8dd31165d..c96f25118 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_request.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkPublicIpRequest struct for UnlinkPublicIpRequest type UnlinkPublicIpRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_response.go index 8b662f59e..c9348940f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_response.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkPublicIpResponse struct for UnlinkPublicIpResponse type UnlinkPublicIpResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_request.go index 1848a2cf0..7afe02b63 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_request.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkRouteTableRequest struct for UnlinkRouteTableRequest type UnlinkRouteTableRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_response.go index ea613e509..2754f92e2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_response.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkRouteTableResponse struct for UnlinkRouteTableResponse type UnlinkRouteTableResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_request.go index 4f652c677..35bd6de17 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_request.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkVirtualGatewayRequest struct for UnlinkVirtualGatewayRequest type UnlinkVirtualGatewayRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_response.go index 6c0dc45d5..8687aff24 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_response.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkVirtualGatewayResponse struct for UnlinkVirtualGatewayResponse type UnlinkVirtualGatewayResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_request.go index 862e69a10..cdb04f3ab 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_request.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkVolumeRequest struct for UnlinkVolumeRequest type UnlinkVolumeRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_response.go index 8a2d35a35..17ca5e494 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_response.go @@ -9,6 +9,7 @@ */ package osc + // UnlinkVolumeResponse struct for UnlinkVolumeResponse type UnlinkVolumeResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_request.go index 3f9eb863a..bf032be3a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_request.go @@ -9,6 +9,7 @@ */ package osc + // UpdateAccessKeyRequest struct for UpdateAccessKeyRequest type UpdateAccessKeyRequest struct { // The ID of the access key. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_response.go index 1a1e2f39b..4d9328269 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateAccessKeyResponse struct for UpdateAccessKeyResponse type UpdateAccessKeyResponse struct { - AccessKey AccessKey `json:"AccessKey,omitempty"` + AccessKey AccessKey `json:"AccessKey,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_request.go index ec245c5ab..449b38d0f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_request.go @@ -9,6 +9,7 @@ */ package osc + // UpdateAccountRequest struct for UpdateAccountRequest type UpdateAccountRequest struct { // The new city of the account owner. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_response.go index 55dfd88f7..d34c782be 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateAccountResponse struct for UpdateAccountResponse type UpdateAccountResponse struct { - Account Account `json:"Account,omitempty"` + Account Account `json:"Account,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_request.go index 41f354920..d4e25db4d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_request.go @@ -9,6 +9,7 @@ */ package osc + // UpdateFlexibleGpuRequest struct for UpdateFlexibleGpuRequest type UpdateFlexibleGpuRequest struct { // If `true`, the fGPU is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_response.go index 57a830636..6d81bad1a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateFlexibleGpuResponse struct for UpdateFlexibleGpuResponse type UpdateFlexibleGpuResponse struct { - FlexibleGpu FlexibleGpu `json:"FlexibleGpu,omitempty"` + FlexibleGpu FlexibleGpu `json:"FlexibleGpu,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_request.go index 23628b6b8..e6ebcc6dc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_request.go @@ -9,11 +9,12 @@ */ package osc + // UpdateImageRequest struct for UpdateImageRequest type UpdateImageRequest struct { // If `true`, checks whether you have the required permissions to perform the action. DryRun bool `json:"DryRun,omitempty"` // The ID of the OMI you want to modify. - ImageId string `json:"ImageId"` + ImageId string `json:"ImageId"` PermissionsToLaunch PermissionsOnResourceCreation `json:"PermissionsToLaunch"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_response.go index b7f27eae4..d6400dff4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateImageResponse struct for UpdateImageResponse type UpdateImageResponse struct { - Image Image `json:"Image,omitempty"` + Image Image `json:"Image,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_request.go index e7c13976e..65d5527eb 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_request.go @@ -9,6 +9,7 @@ */ package osc + // UpdateListenerRuleRequest struct for UpdateListenerRuleRequest type UpdateListenerRuleRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_response.go index 636346522..29a2b437f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateListenerRuleResponse struct for UpdateListenerRuleResponse type UpdateListenerRuleResponse struct { - ListenerRule ListenerRule `json:"ListenerRule,omitempty"` + ListenerRule ListenerRule `json:"ListenerRule,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_request.go index ae36181dd..d1bbb3aa8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_request.go @@ -9,11 +9,12 @@ */ package osc + // UpdateLoadBalancerRequest struct for UpdateLoadBalancerRequest type UpdateLoadBalancerRequest struct { AccessLog AccessLog `json:"AccessLog,omitempty"` // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` HealthCheck HealthCheck `json:"HealthCheck,omitempty"` // The name of the load balancer. LoadBalancerName string `json:"LoadBalancerName"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_response.go index ddaa5d153..234c38306 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateLoadBalancerResponse struct for UpdateLoadBalancerResponse type UpdateLoadBalancerResponse struct { - LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` + LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_request.go index 7b6231bec..f870f0698 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_request.go @@ -9,6 +9,7 @@ */ package osc + // UpdateNetAccessPointRequest struct for UpdateNetAccessPointRequest type UpdateNetAccessPointRequest struct { // One or more IDs of route tables to associate with the specified Net access point. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_response.go index 15280daa9..1c3b2b79e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateNetAccessPointResponse struct for UpdateNetAccessPointResponse type UpdateNetAccessPointResponse struct { - NetAccessPoint NetAccessPoint `json:"NetAccessPoint,omitempty"` + NetAccessPoint NetAccessPoint `json:"NetAccessPoint,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_request.go index 65e37fc08..f84b59053 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_request.go @@ -9,6 +9,7 @@ */ package osc + // UpdateNetRequest struct for UpdateNetRequest type UpdateNetRequest struct { // The ID of the DHCP options set (or `default` if you want to associate the default one). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_response.go index be3e226ec..57b7ac129 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateNetResponse struct for UpdateNetResponse type UpdateNetResponse struct { - Net Net `json:"Net,omitempty"` + Net Net `json:"Net,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_request.go index 4a6c6f7ce..b0a007397 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_request.go @@ -9,12 +9,13 @@ */ package osc + // UpdateNicRequest struct for UpdateNicRequest type UpdateNicRequest struct { // A new description for the NIC. Description string `json:"Description,omitempty"` // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` LinkNic LinkNicToUpdate `json:"LinkNic,omitempty"` // The ID of the NIC you want to modify. NicId string `json:"NicId"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_response.go index 6d7e5971d..9dcedde65 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateNicResponse struct for UpdateNicResponse type UpdateNicResponse struct { - Nic Nic `json:"Nic,omitempty"` + Nic Nic `json:"Nic,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_request.go index 25e5b25ff..cb5543291 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_request.go @@ -9,6 +9,7 @@ */ package osc + // UpdateRoutePropagationRequest struct for UpdateRoutePropagationRequest type UpdateRoutePropagationRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_response.go index a9ef91872..ae658abac 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateRoutePropagationResponse struct for UpdateRoutePropagationResponse type UpdateRoutePropagationResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - RouteTable RouteTable `json:"RouteTable,omitempty"` + RouteTable RouteTable `json:"RouteTable,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_request.go index a7dc16806..ef7867f88 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_request.go @@ -9,6 +9,7 @@ */ package osc + // UpdateRouteRequest struct for UpdateRouteRequest type UpdateRouteRequest struct { // The IP range used for the destination match, in CIDR notation (for example, 10.0.0.0/24). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_response.go index 54c67e46d..8e42af410 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateRouteResponse struct for UpdateRouteResponse type UpdateRouteResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - RouteTable RouteTable `json:"RouteTable,omitempty"` + RouteTable RouteTable `json:"RouteTable,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_request.go index 8b0db0f68..c662d8506 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_request.go @@ -9,6 +9,7 @@ */ package osc + // UpdateServerCertificateRequest struct for UpdateServerCertificateRequest type UpdateServerCertificateRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_response.go index 4cc6789ff..b8e0d7afe 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateServerCertificateResponse struct for UpdateServerCertificateResponse type UpdateServerCertificateResponse struct { - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` ServerCertificate ServerCertificate `json:"ServerCertificate,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_request.go index fd1bd2b25..4b2b4fc65 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_request.go @@ -9,10 +9,11 @@ */ package osc + // UpdateSnapshotRequest struct for UpdateSnapshotRequest type UpdateSnapshotRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` PermissionsToCreateVolume PermissionsOnResourceCreation `json:"PermissionsToCreateVolume"` // The ID of the snapshot. SnapshotId string `json:"SnapshotId"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_response.go index f0deee996..a1b59522f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateSnapshotResponse struct for UpdateSnapshotResponse type UpdateSnapshotResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - Snapshot Snapshot `json:"Snapshot,omitempty"` + Snapshot Snapshot `json:"Snapshot,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_request.go index 29487039b..2aaf1af91 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_request.go @@ -9,6 +9,7 @@ */ package osc + // UpdateSubnetRequest struct for UpdateSubnetRequest type UpdateSubnetRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_response.go index bb426dd95..d429dcb34 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateSubnetResponse struct for UpdateSubnetResponse type UpdateSubnetResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - Subnet Subnet `json:"Subnet,omitempty"` + Subnet Subnet `json:"Subnet,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_request.go index c677f3324..9f1ff13c8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_request.go @@ -9,6 +9,7 @@ */ package osc + // UpdateVmRequest struct for UpdateVmRequest type UpdateVmRequest struct { // One or more block device mappings of the VM. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_response.go index ac92999e4..37c980fd7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_response.go @@ -9,8 +9,9 @@ */ package osc + // UpdateVmResponse struct for UpdateVmResponse type UpdateVmResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - Vm Vm `json:"Vm,omitempty"` + Vm Vm `json:"Vm,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_virtual_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_virtual_gateway.go index 7673bc72b..15e38061c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_virtual_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_virtual_gateway.go @@ -9,6 +9,7 @@ */ package osc + // VirtualGateway Information about the virtual gateway. type VirtualGateway struct { // The type of VPN connection supported by the virtual gateway (only `ipsec.1` is supported). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm.go index d048a8b67..d4d631e98 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm.go @@ -9,6 +9,7 @@ */ package osc + // Vm Information about the VM. type Vm struct { // The architecture of the VM (`i386` \\| `x86_64`). @@ -38,8 +39,8 @@ type Vm struct { // Indicates the operating system (OS) of the VM. OsFamily string `json:"OsFamily,omitempty"` // The performance of the VM (`standard` \\| `high` \\| `highest`). - Performance string `json:"Performance,omitempty"` - Placement Placement `json:"Placement,omitempty"` + Performance string `json:"Performance,omitempty"` + Placement Placement `json:"Placement,omitempty"` // The name of the private DNS. PrivateDnsName string `json:"PrivateDnsName,omitempty"` // The primary private IP address of the VM. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_state.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_state.go index 1d056af11..3a609db19 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_state.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_state.go @@ -9,6 +9,7 @@ */ package osc + // VmState Information about the state of the VM. type VmState struct { // The current state of the VM (`InService` \\| `OutOfService` \\| `Unknown`). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_states.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_states.go index 961d63a67..5c72c1b83 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_states.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_states.go @@ -9,6 +9,7 @@ */ package osc + // VmStates Information about the states of the VMs. type VmStates struct { // One or more scheduled events associated with the VM. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_type.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_type.go index 5d8c2ff2d..554b034ca 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_type.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_type.go @@ -9,6 +9,7 @@ */ package osc + // VmType Information about the VM type. type VmType struct { // Indicates whether the VM is optimized for BSU I/O. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_volume.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_volume.go index d9d1ac294..12d033b9e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_volume.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_volume.go @@ -9,6 +9,7 @@ */ package osc + // Volume Information about the volume. type Volume struct { // The number of I/O operations per second (IOPS):
- For `io1` volumes, the number of provisioned IOPS
- For `gp2` volumes, the baseline performance of the volume diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_vpn_connection.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_vpn_connection.go index 88863c7a9..5a26c520a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_vpn_connection.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_vpn_connection.go @@ -9,6 +9,7 @@ */ package osc + // VpnConnection Information about a VPN connection. type VpnConnection struct { // The configuration to apply to the client gateway to establish the VPN connection, in XML format. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_with.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_with.go index 8654e3ec6..8456d4d78 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_with.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_with.go @@ -9,6 +9,7 @@ */ package osc + // With The information to be displayed in the API logs to retrieve. type With struct { // If set to `true`, the account ID is displayed in the logs. diff --git a/vendor/github.com/shirou/w32/constants.go b/vendor/github.com/shirou/w32/constants.go index 62d2d4b31..b83ff14c2 100644 --- a/vendor/github.com/shirou/w32/constants.go +++ b/vendor/github.com/shirou/w32/constants.go @@ -131,27 +131,27 @@ const ( BS_AUTOCHECKBOX = 3 BS_AUTORADIOBUTTON = 9 BS_BITMAP = 128 - BS_BOTTOM = 0X800 - BS_CENTER = 0X300 + BS_BOTTOM = 0x800 + BS_CENTER = 0x300 BS_CHECKBOX = 2 BS_DEFPUSHBUTTON = 1 BS_GROUPBOX = 7 BS_ICON = 64 BS_LEFT = 256 BS_LEFTTEXT = 32 - BS_MULTILINE = 0X2000 - BS_NOTIFY = 0X4000 - BS_OWNERDRAW = 0XB + BS_MULTILINE = 0x2000 + BS_NOTIFY = 0x4000 + BS_OWNERDRAW = 0xB BS_PUSHBUTTON = 0 BS_PUSHLIKE = 4096 BS_RADIOBUTTON = 4 BS_RIGHT = 512 BS_RIGHTBUTTON = 32 BS_TEXT = 0 - BS_TOP = 0X400 + BS_TOP = 0x400 BS_USERBUTTON = 8 - BS_VCENTER = 0XC00 - BS_FLAT = 0X8000 + BS_VCENTER = 0xC00 + BS_FLAT = 0x8000 ) // Button state constants @@ -246,61 +246,61 @@ const ( // Window style constants const ( - WS_OVERLAPPED = 0X00000000 - WS_POPUP = 0X80000000 - WS_CHILD = 0X40000000 - WS_MINIMIZE = 0X20000000 - WS_VISIBLE = 0X10000000 - WS_DISABLED = 0X08000000 - WS_CLIPSIBLINGS = 0X04000000 - WS_CLIPCHILDREN = 0X02000000 - WS_MAXIMIZE = 0X01000000 - WS_CAPTION = 0X00C00000 - WS_BORDER = 0X00800000 - WS_DLGFRAME = 0X00400000 - WS_VSCROLL = 0X00200000 - WS_HSCROLL = 0X00100000 - WS_SYSMENU = 0X00080000 - WS_THICKFRAME = 0X00040000 - WS_GROUP = 0X00020000 - WS_TABSTOP = 0X00010000 - WS_MINIMIZEBOX = 0X00020000 - WS_MAXIMIZEBOX = 0X00010000 - WS_TILED = 0X00000000 - WS_ICONIC = 0X20000000 - WS_SIZEBOX = 0X00040000 - WS_OVERLAPPEDWINDOW = 0X00000000 | 0X00C00000 | 0X00080000 | 0X00040000 | 0X00020000 | 0X00010000 - WS_POPUPWINDOW = 0X80000000 | 0X00800000 | 0X00080000 - WS_CHILDWINDOW = 0X40000000 + WS_OVERLAPPED = 0x00000000 + WS_POPUP = 0x80000000 + WS_CHILD = 0x40000000 + WS_MINIMIZE = 0x20000000 + WS_VISIBLE = 0x10000000 + WS_DISABLED = 0x08000000 + WS_CLIPSIBLINGS = 0x04000000 + WS_CLIPCHILDREN = 0x02000000 + WS_MAXIMIZE = 0x01000000 + WS_CAPTION = 0x00C00000 + WS_BORDER = 0x00800000 + WS_DLGFRAME = 0x00400000 + WS_VSCROLL = 0x00200000 + WS_HSCROLL = 0x00100000 + WS_SYSMENU = 0x00080000 + WS_THICKFRAME = 0x00040000 + WS_GROUP = 0x00020000 + WS_TABSTOP = 0x00010000 + WS_MINIMIZEBOX = 0x00020000 + WS_MAXIMIZEBOX = 0x00010000 + WS_TILED = 0x00000000 + WS_ICONIC = 0x20000000 + WS_SIZEBOX = 0x00040000 + WS_OVERLAPPEDWINDOW = 0x00000000 | 0x00C00000 | 0x00080000 | 0x00040000 | 0x00020000 | 0x00010000 + WS_POPUPWINDOW = 0x80000000 | 0x00800000 | 0x00080000 + WS_CHILDWINDOW = 0x40000000 ) // Extended window style constants const ( - WS_EX_DLGMODALFRAME = 0X00000001 - WS_EX_NOPARENTNOTIFY = 0X00000004 - WS_EX_TOPMOST = 0X00000008 - WS_EX_ACCEPTFILES = 0X00000010 - WS_EX_TRANSPARENT = 0X00000020 - WS_EX_MDICHILD = 0X00000040 - WS_EX_TOOLWINDOW = 0X00000080 - WS_EX_WINDOWEDGE = 0X00000100 - WS_EX_CLIENTEDGE = 0X00000200 - WS_EX_CONTEXTHELP = 0X00000400 - WS_EX_RIGHT = 0X00001000 - WS_EX_LEFT = 0X00000000 - WS_EX_RTLREADING = 0X00002000 - WS_EX_LTRREADING = 0X00000000 - WS_EX_LEFTSCROLLBAR = 0X00004000 - WS_EX_RIGHTSCROLLBAR = 0X00000000 - WS_EX_CONTROLPARENT = 0X00010000 - WS_EX_STATICEDGE = 0X00020000 - WS_EX_APPWINDOW = 0X00040000 - WS_EX_OVERLAPPEDWINDOW = 0X00000100 | 0X00000200 - WS_EX_PALETTEWINDOW = 0X00000100 | 0X00000080 | 0X00000008 - WS_EX_LAYERED = 0X00080000 - WS_EX_NOINHERITLAYOUT = 0X00100000 - WS_EX_LAYOUTRTL = 0X00400000 - WS_EX_NOACTIVATE = 0X08000000 + WS_EX_DLGMODALFRAME = 0x00000001 + WS_EX_NOPARENTNOTIFY = 0x00000004 + WS_EX_TOPMOST = 0x00000008 + WS_EX_ACCEPTFILES = 0x00000010 + WS_EX_TRANSPARENT = 0x00000020 + WS_EX_MDICHILD = 0x00000040 + WS_EX_TOOLWINDOW = 0x00000080 + WS_EX_WINDOWEDGE = 0x00000100 + WS_EX_CLIENTEDGE = 0x00000200 + WS_EX_CONTEXTHELP = 0x00000400 + WS_EX_RIGHT = 0x00001000 + WS_EX_LEFT = 0x00000000 + WS_EX_RTLREADING = 0x00002000 + WS_EX_LTRREADING = 0x00000000 + WS_EX_LEFTSCROLLBAR = 0x00004000 + WS_EX_RIGHTSCROLLBAR = 0x00000000 + WS_EX_CONTROLPARENT = 0x00010000 + WS_EX_STATICEDGE = 0x00020000 + WS_EX_APPWINDOW = 0x00040000 + WS_EX_OVERLAPPEDWINDOW = 0x00000100 | 0x00000200 + WS_EX_PALETTEWINDOW = 0x00000100 | 0x00000080 | 0x00000008 + WS_EX_LAYERED = 0x00080000 + WS_EX_NOINHERITLAYOUT = 0x00100000 + WS_EX_LAYOUTRTL = 0x00400000 + WS_EX_NOACTIVATE = 0x08000000 ) // Window message constants @@ -372,7 +372,7 @@ const ( WM_INITDIALOG = 272 WM_INITMENU = 278 WM_INITMENUPOPUP = 279 - WM_INPUT = 0X00FF + WM_INPUT = 0x00FF WM_INPUTLANGCHANGE = 81 WM_INPUTLANGCHANGEREQUEST = 80 WM_KEYDOWN = 256 @@ -391,16 +391,16 @@ const ( WM_MDISETMENU = 560 WM_MDITILE = 550 WM_MEASUREITEM = 44 - WM_GETOBJECT = 0X003D - WM_CHANGEUISTATE = 0X0127 - WM_UPDATEUISTATE = 0X0128 - WM_QUERYUISTATE = 0X0129 - WM_UNINITMENUPOPUP = 0X0125 + WM_GETOBJECT = 0x003D + WM_CHANGEUISTATE = 0x0127 + WM_UPDATEUISTATE = 0x0128 + WM_QUERYUISTATE = 0x0129 + WM_UNINITMENUPOPUP = 0x0125 WM_MENURBUTTONUP = 290 - WM_MENUCOMMAND = 0X0126 - WM_MENUGETOBJECT = 0X0124 - WM_MENUDRAG = 0X0123 - WM_APPCOMMAND = 0X0319 + WM_MENUCOMMAND = 0x0126 + WM_MENUGETOBJECT = 0x0124 + WM_MENUDRAG = 0x0123 + WM_APPCOMMAND = 0x0319 WM_MENUCHAR = 288 WM_MENUSELECT = 287 WM_MOVE = 3 @@ -419,8 +419,8 @@ const ( WM_NCXBUTTONDOWN = 171 WM_NCXBUTTONUP = 172 WM_NCXBUTTONDBLCLK = 173 - WM_NCMOUSEHOVER = 0X02A0 - WM_NCMOUSELEAVE = 0X02A2 + WM_NCMOUSEHOVER = 0x02A0 + WM_NCMOUSELEAVE = 0x02A2 WM_NCMOUSEMOVE = 160 WM_NCPAINT = 133 WM_NCRBUTTONDBLCLK = 166 @@ -506,8 +506,8 @@ const ( WM_XBUTTONUP = 524 WM_XBUTTONDBLCLK = 525 WM_MOUSELAST = 525 - WM_MOUSEHOVER = 0X2A1 - WM_MOUSELEAVE = 0X2A3 + WM_MOUSEHOVER = 0x2A1 + WM_MOUSELEAVE = 0x2A3 WM_CLIPBOARDUPDATE = 0x031D ) diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_bsd.go b/vendor/github.com/sirupsen/logrus/terminal_check_bsd.go index 3c4f43f91..ff6ff7b99 100644 --- a/vendor/github.com/sirupsen/logrus/terminal_check_bsd.go +++ b/vendor/github.com/sirupsen/logrus/terminal_check_bsd.go @@ -10,4 +10,3 @@ func isTerminal(fd int) bool { _, err := unix.IoctlGetTermios(fd, ioctlReadTermios) return err == nil } - diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_unix.go b/vendor/github.com/sirupsen/logrus/terminal_check_unix.go index 355dc966f..163c468d5 100644 --- a/vendor/github.com/sirupsen/logrus/terminal_check_unix.go +++ b/vendor/github.com/sirupsen/logrus/terminal_check_unix.go @@ -10,4 +10,3 @@ func isTerminal(fd int) bool { _, err := unix.IoctlGetTermios(fd, ioctlReadTermios) return err == nil } - diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/client.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/client.go index a5078a567..6924ea46f 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/client.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/client.go @@ -15,1048 +15,1047 @@ package v20170312 import ( - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" + tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" ) const APIVersion = "2017-03-12" type Client struct { - common.Client + common.Client } // Deprecated func NewClientWithSecretId(secretId, secretKey, region string) (client *Client, err error) { - cpf := profile.NewClientProfile() - client = &Client{} - client.Init(region).WithSecretId(secretId, secretKey).WithProfile(cpf) - return + cpf := profile.NewClientProfile() + client = &Client{} + client.Init(region).WithSecretId(secretId, secretKey).WithProfile(cpf) + return } func NewClient(credential *common.Credential, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { - client = &Client{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return + client = &Client{} + client.Init(region). + WithCredential(credential). + WithProfile(clientProfile) + return } - func NewAllocateHostsRequest() (request *AllocateHostsRequest) { - request = &AllocateHostsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "AllocateHosts") - return + request = &AllocateHostsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "AllocateHosts") + return } func NewAllocateHostsResponse() (response *AllocateHostsResponse) { - response = &AllocateHostsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AllocateHostsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (AllocateHosts) 用于创建一个或多个指定配置的CDH实例。 // * 当HostChargeType为PREPAID时，必须指定HostChargePrepaid参数。 func (c *Client) AllocateHosts(request *AllocateHostsRequest) (response *AllocateHostsResponse, err error) { - if request == nil { - request = NewAllocateHostsRequest() - } - response = NewAllocateHostsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAllocateHostsRequest() + } + response = NewAllocateHostsResponse() + err = c.Send(request, response) + return } func NewAssociateInstancesKeyPairsRequest() (request *AssociateInstancesKeyPairsRequest) { - request = &AssociateInstancesKeyPairsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "AssociateInstancesKeyPairs") - return + request = &AssociateInstancesKeyPairsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "AssociateInstancesKeyPairs") + return } func NewAssociateInstancesKeyPairsResponse() (response *AssociateInstancesKeyPairsResponse) { - response = &AssociateInstancesKeyPairsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateInstancesKeyPairsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (AssociateInstancesKeyPairs) 用于将密钥绑定到实例上。 -// +// // * 将密钥的公钥写入到实例的`SSH`配置当中，用户就可以通过该密钥的私钥来登录实例。 // * 如果实例原来绑定过密钥，那么原来的密钥将失效。 // * 如果实例原来是通过密码登录，绑定密钥后无法使用密码登录。 // * 支持批量操作。每次请求批量实例的上限为100。如果批量实例存在不允许操作的实例，操作会以特定错误码返回。 func (c *Client) AssociateInstancesKeyPairs(request *AssociateInstancesKeyPairsRequest) (response *AssociateInstancesKeyPairsResponse, err error) { - if request == nil { - request = NewAssociateInstancesKeyPairsRequest() - } - response = NewAssociateInstancesKeyPairsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateInstancesKeyPairsRequest() + } + response = NewAssociateInstancesKeyPairsResponse() + err = c.Send(request, response) + return } func NewAssociateSecurityGroupsRequest() (request *AssociateSecurityGroupsRequest) { - request = &AssociateSecurityGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "AssociateSecurityGroups") - return + request = &AssociateSecurityGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "AssociateSecurityGroups") + return } func NewAssociateSecurityGroupsResponse() (response *AssociateSecurityGroupsResponse) { - response = &AssociateSecurityGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateSecurityGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (AssociateSecurityGroups) 用于绑定安全组到指定实例。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) AssociateSecurityGroups(request *AssociateSecurityGroupsRequest) (response *AssociateSecurityGroupsResponse, err error) { - if request == nil { - request = NewAssociateSecurityGroupsRequest() - } - response = NewAssociateSecurityGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateSecurityGroupsRequest() + } + response = NewAssociateSecurityGroupsResponse() + err = c.Send(request, response) + return } func NewCreateDisasterRecoverGroupRequest() (request *CreateDisasterRecoverGroupRequest) { - request = &CreateDisasterRecoverGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "CreateDisasterRecoverGroup") - return + request = &CreateDisasterRecoverGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "CreateDisasterRecoverGroup") + return } func NewCreateDisasterRecoverGroupResponse() (response *CreateDisasterRecoverGroupResponse) { - response = &CreateDisasterRecoverGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateDisasterRecoverGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (CreateDisasterRecoverGroup)用于创建[分散置放群组](https://cloud.tencent.com/document/product/213/15486)。创建好的置放群组，可在[创建实例](https://cloud.tencent.com/document/api/213/15730)时指定。 func (c *Client) CreateDisasterRecoverGroup(request *CreateDisasterRecoverGroupRequest) (response *CreateDisasterRecoverGroupResponse, err error) { - if request == nil { - request = NewCreateDisasterRecoverGroupRequest() - } - response = NewCreateDisasterRecoverGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateDisasterRecoverGroupRequest() + } + response = NewCreateDisasterRecoverGroupResponse() + err = c.Send(request, response) + return } func NewCreateImageRequest() (request *CreateImageRequest) { - request = &CreateImageRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "CreateImage") - return + request = &CreateImageRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "CreateImage") + return } func NewCreateImageResponse() (response *CreateImageResponse) { - response = &CreateImageResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateImageResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateImage)用于将实例的系统盘制作为新镜像，创建后的镜像可以用于创建实例。 func (c *Client) CreateImage(request *CreateImageRequest) (response *CreateImageResponse, err error) { - if request == nil { - request = NewCreateImageRequest() - } - response = NewCreateImageResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateImageRequest() + } + response = NewCreateImageResponse() + err = c.Send(request, response) + return } func NewCreateKeyPairRequest() (request *CreateKeyPairRequest) { - request = &CreateKeyPairRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "CreateKeyPair") - return + request = &CreateKeyPairRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "CreateKeyPair") + return } func NewCreateKeyPairResponse() (response *CreateKeyPairResponse) { - response = &CreateKeyPairResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateKeyPairResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (CreateKeyPair) 用于创建一个 `OpenSSH RSA` 密钥对，可以用于登录 `Linux` 实例。 -// +// // * 开发者只需指定密钥对名称，即可由系统自动创建密钥对，并返回所生成的密钥对的 `ID` 及其公钥、私钥的内容。 // * 密钥对名称不能和已经存在的密钥对的名称重复。 // * 私钥的内容可以保存到文件中作为 `SSH` 的一种认证方式。 // * 腾讯云不会保存用户的私钥，请妥善保管。 func (c *Client) CreateKeyPair(request *CreateKeyPairRequest) (response *CreateKeyPairResponse, err error) { - if request == nil { - request = NewCreateKeyPairRequest() - } - response = NewCreateKeyPairResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateKeyPairRequest() + } + response = NewCreateKeyPairResponse() + err = c.Send(request, response) + return } func NewDeleteDisasterRecoverGroupsRequest() (request *DeleteDisasterRecoverGroupsRequest) { - request = &DeleteDisasterRecoverGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DeleteDisasterRecoverGroups") - return + request = &DeleteDisasterRecoverGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DeleteDisasterRecoverGroups") + return } func NewDeleteDisasterRecoverGroupsResponse() (response *DeleteDisasterRecoverGroupsResponse) { - response = &DeleteDisasterRecoverGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteDisasterRecoverGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DeleteDisasterRecoverGroups)用于删除[分散置放群组](https://cloud.tencent.com/document/product/213/15486)。只有空的置放群组才能被删除，非空的群组需要先销毁组内所有云服务器，才能执行删除操作，不然会产生删除置放群组失败的错误。 func (c *Client) DeleteDisasterRecoverGroups(request *DeleteDisasterRecoverGroupsRequest) (response *DeleteDisasterRecoverGroupsResponse, err error) { - if request == nil { - request = NewDeleteDisasterRecoverGroupsRequest() - } - response = NewDeleteDisasterRecoverGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteDisasterRecoverGroupsRequest() + } + response = NewDeleteDisasterRecoverGroupsResponse() + err = c.Send(request, response) + return } func NewDeleteImagesRequest() (request *DeleteImagesRequest) { - request = &DeleteImagesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DeleteImages") - return + request = &DeleteImagesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DeleteImages") + return } func NewDeleteImagesResponse() (response *DeleteImagesResponse) { - response = &DeleteImagesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteImagesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteImages）用于删除一个或多个镜像。 -// +// // * 当[镜像状态](https://cloud.tencent.com/document/product/213/15753#Image)为`创建中`和`使用中`时, 不允许删除。镜像状态可以通过[DescribeImages](https://cloud.tencent.com/document/api/213/9418)获取。 // * 每个地域最多只支持创建10个自定义镜像，删除镜像可以释放账户的配额。 // * 当镜像正在被其它账户分享时，不允许删除。 func (c *Client) DeleteImages(request *DeleteImagesRequest) (response *DeleteImagesResponse, err error) { - if request == nil { - request = NewDeleteImagesRequest() - } - response = NewDeleteImagesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteImagesRequest() + } + response = NewDeleteImagesResponse() + err = c.Send(request, response) + return } func NewDeleteKeyPairsRequest() (request *DeleteKeyPairsRequest) { - request = &DeleteKeyPairsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DeleteKeyPairs") - return + request = &DeleteKeyPairsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DeleteKeyPairs") + return } func NewDeleteKeyPairsResponse() (response *DeleteKeyPairsResponse) { - response = &DeleteKeyPairsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteKeyPairsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DeleteKeyPairs) 用于删除已在腾讯云托管的密钥对。 -// +// // * 可以同时删除多个密钥对。 // * 不能删除已被实例或镜像引用的密钥对，所以需要独立判断是否所有密钥对都被成功删除。 func (c *Client) DeleteKeyPairs(request *DeleteKeyPairsRequest) (response *DeleteKeyPairsResponse, err error) { - if request == nil { - request = NewDeleteKeyPairsRequest() - } - response = NewDeleteKeyPairsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteKeyPairsRequest() + } + response = NewDeleteKeyPairsResponse() + err = c.Send(request, response) + return } func NewDescribeDisasterRecoverGroupQuotaRequest() (request *DescribeDisasterRecoverGroupQuotaRequest) { - request = &DescribeDisasterRecoverGroupQuotaRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeDisasterRecoverGroupQuota") - return + request = &DescribeDisasterRecoverGroupQuotaRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeDisasterRecoverGroupQuota") + return } func NewDescribeDisasterRecoverGroupQuotaResponse() (response *DescribeDisasterRecoverGroupQuotaResponse) { - response = &DescribeDisasterRecoverGroupQuotaResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeDisasterRecoverGroupQuotaResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeDisasterRecoverGroupQuota)用于查询[分散置放群组](https://cloud.tencent.com/document/product/213/15486)配额。 func (c *Client) DescribeDisasterRecoverGroupQuota(request *DescribeDisasterRecoverGroupQuotaRequest) (response *DescribeDisasterRecoverGroupQuotaResponse, err error) { - if request == nil { - request = NewDescribeDisasterRecoverGroupQuotaRequest() - } - response = NewDescribeDisasterRecoverGroupQuotaResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeDisasterRecoverGroupQuotaRequest() + } + response = NewDescribeDisasterRecoverGroupQuotaResponse() + err = c.Send(request, response) + return } func NewDescribeDisasterRecoverGroupsRequest() (request *DescribeDisasterRecoverGroupsRequest) { - request = &DescribeDisasterRecoverGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeDisasterRecoverGroups") - return + request = &DescribeDisasterRecoverGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeDisasterRecoverGroups") + return } func NewDescribeDisasterRecoverGroupsResponse() (response *DescribeDisasterRecoverGroupsResponse) { - response = &DescribeDisasterRecoverGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeDisasterRecoverGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeDisasterRecoverGroups)用于查询[分散置放群组](https://cloud.tencent.com/document/product/213/15486)信息。 func (c *Client) DescribeDisasterRecoverGroups(request *DescribeDisasterRecoverGroupsRequest) (response *DescribeDisasterRecoverGroupsResponse, err error) { - if request == nil { - request = NewDescribeDisasterRecoverGroupsRequest() - } - response = NewDescribeDisasterRecoverGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeDisasterRecoverGroupsRequest() + } + response = NewDescribeDisasterRecoverGroupsResponse() + err = c.Send(request, response) + return } func NewDescribeHostsRequest() (request *DescribeHostsRequest) { - request = &DescribeHostsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeHosts") - return + request = &DescribeHostsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeHosts") + return } func NewDescribeHostsResponse() (response *DescribeHostsResponse) { - response = &DescribeHostsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeHostsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeHosts) 用于获取一个或多个CDH实例的详细信息。 func (c *Client) DescribeHosts(request *DescribeHostsRequest) (response *DescribeHostsResponse, err error) { - if request == nil { - request = NewDescribeHostsRequest() - } - response = NewDescribeHostsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeHostsRequest() + } + response = NewDescribeHostsResponse() + err = c.Send(request, response) + return } func NewDescribeImageQuotaRequest() (request *DescribeImageQuotaRequest) { - request = &DescribeImageQuotaRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeImageQuota") - return + request = &DescribeImageQuotaRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeImageQuota") + return } func NewDescribeImageQuotaResponse() (response *DescribeImageQuotaResponse) { - response = &DescribeImageQuotaResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeImageQuotaResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeImageQuota)用于查询用户帐号的镜像配额。 func (c *Client) DescribeImageQuota(request *DescribeImageQuotaRequest) (response *DescribeImageQuotaResponse, err error) { - if request == nil { - request = NewDescribeImageQuotaRequest() - } - response = NewDescribeImageQuotaResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeImageQuotaRequest() + } + response = NewDescribeImageQuotaResponse() + err = c.Send(request, response) + return } func NewDescribeImageSharePermissionRequest() (request *DescribeImageSharePermissionRequest) { - request = &DescribeImageSharePermissionRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeImageSharePermission") - return + request = &DescribeImageSharePermissionRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeImageSharePermission") + return } func NewDescribeImageSharePermissionResponse() (response *DescribeImageSharePermissionResponse) { - response = &DescribeImageSharePermissionResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeImageSharePermissionResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeImageSharePermission）用于查询镜像分享信息。 func (c *Client) DescribeImageSharePermission(request *DescribeImageSharePermissionRequest) (response *DescribeImageSharePermissionResponse, err error) { - if request == nil { - request = NewDescribeImageSharePermissionRequest() - } - response = NewDescribeImageSharePermissionResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeImageSharePermissionRequest() + } + response = NewDescribeImageSharePermissionResponse() + err = c.Send(request, response) + return } func NewDescribeImagesRequest() (request *DescribeImagesRequest) { - request = &DescribeImagesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeImages") - return + request = &DescribeImagesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeImages") + return } func NewDescribeImagesResponse() (response *DescribeImagesResponse) { - response = &DescribeImagesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeImagesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeImages) 用于查看镜像列表。 -// +// // * 可以通过指定镜像ID来查询指定镜像的详细信息，或通过设定过滤器来查询满足过滤条件的镜像的详细信息。 // * 指定偏移(Offset)和限制(Limit)来选择结果中的一部分，默认返回满足条件的前20个镜像信息。 func (c *Client) DescribeImages(request *DescribeImagesRequest) (response *DescribeImagesResponse, err error) { - if request == nil { - request = NewDescribeImagesRequest() - } - response = NewDescribeImagesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeImagesRequest() + } + response = NewDescribeImagesResponse() + err = c.Send(request, response) + return } func NewDescribeImportImageOsRequest() (request *DescribeImportImageOsRequest) { - request = &DescribeImportImageOsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeImportImageOs") - return + request = &DescribeImportImageOsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeImportImageOs") + return } func NewDescribeImportImageOsResponse() (response *DescribeImportImageOsResponse) { - response = &DescribeImportImageOsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeImportImageOsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 查看可以导入的镜像操作系统信息。 func (c *Client) DescribeImportImageOs(request *DescribeImportImageOsRequest) (response *DescribeImportImageOsResponse, err error) { - if request == nil { - request = NewDescribeImportImageOsRequest() - } - response = NewDescribeImportImageOsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeImportImageOsRequest() + } + response = NewDescribeImportImageOsResponse() + err = c.Send(request, response) + return } func NewDescribeInstanceFamilyConfigsRequest() (request *DescribeInstanceFamilyConfigsRequest) { - request = &DescribeInstanceFamilyConfigsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceFamilyConfigs") - return + request = &DescribeInstanceFamilyConfigsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceFamilyConfigs") + return } func NewDescribeInstanceFamilyConfigsResponse() (response *DescribeInstanceFamilyConfigsResponse) { - response = &DescribeInstanceFamilyConfigsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstanceFamilyConfigsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeInstanceFamilyConfigs）查询当前用户和地域所支持的机型族列表信息。 func (c *Client) DescribeInstanceFamilyConfigs(request *DescribeInstanceFamilyConfigsRequest) (response *DescribeInstanceFamilyConfigsResponse, err error) { - if request == nil { - request = NewDescribeInstanceFamilyConfigsRequest() - } - response = NewDescribeInstanceFamilyConfigsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstanceFamilyConfigsRequest() + } + response = NewDescribeInstanceFamilyConfigsResponse() + err = c.Send(request, response) + return } func NewDescribeInstanceInternetBandwidthConfigsRequest() (request *DescribeInstanceInternetBandwidthConfigsRequest) { - request = &DescribeInstanceInternetBandwidthConfigsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceInternetBandwidthConfigs") - return + request = &DescribeInstanceInternetBandwidthConfigsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceInternetBandwidthConfigs") + return } func NewDescribeInstanceInternetBandwidthConfigsResponse() (response *DescribeInstanceInternetBandwidthConfigsResponse) { - response = &DescribeInstanceInternetBandwidthConfigsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstanceInternetBandwidthConfigsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeInstanceInternetBandwidthConfigs) 用于查询实例带宽配置。 -// +// // * 只支持查询`BANDWIDTH_PREPAID`（ 预付费按带宽结算 ）计费模式的带宽配置。 // * 接口返回实例的所有带宽配置信息（包含历史的带宽配置信息）。 func (c *Client) DescribeInstanceInternetBandwidthConfigs(request *DescribeInstanceInternetBandwidthConfigsRequest) (response *DescribeInstanceInternetBandwidthConfigsResponse, err error) { - if request == nil { - request = NewDescribeInstanceInternetBandwidthConfigsRequest() - } - response = NewDescribeInstanceInternetBandwidthConfigsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstanceInternetBandwidthConfigsRequest() + } + response = NewDescribeInstanceInternetBandwidthConfigsResponse() + err = c.Send(request, response) + return } func NewDescribeInstanceTypeConfigsRequest() (request *DescribeInstanceTypeConfigsRequest) { - request = &DescribeInstanceTypeConfigsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceTypeConfigs") - return + request = &DescribeInstanceTypeConfigsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceTypeConfigs") + return } func NewDescribeInstanceTypeConfigsResponse() (response *DescribeInstanceTypeConfigsResponse) { - response = &DescribeInstanceTypeConfigsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstanceTypeConfigsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeInstanceTypeConfigs) 用于查询实例机型配置。 -// +// // * 可以根据`zone`、`instance-family`来查询实例机型配置。过滤条件详见过滤器[`Filter`](https://cloud.tencent.com/document/api/213/15753#Filter)。 // * 如果参数为空，返回指定地域的所有实例机型配置。 func (c *Client) DescribeInstanceTypeConfigs(request *DescribeInstanceTypeConfigsRequest) (response *DescribeInstanceTypeConfigsResponse, err error) { - if request == nil { - request = NewDescribeInstanceTypeConfigsRequest() - } - response = NewDescribeInstanceTypeConfigsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstanceTypeConfigsRequest() + } + response = NewDescribeInstanceTypeConfigsResponse() + err = c.Send(request, response) + return } func NewDescribeInstanceVncUrlRequest() (request *DescribeInstanceVncUrlRequest) { - request = &DescribeInstanceVncUrlRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceVncUrl") - return + request = &DescribeInstanceVncUrlRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceVncUrl") + return } func NewDescribeInstanceVncUrlResponse() (response *DescribeInstanceVncUrlResponse) { - response = &DescribeInstanceVncUrlResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstanceVncUrlResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 ( DescribeInstanceVncUrl ) 用于查询实例管理终端地址，获取的地址可用于实例的 VNC 登录。 -// +// // * 处于 `STOPPED` 状态的机器无法使用此功能。 // * 管理终端地址的有效期为 15 秒，调用接口成功后如果 15 秒内不使用该链接进行访问，管理终端地址自动失效，您需要重新查询。 // * 管理终端地址一旦被访问，将自动失效，您需要重新查询。 // * 如果连接断开，每分钟内重新连接的次数不能超过 30 次。 // * 获取到 `InstanceVncUrl` 后，您需要在链接 末尾加上参数 `InstanceVncUrl=xxxx` 。 -// +// // - 参数 `InstanceVncUrl` ：调用接口成功后会返回的 `InstanceVncUrl` 的值。 -// +// // 最后组成的 URL 格式如下： -// +// // ``` // https://img.qcloud.com/qcloud/app/active_vnc/index.html?InstanceVncUrl=wss%3A%2F%2Fbjvnc.qcloud.com%3A26789%2Fvnc%3Fs%3DaHpjWnRVMFNhYmxKdDM5MjRHNlVTSVQwajNUSW0wb2tBbmFtREFCTmFrcy8vUUNPMG0wSHZNOUUxRm5PMmUzWmFDcWlOdDJIbUJxSTZDL0RXcHZxYnZZMmRkWWZWcEZia2lyb09XMzdKNmM9 // ``` func (c *Client) DescribeInstanceVncUrl(request *DescribeInstanceVncUrlRequest) (response *DescribeInstanceVncUrlResponse, err error) { - if request == nil { - request = NewDescribeInstanceVncUrlRequest() - } - response = NewDescribeInstanceVncUrlResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstanceVncUrlRequest() + } + response = NewDescribeInstanceVncUrlResponse() + err = c.Send(request, response) + return } func NewDescribeInstancesRequest() (request *DescribeInstancesRequest) { - request = &DescribeInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstances") - return + request = &DescribeInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstances") + return } func NewDescribeInstancesResponse() (response *DescribeInstancesResponse) { - response = &DescribeInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeInstances) 用于查询一个或多个实例的详细信息。 -// +// // * 可以根据实例`ID`、实例名称或者实例计费模式等信息来查询实例的详细信息。过滤信息详细请见过滤器`Filter`。 // * 如果参数为空，返回当前用户一定数量（`Limit`所指定的数量，默认为20）的实例。 // * 支持查询实例的最新操作（LatestOperation）以及最新操作状态(LatestOperationState)。 func (c *Client) DescribeInstances(request *DescribeInstancesRequest) (response *DescribeInstancesResponse, err error) { - if request == nil { - request = NewDescribeInstancesRequest() - } - response = NewDescribeInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstancesRequest() + } + response = NewDescribeInstancesResponse() + err = c.Send(request, response) + return } func NewDescribeInstancesOperationLimitRequest() (request *DescribeInstancesOperationLimitRequest) { - request = &DescribeInstancesOperationLimitRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstancesOperationLimit") - return + request = &DescribeInstancesOperationLimitRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstancesOperationLimit") + return } func NewDescribeInstancesOperationLimitResponse() (response *DescribeInstancesOperationLimitResponse) { - response = &DescribeInstancesOperationLimitResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstancesOperationLimitResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeInstancesOperationLimit）用于查询实例操作限制。 -// +// // * 目前支持调整配置操作限制次数查询。 func (c *Client) DescribeInstancesOperationLimit(request *DescribeInstancesOperationLimitRequest) (response *DescribeInstancesOperationLimitResponse, err error) { - if request == nil { - request = NewDescribeInstancesOperationLimitRequest() - } - response = NewDescribeInstancesOperationLimitResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstancesOperationLimitRequest() + } + response = NewDescribeInstancesOperationLimitResponse() + err = c.Send(request, response) + return } func NewDescribeInstancesStatusRequest() (request *DescribeInstancesStatusRequest) { - request = &DescribeInstancesStatusRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstancesStatus") - return + request = &DescribeInstancesStatusRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstancesStatus") + return } func NewDescribeInstancesStatusResponse() (response *DescribeInstancesStatusResponse) { - response = &DescribeInstancesStatusResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstancesStatusResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeInstancesStatus) 用于查询一个或多个实例的状态。 -// +// // * 可以根据实例`ID`来查询实例的状态。 // * 如果参数为空，返回当前用户一定数量（Limit所指定的数量，默认为20）的实例状态。 func (c *Client) DescribeInstancesStatus(request *DescribeInstancesStatusRequest) (response *DescribeInstancesStatusResponse, err error) { - if request == nil { - request = NewDescribeInstancesStatusRequest() - } - response = NewDescribeInstancesStatusResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstancesStatusRequest() + } + response = NewDescribeInstancesStatusResponse() + err = c.Send(request, response) + return } func NewDescribeInternetChargeTypeConfigsRequest() (request *DescribeInternetChargeTypeConfigsRequest) { - request = &DescribeInternetChargeTypeConfigsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInternetChargeTypeConfigs") - return + request = &DescribeInternetChargeTypeConfigsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInternetChargeTypeConfigs") + return } func NewDescribeInternetChargeTypeConfigsResponse() (response *DescribeInternetChargeTypeConfigsResponse) { - response = &DescribeInternetChargeTypeConfigsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInternetChargeTypeConfigsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeInternetChargeTypeConfigs）用于查询网络的计费类型。 func (c *Client) DescribeInternetChargeTypeConfigs(request *DescribeInternetChargeTypeConfigsRequest) (response *DescribeInternetChargeTypeConfigsResponse, err error) { - if request == nil { - request = NewDescribeInternetChargeTypeConfigsRequest() - } - response = NewDescribeInternetChargeTypeConfigsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInternetChargeTypeConfigsRequest() + } + response = NewDescribeInternetChargeTypeConfigsResponse() + err = c.Send(request, response) + return } func NewDescribeKeyPairsRequest() (request *DescribeKeyPairsRequest) { - request = &DescribeKeyPairsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeKeyPairs") - return + request = &DescribeKeyPairsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeKeyPairs") + return } func NewDescribeKeyPairsResponse() (response *DescribeKeyPairsResponse) { - response = &DescribeKeyPairsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeKeyPairsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeKeyPairs) 用于查询密钥对信息。 -// +// // * 密钥对是通过一种算法生成的一对密钥，在生成的密钥对中，一个向外界公开，称为公钥；另一个用户自己保留，称为私钥。密钥对的公钥内容可以通过这个接口查询，但私钥内容系统不保留。 func (c *Client) DescribeKeyPairs(request *DescribeKeyPairsRequest) (response *DescribeKeyPairsResponse, err error) { - if request == nil { - request = NewDescribeKeyPairsRequest() - } - response = NewDescribeKeyPairsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeKeyPairsRequest() + } + response = NewDescribeKeyPairsResponse() + err = c.Send(request, response) + return } func NewDescribeRegionsRequest() (request *DescribeRegionsRequest) { - request = &DescribeRegionsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeRegions") - return + request = &DescribeRegionsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeRegions") + return } func NewDescribeRegionsResponse() (response *DescribeRegionsResponse) { - response = &DescribeRegionsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeRegionsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeRegions)用于查询地域信息。 func (c *Client) DescribeRegions(request *DescribeRegionsRequest) (response *DescribeRegionsResponse, err error) { - if request == nil { - request = NewDescribeRegionsRequest() - } - response = NewDescribeRegionsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeRegionsRequest() + } + response = NewDescribeRegionsResponse() + err = c.Send(request, response) + return } func NewDescribeReservedInstancesRequest() (request *DescribeReservedInstancesRequest) { - request = &DescribeReservedInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeReservedInstances") - return + request = &DescribeReservedInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeReservedInstances") + return } func NewDescribeReservedInstancesResponse() (response *DescribeReservedInstancesResponse) { - response = &DescribeReservedInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeReservedInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeReservedInstances)可提供列出用户已购买的预留实例 func (c *Client) DescribeReservedInstances(request *DescribeReservedInstancesRequest) (response *DescribeReservedInstancesResponse, err error) { - if request == nil { - request = NewDescribeReservedInstancesRequest() - } - response = NewDescribeReservedInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeReservedInstancesRequest() + } + response = NewDescribeReservedInstancesResponse() + err = c.Send(request, response) + return } func NewDescribeReservedInstancesOfferingsRequest() (request *DescribeReservedInstancesOfferingsRequest) { - request = &DescribeReservedInstancesOfferingsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeReservedInstancesOfferings") - return + request = &DescribeReservedInstancesOfferingsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeReservedInstancesOfferings") + return } func NewDescribeReservedInstancesOfferingsResponse() (response *DescribeReservedInstancesOfferingsResponse) { - response = &DescribeReservedInstancesOfferingsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeReservedInstancesOfferingsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeReservedInstancesOfferings)供用户列出可购买的预留实例配置 func (c *Client) DescribeReservedInstancesOfferings(request *DescribeReservedInstancesOfferingsRequest) (response *DescribeReservedInstancesOfferingsResponse, err error) { - if request == nil { - request = NewDescribeReservedInstancesOfferingsRequest() - } - response = NewDescribeReservedInstancesOfferingsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeReservedInstancesOfferingsRequest() + } + response = NewDescribeReservedInstancesOfferingsResponse() + err = c.Send(request, response) + return } func NewDescribeZoneInstanceConfigInfosRequest() (request *DescribeZoneInstanceConfigInfosRequest) { - request = &DescribeZoneInstanceConfigInfosRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeZoneInstanceConfigInfos") - return + request = &DescribeZoneInstanceConfigInfosRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeZoneInstanceConfigInfos") + return } func NewDescribeZoneInstanceConfigInfosResponse() (response *DescribeZoneInstanceConfigInfosResponse) { - response = &DescribeZoneInstanceConfigInfosResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeZoneInstanceConfigInfosResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeZoneInstanceConfigInfos) 获取可用区的机型信息。 func (c *Client) DescribeZoneInstanceConfigInfos(request *DescribeZoneInstanceConfigInfosRequest) (response *DescribeZoneInstanceConfigInfosResponse, err error) { - if request == nil { - request = NewDescribeZoneInstanceConfigInfosRequest() - } - response = NewDescribeZoneInstanceConfigInfosResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeZoneInstanceConfigInfosRequest() + } + response = NewDescribeZoneInstanceConfigInfosResponse() + err = c.Send(request, response) + return } func NewDescribeZonesRequest() (request *DescribeZonesRequest) { - request = &DescribeZonesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeZones") - return + request = &DescribeZonesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeZones") + return } func NewDescribeZonesResponse() (response *DescribeZonesResponse) { - response = &DescribeZonesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeZonesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeZones)用于查询可用区信息。 func (c *Client) DescribeZones(request *DescribeZonesRequest) (response *DescribeZonesResponse, err error) { - if request == nil { - request = NewDescribeZonesRequest() - } - response = NewDescribeZonesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeZonesRequest() + } + response = NewDescribeZonesResponse() + err = c.Send(request, response) + return } func NewDisassociateInstancesKeyPairsRequest() (request *DisassociateInstancesKeyPairsRequest) { - request = &DisassociateInstancesKeyPairsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DisassociateInstancesKeyPairs") - return + request = &DisassociateInstancesKeyPairsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DisassociateInstancesKeyPairs") + return } func NewDisassociateInstancesKeyPairsResponse() (response *DisassociateInstancesKeyPairsResponse) { - response = &DisassociateInstancesKeyPairsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateInstancesKeyPairsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DisassociateInstancesKeyPairs) 用于解除实例的密钥绑定关系。 -// +// // * 只支持[`STOPPED`](https://cloud.tencent.com/document/product/213/15753#InstanceStatus)状态的`Linux`操作系统的实例。 // * 解绑密钥后，实例可以通过原来设置的密码登录。 // * 如果原来没有设置密码，解绑后将无法使用 `SSH` 登录。可以调用 [ResetInstancesPassword](https://cloud.tencent.com/document/api/213/15736) 接口来设置登录密码。 // * 支持批量操作。每次请求批量实例的上限为100。如果批量实例存在不允许操作的实例，操作会以特定错误码返回。 func (c *Client) DisassociateInstancesKeyPairs(request *DisassociateInstancesKeyPairsRequest) (response *DisassociateInstancesKeyPairsResponse, err error) { - if request == nil { - request = NewDisassociateInstancesKeyPairsRequest() - } - response = NewDisassociateInstancesKeyPairsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateInstancesKeyPairsRequest() + } + response = NewDisassociateInstancesKeyPairsResponse() + err = c.Send(request, response) + return } func NewDisassociateSecurityGroupsRequest() (request *DisassociateSecurityGroupsRequest) { - request = &DisassociateSecurityGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DisassociateSecurityGroups") - return + request = &DisassociateSecurityGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DisassociateSecurityGroups") + return } func NewDisassociateSecurityGroupsResponse() (response *DisassociateSecurityGroupsResponse) { - response = &DisassociateSecurityGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateSecurityGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DisassociateSecurityGroups) 用于解绑实例的指定安全组。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) DisassociateSecurityGroups(request *DisassociateSecurityGroupsRequest) (response *DisassociateSecurityGroupsResponse, err error) { - if request == nil { - request = NewDisassociateSecurityGroupsRequest() - } - response = NewDisassociateSecurityGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateSecurityGroupsRequest() + } + response = NewDisassociateSecurityGroupsResponse() + err = c.Send(request, response) + return } func NewImportImageRequest() (request *ImportImageRequest) { - request = &ImportImageRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ImportImage") - return + request = &ImportImageRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ImportImage") + return } func NewImportImageResponse() (response *ImportImageResponse) { - response = &ImportImageResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ImportImageResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } -// 本接口(ImportImage)用于导入镜像，导入后的镜像可用于创建实例。 +// 本接口(ImportImage)用于导入镜像，导入后的镜像可用于创建实例。 func (c *Client) ImportImage(request *ImportImageRequest) (response *ImportImageResponse, err error) { - if request == nil { - request = NewImportImageRequest() - } - response = NewImportImageResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewImportImageRequest() + } + response = NewImportImageResponse() + err = c.Send(request, response) + return } func NewImportKeyPairRequest() (request *ImportKeyPairRequest) { - request = &ImportKeyPairRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ImportKeyPair") - return + request = &ImportKeyPairRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ImportKeyPair") + return } func NewImportKeyPairResponse() (response *ImportKeyPairResponse) { - response = &ImportKeyPairResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ImportKeyPairResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ImportKeyPair) 用于导入密钥对。 -// +// // * 本接口的功能是将密钥对导入到用户账户，并不会自动绑定到实例。如需绑定可以使用[AssociasteInstancesKeyPair](https://cloud.tencent.com/document/api/213/9404)接口。 // * 需指定密钥对名称以及该密钥对的公钥文本。 // * 如果用户只有私钥，可以通过 `SSL` 工具将私钥转换成公钥后再导入。 func (c *Client) ImportKeyPair(request *ImportKeyPairRequest) (response *ImportKeyPairResponse, err error) { - if request == nil { - request = NewImportKeyPairRequest() - } - response = NewImportKeyPairResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewImportKeyPairRequest() + } + response = NewImportKeyPairResponse() + err = c.Send(request, response) + return } func NewInquiryPriceModifyInstancesChargeTypeRequest() (request *InquiryPriceModifyInstancesChargeTypeRequest) { - request = &InquiryPriceModifyInstancesChargeTypeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceModifyInstancesChargeType") - return + request = &InquiryPriceModifyInstancesChargeTypeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceModifyInstancesChargeType") + return } func NewInquiryPriceModifyInstancesChargeTypeResponse() (response *InquiryPriceModifyInstancesChargeTypeResponse) { - response = &InquiryPriceModifyInstancesChargeTypeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceModifyInstancesChargeTypeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (InquiryPriceModifyInstancesChargeType) 用于切换实例的计费模式询价。 -// +// // * 只支持从 `POSTPAID_BY_HOUR` 计费模式切换为`PREPAID`计费模式。 // * 关机不收费的实例、`BC1`和`BS1`机型族的实例、设置定时销毁的实例、竞价实例不支持该操作。 func (c *Client) InquiryPriceModifyInstancesChargeType(request *InquiryPriceModifyInstancesChargeTypeRequest) (response *InquiryPriceModifyInstancesChargeTypeResponse, err error) { - if request == nil { - request = NewInquiryPriceModifyInstancesChargeTypeRequest() - } - response = NewInquiryPriceModifyInstancesChargeTypeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceModifyInstancesChargeTypeRequest() + } + response = NewInquiryPriceModifyInstancesChargeTypeResponse() + err = c.Send(request, response) + return } func NewInquiryPriceRenewInstancesRequest() (request *InquiryPriceRenewInstancesRequest) { - request = &InquiryPriceRenewInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceRenewInstances") - return + request = &InquiryPriceRenewInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceRenewInstances") + return } func NewInquiryPriceRenewInstancesResponse() (response *InquiryPriceRenewInstancesResponse) { - response = &InquiryPriceRenewInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceRenewInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (InquiryPriceRenewInstances) 用于续费包年包月实例询价。 -// +// // * 只支持查询包年包月实例的续费价格。 func (c *Client) InquiryPriceRenewInstances(request *InquiryPriceRenewInstancesRequest) (response *InquiryPriceRenewInstancesResponse, err error) { - if request == nil { - request = NewInquiryPriceRenewInstancesRequest() - } - response = NewInquiryPriceRenewInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceRenewInstancesRequest() + } + response = NewInquiryPriceRenewInstancesResponse() + err = c.Send(request, response) + return } func NewInquiryPriceResetInstanceRequest() (request *InquiryPriceResetInstanceRequest) { - request = &InquiryPriceResetInstanceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResetInstance") - return + request = &InquiryPriceResetInstanceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResetInstance") + return } func NewInquiryPriceResetInstanceResponse() (response *InquiryPriceResetInstanceResponse) { - response = &InquiryPriceResetInstanceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceResetInstanceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (InquiryPriceResetInstance) 用于重装实例询价。 -// +// // * 如果指定了`ImageId`参数，则使用指定的镜像进行重装询价；否则按照当前实例使用的镜像进行重装询价。 // * 目前只支持[系统盘类型](https://cloud.tencent.com/document/api/213/15753#SystemDisk)是`CLOUD_BASIC`、`CLOUD_PREMIUM`、`CLOUD_SSD`类型的实例使用该接口实现`Linux`和`Windows`操作系统切换的重装询价。 // * 目前不支持境外地域的实例使用该接口实现`Linux`和`Windows`操作系统切换的重装询价。 func (c *Client) InquiryPriceResetInstance(request *InquiryPriceResetInstanceRequest) (response *InquiryPriceResetInstanceResponse, err error) { - if request == nil { - request = NewInquiryPriceResetInstanceRequest() - } - response = NewInquiryPriceResetInstanceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceResetInstanceRequest() + } + response = NewInquiryPriceResetInstanceResponse() + err = c.Send(request, response) + return } func NewInquiryPriceResetInstancesInternetMaxBandwidthRequest() (request *InquiryPriceResetInstancesInternetMaxBandwidthRequest) { - request = &InquiryPriceResetInstancesInternetMaxBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResetInstancesInternetMaxBandwidth") - return + request = &InquiryPriceResetInstancesInternetMaxBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResetInstancesInternetMaxBandwidth") + return } func NewInquiryPriceResetInstancesInternetMaxBandwidthResponse() (response *InquiryPriceResetInstancesInternetMaxBandwidthResponse) { - response = &InquiryPriceResetInstancesInternetMaxBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceResetInstancesInternetMaxBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (InquiryPriceResetInstancesInternetMaxBandwidth) 用于调整实例公网带宽上限询价。 -// +// // * 不同机型带宽上限范围不一致，具体限制详见[公网带宽上限](https://cloud.tencent.com/document/product/213/12523)。 // * 对于`BANDWIDTH_PREPAID`计费方式的带宽，目前不支持调小带宽，且需要输入参数`StartTime`和`EndTime`，指定调整后的带宽的生效时间段。在这种场景下会涉及扣费，请确保账户余额充足。可通过[`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253)接口查询账户余额。 // * 对于 `TRAFFIC_POSTPAID_BY_HOUR`、 `BANDWIDTH_POSTPAID_BY_HOUR` 和 `BANDWIDTH_PACKAGE` 计费方式的带宽，使用该接口调整带宽上限是实时生效的，可以在带宽允许的范围内调大或者调小带宽，不支持输入参数 `StartTime` 和 `EndTime` 。 @@ -1064,335 +1063,335 @@ func NewInquiryPriceResetInstancesInternetMaxBandwidthResponse() (response *Inqu // * 接口不支持批量调整 `BANDWIDTH_PREPAID` 和 `BANDWIDTH_POSTPAID_BY_HOUR` 计费方式的带宽。 // * 接口不支持批量调整混合计费方式的带宽。例如不支持同时调整`TRAFFIC_POSTPAID_BY_HOUR`和`BANDWIDTH_PACKAGE`计费方式的带宽。 func (c *Client) InquiryPriceResetInstancesInternetMaxBandwidth(request *InquiryPriceResetInstancesInternetMaxBandwidthRequest) (response *InquiryPriceResetInstancesInternetMaxBandwidthResponse, err error) { - if request == nil { - request = NewInquiryPriceResetInstancesInternetMaxBandwidthRequest() - } - response = NewInquiryPriceResetInstancesInternetMaxBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceResetInstancesInternetMaxBandwidthRequest() + } + response = NewInquiryPriceResetInstancesInternetMaxBandwidthResponse() + err = c.Send(request, response) + return } func NewInquiryPriceResetInstancesTypeRequest() (request *InquiryPriceResetInstancesTypeRequest) { - request = &InquiryPriceResetInstancesTypeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResetInstancesType") - return + request = &InquiryPriceResetInstancesTypeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResetInstancesType") + return } func NewInquiryPriceResetInstancesTypeResponse() (response *InquiryPriceResetInstancesTypeResponse) { - response = &InquiryPriceResetInstancesTypeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceResetInstancesTypeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (InquiryPriceResetInstancesType) 用于调整实例的机型询价。 -// +// // * 目前只支持[系统盘类型](https://cloud.tencent.com/document/product/213/15753#SystemDisk)是`CLOUD_BASIC`、`CLOUD_PREMIUM`、`CLOUD_SSD`类型的实例使用该接口进行调整机型询价。 // * 目前不支持[CDH](https://cloud.tencent.com/document/product/416)实例使用该接口调整机型询价。 // * 对于包年包月实例，使用该接口会涉及扣费，请确保账户余额充足。可通过[`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253)接口查询账户余额。 func (c *Client) InquiryPriceResetInstancesType(request *InquiryPriceResetInstancesTypeRequest) (response *InquiryPriceResetInstancesTypeResponse, err error) { - if request == nil { - request = NewInquiryPriceResetInstancesTypeRequest() - } - response = NewInquiryPriceResetInstancesTypeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceResetInstancesTypeRequest() + } + response = NewInquiryPriceResetInstancesTypeResponse() + err = c.Send(request, response) + return } func NewInquiryPriceResizeInstanceDisksRequest() (request *InquiryPriceResizeInstanceDisksRequest) { - request = &InquiryPriceResizeInstanceDisksRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResizeInstanceDisks") - return + request = &InquiryPriceResizeInstanceDisksRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResizeInstanceDisks") + return } func NewInquiryPriceResizeInstanceDisksResponse() (response *InquiryPriceResizeInstanceDisksResponse) { - response = &InquiryPriceResizeInstanceDisksResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceResizeInstanceDisksResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (InquiryPriceResizeInstanceDisks) 用于扩容实例的数据盘询价。 -// +// // * 目前只支持扩容非弹性数据盘（[`DescribeDisks`](https://cloud.tencent.com/document/api/362/16315)接口返回值中的`Portable`为`false`表示非弹性）询价，且[数据盘类型](https://cloud.tencent.com/document/product/213/15753#DataDisk)为：`CLOUD_BASIC`、`CLOUD_PREMIUM`、`CLOUD_SSD`。 // * 目前不支持[CDH](https://cloud.tencent.com/document/product/416)实例使用该接口扩容数据盘询价。* 仅支持包年包月实例随机器购买的数据盘。* 目前只支持扩容一块数据盘询价。 func (c *Client) InquiryPriceResizeInstanceDisks(request *InquiryPriceResizeInstanceDisksRequest) (response *InquiryPriceResizeInstanceDisksResponse, err error) { - if request == nil { - request = NewInquiryPriceResizeInstanceDisksRequest() - } - response = NewInquiryPriceResizeInstanceDisksResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceResizeInstanceDisksRequest() + } + response = NewInquiryPriceResizeInstanceDisksResponse() + err = c.Send(request, response) + return } func NewInquiryPriceRunInstancesRequest() (request *InquiryPriceRunInstancesRequest) { - request = &InquiryPriceRunInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceRunInstances") - return + request = &InquiryPriceRunInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceRunInstances") + return } func NewInquiryPriceRunInstancesResponse() (response *InquiryPriceRunInstancesResponse) { - response = &InquiryPriceRunInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceRunInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(InquiryPriceRunInstances)用于创建实例询价。本接口仅允许针对购买限制范围内的实例配置进行询价, 详见：[创建实例](https://cloud.tencent.com/document/api/213/15730)。 func (c *Client) InquiryPriceRunInstances(request *InquiryPriceRunInstancesRequest) (response *InquiryPriceRunInstancesResponse, err error) { - if request == nil { - request = NewInquiryPriceRunInstancesRequest() - } - response = NewInquiryPriceRunInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceRunInstancesRequest() + } + response = NewInquiryPriceRunInstancesResponse() + err = c.Send(request, response) + return } func NewModifyDisasterRecoverGroupAttributeRequest() (request *ModifyDisasterRecoverGroupAttributeRequest) { - request = &ModifyDisasterRecoverGroupAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyDisasterRecoverGroupAttribute") - return + request = &ModifyDisasterRecoverGroupAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyDisasterRecoverGroupAttribute") + return } func NewModifyDisasterRecoverGroupAttributeResponse() (response *ModifyDisasterRecoverGroupAttributeResponse) { - response = &ModifyDisasterRecoverGroupAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyDisasterRecoverGroupAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyDisasterRecoverGroupAttribute)用于修改[分散置放群组](https://cloud.tencent.com/document/product/213/15486)属性。 func (c *Client) ModifyDisasterRecoverGroupAttribute(request *ModifyDisasterRecoverGroupAttributeRequest) (response *ModifyDisasterRecoverGroupAttributeResponse, err error) { - if request == nil { - request = NewModifyDisasterRecoverGroupAttributeRequest() - } - response = NewModifyDisasterRecoverGroupAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyDisasterRecoverGroupAttributeRequest() + } + response = NewModifyDisasterRecoverGroupAttributeResponse() + err = c.Send(request, response) + return } func NewModifyHostsAttributeRequest() (request *ModifyHostsAttributeRequest) { - request = &ModifyHostsAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyHostsAttribute") - return + request = &ModifyHostsAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyHostsAttribute") + return } func NewModifyHostsAttributeResponse() (response *ModifyHostsAttributeResponse) { - response = &ModifyHostsAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyHostsAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyHostsAttribute）用于修改CDH实例的属性，如实例名称和续费标记等。参数HostName和RenewFlag必须设置其中一个，但不能同时设置。 func (c *Client) ModifyHostsAttribute(request *ModifyHostsAttributeRequest) (response *ModifyHostsAttributeResponse, err error) { - if request == nil { - request = NewModifyHostsAttributeRequest() - } - response = NewModifyHostsAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyHostsAttributeRequest() + } + response = NewModifyHostsAttributeResponse() + err = c.Send(request, response) + return } func NewModifyImageAttributeRequest() (request *ModifyImageAttributeRequest) { - request = &ModifyImageAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyImageAttribute") - return + request = &ModifyImageAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyImageAttribute") + return } func NewModifyImageAttributeResponse() (response *ModifyImageAttributeResponse) { - response = &ModifyImageAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyImageAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyImageAttribute）用于修改镜像属性。 -// +// // * 已分享的镜像无法修改属性。 func (c *Client) ModifyImageAttribute(request *ModifyImageAttributeRequest) (response *ModifyImageAttributeResponse, err error) { - if request == nil { - request = NewModifyImageAttributeRequest() - } - response = NewModifyImageAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyImageAttributeRequest() + } + response = NewModifyImageAttributeResponse() + err = c.Send(request, response) + return } func NewModifyImageSharePermissionRequest() (request *ModifyImageSharePermissionRequest) { - request = &ModifyImageSharePermissionRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyImageSharePermission") - return + request = &ModifyImageSharePermissionRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyImageSharePermission") + return } func NewModifyImageSharePermissionResponse() (response *ModifyImageSharePermissionResponse) { - response = &ModifyImageSharePermissionResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyImageSharePermissionResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyImageSharePermission）用于修改镜像分享信息。 -// +// // * 分享镜像后，被分享账户可以通过该镜像创建实例。 // * 每个自定义镜像最多可共享给50个账户。 // * 分享镜像无法更改名称，描述，仅可用于创建实例。 // * 只支持分享到对方账户相同地域。 func (c *Client) ModifyImageSharePermission(request *ModifyImageSharePermissionRequest) (response *ModifyImageSharePermissionResponse, err error) { - if request == nil { - request = NewModifyImageSharePermissionRequest() - } - response = NewModifyImageSharePermissionResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyImageSharePermissionRequest() + } + response = NewModifyImageSharePermissionResponse() + err = c.Send(request, response) + return } func NewModifyInstancesAttributeRequest() (request *ModifyInstancesAttributeRequest) { - request = &ModifyInstancesAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesAttribute") - return + request = &ModifyInstancesAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesAttribute") + return } func NewModifyInstancesAttributeResponse() (response *ModifyInstancesAttributeResponse) { - response = &ModifyInstancesAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyInstancesAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyInstancesAttribute) 用于修改实例的属性（目前只支持修改实例的名称和关联的安全组）。 -// +// // * “实例名称”仅为方便用户自己管理之用，腾讯云并不以此名称作为提交工单或是进行实例管理操作的依据。 // * 支持批量操作。每次请求批量实例的上限为100。 // * 修改关联安全组时，子机原来关联的安全组会被解绑。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ModifyInstancesAttribute(request *ModifyInstancesAttributeRequest) (response *ModifyInstancesAttributeResponse, err error) { - if request == nil { - request = NewModifyInstancesAttributeRequest() - } - response = NewModifyInstancesAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyInstancesAttributeRequest() + } + response = NewModifyInstancesAttributeResponse() + err = c.Send(request, response) + return } func NewModifyInstancesChargeTypeRequest() (request *ModifyInstancesChargeTypeRequest) { - request = &ModifyInstancesChargeTypeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesChargeType") - return + request = &ModifyInstancesChargeTypeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesChargeType") + return } func NewModifyInstancesChargeTypeResponse() (response *ModifyInstancesChargeTypeResponse) { - response = &ModifyInstancesChargeTypeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyInstancesChargeTypeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyInstancesChargeType) 用于切换实例的计费模式。 -// +// // * 只支持从 `POSTPAID_BY_HOUR` 计费模式切换为`PREPAID`计费模式。 // * 关机不收费的实例、`BC1`和`BS1`机型族的实例、设置定时销毁的实例不支持该操作。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ModifyInstancesChargeType(request *ModifyInstancesChargeTypeRequest) (response *ModifyInstancesChargeTypeResponse, err error) { - if request == nil { - request = NewModifyInstancesChargeTypeRequest() - } - response = NewModifyInstancesChargeTypeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyInstancesChargeTypeRequest() + } + response = NewModifyInstancesChargeTypeResponse() + err = c.Send(request, response) + return } func NewModifyInstancesProjectRequest() (request *ModifyInstancesProjectRequest) { - request = &ModifyInstancesProjectRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesProject") - return + request = &ModifyInstancesProjectRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesProject") + return } func NewModifyInstancesProjectResponse() (response *ModifyInstancesProjectResponse) { - response = &ModifyInstancesProjectResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyInstancesProjectResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyInstancesProject) 用于修改实例所属项目。 -// +// // * 项目为一个虚拟概念，用户可以在一个账户下面建立多个项目，每个项目中管理不同的资源；将多个不同实例分属到不同项目中，后续使用 [`DescribeInstances`](https://cloud.tencent.com/document/api/213/15728)接口查询实例，项目ID可用于过滤结果。 // * 绑定负载均衡的实例不支持修改实例所属项目，请先使用[`DeregisterInstancesFromLoadBalancer`](https://cloud.tencent.com/document/api/214/1258)接口解绑负载均衡。 // [^_^]: # ( 修改实例所属项目会自动解关联实例原来关联的安全组，修改完成后可使用[`ModifyInstancesAttribute`](https://cloud.tencent.com/document/api/213/15739)接口关联安全组。) // * 支持批量操作。每次请求批量实例的上限为100。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ModifyInstancesProject(request *ModifyInstancesProjectRequest) (response *ModifyInstancesProjectResponse, err error) { - if request == nil { - request = NewModifyInstancesProjectRequest() - } - response = NewModifyInstancesProjectResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyInstancesProjectRequest() + } + response = NewModifyInstancesProjectResponse() + err = c.Send(request, response) + return } func NewModifyInstancesRenewFlagRequest() (request *ModifyInstancesRenewFlagRequest) { - request = &ModifyInstancesRenewFlagRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesRenewFlag") - return + request = &ModifyInstancesRenewFlagRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesRenewFlag") + return } func NewModifyInstancesRenewFlagResponse() (response *ModifyInstancesRenewFlagResponse) { - response = &ModifyInstancesRenewFlagResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyInstancesRenewFlagResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyInstancesRenewFlag) 用于修改包年包月实例续费标识。 -// +// // * 实例被标识为自动续费后，每次在实例到期时，会自动续费一个月。 // * 支持批量操作。每次请求批量实例的上限为100。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ModifyInstancesRenewFlag(request *ModifyInstancesRenewFlagRequest) (response *ModifyInstancesRenewFlagResponse, err error) { - if request == nil { - request = NewModifyInstancesRenewFlagRequest() - } - response = NewModifyInstancesRenewFlagResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyInstancesRenewFlagRequest() + } + response = NewModifyInstancesRenewFlagResponse() + err = c.Send(request, response) + return } func NewModifyInstancesVpcAttributeRequest() (request *ModifyInstancesVpcAttributeRequest) { - request = &ModifyInstancesVpcAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesVpcAttribute") - return + request = &ModifyInstancesVpcAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesVpcAttribute") + return } func NewModifyInstancesVpcAttributeResponse() (response *ModifyInstancesVpcAttributeResponse) { - response = &ModifyInstancesVpcAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyInstancesVpcAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(ModifyInstancesVpcAttribute)用于修改实例vpc属性，如私有网络ip。 @@ -1400,173 +1399,173 @@ func NewModifyInstancesVpcAttributeResponse() (response *ModifyInstancesVpcAttri // * 当指定私有网络ID和子网ID（子网必须在实例所在的可用区）与指定实例所在私有网络不一致时，会将实例迁移至指定的私有网络的子网下。执行此操作前请确保指定的实例上没有绑定[弹性网卡](https://cloud.tencent.com/document/product/576)和[负载均衡](https://cloud.tencent.com/document/product/214)。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ModifyInstancesVpcAttribute(request *ModifyInstancesVpcAttributeRequest) (response *ModifyInstancesVpcAttributeResponse, err error) { - if request == nil { - request = NewModifyInstancesVpcAttributeRequest() - } - response = NewModifyInstancesVpcAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyInstancesVpcAttributeRequest() + } + response = NewModifyInstancesVpcAttributeResponse() + err = c.Send(request, response) + return } func NewModifyKeyPairAttributeRequest() (request *ModifyKeyPairAttributeRequest) { - request = &ModifyKeyPairAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyKeyPairAttribute") - return + request = &ModifyKeyPairAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyKeyPairAttribute") + return } func NewModifyKeyPairAttributeResponse() (response *ModifyKeyPairAttributeResponse) { - response = &ModifyKeyPairAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyKeyPairAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyKeyPairAttribute) 用于修改密钥对属性。 -// +// // * 修改密钥对ID所指定的密钥对的名称和描述信息。 // * 密钥对名称不能和已经存在的密钥对的名称重复。 // * 密钥对ID是密钥对的唯一标识，不可修改。 func (c *Client) ModifyKeyPairAttribute(request *ModifyKeyPairAttributeRequest) (response *ModifyKeyPairAttributeResponse, err error) { - if request == nil { - request = NewModifyKeyPairAttributeRequest() - } - response = NewModifyKeyPairAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyKeyPairAttributeRequest() + } + response = NewModifyKeyPairAttributeResponse() + err = c.Send(request, response) + return } func NewPurchaseReservedInstancesOfferingRequest() (request *PurchaseReservedInstancesOfferingRequest) { - request = &PurchaseReservedInstancesOfferingRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "PurchaseReservedInstancesOffering") - return + request = &PurchaseReservedInstancesOfferingRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "PurchaseReservedInstancesOffering") + return } func NewPurchaseReservedInstancesOfferingResponse() (response *PurchaseReservedInstancesOfferingResponse) { - response = &PurchaseReservedInstancesOfferingResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &PurchaseReservedInstancesOfferingResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(PurchaseReservedInstancesOffering)用于用户购买一个或者多个指定配置的预留实例 func (c *Client) PurchaseReservedInstancesOffering(request *PurchaseReservedInstancesOfferingRequest) (response *PurchaseReservedInstancesOfferingResponse, err error) { - if request == nil { - request = NewPurchaseReservedInstancesOfferingRequest() - } - response = NewPurchaseReservedInstancesOfferingResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewPurchaseReservedInstancesOfferingRequest() + } + response = NewPurchaseReservedInstancesOfferingResponse() + err = c.Send(request, response) + return } func NewRebootInstancesRequest() (request *RebootInstancesRequest) { - request = &RebootInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "RebootInstances") - return + request = &RebootInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "RebootInstances") + return } func NewRebootInstancesResponse() (response *RebootInstancesResponse) { - response = &RebootInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RebootInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (RebootInstances) 用于重启实例。 -// +// // * 只有状态为`RUNNING`的实例才可以进行此操作。 // * 接口调用成功时，实例会进入`REBOOTING`状态；重启实例成功时，实例会进入`RUNNING`状态。 // * 支持强制重启。强制重启的效果等同于关闭物理计算机的电源开关再重新启动。强制重启可能会导致数据丢失或文件系统损坏，请仅在服务器不能正常重启时使用。 // * 支持批量操作，每次请求批量实例的上限为100。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) RebootInstances(request *RebootInstancesRequest) (response *RebootInstancesResponse, err error) { - if request == nil { - request = NewRebootInstancesRequest() - } - response = NewRebootInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRebootInstancesRequest() + } + response = NewRebootInstancesResponse() + err = c.Send(request, response) + return } func NewRenewHostsRequest() (request *RenewHostsRequest) { - request = &RenewHostsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "RenewHosts") - return + request = &RenewHostsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "RenewHosts") + return } func NewRenewHostsResponse() (response *RenewHostsResponse) { - response = &RenewHostsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RenewHostsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (RenewHosts) 用于续费包年包月CDH实例。 -// +// // * 只支持操作包年包月实例，否则操作会以特定[错误码](#6.-.E9.94.99.E8.AF.AF.E7.A0.81)返回。 // * 续费时请确保账户余额充足。可通过[`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253)接口查询账户余额。 func (c *Client) RenewHosts(request *RenewHostsRequest) (response *RenewHostsResponse, err error) { - if request == nil { - request = NewRenewHostsRequest() - } - response = NewRenewHostsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRenewHostsRequest() + } + response = NewRenewHostsResponse() + err = c.Send(request, response) + return } func NewRenewInstancesRequest() (request *RenewInstancesRequest) { - request = &RenewInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "RenewInstances") - return + request = &RenewInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "RenewInstances") + return } func NewRenewInstancesResponse() (response *RenewInstancesResponse) { - response = &RenewInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RenewInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (RenewInstances) 用于续费包年包月实例。 -// +// // * 只支持操作包年包月实例。 // * 续费时请确保账户余额充足。可通过[`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253)接口查询账户余额。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) RenewInstances(request *RenewInstancesRequest) (response *RenewInstancesResponse, err error) { - if request == nil { - request = NewRenewInstancesRequest() - } - response = NewRenewInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRenewInstancesRequest() + } + response = NewRenewInstancesResponse() + err = c.Send(request, response) + return } func NewResetInstanceRequest() (request *ResetInstanceRequest) { - request = &ResetInstanceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ResetInstance") - return + request = &ResetInstanceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ResetInstance") + return } func NewResetInstanceResponse() (response *ResetInstanceResponse) { - response = &ResetInstanceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetInstanceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ResetInstance) 用于重装指定实例上的操作系统。 -// +// // * 如果指定了`ImageId`参数，则使用指定的镜像重装；否则按照当前实例使用的镜像进行重装。 // * 系统盘将会被格式化，并重置；请确保系统盘中无重要文件。 // * `Linux`和`Windows`系统互相切换时，该实例系统盘`ID`将发生变化，系统盘关联快照将无法回滚、恢复数据。 @@ -1575,31 +1574,31 @@ func NewResetInstanceResponse() (response *ResetInstanceResponse) { // * 目前不支持境外地域的实例使用该接口实现`Linux`和`Windows`操作系统切换。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ResetInstance(request *ResetInstanceRequest) (response *ResetInstanceResponse, err error) { - if request == nil { - request = NewResetInstanceRequest() - } - response = NewResetInstanceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetInstanceRequest() + } + response = NewResetInstanceResponse() + err = c.Send(request, response) + return } func NewResetInstancesInternetMaxBandwidthRequest() (request *ResetInstancesInternetMaxBandwidthRequest) { - request = &ResetInstancesInternetMaxBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ResetInstancesInternetMaxBandwidth") - return + request = &ResetInstancesInternetMaxBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ResetInstancesInternetMaxBandwidth") + return } func NewResetInstancesInternetMaxBandwidthResponse() (response *ResetInstancesInternetMaxBandwidthResponse) { - response = &ResetInstancesInternetMaxBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetInstancesInternetMaxBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ResetInstancesInternetMaxBandwidth) 用于调整实例公网带宽上限。 -// +// // * 不同机型带宽上限范围不一致，具体限制详见[公网带宽上限](https://cloud.tencent.com/document/product/213/12523)。 // * 对于 `BANDWIDTH_PREPAID` 计费方式的带宽，需要输入参数 `StartTime` 和 `EndTime` ，指定调整后的带宽的生效时间段。在这种场景下目前不支持调小带宽，会涉及扣费，请确保账户余额充足。可通过 [`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253) 接口查询账户余额。 // * 对于 `TRAFFIC_POSTPAID_BY_HOUR` 、 `BANDWIDTH_POSTPAID_BY_HOUR` 和 `BANDWIDTH_PACKAGE` 计费方式的带宽，使用该接口调整带宽上限是实时生效的，可以在带宽允许的范围内调大或者调小带宽，不支持输入参数 `StartTime` 和 `EndTime` 。 @@ -1608,57 +1607,57 @@ func NewResetInstancesInternetMaxBandwidthResponse() (response *ResetInstancesIn // * 接口不支持批量调整混合计费方式的带宽。例如不支持同时调整 `TRAFFIC_POSTPAID_BY_HOUR` 和 `BANDWIDTH_PACKAGE` 计费方式的带宽。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ResetInstancesInternetMaxBandwidth(request *ResetInstancesInternetMaxBandwidthRequest) (response *ResetInstancesInternetMaxBandwidthResponse, err error) { - if request == nil { - request = NewResetInstancesInternetMaxBandwidthRequest() - } - response = NewResetInstancesInternetMaxBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetInstancesInternetMaxBandwidthRequest() + } + response = NewResetInstancesInternetMaxBandwidthResponse() + err = c.Send(request, response) + return } func NewResetInstancesPasswordRequest() (request *ResetInstancesPasswordRequest) { - request = &ResetInstancesPasswordRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ResetInstancesPassword") - return + request = &ResetInstancesPasswordRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ResetInstancesPassword") + return } func NewResetInstancesPasswordResponse() (response *ResetInstancesPasswordResponse) { - response = &ResetInstancesPasswordResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetInstancesPasswordResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ResetInstancesPassword) 用于将实例操作系统的密码重置为用户指定的密码。 -// +// // *如果是修改系统管理云密码：实例的操作系统不同，管理员帐号也会不一样(`Windows`为`Administrator`，`Ubuntu`为`ubuntu`，其它系统为`root`)。 // * 重置处于运行中状态的实例密码，需要设置关机参数`ForceStop`为`TRUE`。如果没有显式指定强制关机参数，则只有处于关机状态的实例才允许执行重置密码操作。 // * 支持批量操作。将多个实例操作系统的密码重置为相同的密码。每次请求批量实例的上限为100。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ResetInstancesPassword(request *ResetInstancesPasswordRequest) (response *ResetInstancesPasswordResponse, err error) { - if request == nil { - request = NewResetInstancesPasswordRequest() - } - response = NewResetInstancesPasswordResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetInstancesPasswordRequest() + } + response = NewResetInstancesPasswordResponse() + err = c.Send(request, response) + return } func NewResetInstancesTypeRequest() (request *ResetInstancesTypeRequest) { - request = &ResetInstancesTypeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ResetInstancesType") - return + request = &ResetInstancesTypeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ResetInstancesType") + return } func NewResetInstancesTypeResponse() (response *ResetInstancesTypeResponse) { - response = &ResetInstancesTypeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetInstancesTypeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ResetInstancesType) 用于调整实例的机型。 @@ -1666,190 +1665,190 @@ func NewResetInstancesTypeResponse() (response *ResetInstancesTypeResponse) { // * 目前不支持[CDH](https://cloud.tencent.com/document/product/416)实例使用该接口调整机型。对于包年包月实例，使用该接口会涉及扣费，请确保账户余额充足。可通过[`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253)接口查询账户余额。 // * 本接口为异步接口，调整实例配置请求发送成功后会返回一个RequestId，此时操作并未立即完成。实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表调整实例配置操作成功。 func (c *Client) ResetInstancesType(request *ResetInstancesTypeRequest) (response *ResetInstancesTypeResponse, err error) { - if request == nil { - request = NewResetInstancesTypeRequest() - } - response = NewResetInstancesTypeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetInstancesTypeRequest() + } + response = NewResetInstancesTypeResponse() + err = c.Send(request, response) + return } func NewResizeInstanceDisksRequest() (request *ResizeInstanceDisksRequest) { - request = &ResizeInstanceDisksRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ResizeInstanceDisks") - return + request = &ResizeInstanceDisksRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ResizeInstanceDisks") + return } func NewResizeInstanceDisksResponse() (response *ResizeInstanceDisksResponse) { - response = &ResizeInstanceDisksResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResizeInstanceDisksResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ResizeInstanceDisks) 用于扩容实例的数据盘。 -// +// // * 目前只支持扩容非弹性数据盘（[`DescribeDisks`](https://cloud.tencent.com/document/api/362/16315)接口返回值中的`Portable`为`false`表示非弹性），且[数据盘类型](https://cloud.tencent.com/document/api/213/15753#DataDisk)为：`CLOUD_BASIC`、`CLOUD_PREMIUM`、`CLOUD_SSD`和[CDH](https://cloud.tencent.com/document/product/416)实例的`LOCAL_BASIC`、`LOCAL_SSD`类型数据盘。 // * 对于包年包月实例，使用该接口会涉及扣费，请确保账户余额充足。可通过[`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253)接口查询账户余额。 // * 目前只支持扩容一块数据盘。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ResizeInstanceDisks(request *ResizeInstanceDisksRequest) (response *ResizeInstanceDisksResponse, err error) { - if request == nil { - request = NewResizeInstanceDisksRequest() - } - response = NewResizeInstanceDisksResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResizeInstanceDisksRequest() + } + response = NewResizeInstanceDisksResponse() + err = c.Send(request, response) + return } func NewRunInstancesRequest() (request *RunInstancesRequest) { - request = &RunInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "RunInstances") - return + request = &RunInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "RunInstances") + return } func NewRunInstancesResponse() (response *RunInstancesResponse) { - response = &RunInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RunInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (RunInstances) 用于创建一个或多个指定配置的实例。 -// +// // * 实例创建成功后将自动开机启动，[实例状态](https://cloud.tencent.com/document/product/213/15753#InstanceStatus)变为“运行中”。 // * 预付费实例的购买会预先扣除本次实例购买所需金额，按小时后付费实例购买会预先冻结本次实例购买一小时内所需金额，在调用本接口前请确保账户余额充足。 // * 本接口允许购买的实例数量遵循[CVM实例购买限制](https://cloud.tencent.com/document/product/213/2664)，所创建的实例和官网入口创建的实例共用配额。 // * 本接口为异步接口，当创建实例请求下发成功后会返回一个实例`ID`列表和一个`RequestId`，此时创建实例操作并未立即完成。在此期间实例的状态将会处于“PENDING”，实例创建结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728) 接口查询，如果实例状态(InstanceState)由“PENDING”变为“RUNNING”，则代表实例创建成功，“LAUNCH_FAILED”代表实例创建失败。 func (c *Client) RunInstances(request *RunInstancesRequest) (response *RunInstancesResponse, err error) { - if request == nil { - request = NewRunInstancesRequest() - } - response = NewRunInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRunInstancesRequest() + } + response = NewRunInstancesResponse() + err = c.Send(request, response) + return } func NewStartInstancesRequest() (request *StartInstancesRequest) { - request = &StartInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "StartInstances") - return + request = &StartInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "StartInstances") + return } func NewStartInstancesResponse() (response *StartInstancesResponse) { - response = &StartInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &StartInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (StartInstances) 用于启动一个或多个实例。 -// +// // * 只有状态为`STOPPED`的实例才可以进行此操作。 // * 接口调用成功时，实例会进入`STARTING`状态；启动实例成功时，实例会进入`RUNNING`状态。 // * 支持批量操作。每次请求批量实例的上限为100。 // * 本接口为异步接口，启动实例请求发送成功后会返回一个RequestId，此时操作并未立即完成。实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表启动实例操作成功。 func (c *Client) StartInstances(request *StartInstancesRequest) (response *StartInstancesResponse, err error) { - if request == nil { - request = NewStartInstancesRequest() - } - response = NewStartInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewStartInstancesRequest() + } + response = NewStartInstancesResponse() + err = c.Send(request, response) + return } func NewStopInstancesRequest() (request *StopInstancesRequest) { - request = &StopInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "StopInstances") - return + request = &StopInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "StopInstances") + return } func NewStopInstancesResponse() (response *StopInstancesResponse) { - response = &StopInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &StopInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (StopInstances) 用于关闭一个或多个实例。 -// +// // * 只有状态为`RUNNING`的实例才可以进行此操作。 // * 接口调用成功时，实例会进入`STOPPING`状态；关闭实例成功时，实例会进入`STOPPED`状态。 // * 支持强制关闭。强制关机的效果等同于关闭物理计算机的电源开关。强制关机可能会导致数据丢失或文件系统损坏，请仅在服务器不能正常关机时使用。 // * 支持批量操作。每次请求批量实例的上限为100。 // * 本接口为异步接口，关闭实例请求发送成功后会返回一个RequestId，此时操作并未立即完成。实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表关闭实例操作成功。 func (c *Client) StopInstances(request *StopInstancesRequest) (response *StopInstancesResponse, err error) { - if request == nil { - request = NewStopInstancesRequest() - } - response = NewStopInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewStopInstancesRequest() + } + response = NewStopInstancesResponse() + err = c.Send(request, response) + return } func NewSyncImagesRequest() (request *SyncImagesRequest) { - request = &SyncImagesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "SyncImages") - return + request = &SyncImagesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "SyncImages") + return } func NewSyncImagesResponse() (response *SyncImagesResponse) { - response = &SyncImagesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &SyncImagesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（SyncImages）用于将自定义镜像同步到其它地区。 -// +// // * 该接口每次调用只支持同步一个镜像。 // * 该接口支持多个同步地域。 // * 单个帐号在每个地域最多支持存在10个自定义镜像。 func (c *Client) SyncImages(request *SyncImagesRequest) (response *SyncImagesResponse, err error) { - if request == nil { - request = NewSyncImagesRequest() - } - response = NewSyncImagesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewSyncImagesRequest() + } + response = NewSyncImagesResponse() + err = c.Send(request, response) + return } func NewTerminateInstancesRequest() (request *TerminateInstancesRequest) { - request = &TerminateInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "TerminateInstances") - return + request = &TerminateInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "TerminateInstances") + return } func NewTerminateInstancesResponse() (response *TerminateInstancesResponse) { - response = &TerminateInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &TerminateInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (TerminateInstances) 用于主动退还实例。 -// +// // * 不再使用的实例，可通过本接口主动退还。 // * 按量计费的实例通过本接口可直接退还；包年包月实例如符合[退还规则](https://cloud.tencent.com/document/product/213/9711)，也可通过本接口主动退还。 // * 包年包月实例首次调用本接口，实例将被移至回收站，再次调用本接口，实例将被销毁，且不可恢复。按量计费实例调用本接口将被直接销毁 // * 支持批量操作，每次请求批量实例的上限为100。 func (c *Client) TerminateInstances(request *TerminateInstancesRequest) (response *TerminateInstancesResponse, err error) { - if request == nil { - request = NewTerminateInstancesRequest() - } - response = NewTerminateInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewTerminateInstancesRequest() + } + response = NewTerminateInstancesResponse() + err = c.Send(request, response) + return } diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/models.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/models.go index 34b6c7683..6fed1d3dd 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/models.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/models.go @@ -15,9 +15,9 @@ package v20170312 import ( - "encoding/json" + "encoding/json" - tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" + tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" ) type ActionTimer struct { @@ -58,12 +58,12 @@ type AllocateHostsRequest struct { } func (r *AllocateHostsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AllocateHostsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AllocateHostsResponse struct { @@ -79,12 +79,12 @@ type AllocateHostsResponse struct { } func (r *AllocateHostsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AllocateHostsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateInstancesKeyPairsRequest struct { @@ -101,12 +101,12 @@ type AssociateInstancesKeyPairsRequest struct { } func (r *AssociateInstancesKeyPairsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateInstancesKeyPairsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateInstancesKeyPairsResponse struct { @@ -119,12 +119,12 @@ type AssociateInstancesKeyPairsResponse struct { } func (r *AssociateInstancesKeyPairsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateInstancesKeyPairsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateSecurityGroupsRequest struct { @@ -138,12 +138,12 @@ type AssociateSecurityGroupsRequest struct { } func (r *AssociateSecurityGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateSecurityGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateSecurityGroupsResponse struct { @@ -156,12 +156,12 @@ type AssociateSecurityGroupsResponse struct { } func (r *AssociateSecurityGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateSecurityGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ChargePrepaid struct { @@ -187,12 +187,12 @@ type CreateDisasterRecoverGroupRequest struct { } func (r *CreateDisasterRecoverGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDisasterRecoverGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDisasterRecoverGroupResponse struct { @@ -223,12 +223,12 @@ type CreateDisasterRecoverGroupResponse struct { } func (r *CreateDisasterRecoverGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDisasterRecoverGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateImageRequest struct { @@ -261,12 +261,12 @@ type CreateImageRequest struct { } func (r *CreateImageRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateImageRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateImageResponse struct { @@ -274,7 +274,7 @@ type CreateImageResponse struct { Response *struct { // 镜像ID - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 ImageId *string `json:"ImageId,omitempty" name:"ImageId"` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -283,12 +283,12 @@ type CreateImageResponse struct { } func (r *CreateImageResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateImageResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateKeyPairRequest struct { @@ -305,12 +305,12 @@ type CreateKeyPairRequest struct { } func (r *CreateKeyPairRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateKeyPairRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateKeyPairResponse struct { @@ -326,12 +326,12 @@ type CreateKeyPairResponse struct { } func (r *CreateKeyPairResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateKeyPairResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DataDisk struct { @@ -366,7 +366,7 @@ type DataDisk struct { Encrypt *bool `json:"Encrypt,omitempty" name:"Encrypt"` // 自定义CMK对应的ID，取值为UUID或者类似kms-abcd1234。用于加密云盘。 - // + // // 该参数目前仅用于 `RunInstances` 接口。 // 注意：此字段可能返回 null，表示取不到有效值。 KmsKeyId *string `json:"KmsKeyId,omitempty" name:"KmsKeyId"` @@ -380,12 +380,12 @@ type DeleteDisasterRecoverGroupsRequest struct { } func (r *DeleteDisasterRecoverGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDisasterRecoverGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDisasterRecoverGroupsResponse struct { @@ -398,12 +398,12 @@ type DeleteDisasterRecoverGroupsResponse struct { } func (r *DeleteDisasterRecoverGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDisasterRecoverGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteImagesRequest struct { @@ -414,12 +414,12 @@ type DeleteImagesRequest struct { } func (r *DeleteImagesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteImagesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteImagesResponse struct { @@ -432,12 +432,12 @@ type DeleteImagesResponse struct { } func (r *DeleteImagesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteImagesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteKeyPairsRequest struct { @@ -448,12 +448,12 @@ type DeleteKeyPairsRequest struct { } func (r *DeleteKeyPairsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteKeyPairsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteKeyPairsResponse struct { @@ -466,12 +466,12 @@ type DeleteKeyPairsResponse struct { } func (r *DeleteKeyPairsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteKeyPairsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDisasterRecoverGroupQuotaRequest struct { @@ -479,12 +479,12 @@ type DescribeDisasterRecoverGroupQuotaRequest struct { } func (r *DescribeDisasterRecoverGroupQuotaRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDisasterRecoverGroupQuotaRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDisasterRecoverGroupQuotaResponse struct { @@ -512,12 +512,12 @@ type DescribeDisasterRecoverGroupQuotaResponse struct { } func (r *DescribeDisasterRecoverGroupQuotaResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDisasterRecoverGroupQuotaResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDisasterRecoverGroupsRequest struct { @@ -537,12 +537,12 @@ type DescribeDisasterRecoverGroupsRequest struct { } func (r *DescribeDisasterRecoverGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDisasterRecoverGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDisasterRecoverGroupsResponse struct { @@ -561,12 +561,12 @@ type DescribeDisasterRecoverGroupsResponse struct { } func (r *DescribeDisasterRecoverGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDisasterRecoverGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeHostsRequest struct { @@ -593,12 +593,12 @@ type DescribeHostsRequest struct { } func (r *DescribeHostsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeHostsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeHostsResponse struct { @@ -617,12 +617,12 @@ type DescribeHostsResponse struct { } func (r *DescribeHostsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeHostsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImageQuotaRequest struct { @@ -630,12 +630,12 @@ type DescribeImageQuotaRequest struct { } func (r *DescribeImageQuotaRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImageQuotaRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImageQuotaResponse struct { @@ -651,12 +651,12 @@ type DescribeImageQuotaResponse struct { } func (r *DescribeImageQuotaResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImageQuotaResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImageSharePermissionRequest struct { @@ -667,12 +667,12 @@ type DescribeImageSharePermissionRequest struct { } func (r *DescribeImageSharePermissionRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImageSharePermissionRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImageSharePermissionResponse struct { @@ -688,12 +688,12 @@ type DescribeImageSharePermissionResponse struct { } func (r *DescribeImageSharePermissionResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImageSharePermissionResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImagesRequest struct { @@ -705,7 +705,7 @@ type DescribeImagesRequest struct { // 过滤条件，每次请求的`Filters`的上限为0，`Filters.Values`的上限为5。参数不可以同时指定`ImageIds`和`Filters`。详细的过滤条件如下： //
  • image-id - String - 是否必填： 否 - （过滤条件）按照镜像ID进行过滤
    • //
  • image-type - String - 是否必填： 否 - （过滤条件）按照镜像类型进行过滤。取值范围： - // PRIVATE_IMAGE: 私有镜像 (本账户创建的镜像) + // PRIVATE_IMAGE: 私有镜像 (本账户创建的镜像) // PUBLIC_IMAGE: 公共镜像 (腾讯云官方镜像) // SHARED_IMAGE: 共享镜像(其他账户共享给本账户的镜像) 。
    • Filters []*Filter `json:"Filters,omitempty" name:"Filters" list` @@ -721,12 +721,12 @@ type DescribeImagesRequest struct { } func (r *DescribeImagesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImagesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImagesResponse struct { @@ -745,12 +745,12 @@ type DescribeImagesResponse struct { } func (r *DescribeImagesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImagesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImportImageOsRequest struct { @@ -758,12 +758,12 @@ type DescribeImportImageOsRequest struct { } func (r *DescribeImportImageOsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImportImageOsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImportImageOsResponse struct { @@ -782,12 +782,12 @@ type DescribeImportImageOsResponse struct { } func (r *DescribeImportImageOsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImportImageOsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceFamilyConfigsRequest struct { @@ -795,12 +795,12 @@ type DescribeInstanceFamilyConfigsRequest struct { } func (r *DescribeInstanceFamilyConfigsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceFamilyConfigsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceFamilyConfigsResponse struct { @@ -816,12 +816,12 @@ type DescribeInstanceFamilyConfigsResponse struct { } func (r *DescribeInstanceFamilyConfigsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceFamilyConfigsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceInternetBandwidthConfigsRequest struct { @@ -832,12 +832,12 @@ type DescribeInstanceInternetBandwidthConfigsRequest struct { } func (r *DescribeInstanceInternetBandwidthConfigsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceInternetBandwidthConfigsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceInternetBandwidthConfigsResponse struct { @@ -853,12 +853,12 @@ type DescribeInstanceInternetBandwidthConfigsResponse struct { } func (r *DescribeInstanceInternetBandwidthConfigsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceInternetBandwidthConfigsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceTypeConfigsRequest struct { @@ -873,12 +873,12 @@ type DescribeInstanceTypeConfigsRequest struct { } func (r *DescribeInstanceTypeConfigsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceTypeConfigsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceTypeConfigsResponse struct { @@ -894,12 +894,12 @@ type DescribeInstanceTypeConfigsResponse struct { } func (r *DescribeInstanceTypeConfigsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceTypeConfigsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceVncUrlRequest struct { @@ -910,12 +910,12 @@ type DescribeInstanceVncUrlRequest struct { } func (r *DescribeInstanceVncUrlRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceVncUrlRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceVncUrlResponse struct { @@ -931,12 +931,12 @@ type DescribeInstanceVncUrlResponse struct { } func (r *DescribeInstanceVncUrlResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceVncUrlResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstancesOperationLimitRequest struct { @@ -951,12 +951,12 @@ type DescribeInstancesOperationLimitRequest struct { } func (r *DescribeInstancesOperationLimitRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstancesOperationLimitRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstancesOperationLimitResponse struct { @@ -972,12 +972,12 @@ type DescribeInstancesOperationLimitResponse struct { } func (r *DescribeInstancesOperationLimitResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstancesOperationLimitResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstancesRequest struct { @@ -1025,12 +1025,12 @@ type DescribeInstancesRequest struct { } func (r *DescribeInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstancesResponse struct { @@ -1049,12 +1049,12 @@ type DescribeInstancesResponse struct { } func (r *DescribeInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstancesStatusRequest struct { @@ -1071,12 +1071,12 @@ type DescribeInstancesStatusRequest struct { } func (r *DescribeInstancesStatusRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstancesStatusRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstancesStatusResponse struct { @@ -1095,12 +1095,12 @@ type DescribeInstancesStatusResponse struct { } func (r *DescribeInstancesStatusResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstancesStatusResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInternetChargeTypeConfigsRequest struct { @@ -1108,12 +1108,12 @@ type DescribeInternetChargeTypeConfigsRequest struct { } func (r *DescribeInternetChargeTypeConfigsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInternetChargeTypeConfigsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInternetChargeTypeConfigsResponse struct { @@ -1129,12 +1129,12 @@ type DescribeInternetChargeTypeConfigsResponse struct { } func (r *DescribeInternetChargeTypeConfigsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInternetChargeTypeConfigsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeKeyPairsRequest struct { @@ -1156,12 +1156,12 @@ type DescribeKeyPairsRequest struct { } func (r *DescribeKeyPairsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeKeyPairsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeKeyPairsResponse struct { @@ -1180,12 +1180,12 @@ type DescribeKeyPairsResponse struct { } func (r *DescribeKeyPairsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeKeyPairsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeRegionsRequest struct { @@ -1193,12 +1193,12 @@ type DescribeRegionsRequest struct { } func (r *DescribeRegionsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeRegionsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeRegionsResponse struct { @@ -1217,12 +1217,12 @@ type DescribeRegionsResponse struct { } func (r *DescribeRegionsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeRegionsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeReservedInstancesOfferingsRequest struct { @@ -1264,12 +1264,12 @@ type DescribeReservedInstancesOfferingsRequest struct { } func (r *DescribeReservedInstancesOfferingsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeReservedInstancesOfferingsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeReservedInstancesOfferingsResponse struct { @@ -1288,12 +1288,12 @@ type DescribeReservedInstancesOfferingsResponse struct { } func (r *DescribeReservedInstancesOfferingsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeReservedInstancesOfferingsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeReservedInstancesRequest struct { @@ -1327,12 +1327,12 @@ type DescribeReservedInstancesRequest struct { } func (r *DescribeReservedInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeReservedInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeReservedInstancesResponse struct { @@ -1351,12 +1351,12 @@ type DescribeReservedInstancesResponse struct { } func (r *DescribeReservedInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeReservedInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeZoneInstanceConfigInfosRequest struct { @@ -1375,12 +1375,12 @@ type DescribeZoneInstanceConfigInfosRequest struct { } func (r *DescribeZoneInstanceConfigInfosRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeZoneInstanceConfigInfosRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeZoneInstanceConfigInfosResponse struct { @@ -1396,12 +1396,12 @@ type DescribeZoneInstanceConfigInfosResponse struct { } func (r *DescribeZoneInstanceConfigInfosResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeZoneInstanceConfigInfosResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeZonesRequest struct { @@ -1409,12 +1409,12 @@ type DescribeZonesRequest struct { } func (r *DescribeZonesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeZonesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeZonesResponse struct { @@ -1433,12 +1433,12 @@ type DescribeZonesResponse struct { } func (r *DescribeZonesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeZonesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateInstancesKeyPairsRequest struct { @@ -1455,12 +1455,12 @@ type DisassociateInstancesKeyPairsRequest struct { } func (r *DisassociateInstancesKeyPairsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateInstancesKeyPairsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateInstancesKeyPairsResponse struct { @@ -1473,12 +1473,12 @@ type DisassociateInstancesKeyPairsResponse struct { } func (r *DisassociateInstancesKeyPairsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateInstancesKeyPairsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateSecurityGroupsRequest struct { @@ -1492,12 +1492,12 @@ type DisassociateSecurityGroupsRequest struct { } func (r *DisassociateSecurityGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateSecurityGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateSecurityGroupsResponse struct { @@ -1510,12 +1510,12 @@ type DisassociateSecurityGroupsResponse struct { } func (r *DisassociateSecurityGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateSecurityGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisasterRecoverGroup struct { @@ -1742,12 +1742,12 @@ type ImportImageRequest struct { } func (r *ImportImageRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ImportImageRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ImportImageResponse struct { @@ -1760,12 +1760,12 @@ type ImportImageResponse struct { } func (r *ImportImageResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ImportImageResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ImportKeyPairRequest struct { @@ -1775,7 +1775,7 @@ type ImportKeyPairRequest struct { KeyName *string `json:"KeyName,omitempty" name:"KeyName"` // 密钥对创建后所属的[项目](https://cloud.tencent.com/document/product/378/10861)ID。

    可以通过以下方式获取项目ID：
  • 通过[项目列表](https://console.cloud.tencent.com/project)查询项目ID。
  • 通过调用接口 [DescribeProject](https://cloud.tencent.com/document/api/378/4400)，取返回信息中的 `projectId ` 获取项目ID。 - // + // // 如果是默认项目，直接填0就可以。 ProjectId *int64 `json:"ProjectId,omitempty" name:"ProjectId"` @@ -1784,12 +1784,12 @@ type ImportKeyPairRequest struct { } func (r *ImportKeyPairRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ImportKeyPairRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ImportKeyPairResponse struct { @@ -1805,12 +1805,12 @@ type ImportKeyPairResponse struct { } func (r *ImportKeyPairResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ImportKeyPairResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceModifyInstancesChargeTypeRequest struct { @@ -1827,12 +1827,12 @@ type InquiryPriceModifyInstancesChargeTypeRequest struct { } func (r *InquiryPriceModifyInstancesChargeTypeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceModifyInstancesChargeTypeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceModifyInstancesChargeTypeResponse struct { @@ -1848,12 +1848,12 @@ type InquiryPriceModifyInstancesChargeTypeResponse struct { } func (r *InquiryPriceModifyInstancesChargeTypeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceModifyInstancesChargeTypeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceRenewInstancesRequest struct { @@ -1873,12 +1873,12 @@ type InquiryPriceRenewInstancesRequest struct { } func (r *InquiryPriceRenewInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceRenewInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceRenewInstancesResponse struct { @@ -1894,12 +1894,12 @@ type InquiryPriceRenewInstancesResponse struct { } func (r *InquiryPriceRenewInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceRenewInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetInstanceRequest struct { @@ -1922,12 +1922,12 @@ type InquiryPriceResetInstanceRequest struct { } func (r *InquiryPriceResetInstanceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetInstanceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetInstanceResponse struct { @@ -1943,12 +1943,12 @@ type InquiryPriceResetInstanceResponse struct { } func (r *InquiryPriceResetInstanceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetInstanceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetInstancesInternetMaxBandwidthRequest struct { @@ -1968,12 +1968,12 @@ type InquiryPriceResetInstancesInternetMaxBandwidthRequest struct { } func (r *InquiryPriceResetInstancesInternetMaxBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetInstancesInternetMaxBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetInstancesInternetMaxBandwidthResponse struct { @@ -1989,12 +1989,12 @@ type InquiryPriceResetInstancesInternetMaxBandwidthResponse struct { } func (r *InquiryPriceResetInstancesInternetMaxBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetInstancesInternetMaxBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetInstancesTypeRequest struct { @@ -2008,12 +2008,12 @@ type InquiryPriceResetInstancesTypeRequest struct { } func (r *InquiryPriceResetInstancesTypeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetInstancesTypeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetInstancesTypeResponse struct { @@ -2029,12 +2029,12 @@ type InquiryPriceResetInstancesTypeResponse struct { } func (r *InquiryPriceResetInstancesTypeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetInstancesTypeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResizeInstanceDisksRequest struct { @@ -2051,12 +2051,12 @@ type InquiryPriceResizeInstanceDisksRequest struct { } func (r *InquiryPriceResizeInstanceDisksRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResizeInstanceDisksRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResizeInstanceDisksResponse struct { @@ -2072,12 +2072,12 @@ type InquiryPriceResizeInstanceDisksResponse struct { } func (r *InquiryPriceResizeInstanceDisksResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResizeInstanceDisksResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceRunInstancesRequest struct { @@ -2139,12 +2139,12 @@ type InquiryPriceRunInstancesRequest struct { } func (r *InquiryPriceRunInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceRunInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceRunInstancesResponse struct { @@ -2160,12 +2160,12 @@ type InquiryPriceRunInstancesResponse struct { } func (r *InquiryPriceRunInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceRunInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type Instance struct { @@ -2548,12 +2548,12 @@ type ModifyDisasterRecoverGroupAttributeRequest struct { } func (r *ModifyDisasterRecoverGroupAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyDisasterRecoverGroupAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyDisasterRecoverGroupAttributeResponse struct { @@ -2566,12 +2566,12 @@ type ModifyDisasterRecoverGroupAttributeResponse struct { } func (r *ModifyDisasterRecoverGroupAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyDisasterRecoverGroupAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyHostsAttributeRequest struct { @@ -2591,12 +2591,12 @@ type ModifyHostsAttributeRequest struct { } func (r *ModifyHostsAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyHostsAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyHostsAttributeResponse struct { @@ -2609,12 +2609,12 @@ type ModifyHostsAttributeResponse struct { } func (r *ModifyHostsAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyHostsAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyImageAttributeRequest struct { @@ -2631,12 +2631,12 @@ type ModifyImageAttributeRequest struct { } func (r *ModifyImageAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyImageAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyImageAttributeResponse struct { @@ -2649,12 +2649,12 @@ type ModifyImageAttributeResponse struct { } func (r *ModifyImageAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyImageAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyImageSharePermissionRequest struct { @@ -2671,12 +2671,12 @@ type ModifyImageSharePermissionRequest struct { } func (r *ModifyImageSharePermissionRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyImageSharePermissionRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyImageSharePermissionResponse struct { @@ -2689,12 +2689,12 @@ type ModifyImageSharePermissionResponse struct { } func (r *ModifyImageSharePermissionResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyImageSharePermissionResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesAttributeRequest struct { @@ -2711,12 +2711,12 @@ type ModifyInstancesAttributeRequest struct { } func (r *ModifyInstancesAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesAttributeResponse struct { @@ -2729,12 +2729,12 @@ type ModifyInstancesAttributeResponse struct { } func (r *ModifyInstancesAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesChargeTypeRequest struct { @@ -2751,12 +2751,12 @@ type ModifyInstancesChargeTypeRequest struct { } func (r *ModifyInstancesChargeTypeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesChargeTypeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesChargeTypeResponse struct { @@ -2769,12 +2769,12 @@ type ModifyInstancesChargeTypeResponse struct { } func (r *ModifyInstancesChargeTypeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesChargeTypeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesProjectRequest struct { @@ -2788,12 +2788,12 @@ type ModifyInstancesProjectRequest struct { } func (r *ModifyInstancesProjectRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesProjectRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesProjectResponse struct { @@ -2806,12 +2806,12 @@ type ModifyInstancesProjectResponse struct { } func (r *ModifyInstancesProjectResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesProjectResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesRenewFlagRequest struct { @@ -2825,12 +2825,12 @@ type ModifyInstancesRenewFlagRequest struct { } func (r *ModifyInstancesRenewFlagRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesRenewFlagRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesRenewFlagResponse struct { @@ -2843,12 +2843,12 @@ type ModifyInstancesRenewFlagResponse struct { } func (r *ModifyInstancesRenewFlagResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesRenewFlagResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesVpcAttributeRequest struct { @@ -2868,12 +2868,12 @@ type ModifyInstancesVpcAttributeRequest struct { } func (r *ModifyInstancesVpcAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesVpcAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesVpcAttributeResponse struct { @@ -2886,12 +2886,12 @@ type ModifyInstancesVpcAttributeResponse struct { } func (r *ModifyInstancesVpcAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesVpcAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyKeyPairAttributeRequest struct { @@ -2908,12 +2908,12 @@ type ModifyKeyPairAttributeRequest struct { } func (r *ModifyKeyPairAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyKeyPairAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyKeyPairAttributeResponse struct { @@ -2926,12 +2926,12 @@ type ModifyKeyPairAttributeResponse struct { } func (r *ModifyKeyPairAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyKeyPairAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type OperationCountLimit struct { @@ -3005,12 +3005,12 @@ type PurchaseReservedInstancesOfferingRequest struct { } func (r *PurchaseReservedInstancesOfferingRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *PurchaseReservedInstancesOfferingRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type PurchaseReservedInstancesOfferingResponse struct { @@ -3026,12 +3026,12 @@ type PurchaseReservedInstancesOfferingResponse struct { } func (r *PurchaseReservedInstancesOfferingResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *PurchaseReservedInstancesOfferingResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RebootInstancesRequest struct { @@ -3048,12 +3048,12 @@ type RebootInstancesRequest struct { } func (r *RebootInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RebootInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RebootInstancesResponse struct { @@ -3066,12 +3066,12 @@ type RebootInstancesResponse struct { } func (r *RebootInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RebootInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RegionInfo struct { @@ -3097,12 +3097,12 @@ type RenewHostsRequest struct { } func (r *RenewHostsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RenewHostsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RenewHostsResponse struct { @@ -3115,12 +3115,12 @@ type RenewHostsResponse struct { } func (r *RenewHostsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RenewHostsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RenewInstancesRequest struct { @@ -3137,12 +3137,12 @@ type RenewInstancesRequest struct { } func (r *RenewInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RenewInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RenewInstancesResponse struct { @@ -3155,12 +3155,12 @@ type RenewInstancesResponse struct { } func (r *RenewInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RenewInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReservedInstances struct { @@ -3269,12 +3269,12 @@ type ResetInstanceRequest struct { } func (r *ResetInstanceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstanceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstanceResponse struct { @@ -3287,12 +3287,12 @@ type ResetInstanceResponse struct { } func (r *ResetInstanceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstanceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstancesInternetMaxBandwidthRequest struct { @@ -3312,12 +3312,12 @@ type ResetInstancesInternetMaxBandwidthRequest struct { } func (r *ResetInstancesInternetMaxBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstancesInternetMaxBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstancesInternetMaxBandwidthResponse struct { @@ -3330,12 +3330,12 @@ type ResetInstancesInternetMaxBandwidthResponse struct { } func (r *ResetInstancesInternetMaxBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstancesInternetMaxBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstancesPasswordRequest struct { @@ -3357,12 +3357,12 @@ type ResetInstancesPasswordRequest struct { } func (r *ResetInstancesPasswordRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstancesPasswordRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstancesPasswordResponse struct { @@ -3375,12 +3375,12 @@ type ResetInstancesPasswordResponse struct { } func (r *ResetInstancesPasswordResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstancesPasswordResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstancesTypeRequest struct { @@ -3397,12 +3397,12 @@ type ResetInstancesTypeRequest struct { } func (r *ResetInstancesTypeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstancesTypeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstancesTypeResponse struct { @@ -3415,12 +3415,12 @@ type ResetInstancesTypeResponse struct { } func (r *ResetInstancesTypeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstancesTypeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResizeInstanceDisksRequest struct { @@ -3437,12 +3437,12 @@ type ResizeInstanceDisksRequest struct { } func (r *ResizeInstanceDisksRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResizeInstanceDisksRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResizeInstanceDisksResponse struct { @@ -3455,12 +3455,12 @@ type ResizeInstanceDisksResponse struct { } func (r *ResizeInstanceDisksResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResizeInstanceDisksResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RunInstancesRequest struct { @@ -3539,12 +3539,12 @@ type RunInstancesRequest struct { } func (r *RunInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RunInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RunInstancesResponse struct { @@ -3560,12 +3560,12 @@ type RunInstancesResponse struct { } func (r *RunInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RunInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RunMonitorServiceEnabled struct { @@ -3620,12 +3620,12 @@ type StartInstancesRequest struct { } func (r *StartInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *StartInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type StartInstancesResponse struct { @@ -3638,12 +3638,12 @@ type StartInstancesResponse struct { } func (r *StartInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *StartInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type StopInstancesRequest struct { @@ -3665,12 +3665,12 @@ type StopInstancesRequest struct { } func (r *StopInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *StopInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type StopInstancesResponse struct { @@ -3683,12 +3683,12 @@ type StopInstancesResponse struct { } func (r *StopInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *StopInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type StorageBlock struct { @@ -3717,12 +3717,12 @@ type SyncImagesRequest struct { } func (r *SyncImagesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *SyncImagesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type SyncImagesResponse struct { @@ -3735,12 +3735,12 @@ type SyncImagesResponse struct { } func (r *SyncImagesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *SyncImagesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type SystemDisk struct { @@ -3781,12 +3781,12 @@ type TerminateInstancesRequest struct { } func (r *TerminateInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *TerminateInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type TerminateInstancesResponse struct { @@ -3799,12 +3799,12 @@ type TerminateInstancesResponse struct { } func (r *TerminateInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *TerminateInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type VirtualPrivateCloud struct { diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/client.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/client.go index 34c5595e5..706c0aa2c 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/client.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/client.go @@ -15,124 +15,123 @@ package v20170312 import ( - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" + tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" ) const APIVersion = "2017-03-12" type Client struct { - common.Client + common.Client } // Deprecated func NewClientWithSecretId(secretId, secretKey, region string) (client *Client, err error) { - cpf := profile.NewClientProfile() - client = &Client{} - client.Init(region).WithSecretId(secretId, secretKey).WithProfile(cpf) - return + cpf := profile.NewClientProfile() + client = &Client{} + client.Init(region).WithSecretId(secretId, secretKey).WithProfile(cpf) + return } func NewClient(credential *common.Credential, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { - client = &Client{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return + client = &Client{} + client.Init(region). + WithCredential(credential). + WithProfile(clientProfile) + return } - func NewAcceptAttachCcnInstancesRequest() (request *AcceptAttachCcnInstancesRequest) { - request = &AcceptAttachCcnInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AcceptAttachCcnInstances") - return + request = &AcceptAttachCcnInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AcceptAttachCcnInstances") + return } func NewAcceptAttachCcnInstancesResponse() (response *AcceptAttachCcnInstancesResponse) { - response = &AcceptAttachCcnInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AcceptAttachCcnInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AcceptAttachCcnInstances）用于跨账号关联实例时，云联网所有者接受并同意关联操作。 func (c *Client) AcceptAttachCcnInstances(request *AcceptAttachCcnInstancesRequest) (response *AcceptAttachCcnInstancesResponse, err error) { - if request == nil { - request = NewAcceptAttachCcnInstancesRequest() - } - response = NewAcceptAttachCcnInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAcceptAttachCcnInstancesRequest() + } + response = NewAcceptAttachCcnInstancesResponse() + err = c.Send(request, response) + return } func NewAddBandwidthPackageResourcesRequest() (request *AddBandwidthPackageResourcesRequest) { - request = &AddBandwidthPackageResourcesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AddBandwidthPackageResources") - return + request = &AddBandwidthPackageResourcesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AddBandwidthPackageResources") + return } func NewAddBandwidthPackageResourcesResponse() (response *AddBandwidthPackageResourcesResponse) { - response = &AddBandwidthPackageResourcesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AddBandwidthPackageResourcesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口用于添加带宽包资源，包括[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)和[负载均衡](https://cloud.tencent.com/document/product/214/517)等 func (c *Client) AddBandwidthPackageResources(request *AddBandwidthPackageResourcesRequest) (response *AddBandwidthPackageResourcesResponse, err error) { - if request == nil { - request = NewAddBandwidthPackageResourcesRequest() - } - response = NewAddBandwidthPackageResourcesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAddBandwidthPackageResourcesRequest() + } + response = NewAddBandwidthPackageResourcesResponse() + err = c.Send(request, response) + return } func NewAddIp6RulesRequest() (request *AddIp6RulesRequest) { - request = &AddIp6RulesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AddIp6Rules") - return + request = &AddIp6RulesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AddIp6Rules") + return } func NewAddIp6RulesResponse() (response *AddIp6RulesResponse) { - response = &AddIp6RulesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AddIp6RulesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 1. 该接口用于在转换实例下添加IPV6转换规则。 // 2. 支持在同一个转换实例下批量添加转换规则，一个账户在一个地域最多50个。 // 3. 一个完整的转换规则包括vip6:vport6:protocol:vip:vport，其中vip6:vport6:protocol必须是唯一。 func (c *Client) AddIp6Rules(request *AddIp6RulesRequest) (response *AddIp6RulesResponse, err error) { - if request == nil { - request = NewAddIp6RulesRequest() - } - response = NewAddIp6RulesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAddIp6RulesRequest() + } + response = NewAddIp6RulesResponse() + err = c.Send(request, response) + return } func NewAllocateAddressesRequest() (request *AllocateAddressesRequest) { - request = &AllocateAddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AllocateAddresses") - return + request = &AllocateAddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AllocateAddresses") + return } func NewAllocateAddressesResponse() (response *AllocateAddressesResponse) { - response = &AllocateAddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AllocateAddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (AllocateAddresses) 用于申请一个或多个[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）。 @@ -140,52 +139,52 @@ func NewAllocateAddressesResponse() (response *AllocateAddressesResponse) { // * 您的 EIP 与腾讯云账户相关联，而不是与某个实例相关联。在您选择显式释放该地址，或欠费超过24小时之前，它会一直与您的腾讯云账户保持关联。 // * 一个腾讯云账户在每个地域能申请的 EIP 最大配额有所限制，可参见 [EIP 产品简介](https://cloud.tencent.com/document/product/213/5733)，上述配额可通过 DescribeAddressQuota 接口获取。 func (c *Client) AllocateAddresses(request *AllocateAddressesRequest) (response *AllocateAddressesResponse, err error) { - if request == nil { - request = NewAllocateAddressesRequest() - } - response = NewAllocateAddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAllocateAddressesRequest() + } + response = NewAllocateAddressesResponse() + err = c.Send(request, response) + return } func NewAllocateIp6AddressesBandwidthRequest() (request *AllocateIp6AddressesBandwidthRequest) { - request = &AllocateIp6AddressesBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AllocateIp6AddressesBandwidth") - return + request = &AllocateIp6AddressesBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AllocateIp6AddressesBandwidth") + return } func NewAllocateIp6AddressesBandwidthResponse() (response *AllocateIp6AddressesBandwidthResponse) { - response = &AllocateIp6AddressesBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AllocateIp6AddressesBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于给IPv6地址初次分配公网带宽 func (c *Client) AllocateIp6AddressesBandwidth(request *AllocateIp6AddressesBandwidthRequest) (response *AllocateIp6AddressesBandwidthResponse, err error) { - if request == nil { - request = NewAllocateIp6AddressesBandwidthRequest() - } - response = NewAllocateIp6AddressesBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAllocateIp6AddressesBandwidthRequest() + } + response = NewAllocateIp6AddressesBandwidthResponse() + err = c.Send(request, response) + return } func NewAssignIpv6AddressesRequest() (request *AssignIpv6AddressesRequest) { - request = &AssignIpv6AddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssignIpv6Addresses") - return + request = &AssignIpv6AddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssignIpv6Addresses") + return } func NewAssignIpv6AddressesResponse() (response *AssignIpv6AddressesResponse) { - response = &AssignIpv6AddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssignIpv6AddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssignIpv6Addresses）用于弹性网卡申请`IPv6`地址。
    @@ -195,81 +194,81 @@ func NewAssignIpv6AddressesResponse() (response *AssignIpv6AddressesResponse) { // * 地址必须要在弹性网卡所在子网内，而且不能被占用。 // * 在弹性网卡上申请一个到多个辅助`IPv6`地址，接口会在弹性网卡所在子网段内返回指定数量的辅助`IPv6`地址。 func (c *Client) AssignIpv6Addresses(request *AssignIpv6AddressesRequest) (response *AssignIpv6AddressesResponse, err error) { - if request == nil { - request = NewAssignIpv6AddressesRequest() - } - response = NewAssignIpv6AddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssignIpv6AddressesRequest() + } + response = NewAssignIpv6AddressesResponse() + err = c.Send(request, response) + return } func NewAssignIpv6CidrBlockRequest() (request *AssignIpv6CidrBlockRequest) { - request = &AssignIpv6CidrBlockRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssignIpv6CidrBlock") - return + request = &AssignIpv6CidrBlockRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssignIpv6CidrBlock") + return } func NewAssignIpv6CidrBlockResponse() (response *AssignIpv6CidrBlockResponse) { - response = &AssignIpv6CidrBlockResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssignIpv6CidrBlockResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssignIpv6CidrBlock）用于分配IPv6网段。 // * 使用本接口前，您需要已有VPC实例，如果没有可通过接口CreateVpc创建。 // * 每个VPC只能申请一个IPv6网段 func (c *Client) AssignIpv6CidrBlock(request *AssignIpv6CidrBlockRequest) (response *AssignIpv6CidrBlockResponse, err error) { - if request == nil { - request = NewAssignIpv6CidrBlockRequest() - } - response = NewAssignIpv6CidrBlockResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssignIpv6CidrBlockRequest() + } + response = NewAssignIpv6CidrBlockResponse() + err = c.Send(request, response) + return } func NewAssignIpv6SubnetCidrBlockRequest() (request *AssignIpv6SubnetCidrBlockRequest) { - request = &AssignIpv6SubnetCidrBlockRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssignIpv6SubnetCidrBlock") - return + request = &AssignIpv6SubnetCidrBlockRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssignIpv6SubnetCidrBlock") + return } func NewAssignIpv6SubnetCidrBlockResponse() (response *AssignIpv6SubnetCidrBlockResponse) { - response = &AssignIpv6SubnetCidrBlockResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssignIpv6SubnetCidrBlockResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssignIpv6SubnetCidrBlock）用于分配IPv6子网段。 // * 给子网分配 `IPv6` 网段，要求子网所属 `VPC` 已获得 `IPv6` 网段。如果尚未分配，请先通过接口 `AssignIpv6CidrBlock` 给子网所属 `VPC` 分配一个 `IPv6` 网段。否则无法分配 `IPv6` 子网段。 // * 每个子网只能分配一个IPv6网段。 func (c *Client) AssignIpv6SubnetCidrBlock(request *AssignIpv6SubnetCidrBlockRequest) (response *AssignIpv6SubnetCidrBlockResponse, err error) { - if request == nil { - request = NewAssignIpv6SubnetCidrBlockRequest() - } - response = NewAssignIpv6SubnetCidrBlockResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssignIpv6SubnetCidrBlockRequest() + } + response = NewAssignIpv6SubnetCidrBlockResponse() + err = c.Send(request, response) + return } func NewAssignPrivateIpAddressesRequest() (request *AssignPrivateIpAddressesRequest) { - request = &AssignPrivateIpAddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssignPrivateIpAddresses") - return + request = &AssignPrivateIpAddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssignPrivateIpAddresses") + return } func NewAssignPrivateIpAddressesResponse() (response *AssignPrivateIpAddressesResponse) { - response = &AssignPrivateIpAddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssignPrivateIpAddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssignPrivateIpAddresses）用于弹性网卡申请内网 IP。 @@ -277,27 +276,27 @@ func NewAssignPrivateIpAddressesResponse() (response *AssignPrivateIpAddressesRe // * 可以指定内网IP地址申请，内网IP地址类型不能为主IP，主IP已存在，不能修改，内网IP必须要弹性网卡所在子网内，而且不能被占用。 // * 在弹性网卡上申请一个到多个辅助内网IP，接口会在弹性网卡所在子网网段内返回指定数量的辅助内网IP。 func (c *Client) AssignPrivateIpAddresses(request *AssignPrivateIpAddressesRequest) (response *AssignPrivateIpAddressesResponse, err error) { - if request == nil { - request = NewAssignPrivateIpAddressesRequest() - } - response = NewAssignPrivateIpAddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssignPrivateIpAddressesRequest() + } + response = NewAssignPrivateIpAddressesResponse() + err = c.Send(request, response) + return } func NewAssociateAddressRequest() (request *AssociateAddressRequest) { - request = &AssociateAddressRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssociateAddress") - return + request = &AssociateAddressRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssociateAddress") + return } func NewAssociateAddressResponse() (response *AssociateAddressResponse) { - response = &AssociateAddressResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateAddressResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (AssociateAddress) 用于将[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）绑定到实例或弹性网卡的指定内网 IP 上。 @@ -308,180 +307,180 @@ func NewAssociateAddressResponse() (response *AssociateAddressResponse) { // * EIP 如果欠费或被封堵，则不能被绑定。 // * 只有状态为 UNBIND 的 EIP 才能够被绑定。 func (c *Client) AssociateAddress(request *AssociateAddressRequest) (response *AssociateAddressResponse, err error) { - if request == nil { - request = NewAssociateAddressRequest() - } - response = NewAssociateAddressResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateAddressRequest() + } + response = NewAssociateAddressResponse() + err = c.Send(request, response) + return } func NewAssociateDhcpIpWithAddressIpRequest() (request *AssociateDhcpIpWithAddressIpRequest) { - request = &AssociateDhcpIpWithAddressIpRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssociateDhcpIpWithAddressIp") - return + request = &AssociateDhcpIpWithAddressIpRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssociateDhcpIpWithAddressIp") + return } func NewAssociateDhcpIpWithAddressIpResponse() (response *AssociateDhcpIpWithAddressIpResponse) { - response = &AssociateDhcpIpWithAddressIpResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateDhcpIpWithAddressIpResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssociateDhcpIpWithAddressIp）用于DhcpIp绑定弹性公网IP（EIP）。
    func (c *Client) AssociateDhcpIpWithAddressIp(request *AssociateDhcpIpWithAddressIpRequest) (response *AssociateDhcpIpWithAddressIpResponse, err error) { - if request == nil { - request = NewAssociateDhcpIpWithAddressIpRequest() - } - response = NewAssociateDhcpIpWithAddressIpResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateDhcpIpWithAddressIpRequest() + } + response = NewAssociateDhcpIpWithAddressIpResponse() + err = c.Send(request, response) + return } func NewAssociateNatGatewayAddressRequest() (request *AssociateNatGatewayAddressRequest) { - request = &AssociateNatGatewayAddressRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssociateNatGatewayAddress") - return + request = &AssociateNatGatewayAddressRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssociateNatGatewayAddress") + return } func NewAssociateNatGatewayAddressResponse() (response *AssociateNatGatewayAddressResponse) { - response = &AssociateNatGatewayAddressResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateNatGatewayAddressResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(AssociateNatGatewayAddress)用于NAT网关绑定弹性IP（EIP）。 func (c *Client) AssociateNatGatewayAddress(request *AssociateNatGatewayAddressRequest) (response *AssociateNatGatewayAddressResponse, err error) { - if request == nil { - request = NewAssociateNatGatewayAddressRequest() - } - response = NewAssociateNatGatewayAddressResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateNatGatewayAddressRequest() + } + response = NewAssociateNatGatewayAddressResponse() + err = c.Send(request, response) + return } func NewAssociateNetworkAclSubnetsRequest() (request *AssociateNetworkAclSubnetsRequest) { - request = &AssociateNetworkAclSubnetsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssociateNetworkAclSubnets") - return + request = &AssociateNetworkAclSubnetsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssociateNetworkAclSubnets") + return } func NewAssociateNetworkAclSubnetsResponse() (response *AssociateNetworkAclSubnetsResponse) { - response = &AssociateNetworkAclSubnetsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateNetworkAclSubnetsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssociateNetworkAclSubnets）用于网络ACL关联vpc下的子网。 func (c *Client) AssociateNetworkAclSubnets(request *AssociateNetworkAclSubnetsRequest) (response *AssociateNetworkAclSubnetsResponse, err error) { - if request == nil { - request = NewAssociateNetworkAclSubnetsRequest() - } - response = NewAssociateNetworkAclSubnetsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateNetworkAclSubnetsRequest() + } + response = NewAssociateNetworkAclSubnetsResponse() + err = c.Send(request, response) + return } func NewAssociateNetworkInterfaceSecurityGroupsRequest() (request *AssociateNetworkInterfaceSecurityGroupsRequest) { - request = &AssociateNetworkInterfaceSecurityGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssociateNetworkInterfaceSecurityGroups") - return + request = &AssociateNetworkInterfaceSecurityGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssociateNetworkInterfaceSecurityGroups") + return } func NewAssociateNetworkInterfaceSecurityGroupsResponse() (response *AssociateNetworkInterfaceSecurityGroupsResponse) { - response = &AssociateNetworkInterfaceSecurityGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateNetworkInterfaceSecurityGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssociateNetworkInterfaceSecurityGroups）用于弹性网卡绑定安全组（SecurityGroup）。 func (c *Client) AssociateNetworkInterfaceSecurityGroups(request *AssociateNetworkInterfaceSecurityGroupsRequest) (response *AssociateNetworkInterfaceSecurityGroupsResponse, err error) { - if request == nil { - request = NewAssociateNetworkInterfaceSecurityGroupsRequest() - } - response = NewAssociateNetworkInterfaceSecurityGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateNetworkInterfaceSecurityGroupsRequest() + } + response = NewAssociateNetworkInterfaceSecurityGroupsResponse() + err = c.Send(request, response) + return } func NewAttachCcnInstancesRequest() (request *AttachCcnInstancesRequest) { - request = &AttachCcnInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AttachCcnInstances") - return + request = &AttachCcnInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AttachCcnInstances") + return } func NewAttachCcnInstancesResponse() (response *AttachCcnInstancesResponse) { - response = &AttachCcnInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AttachCcnInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AttachCcnInstances）用于将网络实例加载到云联网实例中，网络实例包括VPC和专线网关。
    // 每个云联网能够关联的网络实例个数是有限的，详请参考产品文档。如果需要扩充请联系在线客服。 func (c *Client) AttachCcnInstances(request *AttachCcnInstancesRequest) (response *AttachCcnInstancesResponse, err error) { - if request == nil { - request = NewAttachCcnInstancesRequest() - } - response = NewAttachCcnInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAttachCcnInstancesRequest() + } + response = NewAttachCcnInstancesResponse() + err = c.Send(request, response) + return } func NewAttachClassicLinkVpcRequest() (request *AttachClassicLinkVpcRequest) { - request = &AttachClassicLinkVpcRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AttachClassicLinkVpc") - return + request = &AttachClassicLinkVpcRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AttachClassicLinkVpc") + return } func NewAttachClassicLinkVpcResponse() (response *AttachClassicLinkVpcResponse) { - response = &AttachClassicLinkVpcResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AttachClassicLinkVpcResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(AttachClassicLinkVpc)用于创建私有网络和基础网络设备互通。 // * 私有网络和基础网络设备必须在同一个地域。 // * 私有网络和基础网络的区别详见vpc产品文档-私有网络与基础网络。 func (c *Client) AttachClassicLinkVpc(request *AttachClassicLinkVpcRequest) (response *AttachClassicLinkVpcResponse, err error) { - if request == nil { - request = NewAttachClassicLinkVpcRequest() - } - response = NewAttachClassicLinkVpcResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAttachClassicLinkVpcRequest() + } + response = NewAttachClassicLinkVpcResponse() + err = c.Send(request, response) + return } func NewAttachNetworkInterfaceRequest() (request *AttachNetworkInterfaceRequest) { - request = &AttachNetworkInterfaceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AttachNetworkInterface") - return + request = &AttachNetworkInterfaceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AttachNetworkInterface") + return } func NewAttachNetworkInterfaceResponse() (response *AttachNetworkInterfaceResponse) { - response = &AttachNetworkInterfaceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AttachNetworkInterfaceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AttachNetworkInterface）用于弹性网卡绑定云主机。 @@ -490,27 +489,27 @@ func NewAttachNetworkInterfaceResponse() (response *AttachNetworkInterfaceRespon // * 只有运行中或者已关机状态的云主机才能绑定弹性网卡，查看云主机状态详见腾讯云主机信息。 // * 弹性网卡绑定的云主机必须是私有网络的，而且云主机所在可用区必须和弹性网卡子网的可用区相同。 func (c *Client) AttachNetworkInterface(request *AttachNetworkInterfaceRequest) (response *AttachNetworkInterfaceResponse, err error) { - if request == nil { - request = NewAttachNetworkInterfaceRequest() - } - response = NewAttachNetworkInterfaceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAttachNetworkInterfaceRequest() + } + response = NewAttachNetworkInterfaceResponse() + err = c.Send(request, response) + return } func NewCheckAssistantCidrRequest() (request *CheckAssistantCidrRequest) { - request = &CheckAssistantCidrRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CheckAssistantCidr") - return + request = &CheckAssistantCidrRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CheckAssistantCidr") + return } func NewCheckAssistantCidrResponse() (response *CheckAssistantCidrResponse) { - response = &CheckAssistantCidrResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CheckAssistantCidrResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CheckAssistantCidr)用于检查辅助CIDR是否与存量路由、对等连接（对端VPC的CIDR）等资源存在冲突。如果存在重叠，则返回重叠的资源。（接口灰度中，如需使用请提工单。） @@ -518,127 +517,127 @@ func NewCheckAssistantCidrResponse() (response *CheckAssistantCidrResponse) { // * 检测辅助CIDR是否与当前VPC的路由的目的端存在重叠。 // * 检测辅助CIDR是否与当前VPC的对等连接，对端VPC下的主CIDR或辅助CIDR存在重叠。 func (c *Client) CheckAssistantCidr(request *CheckAssistantCidrRequest) (response *CheckAssistantCidrResponse, err error) { - if request == nil { - request = NewCheckAssistantCidrRequest() - } - response = NewCheckAssistantCidrResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCheckAssistantCidrRequest() + } + response = NewCheckAssistantCidrResponse() + err = c.Send(request, response) + return } func NewCheckDefaultSubnetRequest() (request *CheckDefaultSubnetRequest) { - request = &CheckDefaultSubnetRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CheckDefaultSubnet") - return + request = &CheckDefaultSubnetRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CheckDefaultSubnet") + return } func NewCheckDefaultSubnetResponse() (response *CheckDefaultSubnetResponse) { - response = &CheckDefaultSubnetResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CheckDefaultSubnetResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CheckDefaultSubnet）用于预判是否可建默认子网。 func (c *Client) CheckDefaultSubnet(request *CheckDefaultSubnetRequest) (response *CheckDefaultSubnetResponse, err error) { - if request == nil { - request = NewCheckDefaultSubnetRequest() - } - response = NewCheckDefaultSubnetResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCheckDefaultSubnetRequest() + } + response = NewCheckDefaultSubnetResponse() + err = c.Send(request, response) + return } func NewCheckNetDetectStateRequest() (request *CheckNetDetectStateRequest) { - request = &CheckNetDetectStateRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CheckNetDetectState") - return + request = &CheckNetDetectStateRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CheckNetDetectState") + return } func NewCheckNetDetectStateResponse() (response *CheckNetDetectStateResponse) { - response = &CheckNetDetectStateResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CheckNetDetectStateResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CheckNetDetectState)用于验证网络探测。 func (c *Client) CheckNetDetectState(request *CheckNetDetectStateRequest) (response *CheckNetDetectStateResponse, err error) { - if request == nil { - request = NewCheckNetDetectStateRequest() - } - response = NewCheckNetDetectStateResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCheckNetDetectStateRequest() + } + response = NewCheckNetDetectStateResponse() + err = c.Send(request, response) + return } func NewCreateAddressTemplateRequest() (request *CreateAddressTemplateRequest) { - request = &CreateAddressTemplateRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateAddressTemplate") - return + request = &CreateAddressTemplateRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateAddressTemplate") + return } func NewCreateAddressTemplateResponse() (response *CreateAddressTemplateResponse) { - response = &CreateAddressTemplateResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateAddressTemplateResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateAddressTemplate）用于创建IP地址模版 func (c *Client) CreateAddressTemplate(request *CreateAddressTemplateRequest) (response *CreateAddressTemplateResponse, err error) { - if request == nil { - request = NewCreateAddressTemplateRequest() - } - response = NewCreateAddressTemplateResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateAddressTemplateRequest() + } + response = NewCreateAddressTemplateResponse() + err = c.Send(request, response) + return } func NewCreateAddressTemplateGroupRequest() (request *CreateAddressTemplateGroupRequest) { - request = &CreateAddressTemplateGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateAddressTemplateGroup") - return + request = &CreateAddressTemplateGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateAddressTemplateGroup") + return } func NewCreateAddressTemplateGroupResponse() (response *CreateAddressTemplateGroupResponse) { - response = &CreateAddressTemplateGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateAddressTemplateGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateAddressTemplateGroup）用于创建IP地址模版集合 func (c *Client) CreateAddressTemplateGroup(request *CreateAddressTemplateGroupRequest) (response *CreateAddressTemplateGroupResponse, err error) { - if request == nil { - request = NewCreateAddressTemplateGroupRequest() - } - response = NewCreateAddressTemplateGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateAddressTemplateGroupRequest() + } + response = NewCreateAddressTemplateGroupResponse() + err = c.Send(request, response) + return } func NewCreateAndAttachNetworkInterfaceRequest() (request *CreateAndAttachNetworkInterfaceRequest) { - request = &CreateAndAttachNetworkInterfaceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateAndAttachNetworkInterface") - return + request = &CreateAndAttachNetworkInterfaceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateAndAttachNetworkInterface") + return } func NewCreateAndAttachNetworkInterfaceResponse() (response *CreateAndAttachNetworkInterfaceResponse) { - response = &CreateAndAttachNetworkInterfaceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateAndAttachNetworkInterfaceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateAndAttachNetworkInterface）用于创建弹性网卡并绑定云主机。 @@ -648,129 +647,129 @@ func NewCreateAndAttachNetworkInterfaceResponse() (response *CreateAndAttachNetw // * 创建弹性网卡同时可以绑定已有安全组。 // * 创建弹性网卡同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateAndAttachNetworkInterface(request *CreateAndAttachNetworkInterfaceRequest) (response *CreateAndAttachNetworkInterfaceResponse, err error) { - if request == nil { - request = NewCreateAndAttachNetworkInterfaceRequest() - } - response = NewCreateAndAttachNetworkInterfaceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateAndAttachNetworkInterfaceRequest() + } + response = NewCreateAndAttachNetworkInterfaceResponse() + err = c.Send(request, response) + return } func NewCreateAssistantCidrRequest() (request *CreateAssistantCidrRequest) { - request = &CreateAssistantCidrRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateAssistantCidr") - return + request = &CreateAssistantCidrRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateAssistantCidr") + return } func NewCreateAssistantCidrResponse() (response *CreateAssistantCidrResponse) { - response = &CreateAssistantCidrResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateAssistantCidrResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateAssistantCidr)用于批量创建辅助CIDR。（接口灰度中，如需使用请提工单。） func (c *Client) CreateAssistantCidr(request *CreateAssistantCidrRequest) (response *CreateAssistantCidrResponse, err error) { - if request == nil { - request = NewCreateAssistantCidrRequest() - } - response = NewCreateAssistantCidrResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateAssistantCidrRequest() + } + response = NewCreateAssistantCidrResponse() + err = c.Send(request, response) + return } func NewCreateBandwidthPackageRequest() (request *CreateBandwidthPackageRequest) { - request = &CreateBandwidthPackageRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateBandwidthPackage") - return + request = &CreateBandwidthPackageRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateBandwidthPackage") + return } func NewCreateBandwidthPackageResponse() (response *CreateBandwidthPackageResponse) { - response = &CreateBandwidthPackageResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateBandwidthPackageResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口支持创建[设备带宽包](https://cloud.tencent.com/document/product/684/15246#.E8.AE.BE.E5.A4.87.E5.B8.A6.E5.AE.BD.E5.8C.85)和[IP带宽包](https://cloud.tencent.com/document/product/684/15246#ip-.E5.B8.A6.E5.AE.BD.E5.8C.85) func (c *Client) CreateBandwidthPackage(request *CreateBandwidthPackageRequest) (response *CreateBandwidthPackageResponse, err error) { - if request == nil { - request = NewCreateBandwidthPackageRequest() - } - response = NewCreateBandwidthPackageResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateBandwidthPackageRequest() + } + response = NewCreateBandwidthPackageResponse() + err = c.Send(request, response) + return } func NewCreateCcnRequest() (request *CreateCcnRequest) { - request = &CreateCcnRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateCcn") - return + request = &CreateCcnRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateCcn") + return } func NewCreateCcnResponse() (response *CreateCcnResponse) { - response = &CreateCcnResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateCcnResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateCcn）用于创建云联网（CCN）。
    // * 创建云联网同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 // 每个账号能创建的云联网实例个数是有限的，详请参考产品文档。如果需要扩充请联系在线客服。 func (c *Client) CreateCcn(request *CreateCcnRequest) (response *CreateCcnResponse, err error) { - if request == nil { - request = NewCreateCcnRequest() - } - response = NewCreateCcnResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateCcnRequest() + } + response = NewCreateCcnResponse() + err = c.Send(request, response) + return } func NewCreateCustomerGatewayRequest() (request *CreateCustomerGatewayRequest) { - request = &CreateCustomerGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateCustomerGateway") - return + request = &CreateCustomerGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateCustomerGateway") + return } func NewCreateCustomerGatewayResponse() (response *CreateCustomerGatewayResponse) { - response = &CreateCustomerGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateCustomerGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateCustomerGateway）用于创建对端网关。 func (c *Client) CreateCustomerGateway(request *CreateCustomerGatewayRequest) (response *CreateCustomerGatewayResponse, err error) { - if request == nil { - request = NewCreateCustomerGatewayRequest() - } - response = NewCreateCustomerGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateCustomerGatewayRequest() + } + response = NewCreateCustomerGatewayResponse() + err = c.Send(request, response) + return } func NewCreateDefaultSecurityGroupRequest() (request *CreateDefaultSecurityGroupRequest) { - request = &CreateDefaultSecurityGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateDefaultSecurityGroup") - return + request = &CreateDefaultSecurityGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateDefaultSecurityGroup") + return } func NewCreateDefaultSecurityGroupResponse() (response *CreateDefaultSecurityGroupResponse) { - response = &CreateDefaultSecurityGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateDefaultSecurityGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateDefaultSecurityGroup）用于创建（如果项目下未存在默认安全组，则创建；已存在则获取。）默认安全组（SecurityGroup）。 @@ -778,312 +777,312 @@ func NewCreateDefaultSecurityGroupResponse() (response *CreateDefaultSecurityGro // * 新建的安全组的入站和出站规则默认都是全部拒绝，在创建后通常您需要再调用CreateSecurityGroupPolicies将安全组的规则设置为需要的规则。 // * 创建安全组同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateDefaultSecurityGroup(request *CreateDefaultSecurityGroupRequest) (response *CreateDefaultSecurityGroupResponse, err error) { - if request == nil { - request = NewCreateDefaultSecurityGroupRequest() - } - response = NewCreateDefaultSecurityGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateDefaultSecurityGroupRequest() + } + response = NewCreateDefaultSecurityGroupResponse() + err = c.Send(request, response) + return } func NewCreateDefaultVpcRequest() (request *CreateDefaultVpcRequest) { - request = &CreateDefaultVpcRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateDefaultVpc") - return + request = &CreateDefaultVpcRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateDefaultVpc") + return } func NewCreateDefaultVpcResponse() (response *CreateDefaultVpcResponse) { - response = &CreateDefaultVpcResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateDefaultVpcResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateDefaultVpc）用于创建默认私有网络(VPC）。 -// +// // 默认VPC适用于快速入门和启动公共实例，您可以像使用任何其他VPC一样使用默认VPC。如果您想创建标准VPC，即指定VPC名称、VPC网段、子网网段、子网可用区，请使用常规创建VPC接口（CreateVpc） -// +// // 正常情况，本接口并不一定生产默认VPC，而是根据用户账号的网络属性（DescribeAccountAttributes）来决定的 // * 支持基础网络、VPC，返回VpcId为0 // * 只支持VPC，返回默认VPC信息 -// +// // 您也可以通过 Force 参数，强制返回默认VPC func (c *Client) CreateDefaultVpc(request *CreateDefaultVpcRequest) (response *CreateDefaultVpcResponse, err error) { - if request == nil { - request = NewCreateDefaultVpcRequest() - } - response = NewCreateDefaultVpcResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateDefaultVpcRequest() + } + response = NewCreateDefaultVpcResponse() + err = c.Send(request, response) + return } func NewCreateDhcpIpRequest() (request *CreateDhcpIpRequest) { - request = &CreateDhcpIpRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateDhcpIp") - return + request = &CreateDhcpIpRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateDhcpIp") + return } func NewCreateDhcpIpResponse() (response *CreateDhcpIpResponse) { - response = &CreateDhcpIpResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateDhcpIpResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateDhcpIp）用于创建DhcpIp func (c *Client) CreateDhcpIp(request *CreateDhcpIpRequest) (response *CreateDhcpIpResponse, err error) { - if request == nil { - request = NewCreateDhcpIpRequest() - } - response = NewCreateDhcpIpResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateDhcpIpRequest() + } + response = NewCreateDhcpIpResponse() + err = c.Send(request, response) + return } func NewCreateDirectConnectGatewayRequest() (request *CreateDirectConnectGatewayRequest) { - request = &CreateDirectConnectGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateDirectConnectGateway") - return + request = &CreateDirectConnectGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateDirectConnectGateway") + return } func NewCreateDirectConnectGatewayResponse() (response *CreateDirectConnectGatewayResponse) { - response = &CreateDirectConnectGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateDirectConnectGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateDirectConnectGateway）用于创建专线网关。 func (c *Client) CreateDirectConnectGateway(request *CreateDirectConnectGatewayRequest) (response *CreateDirectConnectGatewayResponse, err error) { - if request == nil { - request = NewCreateDirectConnectGatewayRequest() - } - response = NewCreateDirectConnectGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateDirectConnectGatewayRequest() + } + response = NewCreateDirectConnectGatewayResponse() + err = c.Send(request, response) + return } func NewCreateDirectConnectGatewayCcnRoutesRequest() (request *CreateDirectConnectGatewayCcnRoutesRequest) { - request = &CreateDirectConnectGatewayCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateDirectConnectGatewayCcnRoutes") - return + request = &CreateDirectConnectGatewayCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateDirectConnectGatewayCcnRoutes") + return } func NewCreateDirectConnectGatewayCcnRoutesResponse() (response *CreateDirectConnectGatewayCcnRoutesResponse) { - response = &CreateDirectConnectGatewayCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateDirectConnectGatewayCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateDirectConnectGatewayCcnRoutes）用于创建专线网关的云联网路由（IDC网段） func (c *Client) CreateDirectConnectGatewayCcnRoutes(request *CreateDirectConnectGatewayCcnRoutesRequest) (response *CreateDirectConnectGatewayCcnRoutesResponse, err error) { - if request == nil { - request = NewCreateDirectConnectGatewayCcnRoutesRequest() - } - response = NewCreateDirectConnectGatewayCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateDirectConnectGatewayCcnRoutesRequest() + } + response = NewCreateDirectConnectGatewayCcnRoutesResponse() + err = c.Send(request, response) + return } func NewCreateFlowLogRequest() (request *CreateFlowLogRequest) { - request = &CreateFlowLogRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateFlowLog") - return + request = &CreateFlowLogRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateFlowLog") + return } func NewCreateFlowLogResponse() (response *CreateFlowLogResponse) { - response = &CreateFlowLogResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateFlowLogResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateFlowLog）用于创建流日志 func (c *Client) CreateFlowLog(request *CreateFlowLogRequest) (response *CreateFlowLogResponse, err error) { - if request == nil { - request = NewCreateFlowLogRequest() - } - response = NewCreateFlowLogResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateFlowLogRequest() + } + response = NewCreateFlowLogResponse() + err = c.Send(request, response) + return } func NewCreateHaVipRequest() (request *CreateHaVipRequest) { - request = &CreateHaVipRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateHaVip") - return + request = &CreateHaVipRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateHaVip") + return } func NewCreateHaVipResponse() (response *CreateHaVipResponse) { - response = &CreateHaVipResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateHaVipResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateHaVip）用于创建高可用虚拟IP（HAVIP） func (c *Client) CreateHaVip(request *CreateHaVipRequest) (response *CreateHaVipResponse, err error) { - if request == nil { - request = NewCreateHaVipRequest() - } - response = NewCreateHaVipResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateHaVipRequest() + } + response = NewCreateHaVipResponse() + err = c.Send(request, response) + return } func NewCreateIp6TranslatorsRequest() (request *CreateIp6TranslatorsRequest) { - request = &CreateIp6TranslatorsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateIp6Translators") - return + request = &CreateIp6TranslatorsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateIp6Translators") + return } func NewCreateIp6TranslatorsResponse() (response *CreateIp6TranslatorsResponse) { - response = &CreateIp6TranslatorsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateIp6TranslatorsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 1. 该接口用于创建IPV6转换IPV4实例，支持批量 // 2. 同一个账户在一个地域最多允许创建10个转换实例 func (c *Client) CreateIp6Translators(request *CreateIp6TranslatorsRequest) (response *CreateIp6TranslatorsResponse, err error) { - if request == nil { - request = NewCreateIp6TranslatorsRequest() - } - response = NewCreateIp6TranslatorsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateIp6TranslatorsRequest() + } + response = NewCreateIp6TranslatorsResponse() + err = c.Send(request, response) + return } func NewCreateNatGatewayRequest() (request *CreateNatGatewayRequest) { - request = &CreateNatGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateNatGateway") - return + request = &CreateNatGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateNatGateway") + return } func NewCreateNatGatewayResponse() (response *CreateNatGatewayResponse) { - response = &CreateNatGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateNatGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateNatGateway)用于创建NAT网关。 func (c *Client) CreateNatGateway(request *CreateNatGatewayRequest) (response *CreateNatGatewayResponse, err error) { - if request == nil { - request = NewCreateNatGatewayRequest() - } - response = NewCreateNatGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateNatGatewayRequest() + } + response = NewCreateNatGatewayResponse() + err = c.Send(request, response) + return } func NewCreateNatGatewayDestinationIpPortTranslationNatRuleRequest() (request *CreateNatGatewayDestinationIpPortTranslationNatRuleRequest) { - request = &CreateNatGatewayDestinationIpPortTranslationNatRuleRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateNatGatewayDestinationIpPortTranslationNatRule") - return + request = &CreateNatGatewayDestinationIpPortTranslationNatRuleRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateNatGatewayDestinationIpPortTranslationNatRule") + return } func NewCreateNatGatewayDestinationIpPortTranslationNatRuleResponse() (response *CreateNatGatewayDestinationIpPortTranslationNatRuleResponse) { - response = &CreateNatGatewayDestinationIpPortTranslationNatRuleResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateNatGatewayDestinationIpPortTranslationNatRuleResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateNatGatewayDestinationIpPortTranslationNatRule)用于创建NAT网关端口转发规则。 func (c *Client) CreateNatGatewayDestinationIpPortTranslationNatRule(request *CreateNatGatewayDestinationIpPortTranslationNatRuleRequest) (response *CreateNatGatewayDestinationIpPortTranslationNatRuleResponse, err error) { - if request == nil { - request = NewCreateNatGatewayDestinationIpPortTranslationNatRuleRequest() - } - response = NewCreateNatGatewayDestinationIpPortTranslationNatRuleResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateNatGatewayDestinationIpPortTranslationNatRuleRequest() + } + response = NewCreateNatGatewayDestinationIpPortTranslationNatRuleResponse() + err = c.Send(request, response) + return } func NewCreateNetDetectRequest() (request *CreateNetDetectRequest) { - request = &CreateNetDetectRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateNetDetect") - return + request = &CreateNetDetectRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateNetDetect") + return } func NewCreateNetDetectResponse() (response *CreateNetDetectResponse) { - response = &CreateNetDetectResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateNetDetectResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateNetDetect)用于创建网络探测。 func (c *Client) CreateNetDetect(request *CreateNetDetectRequest) (response *CreateNetDetectResponse, err error) { - if request == nil { - request = NewCreateNetDetectRequest() - } - response = NewCreateNetDetectResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateNetDetectRequest() + } + response = NewCreateNetDetectResponse() + err = c.Send(request, response) + return } func NewCreateNetworkAclRequest() (request *CreateNetworkAclRequest) { - request = &CreateNetworkAclRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateNetworkAcl") - return + request = &CreateNetworkAclRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateNetworkAcl") + return } func NewCreateNetworkAclResponse() (response *CreateNetworkAclResponse) { - response = &CreateNetworkAclResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateNetworkAclResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateNetworkAcl）用于创建新的网络ACL。 // * 新建的网络ACL的入站和出站规则默认都是全部拒绝，在创建后通常您需要再调用ModifyNetworkAclEntries将网络ACL的规则设置为需要的规则。 func (c *Client) CreateNetworkAcl(request *CreateNetworkAclRequest) (response *CreateNetworkAclResponse, err error) { - if request == nil { - request = NewCreateNetworkAclRequest() - } - response = NewCreateNetworkAclResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateNetworkAclRequest() + } + response = NewCreateNetworkAclResponse() + err = c.Send(request, response) + return } func NewCreateNetworkInterfaceRequest() (request *CreateNetworkInterfaceRequest) { - request = &CreateNetworkInterfaceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateNetworkInterface") - return + request = &CreateNetworkInterfaceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateNetworkInterface") + return } func NewCreateNetworkInterfaceResponse() (response *CreateNetworkInterfaceResponse) { - response = &CreateNetworkInterfaceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateNetworkInterfaceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateNetworkInterface）用于创建弹性网卡。 @@ -1093,80 +1092,80 @@ func NewCreateNetworkInterfaceResponse() (response *CreateNetworkInterfaceRespon // * 创建弹性网卡同时可以绑定已有安全组。 // * 创建弹性网卡同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateNetworkInterface(request *CreateNetworkInterfaceRequest) (response *CreateNetworkInterfaceResponse, err error) { - if request == nil { - request = NewCreateNetworkInterfaceRequest() - } - response = NewCreateNetworkInterfaceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateNetworkInterfaceRequest() + } + response = NewCreateNetworkInterfaceResponse() + err = c.Send(request, response) + return } func NewCreateRouteTableRequest() (request *CreateRouteTableRequest) { - request = &CreateRouteTableRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateRouteTable") - return + request = &CreateRouteTableRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateRouteTable") + return } func NewCreateRouteTableResponse() (response *CreateRouteTableResponse) { - response = &CreateRouteTableResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateRouteTableResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateRouteTable)用于创建路由表。 // * 创建了VPC后，系统会创建一个默认路由表，所有新建的子网都会关联到默认路由表。默认情况下您可以直接使用默认路由表来管理您的路由策略。当您的路由策略较多时，您可以调用创建路由表接口创建更多路由表管理您的路由策略。 // * 创建路由表同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateRouteTable(request *CreateRouteTableRequest) (response *CreateRouteTableResponse, err error) { - if request == nil { - request = NewCreateRouteTableRequest() - } - response = NewCreateRouteTableResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateRouteTableRequest() + } + response = NewCreateRouteTableResponse() + err = c.Send(request, response) + return } func NewCreateRoutesRequest() (request *CreateRoutesRequest) { - request = &CreateRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateRoutes") - return + request = &CreateRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateRoutes") + return } func NewCreateRoutesResponse() (response *CreateRoutesResponse) { - response = &CreateRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateRoutes)用于创建路由策略。 // * 向指定路由表批量新增路由策略。 func (c *Client) CreateRoutes(request *CreateRoutesRequest) (response *CreateRoutesResponse, err error) { - if request == nil { - request = NewCreateRoutesRequest() - } - response = NewCreateRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateRoutesRequest() + } + response = NewCreateRoutesResponse() + err = c.Send(request, response) + return } func NewCreateSecurityGroupRequest() (request *CreateSecurityGroupRequest) { - request = &CreateSecurityGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateSecurityGroup") - return + request = &CreateSecurityGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateSecurityGroup") + return } func NewCreateSecurityGroupResponse() (response *CreateSecurityGroupResponse) { - response = &CreateSecurityGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateSecurityGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateSecurityGroup）用于创建新的安全组（SecurityGroup）。 @@ -1174,31 +1173,31 @@ func NewCreateSecurityGroupResponse() (response *CreateSecurityGroupResponse) { // * 新建的安全组的入站和出站规则默认都是全部拒绝，在创建后通常您需要再调用CreateSecurityGroupPolicies将安全组的规则设置为需要的规则。 // * 创建安全组同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateSecurityGroup(request *CreateSecurityGroupRequest) (response *CreateSecurityGroupResponse, err error) { - if request == nil { - request = NewCreateSecurityGroupRequest() - } - response = NewCreateSecurityGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateSecurityGroupRequest() + } + response = NewCreateSecurityGroupResponse() + err = c.Send(request, response) + return } func NewCreateSecurityGroupPoliciesRequest() (request *CreateSecurityGroupPoliciesRequest) { - request = &CreateSecurityGroupPoliciesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateSecurityGroupPolicies") - return + request = &CreateSecurityGroupPoliciesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateSecurityGroupPolicies") + return } func NewCreateSecurityGroupPoliciesResponse() (response *CreateSecurityGroupPoliciesResponse) { - response = &CreateSecurityGroupPoliciesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateSecurityGroupPoliciesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateSecurityGroupPolicies）用于创建安全组规则（SecurityGroupPolicy）。 -// +// // 在 SecurityGroupPolicySet 参数中： //
      //
    • Version 安全组规则版本号，用户每次更新安全规则版本会自动加1，防止您更新的路由规则已过期，不填不考虑冲突。
      • @@ -1213,33 +1212,33 @@ func NewCreateSecurityGroupPoliciesResponse() (response *CreateSecurityGroupPoli //
    • 一次请求中只能创建单个方向的规则, 如果需要指定索引（PolicyIndex）参数, 多条规则的索引必须一致。
      • //
    • func (c *Client) CreateSecurityGroupPolicies(request *CreateSecurityGroupPoliciesRequest) (response *CreateSecurityGroupPoliciesResponse, err error) { - if request == nil { - request = NewCreateSecurityGroupPoliciesRequest() - } - response = NewCreateSecurityGroupPoliciesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateSecurityGroupPoliciesRequest() + } + response = NewCreateSecurityGroupPoliciesResponse() + err = c.Send(request, response) + return } func NewCreateSecurityGroupWithPoliciesRequest() (request *CreateSecurityGroupWithPoliciesRequest) { - request = &CreateSecurityGroupWithPoliciesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateSecurityGroupWithPolicies") - return + request = &CreateSecurityGroupWithPoliciesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateSecurityGroupWithPolicies") + return } func NewCreateSecurityGroupWithPoliciesResponse() (response *CreateSecurityGroupWithPoliciesResponse) { - response = &CreateSecurityGroupWithPoliciesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateSecurityGroupWithPoliciesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateSecurityGroupWithPolicies）用于创建新的安全组（SecurityGroup），并且可以同时添加安全组规则（SecurityGroupPolicy）。 // * 每个账户下每个地域的每个项目的安全组数量限制。 // * 新建的安全组的入站和出站规则默认都是全部拒绝，在创建后通常您需要再调用CreateSecurityGroupPolicies将安全组的规则设置为需要的规则。 -// +// // 安全组规则说明： // * Version安全组规则版本号，用户每次更新安全规则版本会自动加1，防止您更新的路由规则已过期，不填不考虑冲突。 // * Protocol字段支持输入TCP, UDP, ICMP, ICMPV6, GRE, ALL。 @@ -1251,77 +1250,77 @@ func NewCreateSecurityGroupWithPoliciesResponse() (response *CreateSecurityGroup // * CidrBlock, Ipv6CidrBlock, SecurityGroupId, AddressTemplate四者是排他关系，不允许同时输入，Protocol + Port和ServiceTemplate二者是排他关系，不允许同时输入。 // * 一次请求中只能创建单个方向的规则, 如果需要指定索引（PolicyIndex）参数, 多条规则的索引必须一致。 func (c *Client) CreateSecurityGroupWithPolicies(request *CreateSecurityGroupWithPoliciesRequest) (response *CreateSecurityGroupWithPoliciesResponse, err error) { - if request == nil { - request = NewCreateSecurityGroupWithPoliciesRequest() - } - response = NewCreateSecurityGroupWithPoliciesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateSecurityGroupWithPoliciesRequest() + } + response = NewCreateSecurityGroupWithPoliciesResponse() + err = c.Send(request, response) + return } func NewCreateServiceTemplateRequest() (request *CreateServiceTemplateRequest) { - request = &CreateServiceTemplateRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateServiceTemplate") - return + request = &CreateServiceTemplateRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateServiceTemplate") + return } func NewCreateServiceTemplateResponse() (response *CreateServiceTemplateResponse) { - response = &CreateServiceTemplateResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateServiceTemplateResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateServiceTemplate）用于创建协议端口模板 func (c *Client) CreateServiceTemplate(request *CreateServiceTemplateRequest) (response *CreateServiceTemplateResponse, err error) { - if request == nil { - request = NewCreateServiceTemplateRequest() - } - response = NewCreateServiceTemplateResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateServiceTemplateRequest() + } + response = NewCreateServiceTemplateResponse() + err = c.Send(request, response) + return } func NewCreateServiceTemplateGroupRequest() (request *CreateServiceTemplateGroupRequest) { - request = &CreateServiceTemplateGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateServiceTemplateGroup") - return + request = &CreateServiceTemplateGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateServiceTemplateGroup") + return } func NewCreateServiceTemplateGroupResponse() (response *CreateServiceTemplateGroupResponse) { - response = &CreateServiceTemplateGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateServiceTemplateGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateServiceTemplateGroup）用于创建协议端口模板集合 func (c *Client) CreateServiceTemplateGroup(request *CreateServiceTemplateGroupRequest) (response *CreateServiceTemplateGroupResponse, err error) { - if request == nil { - request = NewCreateServiceTemplateGroupRequest() - } - response = NewCreateServiceTemplateGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateServiceTemplateGroupRequest() + } + response = NewCreateServiceTemplateGroupResponse() + err = c.Send(request, response) + return } func NewCreateSubnetRequest() (request *CreateSubnetRequest) { - request = &CreateSubnetRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateSubnet") - return + request = &CreateSubnetRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateSubnet") + return } func NewCreateSubnetResponse() (response *CreateSubnetResponse) { - response = &CreateSubnetResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateSubnetResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateSubnet)用于创建子网。 @@ -1332,27 +1331,27 @@ func NewCreateSubnetResponse() (response *CreateSubnetResponse) { // * 子网创建后会自动关联到默认路由表。 // * 创建子网同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateSubnet(request *CreateSubnetRequest) (response *CreateSubnetResponse, err error) { - if request == nil { - request = NewCreateSubnetRequest() - } - response = NewCreateSubnetResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateSubnetRequest() + } + response = NewCreateSubnetResponse() + err = c.Send(request, response) + return } func NewCreateSubnetsRequest() (request *CreateSubnetsRequest) { - request = &CreateSubnetsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateSubnets") - return + request = &CreateSubnetsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateSubnets") + return } func NewCreateSubnetsResponse() (response *CreateSubnetsResponse) { - response = &CreateSubnetsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateSubnetsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateSubnets)用于批量创建子网。 @@ -1363,27 +1362,27 @@ func NewCreateSubnetsResponse() (response *CreateSubnetsResponse) { // * 子网创建后会自动关联到默认路由表。 // * 创建子网同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateSubnets(request *CreateSubnetsRequest) (response *CreateSubnetsResponse, err error) { - if request == nil { - request = NewCreateSubnetsRequest() - } - response = NewCreateSubnetsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateSubnetsRequest() + } + response = NewCreateSubnetsResponse() + err = c.Send(request, response) + return } func NewCreateVpcRequest() (request *CreateVpcRequest) { - request = &CreateVpcRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateVpc") - return + request = &CreateVpcRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateVpc") + return } func NewCreateVpcResponse() (response *CreateVpcResponse) { - response = &CreateVpcResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateVpcResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateVpc)用于创建私有网络(VPC)。 @@ -1391,254 +1390,254 @@ func NewCreateVpcResponse() (response *CreateVpcResponse) { // * 同一个地域能创建的VPC资源个数也是有限制的，详见 VPC使用限制,如果需要扩充请联系在线客服。 // * 创建VPC同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateVpc(request *CreateVpcRequest) (response *CreateVpcResponse, err error) { - if request == nil { - request = NewCreateVpcRequest() - } - response = NewCreateVpcResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateVpcRequest() + } + response = NewCreateVpcResponse() + err = c.Send(request, response) + return } func NewCreateVpnConnectionRequest() (request *CreateVpnConnectionRequest) { - request = &CreateVpnConnectionRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateVpnConnection") - return + request = &CreateVpnConnectionRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateVpnConnection") + return } func NewCreateVpnConnectionResponse() (response *CreateVpnConnectionResponse) { - response = &CreateVpnConnectionResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateVpnConnectionResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateVpnConnection）用于创建VPN通道。 func (c *Client) CreateVpnConnection(request *CreateVpnConnectionRequest) (response *CreateVpnConnectionResponse, err error) { - if request == nil { - request = NewCreateVpnConnectionRequest() - } - response = NewCreateVpnConnectionResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateVpnConnectionRequest() + } + response = NewCreateVpnConnectionResponse() + err = c.Send(request, response) + return } func NewCreateVpnGatewayRequest() (request *CreateVpnGatewayRequest) { - request = &CreateVpnGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateVpnGateway") - return + request = &CreateVpnGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateVpnGateway") + return } func NewCreateVpnGatewayResponse() (response *CreateVpnGatewayResponse) { - response = &CreateVpnGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateVpnGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateVpnGateway）用于创建VPN网关。 func (c *Client) CreateVpnGateway(request *CreateVpnGatewayRequest) (response *CreateVpnGatewayResponse, err error) { - if request == nil { - request = NewCreateVpnGatewayRequest() - } - response = NewCreateVpnGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateVpnGatewayRequest() + } + response = NewCreateVpnGatewayResponse() + err = c.Send(request, response) + return } func NewDeleteAddressTemplateRequest() (request *DeleteAddressTemplateRequest) { - request = &DeleteAddressTemplateRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteAddressTemplate") - return + request = &DeleteAddressTemplateRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteAddressTemplate") + return } func NewDeleteAddressTemplateResponse() (response *DeleteAddressTemplateResponse) { - response = &DeleteAddressTemplateResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteAddressTemplateResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteAddressTemplate）用于删除IP地址模板 func (c *Client) DeleteAddressTemplate(request *DeleteAddressTemplateRequest) (response *DeleteAddressTemplateResponse, err error) { - if request == nil { - request = NewDeleteAddressTemplateRequest() - } - response = NewDeleteAddressTemplateResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteAddressTemplateRequest() + } + response = NewDeleteAddressTemplateResponse() + err = c.Send(request, response) + return } func NewDeleteAddressTemplateGroupRequest() (request *DeleteAddressTemplateGroupRequest) { - request = &DeleteAddressTemplateGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteAddressTemplateGroup") - return + request = &DeleteAddressTemplateGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteAddressTemplateGroup") + return } func NewDeleteAddressTemplateGroupResponse() (response *DeleteAddressTemplateGroupResponse) { - response = &DeleteAddressTemplateGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteAddressTemplateGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteAddressTemplateGroup）用于删除IP地址模板集合 func (c *Client) DeleteAddressTemplateGroup(request *DeleteAddressTemplateGroupRequest) (response *DeleteAddressTemplateGroupResponse, err error) { - if request == nil { - request = NewDeleteAddressTemplateGroupRequest() - } - response = NewDeleteAddressTemplateGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteAddressTemplateGroupRequest() + } + response = NewDeleteAddressTemplateGroupResponse() + err = c.Send(request, response) + return } func NewDeleteAssistantCidrRequest() (request *DeleteAssistantCidrRequest) { - request = &DeleteAssistantCidrRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteAssistantCidr") - return + request = &DeleteAssistantCidrRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteAssistantCidr") + return } func NewDeleteAssistantCidrResponse() (response *DeleteAssistantCidrResponse) { - response = &DeleteAssistantCidrResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteAssistantCidrResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DeleteAssistantCidr)用于删除辅助CIDR。（接口灰度中，如需使用请提工单。） func (c *Client) DeleteAssistantCidr(request *DeleteAssistantCidrRequest) (response *DeleteAssistantCidrResponse, err error) { - if request == nil { - request = NewDeleteAssistantCidrRequest() - } - response = NewDeleteAssistantCidrResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteAssistantCidrRequest() + } + response = NewDeleteAssistantCidrResponse() + err = c.Send(request, response) + return } func NewDeleteBandwidthPackageRequest() (request *DeleteBandwidthPackageRequest) { - request = &DeleteBandwidthPackageRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteBandwidthPackage") - return + request = &DeleteBandwidthPackageRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteBandwidthPackage") + return } func NewDeleteBandwidthPackageResponse() (response *DeleteBandwidthPackageResponse) { - response = &DeleteBandwidthPackageResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteBandwidthPackageResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口支持删除共享带宽包，包括[设备带宽包](https://cloud.tencent.com/document/product/684/15246#.E8.AE.BE.E5.A4.87.E5.B8.A6.E5.AE.BD.E5.8C.85)和[IP带宽包](https://cloud.tencent.com/document/product/684/15246#ip-.E5.B8.A6.E5.AE.BD.E5.8C.85) func (c *Client) DeleteBandwidthPackage(request *DeleteBandwidthPackageRequest) (response *DeleteBandwidthPackageResponse, err error) { - if request == nil { - request = NewDeleteBandwidthPackageRequest() - } - response = NewDeleteBandwidthPackageResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteBandwidthPackageRequest() + } + response = NewDeleteBandwidthPackageResponse() + err = c.Send(request, response) + return } func NewDeleteCcnRequest() (request *DeleteCcnRequest) { - request = &DeleteCcnRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteCcn") - return + request = &DeleteCcnRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteCcn") + return } func NewDeleteCcnResponse() (response *DeleteCcnResponse) { - response = &DeleteCcnResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteCcnResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteCcn）用于删除云联网。 // * 删除后，云联网关联的所有实例间路由将被删除，网络将会中断，请务必确认 // * 删除云联网是不可逆的操作，请谨慎处理。 func (c *Client) DeleteCcn(request *DeleteCcnRequest) (response *DeleteCcnResponse, err error) { - if request == nil { - request = NewDeleteCcnRequest() - } - response = NewDeleteCcnResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteCcnRequest() + } + response = NewDeleteCcnResponse() + err = c.Send(request, response) + return } func NewDeleteCustomerGatewayRequest() (request *DeleteCustomerGatewayRequest) { - request = &DeleteCustomerGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteCustomerGateway") - return + request = &DeleteCustomerGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteCustomerGateway") + return } func NewDeleteCustomerGatewayResponse() (response *DeleteCustomerGatewayResponse) { - response = &DeleteCustomerGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteCustomerGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteCustomerGateway）用于删除对端网关。 func (c *Client) DeleteCustomerGateway(request *DeleteCustomerGatewayRequest) (response *DeleteCustomerGatewayResponse, err error) { - if request == nil { - request = NewDeleteCustomerGatewayRequest() - } - response = NewDeleteCustomerGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteCustomerGatewayRequest() + } + response = NewDeleteCustomerGatewayResponse() + err = c.Send(request, response) + return } func NewDeleteDhcpIpRequest() (request *DeleteDhcpIpRequest) { - request = &DeleteDhcpIpRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteDhcpIp") - return + request = &DeleteDhcpIpRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteDhcpIp") + return } func NewDeleteDhcpIpResponse() (response *DeleteDhcpIpResponse) { - response = &DeleteDhcpIpResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteDhcpIpResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteDhcpIp）用于删除DhcpIp func (c *Client) DeleteDhcpIp(request *DeleteDhcpIpRequest) (response *DeleteDhcpIpResponse, err error) { - if request == nil { - request = NewDeleteDhcpIpRequest() - } - response = NewDeleteDhcpIpResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteDhcpIpRequest() + } + response = NewDeleteDhcpIpResponse() + err = c.Send(request, response) + return } func NewDeleteDirectConnectGatewayRequest() (request *DeleteDirectConnectGatewayRequest) { - request = &DeleteDirectConnectGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteDirectConnectGateway") - return + request = &DeleteDirectConnectGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteDirectConnectGateway") + return } func NewDeleteDirectConnectGatewayResponse() (response *DeleteDirectConnectGatewayResponse) { - response = &DeleteDirectConnectGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteDirectConnectGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteDirectConnectGateway）用于删除专线网关。 @@ -1646,307 +1645,307 @@ func NewDeleteDirectConnectGatewayResponse() (response *DeleteDirectConnectGatew //
  • 删除专线网关后，系统会删除路由表中跟该专线网关相关的路由策略。
    • // 本接口是异步完成，如需查询异步任务执行结果，请使用本接口返回的`RequestId`轮询`QueryTask`接口 func (c *Client) DeleteDirectConnectGateway(request *DeleteDirectConnectGatewayRequest) (response *DeleteDirectConnectGatewayResponse, err error) { - if request == nil { - request = NewDeleteDirectConnectGatewayRequest() - } - response = NewDeleteDirectConnectGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteDirectConnectGatewayRequest() + } + response = NewDeleteDirectConnectGatewayResponse() + err = c.Send(request, response) + return } func NewDeleteDirectConnectGatewayCcnRoutesRequest() (request *DeleteDirectConnectGatewayCcnRoutesRequest) { - request = &DeleteDirectConnectGatewayCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteDirectConnectGatewayCcnRoutes") - return + request = &DeleteDirectConnectGatewayCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteDirectConnectGatewayCcnRoutes") + return } func NewDeleteDirectConnectGatewayCcnRoutesResponse() (response *DeleteDirectConnectGatewayCcnRoutesResponse) { - response = &DeleteDirectConnectGatewayCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteDirectConnectGatewayCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteDirectConnectGatewayCcnRoutes）用于删除专线网关的云联网路由（IDC网段） func (c *Client) DeleteDirectConnectGatewayCcnRoutes(request *DeleteDirectConnectGatewayCcnRoutesRequest) (response *DeleteDirectConnectGatewayCcnRoutesResponse, err error) { - if request == nil { - request = NewDeleteDirectConnectGatewayCcnRoutesRequest() - } - response = NewDeleteDirectConnectGatewayCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteDirectConnectGatewayCcnRoutesRequest() + } + response = NewDeleteDirectConnectGatewayCcnRoutesResponse() + err = c.Send(request, response) + return } func NewDeleteFlowLogRequest() (request *DeleteFlowLogRequest) { - request = &DeleteFlowLogRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteFlowLog") - return + request = &DeleteFlowLogRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteFlowLog") + return } func NewDeleteFlowLogResponse() (response *DeleteFlowLogResponse) { - response = &DeleteFlowLogResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteFlowLogResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteFlowLog）用于删除流日志 func (c *Client) DeleteFlowLog(request *DeleteFlowLogRequest) (response *DeleteFlowLogResponse, err error) { - if request == nil { - request = NewDeleteFlowLogRequest() - } - response = NewDeleteFlowLogResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteFlowLogRequest() + } + response = NewDeleteFlowLogResponse() + err = c.Send(request, response) + return } func NewDeleteHaVipRequest() (request *DeleteHaVipRequest) { - request = &DeleteHaVipRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteHaVip") - return + request = &DeleteHaVipRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteHaVip") + return } func NewDeleteHaVipResponse() (response *DeleteHaVipResponse) { - response = &DeleteHaVipResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteHaVipResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteHaVip）用于删除高可用虚拟IP（HAVIP）
    // 本接口是异步完成，如需查询异步任务执行结果，请使用本接口返回的`RequestId`轮询`QueryTask`接口 func (c *Client) DeleteHaVip(request *DeleteHaVipRequest) (response *DeleteHaVipResponse, err error) { - if request == nil { - request = NewDeleteHaVipRequest() - } - response = NewDeleteHaVipResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteHaVipRequest() + } + response = NewDeleteHaVipResponse() + err = c.Send(request, response) + return } func NewDeleteIp6TranslatorsRequest() (request *DeleteIp6TranslatorsRequest) { - request = &DeleteIp6TranslatorsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteIp6Translators") - return + request = &DeleteIp6TranslatorsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteIp6Translators") + return } func NewDeleteIp6TranslatorsResponse() (response *DeleteIp6TranslatorsResponse) { - response = &DeleteIp6TranslatorsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteIp6TranslatorsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 1. 该接口用于释放IPV6转换实例，支持批量。 // 2. 如果IPV6转换实例建立有转换规则，会一并删除。 func (c *Client) DeleteIp6Translators(request *DeleteIp6TranslatorsRequest) (response *DeleteIp6TranslatorsResponse, err error) { - if request == nil { - request = NewDeleteIp6TranslatorsRequest() - } - response = NewDeleteIp6TranslatorsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteIp6TranslatorsRequest() + } + response = NewDeleteIp6TranslatorsResponse() + err = c.Send(request, response) + return } func NewDeleteNatGatewayRequest() (request *DeleteNatGatewayRequest) { - request = &DeleteNatGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteNatGateway") - return + request = &DeleteNatGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteNatGateway") + return } func NewDeleteNatGatewayResponse() (response *DeleteNatGatewayResponse) { - response = &DeleteNatGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteNatGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteNatGateway）用于删除NAT网关。 // 删除 NAT 网关后，系统会自动删除路由表中包含此 NAT 网关的路由项，同时也会解绑弹性公网IP（EIP）。 func (c *Client) DeleteNatGateway(request *DeleteNatGatewayRequest) (response *DeleteNatGatewayResponse, err error) { - if request == nil { - request = NewDeleteNatGatewayRequest() - } - response = NewDeleteNatGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteNatGatewayRequest() + } + response = NewDeleteNatGatewayResponse() + err = c.Send(request, response) + return } func NewDeleteNatGatewayDestinationIpPortTranslationNatRuleRequest() (request *DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest) { - request = &DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteNatGatewayDestinationIpPortTranslationNatRule") - return + request = &DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteNatGatewayDestinationIpPortTranslationNatRule") + return } func NewDeleteNatGatewayDestinationIpPortTranslationNatRuleResponse() (response *DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse) { - response = &DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteNatGatewayDestinationIpPortTranslationNatRule）用于删除NAT网关端口转发规则。 func (c *Client) DeleteNatGatewayDestinationIpPortTranslationNatRule(request *DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest) (response *DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse, err error) { - if request == nil { - request = NewDeleteNatGatewayDestinationIpPortTranslationNatRuleRequest() - } - response = NewDeleteNatGatewayDestinationIpPortTranslationNatRuleResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteNatGatewayDestinationIpPortTranslationNatRuleRequest() + } + response = NewDeleteNatGatewayDestinationIpPortTranslationNatRuleResponse() + err = c.Send(request, response) + return } func NewDeleteNetDetectRequest() (request *DeleteNetDetectRequest) { - request = &DeleteNetDetectRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteNetDetect") - return + request = &DeleteNetDetectRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteNetDetect") + return } func NewDeleteNetDetectResponse() (response *DeleteNetDetectResponse) { - response = &DeleteNetDetectResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteNetDetectResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DeleteNetDetect)用于删除网络探测实例。 func (c *Client) DeleteNetDetect(request *DeleteNetDetectRequest) (response *DeleteNetDetectResponse, err error) { - if request == nil { - request = NewDeleteNetDetectRequest() - } - response = NewDeleteNetDetectResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteNetDetectRequest() + } + response = NewDeleteNetDetectResponse() + err = c.Send(request, response) + return } func NewDeleteNetworkAclRequest() (request *DeleteNetworkAclRequest) { - request = &DeleteNetworkAclRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteNetworkAcl") - return + request = &DeleteNetworkAclRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteNetworkAcl") + return } func NewDeleteNetworkAclResponse() (response *DeleteNetworkAclResponse) { - response = &DeleteNetworkAclResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteNetworkAclResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteNetworkAcl）用于删除网络ACL。 func (c *Client) DeleteNetworkAcl(request *DeleteNetworkAclRequest) (response *DeleteNetworkAclResponse, err error) { - if request == nil { - request = NewDeleteNetworkAclRequest() - } - response = NewDeleteNetworkAclResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteNetworkAclRequest() + } + response = NewDeleteNetworkAclResponse() + err = c.Send(request, response) + return } func NewDeleteNetworkInterfaceRequest() (request *DeleteNetworkInterfaceRequest) { - request = &DeleteNetworkInterfaceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteNetworkInterface") - return + request = &DeleteNetworkInterfaceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteNetworkInterface") + return } func NewDeleteNetworkInterfaceResponse() (response *DeleteNetworkInterfaceResponse) { - response = &DeleteNetworkInterfaceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteNetworkInterfaceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteNetworkInterface）用于删除弹性网卡。 // * 弹性网卡上绑定了云服务器时，不能被删除。 // * 删除指定弹性网卡，弹性网卡必须先和子机解绑才能删除。删除之后弹性网卡上所有内网IP都将被退还。 func (c *Client) DeleteNetworkInterface(request *DeleteNetworkInterfaceRequest) (response *DeleteNetworkInterfaceResponse, err error) { - if request == nil { - request = NewDeleteNetworkInterfaceRequest() - } - response = NewDeleteNetworkInterfaceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteNetworkInterfaceRequest() + } + response = NewDeleteNetworkInterfaceResponse() + err = c.Send(request, response) + return } func NewDeleteRouteTableRequest() (request *DeleteRouteTableRequest) { - request = &DeleteRouteTableRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteRouteTable") - return + request = &DeleteRouteTableRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteRouteTable") + return } func NewDeleteRouteTableResponse() (response *DeleteRouteTableResponse) { - response = &DeleteRouteTableResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteRouteTableResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 删除路由表 func (c *Client) DeleteRouteTable(request *DeleteRouteTableRequest) (response *DeleteRouteTableResponse, err error) { - if request == nil { - request = NewDeleteRouteTableRequest() - } - response = NewDeleteRouteTableResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteRouteTableRequest() + } + response = NewDeleteRouteTableResponse() + err = c.Send(request, response) + return } func NewDeleteRoutesRequest() (request *DeleteRoutesRequest) { - request = &DeleteRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteRoutes") - return + request = &DeleteRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteRoutes") + return } func NewDeleteRoutesResponse() (response *DeleteRoutesResponse) { - response = &DeleteRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DeleteRoutes)用于对某个路由表批量删除路由策略（Route）。 func (c *Client) DeleteRoutes(request *DeleteRoutesRequest) (response *DeleteRoutesResponse, err error) { - if request == nil { - request = NewDeleteRoutesRequest() - } - response = NewDeleteRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteRoutesRequest() + } + response = NewDeleteRoutesResponse() + err = c.Send(request, response) + return } func NewDeleteSecurityGroupRequest() (request *DeleteSecurityGroupRequest) { - request = &DeleteSecurityGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteSecurityGroup") - return + request = &DeleteSecurityGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteSecurityGroup") + return } func NewDeleteSecurityGroupResponse() (response *DeleteSecurityGroupResponse) { - response = &DeleteSecurityGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteSecurityGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteSecurityGroup）用于删除安全组（SecurityGroup）。 @@ -1954,1386 +1953,1386 @@ func NewDeleteSecurityGroupResponse() (response *DeleteSecurityGroupResponse) { // * 安全组实例ID如果在其他安全组的规则中被引用，则无法直接删除。这种情况下，需要先进行规则修改，再删除安全组。 // * 删除的安全组无法再找回，请谨慎调用。 func (c *Client) DeleteSecurityGroup(request *DeleteSecurityGroupRequest) (response *DeleteSecurityGroupResponse, err error) { - if request == nil { - request = NewDeleteSecurityGroupRequest() - } - response = NewDeleteSecurityGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteSecurityGroupRequest() + } + response = NewDeleteSecurityGroupResponse() + err = c.Send(request, response) + return } func NewDeleteSecurityGroupPoliciesRequest() (request *DeleteSecurityGroupPoliciesRequest) { - request = &DeleteSecurityGroupPoliciesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteSecurityGroupPolicies") - return + request = &DeleteSecurityGroupPoliciesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteSecurityGroupPolicies") + return } func NewDeleteSecurityGroupPoliciesResponse() (response *DeleteSecurityGroupPoliciesResponse) { - response = &DeleteSecurityGroupPoliciesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteSecurityGroupPoliciesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteSecurityGroupPolicies）用于用于删除安全组规则（SecurityGroupPolicy）。 // * SecurityGroupPolicySet.Version 用于指定要操作的安全组的版本。传入 Version 版本号若不等于当前安全组的最新版本，将返回失败；若不传 Version 则直接删除指定PolicyIndex的规则。 func (c *Client) DeleteSecurityGroupPolicies(request *DeleteSecurityGroupPoliciesRequest) (response *DeleteSecurityGroupPoliciesResponse, err error) { - if request == nil { - request = NewDeleteSecurityGroupPoliciesRequest() - } - response = NewDeleteSecurityGroupPoliciesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteSecurityGroupPoliciesRequest() + } + response = NewDeleteSecurityGroupPoliciesResponse() + err = c.Send(request, response) + return } func NewDeleteServiceTemplateRequest() (request *DeleteServiceTemplateRequest) { - request = &DeleteServiceTemplateRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteServiceTemplate") - return + request = &DeleteServiceTemplateRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteServiceTemplate") + return } func NewDeleteServiceTemplateResponse() (response *DeleteServiceTemplateResponse) { - response = &DeleteServiceTemplateResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteServiceTemplateResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteServiceTemplate）用于删除协议端口模板 func (c *Client) DeleteServiceTemplate(request *DeleteServiceTemplateRequest) (response *DeleteServiceTemplateResponse, err error) { - if request == nil { - request = NewDeleteServiceTemplateRequest() - } - response = NewDeleteServiceTemplateResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteServiceTemplateRequest() + } + response = NewDeleteServiceTemplateResponse() + err = c.Send(request, response) + return } func NewDeleteServiceTemplateGroupRequest() (request *DeleteServiceTemplateGroupRequest) { - request = &DeleteServiceTemplateGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteServiceTemplateGroup") - return + request = &DeleteServiceTemplateGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteServiceTemplateGroup") + return } func NewDeleteServiceTemplateGroupResponse() (response *DeleteServiceTemplateGroupResponse) { - response = &DeleteServiceTemplateGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteServiceTemplateGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteServiceTemplateGroup）用于删除协议端口模板集合 func (c *Client) DeleteServiceTemplateGroup(request *DeleteServiceTemplateGroupRequest) (response *DeleteServiceTemplateGroupResponse, err error) { - if request == nil { - request = NewDeleteServiceTemplateGroupRequest() - } - response = NewDeleteServiceTemplateGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteServiceTemplateGroupRequest() + } + response = NewDeleteServiceTemplateGroupResponse() + err = c.Send(request, response) + return } func NewDeleteSubnetRequest() (request *DeleteSubnetRequest) { - request = &DeleteSubnetRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteSubnet") - return + request = &DeleteSubnetRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteSubnet") + return } func NewDeleteSubnetResponse() (response *DeleteSubnetResponse) { - response = &DeleteSubnetResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteSubnetResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteSubnet）用于用于删除子网(Subnet)。 // * 删除子网前，请清理该子网下所有资源，包括云服务器、负载均衡、云数据、noSql、弹性网卡等资源。 func (c *Client) DeleteSubnet(request *DeleteSubnetRequest) (response *DeleteSubnetResponse, err error) { - if request == nil { - request = NewDeleteSubnetRequest() - } - response = NewDeleteSubnetResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteSubnetRequest() + } + response = NewDeleteSubnetResponse() + err = c.Send(request, response) + return } func NewDeleteVpcRequest() (request *DeleteVpcRequest) { - request = &DeleteVpcRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteVpc") - return + request = &DeleteVpcRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteVpc") + return } func NewDeleteVpcResponse() (response *DeleteVpcResponse) { - response = &DeleteVpcResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteVpcResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteVpc）用于删除私有网络。 // * 删除前请确保 VPC 内已经没有相关资源，例如云服务器、云数据库、NoSQL、VPN网关、专线网关、负载均衡、对等连接、与之互通的基础网络设备等。 // * 删除私有网络是不可逆的操作，请谨慎处理。 func (c *Client) DeleteVpc(request *DeleteVpcRequest) (response *DeleteVpcResponse, err error) { - if request == nil { - request = NewDeleteVpcRequest() - } - response = NewDeleteVpcResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteVpcRequest() + } + response = NewDeleteVpcResponse() + err = c.Send(request, response) + return } func NewDeleteVpnConnectionRequest() (request *DeleteVpnConnectionRequest) { - request = &DeleteVpnConnectionRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteVpnConnection") - return + request = &DeleteVpnConnectionRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteVpnConnection") + return } func NewDeleteVpnConnectionResponse() (response *DeleteVpnConnectionResponse) { - response = &DeleteVpnConnectionResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteVpnConnectionResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DeleteVpnConnection)用于删除VPN通道。 func (c *Client) DeleteVpnConnection(request *DeleteVpnConnectionRequest) (response *DeleteVpnConnectionResponse, err error) { - if request == nil { - request = NewDeleteVpnConnectionRequest() - } - response = NewDeleteVpnConnectionResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteVpnConnectionRequest() + } + response = NewDeleteVpnConnectionResponse() + err = c.Send(request, response) + return } func NewDeleteVpnGatewayRequest() (request *DeleteVpnGatewayRequest) { - request = &DeleteVpnGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteVpnGateway") - return + request = &DeleteVpnGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteVpnGateway") + return } func NewDeleteVpnGatewayResponse() (response *DeleteVpnGatewayResponse) { - response = &DeleteVpnGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteVpnGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteVpnGateway）用于删除VPN网关。目前只支持删除运行中的按量计费的IPSEC网关实例。 func (c *Client) DeleteVpnGateway(request *DeleteVpnGatewayRequest) (response *DeleteVpnGatewayResponse, err error) { - if request == nil { - request = NewDeleteVpnGatewayRequest() - } - response = NewDeleteVpnGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteVpnGatewayRequest() + } + response = NewDeleteVpnGatewayResponse() + err = c.Send(request, response) + return } func NewDescribeAccountAttributesRequest() (request *DescribeAccountAttributesRequest) { - request = &DescribeAccountAttributesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeAccountAttributes") - return + request = &DescribeAccountAttributesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeAccountAttributes") + return } func NewDescribeAccountAttributesResponse() (response *DescribeAccountAttributesResponse) { - response = &DescribeAccountAttributesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeAccountAttributesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeAccountAttributes）用于查询用户账号私有属性。 func (c *Client) DescribeAccountAttributes(request *DescribeAccountAttributesRequest) (response *DescribeAccountAttributesResponse, err error) { - if request == nil { - request = NewDescribeAccountAttributesRequest() - } - response = NewDescribeAccountAttributesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeAccountAttributesRequest() + } + response = NewDescribeAccountAttributesResponse() + err = c.Send(request, response) + return } func NewDescribeAddressQuotaRequest() (request *DescribeAddressQuotaRequest) { - request = &DescribeAddressQuotaRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddressQuota") - return + request = &DescribeAddressQuotaRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddressQuota") + return } func NewDescribeAddressQuotaResponse() (response *DescribeAddressQuotaResponse) { - response = &DescribeAddressQuotaResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeAddressQuotaResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeAddressQuota) 用于查询您账户的[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）在当前地域的配额信息。配额详情可参见 [EIP 产品简介](https://cloud.tencent.com/document/product/213/5733)。 func (c *Client) DescribeAddressQuota(request *DescribeAddressQuotaRequest) (response *DescribeAddressQuotaResponse, err error) { - if request == nil { - request = NewDescribeAddressQuotaRequest() - } - response = NewDescribeAddressQuotaResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeAddressQuotaRequest() + } + response = NewDescribeAddressQuotaResponse() + err = c.Send(request, response) + return } func NewDescribeAddressTemplateGroupsRequest() (request *DescribeAddressTemplateGroupsRequest) { - request = &DescribeAddressTemplateGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddressTemplateGroups") - return + request = &DescribeAddressTemplateGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddressTemplateGroups") + return } func NewDescribeAddressTemplateGroupsResponse() (response *DescribeAddressTemplateGroupsResponse) { - response = &DescribeAddressTemplateGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeAddressTemplateGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeAddressTemplateGroups）用于查询IP地址模板集合 func (c *Client) DescribeAddressTemplateGroups(request *DescribeAddressTemplateGroupsRequest) (response *DescribeAddressTemplateGroupsResponse, err error) { - if request == nil { - request = NewDescribeAddressTemplateGroupsRequest() - } - response = NewDescribeAddressTemplateGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeAddressTemplateGroupsRequest() + } + response = NewDescribeAddressTemplateGroupsResponse() + err = c.Send(request, response) + return } func NewDescribeAddressTemplatesRequest() (request *DescribeAddressTemplatesRequest) { - request = &DescribeAddressTemplatesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddressTemplates") - return + request = &DescribeAddressTemplatesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddressTemplates") + return } func NewDescribeAddressTemplatesResponse() (response *DescribeAddressTemplatesResponse) { - response = &DescribeAddressTemplatesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeAddressTemplatesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeAddressTemplates）用于查询IP地址模板 func (c *Client) DescribeAddressTemplates(request *DescribeAddressTemplatesRequest) (response *DescribeAddressTemplatesResponse, err error) { - if request == nil { - request = NewDescribeAddressTemplatesRequest() - } - response = NewDescribeAddressTemplatesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeAddressTemplatesRequest() + } + response = NewDescribeAddressTemplatesResponse() + err = c.Send(request, response) + return } func NewDescribeAddressesRequest() (request *DescribeAddressesRequest) { - request = &DescribeAddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddresses") - return + request = &DescribeAddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddresses") + return } func NewDescribeAddressesResponse() (response *DescribeAddressesResponse) { - response = &DescribeAddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeAddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeAddresses) 用于查询一个或多个[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）的详细信息。 // * 如果参数为空，返回当前用户一定数量（Limit所指定的数量，默认为20）的 EIP。 func (c *Client) DescribeAddresses(request *DescribeAddressesRequest) (response *DescribeAddressesResponse, err error) { - if request == nil { - request = NewDescribeAddressesRequest() - } - response = NewDescribeAddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeAddressesRequest() + } + response = NewDescribeAddressesResponse() + err = c.Send(request, response) + return } func NewDescribeAssistantCidrRequest() (request *DescribeAssistantCidrRequest) { - request = &DescribeAssistantCidrRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeAssistantCidr") - return + request = &DescribeAssistantCidrRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeAssistantCidr") + return } func NewDescribeAssistantCidrResponse() (response *DescribeAssistantCidrResponse) { - response = &DescribeAssistantCidrResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeAssistantCidrResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeAssistantCidr）用于查询辅助CIDR列表。（接口灰度中，如需使用请提工单。） func (c *Client) DescribeAssistantCidr(request *DescribeAssistantCidrRequest) (response *DescribeAssistantCidrResponse, err error) { - if request == nil { - request = NewDescribeAssistantCidrRequest() - } - response = NewDescribeAssistantCidrResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeAssistantCidrRequest() + } + response = NewDescribeAssistantCidrResponse() + err = c.Send(request, response) + return } func NewDescribeBandwidthPackageQuotaRequest() (request *DescribeBandwidthPackageQuotaRequest) { - request = &DescribeBandwidthPackageQuotaRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeBandwidthPackageQuota") - return + request = &DescribeBandwidthPackageQuotaRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeBandwidthPackageQuota") + return } func NewDescribeBandwidthPackageQuotaResponse() (response *DescribeBandwidthPackageQuotaResponse) { - response = &DescribeBandwidthPackageQuotaResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeBandwidthPackageQuotaResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口用于查询账户在当前地域的带宽包上限数量以及使用数量 func (c *Client) DescribeBandwidthPackageQuota(request *DescribeBandwidthPackageQuotaRequest) (response *DescribeBandwidthPackageQuotaResponse, err error) { - if request == nil { - request = NewDescribeBandwidthPackageQuotaRequest() - } - response = NewDescribeBandwidthPackageQuotaResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeBandwidthPackageQuotaRequest() + } + response = NewDescribeBandwidthPackageQuotaResponse() + err = c.Send(request, response) + return } func NewDescribeBandwidthPackagesRequest() (request *DescribeBandwidthPackagesRequest) { - request = &DescribeBandwidthPackagesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeBandwidthPackages") - return + request = &DescribeBandwidthPackagesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeBandwidthPackages") + return } func NewDescribeBandwidthPackagesResponse() (response *DescribeBandwidthPackagesResponse) { - response = &DescribeBandwidthPackagesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeBandwidthPackagesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口用于查询带宽包详细信息，包括带宽包唯一标识ID，类型，计费模式，名称，资源信息等 func (c *Client) DescribeBandwidthPackages(request *DescribeBandwidthPackagesRequest) (response *DescribeBandwidthPackagesResponse, err error) { - if request == nil { - request = NewDescribeBandwidthPackagesRequest() - } - response = NewDescribeBandwidthPackagesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeBandwidthPackagesRequest() + } + response = NewDescribeBandwidthPackagesResponse() + err = c.Send(request, response) + return } func NewDescribeCcnAttachedInstancesRequest() (request *DescribeCcnAttachedInstancesRequest) { - request = &DescribeCcnAttachedInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcnAttachedInstances") - return + request = &DescribeCcnAttachedInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcnAttachedInstances") + return } func NewDescribeCcnAttachedInstancesResponse() (response *DescribeCcnAttachedInstancesResponse) { - response = &DescribeCcnAttachedInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeCcnAttachedInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeCcnAttachedInstances）用于查询云联网实例下已关联的网络实例。 func (c *Client) DescribeCcnAttachedInstances(request *DescribeCcnAttachedInstancesRequest) (response *DescribeCcnAttachedInstancesResponse, err error) { - if request == nil { - request = NewDescribeCcnAttachedInstancesRequest() - } - response = NewDescribeCcnAttachedInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeCcnAttachedInstancesRequest() + } + response = NewDescribeCcnAttachedInstancesResponse() + err = c.Send(request, response) + return } func NewDescribeCcnRegionBandwidthLimitsRequest() (request *DescribeCcnRegionBandwidthLimitsRequest) { - request = &DescribeCcnRegionBandwidthLimitsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcnRegionBandwidthLimits") - return + request = &DescribeCcnRegionBandwidthLimitsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcnRegionBandwidthLimits") + return } func NewDescribeCcnRegionBandwidthLimitsResponse() (response *DescribeCcnRegionBandwidthLimitsResponse) { - response = &DescribeCcnRegionBandwidthLimitsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeCcnRegionBandwidthLimitsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeCcnRegionBandwidthLimits）用于查询云联网各地域出带宽上限，该接口只返回已关联网络实例包含的地域 func (c *Client) DescribeCcnRegionBandwidthLimits(request *DescribeCcnRegionBandwidthLimitsRequest) (response *DescribeCcnRegionBandwidthLimitsResponse, err error) { - if request == nil { - request = NewDescribeCcnRegionBandwidthLimitsRequest() - } - response = NewDescribeCcnRegionBandwidthLimitsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeCcnRegionBandwidthLimitsRequest() + } + response = NewDescribeCcnRegionBandwidthLimitsResponse() + err = c.Send(request, response) + return } func NewDescribeCcnRoutesRequest() (request *DescribeCcnRoutesRequest) { - request = &DescribeCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcnRoutes") - return + request = &DescribeCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcnRoutes") + return } func NewDescribeCcnRoutesResponse() (response *DescribeCcnRoutesResponse) { - response = &DescribeCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeCcnRoutes）用于查询已加入云联网（CCN）的路由 func (c *Client) DescribeCcnRoutes(request *DescribeCcnRoutesRequest) (response *DescribeCcnRoutesResponse, err error) { - if request == nil { - request = NewDescribeCcnRoutesRequest() - } - response = NewDescribeCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeCcnRoutesRequest() + } + response = NewDescribeCcnRoutesResponse() + err = c.Send(request, response) + return } func NewDescribeCcnsRequest() (request *DescribeCcnsRequest) { - request = &DescribeCcnsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcns") - return + request = &DescribeCcnsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcns") + return } func NewDescribeCcnsResponse() (response *DescribeCcnsResponse) { - response = &DescribeCcnsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeCcnsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeCcns）用于查询云联网（CCN）列表。 func (c *Client) DescribeCcns(request *DescribeCcnsRequest) (response *DescribeCcnsResponse, err error) { - if request == nil { - request = NewDescribeCcnsRequest() - } - response = NewDescribeCcnsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeCcnsRequest() + } + response = NewDescribeCcnsResponse() + err = c.Send(request, response) + return } func NewDescribeClassicLinkInstancesRequest() (request *DescribeClassicLinkInstancesRequest) { - request = &DescribeClassicLinkInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeClassicLinkInstances") - return + request = &DescribeClassicLinkInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeClassicLinkInstances") + return } func NewDescribeClassicLinkInstancesResponse() (response *DescribeClassicLinkInstancesResponse) { - response = &DescribeClassicLinkInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeClassicLinkInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeClassicLinkInstances)用于查询私有网络和基础网络设备互通列表。 func (c *Client) DescribeClassicLinkInstances(request *DescribeClassicLinkInstancesRequest) (response *DescribeClassicLinkInstancesResponse, err error) { - if request == nil { - request = NewDescribeClassicLinkInstancesRequest() - } - response = NewDescribeClassicLinkInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeClassicLinkInstancesRequest() + } + response = NewDescribeClassicLinkInstancesResponse() + err = c.Send(request, response) + return } func NewDescribeCustomerGatewayVendorsRequest() (request *DescribeCustomerGatewayVendorsRequest) { - request = &DescribeCustomerGatewayVendorsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeCustomerGatewayVendors") - return + request = &DescribeCustomerGatewayVendorsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeCustomerGatewayVendors") + return } func NewDescribeCustomerGatewayVendorsResponse() (response *DescribeCustomerGatewayVendorsResponse) { - response = &DescribeCustomerGatewayVendorsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeCustomerGatewayVendorsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeCustomerGatewayVendors）用于查询可支持的对端网关厂商信息。 func (c *Client) DescribeCustomerGatewayVendors(request *DescribeCustomerGatewayVendorsRequest) (response *DescribeCustomerGatewayVendorsResponse, err error) { - if request == nil { - request = NewDescribeCustomerGatewayVendorsRequest() - } - response = NewDescribeCustomerGatewayVendorsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeCustomerGatewayVendorsRequest() + } + response = NewDescribeCustomerGatewayVendorsResponse() + err = c.Send(request, response) + return } func NewDescribeCustomerGatewaysRequest() (request *DescribeCustomerGatewaysRequest) { - request = &DescribeCustomerGatewaysRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeCustomerGateways") - return + request = &DescribeCustomerGatewaysRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeCustomerGateways") + return } func NewDescribeCustomerGatewaysResponse() (response *DescribeCustomerGatewaysResponse) { - response = &DescribeCustomerGatewaysResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeCustomerGatewaysResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeCustomerGateways）用于查询对端网关列表。 func (c *Client) DescribeCustomerGateways(request *DescribeCustomerGatewaysRequest) (response *DescribeCustomerGatewaysResponse, err error) { - if request == nil { - request = NewDescribeCustomerGatewaysRequest() - } - response = NewDescribeCustomerGatewaysResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeCustomerGatewaysRequest() + } + response = NewDescribeCustomerGatewaysResponse() + err = c.Send(request, response) + return } func NewDescribeDhcpIpsRequest() (request *DescribeDhcpIpsRequest) { - request = &DescribeDhcpIpsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeDhcpIps") - return + request = &DescribeDhcpIpsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeDhcpIps") + return } func NewDescribeDhcpIpsResponse() (response *DescribeDhcpIpsResponse) { - response = &DescribeDhcpIpsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeDhcpIpsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeDhcpIps）用于查询DhcpIp列表 func (c *Client) DescribeDhcpIps(request *DescribeDhcpIpsRequest) (response *DescribeDhcpIpsResponse, err error) { - if request == nil { - request = NewDescribeDhcpIpsRequest() - } - response = NewDescribeDhcpIpsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeDhcpIpsRequest() + } + response = NewDescribeDhcpIpsResponse() + err = c.Send(request, response) + return } func NewDescribeDirectConnectGatewayCcnRoutesRequest() (request *DescribeDirectConnectGatewayCcnRoutesRequest) { - request = &DescribeDirectConnectGatewayCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeDirectConnectGatewayCcnRoutes") - return + request = &DescribeDirectConnectGatewayCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeDirectConnectGatewayCcnRoutes") + return } func NewDescribeDirectConnectGatewayCcnRoutesResponse() (response *DescribeDirectConnectGatewayCcnRoutesResponse) { - response = &DescribeDirectConnectGatewayCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeDirectConnectGatewayCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeDirectConnectGatewayCcnRoutes）用于查询专线网关的云联网路由（IDC网段） func (c *Client) DescribeDirectConnectGatewayCcnRoutes(request *DescribeDirectConnectGatewayCcnRoutesRequest) (response *DescribeDirectConnectGatewayCcnRoutesResponse, err error) { - if request == nil { - request = NewDescribeDirectConnectGatewayCcnRoutesRequest() - } - response = NewDescribeDirectConnectGatewayCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeDirectConnectGatewayCcnRoutesRequest() + } + response = NewDescribeDirectConnectGatewayCcnRoutesResponse() + err = c.Send(request, response) + return } func NewDescribeDirectConnectGatewaysRequest() (request *DescribeDirectConnectGatewaysRequest) { - request = &DescribeDirectConnectGatewaysRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeDirectConnectGateways") - return + request = &DescribeDirectConnectGatewaysRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeDirectConnectGateways") + return } func NewDescribeDirectConnectGatewaysResponse() (response *DescribeDirectConnectGatewaysResponse) { - response = &DescribeDirectConnectGatewaysResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeDirectConnectGatewaysResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeDirectConnectGateways）用于查询专线网关。 func (c *Client) DescribeDirectConnectGateways(request *DescribeDirectConnectGatewaysRequest) (response *DescribeDirectConnectGatewaysResponse, err error) { - if request == nil { - request = NewDescribeDirectConnectGatewaysRequest() - } - response = NewDescribeDirectConnectGatewaysResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeDirectConnectGatewaysRequest() + } + response = NewDescribeDirectConnectGatewaysResponse() + err = c.Send(request, response) + return } func NewDescribeFlowLogRequest() (request *DescribeFlowLogRequest) { - request = &DescribeFlowLogRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeFlowLog") - return + request = &DescribeFlowLogRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeFlowLog") + return } func NewDescribeFlowLogResponse() (response *DescribeFlowLogResponse) { - response = &DescribeFlowLogResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeFlowLogResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeFlowLog）用于查询流日志实例信息 func (c *Client) DescribeFlowLog(request *DescribeFlowLogRequest) (response *DescribeFlowLogResponse, err error) { - if request == nil { - request = NewDescribeFlowLogRequest() - } - response = NewDescribeFlowLogResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeFlowLogRequest() + } + response = NewDescribeFlowLogResponse() + err = c.Send(request, response) + return } func NewDescribeFlowLogsRequest() (request *DescribeFlowLogsRequest) { - request = &DescribeFlowLogsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeFlowLogs") - return + request = &DescribeFlowLogsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeFlowLogs") + return } func NewDescribeFlowLogsResponse() (response *DescribeFlowLogsResponse) { - response = &DescribeFlowLogsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeFlowLogsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeFlowLogs）用于查询获取流日志集合 func (c *Client) DescribeFlowLogs(request *DescribeFlowLogsRequest) (response *DescribeFlowLogsResponse, err error) { - if request == nil { - request = NewDescribeFlowLogsRequest() - } - response = NewDescribeFlowLogsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeFlowLogsRequest() + } + response = NewDescribeFlowLogsResponse() + err = c.Send(request, response) + return } func NewDescribeGatewayFlowMonitorDetailRequest() (request *DescribeGatewayFlowMonitorDetailRequest) { - request = &DescribeGatewayFlowMonitorDetailRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeGatewayFlowMonitorDetail") - return + request = &DescribeGatewayFlowMonitorDetailRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeGatewayFlowMonitorDetail") + return } func NewDescribeGatewayFlowMonitorDetailResponse() (response *DescribeGatewayFlowMonitorDetailResponse) { - response = &DescribeGatewayFlowMonitorDetailResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeGatewayFlowMonitorDetailResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeGatewayFlowMonitorDetail）用于查询网关流量监控明细。 // * 只支持单个网关实例查询。即入参 `VpnId` `DirectConnectGatewayId` `PeeringConnectionId` `NatId` 最多只支持传一个，且必须传一个。 // * 如果网关有流量，但调用本接口没有返回数据，请在控制台对应网关详情页确认是否开启网关流量监控。 func (c *Client) DescribeGatewayFlowMonitorDetail(request *DescribeGatewayFlowMonitorDetailRequest) (response *DescribeGatewayFlowMonitorDetailResponse, err error) { - if request == nil { - request = NewDescribeGatewayFlowMonitorDetailRequest() - } - response = NewDescribeGatewayFlowMonitorDetailResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeGatewayFlowMonitorDetailRequest() + } + response = NewDescribeGatewayFlowMonitorDetailResponse() + err = c.Send(request, response) + return } func NewDescribeGatewayFlowQosRequest() (request *DescribeGatewayFlowQosRequest) { - request = &DescribeGatewayFlowQosRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeGatewayFlowQos") - return + request = &DescribeGatewayFlowQosRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeGatewayFlowQos") + return } func NewDescribeGatewayFlowQosResponse() (response *DescribeGatewayFlowQosResponse) { - response = &DescribeGatewayFlowQosResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeGatewayFlowQosResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeGatewayFlowQos）用于查询网关来访IP流控带宽。 func (c *Client) DescribeGatewayFlowQos(request *DescribeGatewayFlowQosRequest) (response *DescribeGatewayFlowQosResponse, err error) { - if request == nil { - request = NewDescribeGatewayFlowQosRequest() - } - response = NewDescribeGatewayFlowQosResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeGatewayFlowQosRequest() + } + response = NewDescribeGatewayFlowQosResponse() + err = c.Send(request, response) + return } func NewDescribeHaVipsRequest() (request *DescribeHaVipsRequest) { - request = &DescribeHaVipsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeHaVips") - return + request = &DescribeHaVipsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeHaVips") + return } func NewDescribeHaVipsResponse() (response *DescribeHaVipsResponse) { - response = &DescribeHaVipsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeHaVipsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeHaVips）用于查询高可用虚拟IP（HAVIP）列表。 func (c *Client) DescribeHaVips(request *DescribeHaVipsRequest) (response *DescribeHaVipsResponse, err error) { - if request == nil { - request = NewDescribeHaVipsRequest() - } - response = NewDescribeHaVipsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeHaVipsRequest() + } + response = NewDescribeHaVipsResponse() + err = c.Send(request, response) + return } func NewDescribeIp6AddressesRequest() (request *DescribeIp6AddressesRequest) { - request = &DescribeIp6AddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeIp6Addresses") - return + request = &DescribeIp6AddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeIp6Addresses") + return } func NewDescribeIp6AddressesResponse() (response *DescribeIp6AddressesResponse) { - response = &DescribeIp6AddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeIp6AddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于查询IPV6地址信息 func (c *Client) DescribeIp6Addresses(request *DescribeIp6AddressesRequest) (response *DescribeIp6AddressesResponse, err error) { - if request == nil { - request = NewDescribeIp6AddressesRequest() - } - response = NewDescribeIp6AddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeIp6AddressesRequest() + } + response = NewDescribeIp6AddressesResponse() + err = c.Send(request, response) + return } func NewDescribeIp6TranslatorQuotaRequest() (request *DescribeIp6TranslatorQuotaRequest) { - request = &DescribeIp6TranslatorQuotaRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeIp6TranslatorQuota") - return + request = &DescribeIp6TranslatorQuotaRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeIp6TranslatorQuota") + return } func NewDescribeIp6TranslatorQuotaResponse() (response *DescribeIp6TranslatorQuotaResponse) { - response = &DescribeIp6TranslatorQuotaResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeIp6TranslatorQuotaResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 查询账户在指定地域IPV6转换实例和规则的配额 func (c *Client) DescribeIp6TranslatorQuota(request *DescribeIp6TranslatorQuotaRequest) (response *DescribeIp6TranslatorQuotaResponse, err error) { - if request == nil { - request = NewDescribeIp6TranslatorQuotaRequest() - } - response = NewDescribeIp6TranslatorQuotaResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeIp6TranslatorQuotaRequest() + } + response = NewDescribeIp6TranslatorQuotaResponse() + err = c.Send(request, response) + return } func NewDescribeIp6TranslatorsRequest() (request *DescribeIp6TranslatorsRequest) { - request = &DescribeIp6TranslatorsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeIp6Translators") - return + request = &DescribeIp6TranslatorsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeIp6Translators") + return } func NewDescribeIp6TranslatorsResponse() (response *DescribeIp6TranslatorsResponse) { - response = &DescribeIp6TranslatorsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeIp6TranslatorsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 1. 该接口用于查询账户下的IPV6转换实例及其绑定的转换规则信息 // 2. 支持过滤查询 func (c *Client) DescribeIp6Translators(request *DescribeIp6TranslatorsRequest) (response *DescribeIp6TranslatorsResponse, err error) { - if request == nil { - request = NewDescribeIp6TranslatorsRequest() - } - response = NewDescribeIp6TranslatorsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeIp6TranslatorsRequest() + } + response = NewDescribeIp6TranslatorsResponse() + err = c.Send(request, response) + return } func NewDescribeNatGatewayDestinationIpPortTranslationNatRulesRequest() (request *DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest) { - request = &DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNatGatewayDestinationIpPortTranslationNatRules") - return + request = &DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNatGatewayDestinationIpPortTranslationNatRules") + return } func NewDescribeNatGatewayDestinationIpPortTranslationNatRulesResponse() (response *DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse) { - response = &DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeNatGatewayDestinationIpPortTranslationNatRules）用于查询NAT网关端口转发规则对象数组。 func (c *Client) DescribeNatGatewayDestinationIpPortTranslationNatRules(request *DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest) (response *DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse, err error) { - if request == nil { - request = NewDescribeNatGatewayDestinationIpPortTranslationNatRulesRequest() - } - response = NewDescribeNatGatewayDestinationIpPortTranslationNatRulesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNatGatewayDestinationIpPortTranslationNatRulesRequest() + } + response = NewDescribeNatGatewayDestinationIpPortTranslationNatRulesResponse() + err = c.Send(request, response) + return } func NewDescribeNatGatewaysRequest() (request *DescribeNatGatewaysRequest) { - request = &DescribeNatGatewaysRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNatGateways") - return + request = &DescribeNatGatewaysRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNatGateways") + return } func NewDescribeNatGatewaysResponse() (response *DescribeNatGatewaysResponse) { - response = &DescribeNatGatewaysResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNatGatewaysResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeNatGateways）用于查询 NAT 网关。 func (c *Client) DescribeNatGateways(request *DescribeNatGatewaysRequest) (response *DescribeNatGatewaysResponse, err error) { - if request == nil { - request = NewDescribeNatGatewaysRequest() - } - response = NewDescribeNatGatewaysResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNatGatewaysRequest() + } + response = NewDescribeNatGatewaysResponse() + err = c.Send(request, response) + return } func NewDescribeNetDetectStatesRequest() (request *DescribeNetDetectStatesRequest) { - request = &DescribeNetDetectStatesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetDetectStates") - return + request = &DescribeNetDetectStatesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetDetectStates") + return } func NewDescribeNetDetectStatesResponse() (response *DescribeNetDetectStatesResponse) { - response = &DescribeNetDetectStatesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNetDetectStatesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeNetDetectStates)用于查询网络探测验证结果列表。 func (c *Client) DescribeNetDetectStates(request *DescribeNetDetectStatesRequest) (response *DescribeNetDetectStatesResponse, err error) { - if request == nil { - request = NewDescribeNetDetectStatesRequest() - } - response = NewDescribeNetDetectStatesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNetDetectStatesRequest() + } + response = NewDescribeNetDetectStatesResponse() + err = c.Send(request, response) + return } func NewDescribeNetDetectsRequest() (request *DescribeNetDetectsRequest) { - request = &DescribeNetDetectsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetDetects") - return + request = &DescribeNetDetectsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetDetects") + return } func NewDescribeNetDetectsResponse() (response *DescribeNetDetectsResponse) { - response = &DescribeNetDetectsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNetDetectsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeNetDetects）用于查询网络探测列表。 func (c *Client) DescribeNetDetects(request *DescribeNetDetectsRequest) (response *DescribeNetDetectsResponse, err error) { - if request == nil { - request = NewDescribeNetDetectsRequest() - } - response = NewDescribeNetDetectsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNetDetectsRequest() + } + response = NewDescribeNetDetectsResponse() + err = c.Send(request, response) + return } func NewDescribeNetworkAclsRequest() (request *DescribeNetworkAclsRequest) { - request = &DescribeNetworkAclsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetworkAcls") - return + request = &DescribeNetworkAclsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetworkAcls") + return } func NewDescribeNetworkAclsResponse() (response *DescribeNetworkAclsResponse) { - response = &DescribeNetworkAclsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNetworkAclsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeNetworkAcls）用于查询网络ACL列表。 func (c *Client) DescribeNetworkAcls(request *DescribeNetworkAclsRequest) (response *DescribeNetworkAclsResponse, err error) { - if request == nil { - request = NewDescribeNetworkAclsRequest() - } - response = NewDescribeNetworkAclsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNetworkAclsRequest() + } + response = NewDescribeNetworkAclsResponse() + err = c.Send(request, response) + return } func NewDescribeNetworkInterfaceLimitRequest() (request *DescribeNetworkInterfaceLimitRequest) { - request = &DescribeNetworkInterfaceLimitRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetworkInterfaceLimit") - return + request = &DescribeNetworkInterfaceLimitRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetworkInterfaceLimit") + return } func NewDescribeNetworkInterfaceLimitResponse() (response *DescribeNetworkInterfaceLimitResponse) { - response = &DescribeNetworkInterfaceLimitResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNetworkInterfaceLimitResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeNetworkInterfaceLimit）根据CVM实例ID或弹性网卡ID查询弹性网卡配额，返回该CVM实例或弹性网卡能绑定的弹性网卡配额，以及弹性网卡可以分配的IP配额 func (c *Client) DescribeNetworkInterfaceLimit(request *DescribeNetworkInterfaceLimitRequest) (response *DescribeNetworkInterfaceLimitResponse, err error) { - if request == nil { - request = NewDescribeNetworkInterfaceLimitRequest() - } - response = NewDescribeNetworkInterfaceLimitResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNetworkInterfaceLimitRequest() + } + response = NewDescribeNetworkInterfaceLimitResponse() + err = c.Send(request, response) + return } func NewDescribeNetworkInterfacesRequest() (request *DescribeNetworkInterfacesRequest) { - request = &DescribeNetworkInterfacesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetworkInterfaces") - return + request = &DescribeNetworkInterfacesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetworkInterfaces") + return } func NewDescribeNetworkInterfacesResponse() (response *DescribeNetworkInterfacesResponse) { - response = &DescribeNetworkInterfacesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNetworkInterfacesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeNetworkInterfaces）用于查询弹性网卡列表。 func (c *Client) DescribeNetworkInterfaces(request *DescribeNetworkInterfacesRequest) (response *DescribeNetworkInterfacesResponse, err error) { - if request == nil { - request = NewDescribeNetworkInterfacesRequest() - } - response = NewDescribeNetworkInterfacesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNetworkInterfacesRequest() + } + response = NewDescribeNetworkInterfacesResponse() + err = c.Send(request, response) + return } func NewDescribeRouteConflictsRequest() (request *DescribeRouteConflictsRequest) { - request = &DescribeRouteConflictsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeRouteConflicts") - return + request = &DescribeRouteConflictsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeRouteConflicts") + return } func NewDescribeRouteConflictsResponse() (response *DescribeRouteConflictsResponse) { - response = &DescribeRouteConflictsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeRouteConflictsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeRouteConflicts）用于查询自定义路由策略与云联网路由策略冲突列表 func (c *Client) DescribeRouteConflicts(request *DescribeRouteConflictsRequest) (response *DescribeRouteConflictsResponse, err error) { - if request == nil { - request = NewDescribeRouteConflictsRequest() - } - response = NewDescribeRouteConflictsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeRouteConflictsRequest() + } + response = NewDescribeRouteConflictsResponse() + err = c.Send(request, response) + return } func NewDescribeRouteTablesRequest() (request *DescribeRouteTablesRequest) { - request = &DescribeRouteTablesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeRouteTables") - return + request = &DescribeRouteTablesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeRouteTables") + return } func NewDescribeRouteTablesResponse() (response *DescribeRouteTablesResponse) { - response = &DescribeRouteTablesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeRouteTablesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeRouteTables）用于查询路由表。 func (c *Client) DescribeRouteTables(request *DescribeRouteTablesRequest) (response *DescribeRouteTablesResponse, err error) { - if request == nil { - request = NewDescribeRouteTablesRequest() - } - response = NewDescribeRouteTablesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeRouteTablesRequest() + } + response = NewDescribeRouteTablesResponse() + err = c.Send(request, response) + return } func NewDescribeSecurityGroupAssociationStatisticsRequest() (request *DescribeSecurityGroupAssociationStatisticsRequest) { - request = &DescribeSecurityGroupAssociationStatisticsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupAssociationStatistics") - return + request = &DescribeSecurityGroupAssociationStatisticsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupAssociationStatistics") + return } func NewDescribeSecurityGroupAssociationStatisticsResponse() (response *DescribeSecurityGroupAssociationStatisticsResponse) { - response = &DescribeSecurityGroupAssociationStatisticsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeSecurityGroupAssociationStatisticsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeSecurityGroupAssociationStatistics）用于查询安全组关联的实例统计。 func (c *Client) DescribeSecurityGroupAssociationStatistics(request *DescribeSecurityGroupAssociationStatisticsRequest) (response *DescribeSecurityGroupAssociationStatisticsResponse, err error) { - if request == nil { - request = NewDescribeSecurityGroupAssociationStatisticsRequest() - } - response = NewDescribeSecurityGroupAssociationStatisticsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeSecurityGroupAssociationStatisticsRequest() + } + response = NewDescribeSecurityGroupAssociationStatisticsResponse() + err = c.Send(request, response) + return } func NewDescribeSecurityGroupLimitsRequest() (request *DescribeSecurityGroupLimitsRequest) { - request = &DescribeSecurityGroupLimitsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupLimits") - return + request = &DescribeSecurityGroupLimitsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupLimits") + return } func NewDescribeSecurityGroupLimitsResponse() (response *DescribeSecurityGroupLimitsResponse) { - response = &DescribeSecurityGroupLimitsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeSecurityGroupLimitsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeSecurityGroupLimits)用于查询用户安全组配额。 func (c *Client) DescribeSecurityGroupLimits(request *DescribeSecurityGroupLimitsRequest) (response *DescribeSecurityGroupLimitsResponse, err error) { - if request == nil { - request = NewDescribeSecurityGroupLimitsRequest() - } - response = NewDescribeSecurityGroupLimitsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeSecurityGroupLimitsRequest() + } + response = NewDescribeSecurityGroupLimitsResponse() + err = c.Send(request, response) + return } func NewDescribeSecurityGroupPoliciesRequest() (request *DescribeSecurityGroupPoliciesRequest) { - request = &DescribeSecurityGroupPoliciesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupPolicies") - return + request = &DescribeSecurityGroupPoliciesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupPolicies") + return } func NewDescribeSecurityGroupPoliciesResponse() (response *DescribeSecurityGroupPoliciesResponse) { - response = &DescribeSecurityGroupPoliciesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeSecurityGroupPoliciesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeSecurityGroupPolicies）用于查询安全组规则。 func (c *Client) DescribeSecurityGroupPolicies(request *DescribeSecurityGroupPoliciesRequest) (response *DescribeSecurityGroupPoliciesResponse, err error) { - if request == nil { - request = NewDescribeSecurityGroupPoliciesRequest() - } - response = NewDescribeSecurityGroupPoliciesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeSecurityGroupPoliciesRequest() + } + response = NewDescribeSecurityGroupPoliciesResponse() + err = c.Send(request, response) + return } func NewDescribeSecurityGroupReferencesRequest() (request *DescribeSecurityGroupReferencesRequest) { - request = &DescribeSecurityGroupReferencesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupReferences") - return + request = &DescribeSecurityGroupReferencesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupReferences") + return } func NewDescribeSecurityGroupReferencesResponse() (response *DescribeSecurityGroupReferencesResponse) { - response = &DescribeSecurityGroupReferencesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeSecurityGroupReferencesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeSecurityGroupReferences）用于查询安全组被引用信息。 func (c *Client) DescribeSecurityGroupReferences(request *DescribeSecurityGroupReferencesRequest) (response *DescribeSecurityGroupReferencesResponse, err error) { - if request == nil { - request = NewDescribeSecurityGroupReferencesRequest() - } - response = NewDescribeSecurityGroupReferencesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeSecurityGroupReferencesRequest() + } + response = NewDescribeSecurityGroupReferencesResponse() + err = c.Send(request, response) + return } func NewDescribeSecurityGroupsRequest() (request *DescribeSecurityGroupsRequest) { - request = &DescribeSecurityGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroups") - return + request = &DescribeSecurityGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroups") + return } func NewDescribeSecurityGroupsResponse() (response *DescribeSecurityGroupsResponse) { - response = &DescribeSecurityGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeSecurityGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeSecurityGroups）用于查询安全组。 func (c *Client) DescribeSecurityGroups(request *DescribeSecurityGroupsRequest) (response *DescribeSecurityGroupsResponse, err error) { - if request == nil { - request = NewDescribeSecurityGroupsRequest() - } - response = NewDescribeSecurityGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeSecurityGroupsRequest() + } + response = NewDescribeSecurityGroupsResponse() + err = c.Send(request, response) + return } func NewDescribeServiceTemplateGroupsRequest() (request *DescribeServiceTemplateGroupsRequest) { - request = &DescribeServiceTemplateGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeServiceTemplateGroups") - return + request = &DescribeServiceTemplateGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeServiceTemplateGroups") + return } func NewDescribeServiceTemplateGroupsResponse() (response *DescribeServiceTemplateGroupsResponse) { - response = &DescribeServiceTemplateGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeServiceTemplateGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeServiceTemplateGroups）用于查询协议端口模板集合 func (c *Client) DescribeServiceTemplateGroups(request *DescribeServiceTemplateGroupsRequest) (response *DescribeServiceTemplateGroupsResponse, err error) { - if request == nil { - request = NewDescribeServiceTemplateGroupsRequest() - } - response = NewDescribeServiceTemplateGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeServiceTemplateGroupsRequest() + } + response = NewDescribeServiceTemplateGroupsResponse() + err = c.Send(request, response) + return } func NewDescribeServiceTemplatesRequest() (request *DescribeServiceTemplatesRequest) { - request = &DescribeServiceTemplatesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeServiceTemplates") - return + request = &DescribeServiceTemplatesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeServiceTemplates") + return } func NewDescribeServiceTemplatesResponse() (response *DescribeServiceTemplatesResponse) { - response = &DescribeServiceTemplatesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeServiceTemplatesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeServiceTemplates）用于查询协议端口模板 func (c *Client) DescribeServiceTemplates(request *DescribeServiceTemplatesRequest) (response *DescribeServiceTemplatesResponse, err error) { - if request == nil { - request = NewDescribeServiceTemplatesRequest() - } - response = NewDescribeServiceTemplatesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeServiceTemplatesRequest() + } + response = NewDescribeServiceTemplatesResponse() + err = c.Send(request, response) + return } func NewDescribeSubnetsRequest() (request *DescribeSubnetsRequest) { - request = &DescribeSubnetsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeSubnets") - return + request = &DescribeSubnetsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeSubnets") + return } func NewDescribeSubnetsResponse() (response *DescribeSubnetsResponse) { - response = &DescribeSubnetsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeSubnetsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeSubnets）用于查询子网列表。 func (c *Client) DescribeSubnets(request *DescribeSubnetsRequest) (response *DescribeSubnetsResponse, err error) { - if request == nil { - request = NewDescribeSubnetsRequest() - } - response = NewDescribeSubnetsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeSubnetsRequest() + } + response = NewDescribeSubnetsResponse() + err = c.Send(request, response) + return } func NewDescribeTaskResultRequest() (request *DescribeTaskResultRequest) { - request = &DescribeTaskResultRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeTaskResult") - return + request = &DescribeTaskResultRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeTaskResult") + return } func NewDescribeTaskResultResponse() (response *DescribeTaskResultResponse) { - response = &DescribeTaskResultResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeTaskResultResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 查询EIP异步任务执行结果 func (c *Client) DescribeTaskResult(request *DescribeTaskResultRequest) (response *DescribeTaskResultResponse, err error) { - if request == nil { - request = NewDescribeTaskResultRequest() - } - response = NewDescribeTaskResultResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeTaskResultRequest() + } + response = NewDescribeTaskResultResponse() + err = c.Send(request, response) + return } func NewDescribeTemplateLimitsRequest() (request *DescribeTemplateLimitsRequest) { - request = &DescribeTemplateLimitsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeTemplateLimits") - return + request = &DescribeTemplateLimitsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeTemplateLimits") + return } func NewDescribeTemplateLimitsResponse() (response *DescribeTemplateLimitsResponse) { - response = &DescribeTemplateLimitsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeTemplateLimitsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeTemplateLimits）用于查询参数模板配额列表。 func (c *Client) DescribeTemplateLimits(request *DescribeTemplateLimitsRequest) (response *DescribeTemplateLimitsResponse, err error) { - if request == nil { - request = NewDescribeTemplateLimitsRequest() - } - response = NewDescribeTemplateLimitsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeTemplateLimitsRequest() + } + response = NewDescribeTemplateLimitsResponse() + err = c.Send(request, response) + return } func NewDescribeVpcInstancesRequest() (request *DescribeVpcInstancesRequest) { - request = &DescribeVpcInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcInstances") - return + request = &DescribeVpcInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcInstances") + return } func NewDescribeVpcInstancesResponse() (response *DescribeVpcInstancesResponse) { - response = &DescribeVpcInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpcInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpcInstances）用于查询VPC下的云主机实例列表。 func (c *Client) DescribeVpcInstances(request *DescribeVpcInstancesRequest) (response *DescribeVpcInstancesResponse, err error) { - if request == nil { - request = NewDescribeVpcInstancesRequest() - } - response = NewDescribeVpcInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpcInstancesRequest() + } + response = NewDescribeVpcInstancesResponse() + err = c.Send(request, response) + return } func NewDescribeVpcIpv6AddressesRequest() (request *DescribeVpcIpv6AddressesRequest) { - request = &DescribeVpcIpv6AddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcIpv6Addresses") - return + request = &DescribeVpcIpv6AddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcIpv6Addresses") + return } func NewDescribeVpcIpv6AddressesResponse() (response *DescribeVpcIpv6AddressesResponse) { - response = &DescribeVpcIpv6AddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpcIpv6AddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpcIpv6Addresses）用于查询 `VPC` `IPv6` 信息。 // 只能查询已使用的`IPv6`信息，当查询未使用的IP时，本接口不会报错，但不会出现在返回结果里。 func (c *Client) DescribeVpcIpv6Addresses(request *DescribeVpcIpv6AddressesRequest) (response *DescribeVpcIpv6AddressesResponse, err error) { - if request == nil { - request = NewDescribeVpcIpv6AddressesRequest() - } - response = NewDescribeVpcIpv6AddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpcIpv6AddressesRequest() + } + response = NewDescribeVpcIpv6AddressesResponse() + err = c.Send(request, response) + return } func NewDescribeVpcLimitsRequest() (request *DescribeVpcLimitsRequest) { - request = &DescribeVpcLimitsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcLimits") - return + request = &DescribeVpcLimitsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcLimits") + return } func NewDescribeVpcLimitsResponse() (response *DescribeVpcLimitsResponse) { - response = &DescribeVpcLimitsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpcLimitsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 获取私有网络配额，部分私有网络的配额有地域属性。 @@ -3367,329 +3366,329 @@ func NewDescribeVpcLimitsResponse() (response *DescribeVpcLimitsResponse) { // * eni-max-ipv6s（每个ENI可分配的IPv6地址数） // * vpc-max-assistant_cidrs（每个VPC可分配的辅助CIDR数） func (c *Client) DescribeVpcLimits(request *DescribeVpcLimitsRequest) (response *DescribeVpcLimitsResponse, err error) { - if request == nil { - request = NewDescribeVpcLimitsRequest() - } - response = NewDescribeVpcLimitsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpcLimitsRequest() + } + response = NewDescribeVpcLimitsResponse() + err = c.Send(request, response) + return } func NewDescribeVpcPrivateIpAddressesRequest() (request *DescribeVpcPrivateIpAddressesRequest) { - request = &DescribeVpcPrivateIpAddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcPrivateIpAddresses") - return + request = &DescribeVpcPrivateIpAddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcPrivateIpAddresses") + return } func NewDescribeVpcPrivateIpAddressesResponse() (response *DescribeVpcPrivateIpAddressesResponse) { - response = &DescribeVpcPrivateIpAddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpcPrivateIpAddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpcPrivateIpAddresses）用于查询VPC内网IP信息。
    // 只能查询已使用的IP信息，当查询未使用的IP时，本接口不会报错，但不会出现在返回结果里。 func (c *Client) DescribeVpcPrivateIpAddresses(request *DescribeVpcPrivateIpAddressesRequest) (response *DescribeVpcPrivateIpAddressesResponse, err error) { - if request == nil { - request = NewDescribeVpcPrivateIpAddressesRequest() - } - response = NewDescribeVpcPrivateIpAddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpcPrivateIpAddressesRequest() + } + response = NewDescribeVpcPrivateIpAddressesResponse() + err = c.Send(request, response) + return } func NewDescribeVpcResourceDashboardRequest() (request *DescribeVpcResourceDashboardRequest) { - request = &DescribeVpcResourceDashboardRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcResourceDashboard") - return + request = &DescribeVpcResourceDashboardRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcResourceDashboard") + return } func NewDescribeVpcResourceDashboardResponse() (response *DescribeVpcResourceDashboardResponse) { - response = &DescribeVpcResourceDashboardResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpcResourceDashboardResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeVpcResourceDashboard)用于查看VPC资源信息。 func (c *Client) DescribeVpcResourceDashboard(request *DescribeVpcResourceDashboardRequest) (response *DescribeVpcResourceDashboardResponse, err error) { - if request == nil { - request = NewDescribeVpcResourceDashboardRequest() - } - response = NewDescribeVpcResourceDashboardResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpcResourceDashboardRequest() + } + response = NewDescribeVpcResourceDashboardResponse() + err = c.Send(request, response) + return } func NewDescribeVpcsRequest() (request *DescribeVpcsRequest) { - request = &DescribeVpcsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcs") - return + request = &DescribeVpcsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcs") + return } func NewDescribeVpcsResponse() (response *DescribeVpcsResponse) { - response = &DescribeVpcsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpcsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpcs）用于查询私有网络列表。 func (c *Client) DescribeVpcs(request *DescribeVpcsRequest) (response *DescribeVpcsResponse, err error) { - if request == nil { - request = NewDescribeVpcsRequest() - } - response = NewDescribeVpcsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpcsRequest() + } + response = NewDescribeVpcsResponse() + err = c.Send(request, response) + return } func NewDescribeVpnConnectionsRequest() (request *DescribeVpnConnectionsRequest) { - request = &DescribeVpnConnectionsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpnConnections") - return + request = &DescribeVpnConnectionsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpnConnections") + return } func NewDescribeVpnConnectionsResponse() (response *DescribeVpnConnectionsResponse) { - response = &DescribeVpnConnectionsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpnConnectionsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpnConnections）查询VPN通道列表。 func (c *Client) DescribeVpnConnections(request *DescribeVpnConnectionsRequest) (response *DescribeVpnConnectionsResponse, err error) { - if request == nil { - request = NewDescribeVpnConnectionsRequest() - } - response = NewDescribeVpnConnectionsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpnConnectionsRequest() + } + response = NewDescribeVpnConnectionsResponse() + err = c.Send(request, response) + return } func NewDescribeVpnGatewayCcnRoutesRequest() (request *DescribeVpnGatewayCcnRoutesRequest) { - request = &DescribeVpnGatewayCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpnGatewayCcnRoutes") - return + request = &DescribeVpnGatewayCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpnGatewayCcnRoutes") + return } func NewDescribeVpnGatewayCcnRoutesResponse() (response *DescribeVpnGatewayCcnRoutesResponse) { - response = &DescribeVpnGatewayCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpnGatewayCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpnGatewayCcnRoutes）用于查询VPN网关云联网路由 func (c *Client) DescribeVpnGatewayCcnRoutes(request *DescribeVpnGatewayCcnRoutesRequest) (response *DescribeVpnGatewayCcnRoutesResponse, err error) { - if request == nil { - request = NewDescribeVpnGatewayCcnRoutesRequest() - } - response = NewDescribeVpnGatewayCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpnGatewayCcnRoutesRequest() + } + response = NewDescribeVpnGatewayCcnRoutesResponse() + err = c.Send(request, response) + return } func NewDescribeVpnGatewaysRequest() (request *DescribeVpnGatewaysRequest) { - request = &DescribeVpnGatewaysRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpnGateways") - return + request = &DescribeVpnGatewaysRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpnGateways") + return } func NewDescribeVpnGatewaysResponse() (response *DescribeVpnGatewaysResponse) { - response = &DescribeVpnGatewaysResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpnGatewaysResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpnGateways）用于查询VPN网关列表。 func (c *Client) DescribeVpnGateways(request *DescribeVpnGatewaysRequest) (response *DescribeVpnGatewaysResponse, err error) { - if request == nil { - request = NewDescribeVpnGatewaysRequest() - } - response = NewDescribeVpnGatewaysResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpnGatewaysRequest() + } + response = NewDescribeVpnGatewaysResponse() + err = c.Send(request, response) + return } func NewDetachCcnInstancesRequest() (request *DetachCcnInstancesRequest) { - request = &DetachCcnInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DetachCcnInstances") - return + request = &DetachCcnInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DetachCcnInstances") + return } func NewDetachCcnInstancesResponse() (response *DetachCcnInstancesResponse) { - response = &DetachCcnInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DetachCcnInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DetachCcnInstances）用于从云联网实例中解关联指定的网络实例。
    // 解关联网络实例后，相应的路由策略会一并删除。 func (c *Client) DetachCcnInstances(request *DetachCcnInstancesRequest) (response *DetachCcnInstancesResponse, err error) { - if request == nil { - request = NewDetachCcnInstancesRequest() - } - response = NewDetachCcnInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDetachCcnInstancesRequest() + } + response = NewDetachCcnInstancesResponse() + err = c.Send(request, response) + return } func NewDetachClassicLinkVpcRequest() (request *DetachClassicLinkVpcRequest) { - request = &DetachClassicLinkVpcRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DetachClassicLinkVpc") - return + request = &DetachClassicLinkVpcRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DetachClassicLinkVpc") + return } func NewDetachClassicLinkVpcResponse() (response *DetachClassicLinkVpcResponse) { - response = &DetachClassicLinkVpcResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DetachClassicLinkVpcResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DetachClassicLinkVpc)用于删除私有网络和基础网络设备互通。 func (c *Client) DetachClassicLinkVpc(request *DetachClassicLinkVpcRequest) (response *DetachClassicLinkVpcResponse, err error) { - if request == nil { - request = NewDetachClassicLinkVpcRequest() - } - response = NewDetachClassicLinkVpcResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDetachClassicLinkVpcRequest() + } + response = NewDetachClassicLinkVpcResponse() + err = c.Send(request, response) + return } func NewDetachNetworkInterfaceRequest() (request *DetachNetworkInterfaceRequest) { - request = &DetachNetworkInterfaceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DetachNetworkInterface") - return + request = &DetachNetworkInterfaceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DetachNetworkInterface") + return } func NewDetachNetworkInterfaceResponse() (response *DetachNetworkInterfaceResponse) { - response = &DetachNetworkInterfaceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DetachNetworkInterfaceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DetachNetworkInterface）用于弹性网卡解绑云主机。 func (c *Client) DetachNetworkInterface(request *DetachNetworkInterfaceRequest) (response *DetachNetworkInterfaceResponse, err error) { - if request == nil { - request = NewDetachNetworkInterfaceRequest() - } - response = NewDetachNetworkInterfaceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDetachNetworkInterfaceRequest() + } + response = NewDetachNetworkInterfaceResponse() + err = c.Send(request, response) + return } func NewDisableCcnRoutesRequest() (request *DisableCcnRoutesRequest) { - request = &DisableCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisableCcnRoutes") - return + request = &DisableCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisableCcnRoutes") + return } func NewDisableCcnRoutesResponse() (response *DisableCcnRoutesResponse) { - response = &DisableCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisableCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisableCcnRoutes）用于禁用已经启用的云联网（CCN）路由 func (c *Client) DisableCcnRoutes(request *DisableCcnRoutesRequest) (response *DisableCcnRoutesResponse, err error) { - if request == nil { - request = NewDisableCcnRoutesRequest() - } - response = NewDisableCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisableCcnRoutesRequest() + } + response = NewDisableCcnRoutesResponse() + err = c.Send(request, response) + return } func NewDisableGatewayFlowMonitorRequest() (request *DisableGatewayFlowMonitorRequest) { - request = &DisableGatewayFlowMonitorRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisableGatewayFlowMonitor") - return + request = &DisableGatewayFlowMonitorRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisableGatewayFlowMonitor") + return } func NewDisableGatewayFlowMonitorResponse() (response *DisableGatewayFlowMonitorResponse) { - response = &DisableGatewayFlowMonitorResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisableGatewayFlowMonitorResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisableGatewayFlowMonitor）用于关闭网关流量监控。 func (c *Client) DisableGatewayFlowMonitor(request *DisableGatewayFlowMonitorRequest) (response *DisableGatewayFlowMonitorResponse, err error) { - if request == nil { - request = NewDisableGatewayFlowMonitorRequest() - } - response = NewDisableGatewayFlowMonitorResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisableGatewayFlowMonitorRequest() + } + response = NewDisableGatewayFlowMonitorResponse() + err = c.Send(request, response) + return } func NewDisableRoutesRequest() (request *DisableRoutesRequest) { - request = &DisableRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisableRoutes") - return + request = &DisableRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisableRoutes") + return } func NewDisableRoutesResponse() (response *DisableRoutesResponse) { - response = &DisableRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisableRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisableRoutes）用于禁用已启用的子网路由 func (c *Client) DisableRoutes(request *DisableRoutesRequest) (response *DisableRoutesResponse, err error) { - if request == nil { - request = NewDisableRoutesRequest() - } - response = NewDisableRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisableRoutesRequest() + } + response = NewDisableRoutesResponse() + err = c.Send(request, response) + return } func NewDisassociateAddressRequest() (request *DisassociateAddressRequest) { - request = &DisassociateAddressRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisassociateAddress") - return + request = &DisassociateAddressRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisassociateAddress") + return } func NewDisassociateAddressResponse() (response *DisassociateAddressResponse) { - response = &DisassociateAddressResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateAddressResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DisassociateAddress) 用于解绑[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）。 @@ -3698,1142 +3697,1142 @@ func NewDisassociateAddressResponse() (response *DisassociateAddressResponse) { // * 只有状态为 BIND 和 BIND_ENI 的 EIP 才能进行解绑定操作。 // * EIP 如果被封堵，则不能进行解绑定操作。 func (c *Client) DisassociateAddress(request *DisassociateAddressRequest) (response *DisassociateAddressResponse, err error) { - if request == nil { - request = NewDisassociateAddressRequest() - } - response = NewDisassociateAddressResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateAddressRequest() + } + response = NewDisassociateAddressResponse() + err = c.Send(request, response) + return } func NewDisassociateDhcpIpWithAddressIpRequest() (request *DisassociateDhcpIpWithAddressIpRequest) { - request = &DisassociateDhcpIpWithAddressIpRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisassociateDhcpIpWithAddressIp") - return + request = &DisassociateDhcpIpWithAddressIpRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisassociateDhcpIpWithAddressIp") + return } func NewDisassociateDhcpIpWithAddressIpResponse() (response *DisassociateDhcpIpWithAddressIpResponse) { - response = &DisassociateDhcpIpWithAddressIpResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateDhcpIpWithAddressIpResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisassociateDhcpIpWithAddressIp）用于将DhcpIp已绑定的弹性公网IP（EIP）解除绑定。
    func (c *Client) DisassociateDhcpIpWithAddressIp(request *DisassociateDhcpIpWithAddressIpRequest) (response *DisassociateDhcpIpWithAddressIpResponse, err error) { - if request == nil { - request = NewDisassociateDhcpIpWithAddressIpRequest() - } - response = NewDisassociateDhcpIpWithAddressIpResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateDhcpIpWithAddressIpRequest() + } + response = NewDisassociateDhcpIpWithAddressIpResponse() + err = c.Send(request, response) + return } func NewDisassociateNatGatewayAddressRequest() (request *DisassociateNatGatewayAddressRequest) { - request = &DisassociateNatGatewayAddressRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisassociateNatGatewayAddress") - return + request = &DisassociateNatGatewayAddressRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisassociateNatGatewayAddress") + return } func NewDisassociateNatGatewayAddressResponse() (response *DisassociateNatGatewayAddressResponse) { - response = &DisassociateNatGatewayAddressResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateNatGatewayAddressResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisassociateNatGatewayAddress）用于NAT网关解绑弹性IP。 func (c *Client) DisassociateNatGatewayAddress(request *DisassociateNatGatewayAddressRequest) (response *DisassociateNatGatewayAddressResponse, err error) { - if request == nil { - request = NewDisassociateNatGatewayAddressRequest() - } - response = NewDisassociateNatGatewayAddressResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateNatGatewayAddressRequest() + } + response = NewDisassociateNatGatewayAddressResponse() + err = c.Send(request, response) + return } func NewDisassociateNetworkAclSubnetsRequest() (request *DisassociateNetworkAclSubnetsRequest) { - request = &DisassociateNetworkAclSubnetsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisassociateNetworkAclSubnets") - return + request = &DisassociateNetworkAclSubnetsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisassociateNetworkAclSubnets") + return } func NewDisassociateNetworkAclSubnetsResponse() (response *DisassociateNetworkAclSubnetsResponse) { - response = &DisassociateNetworkAclSubnetsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateNetworkAclSubnetsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisassociateNetworkAclSubnets）用于网络ACL解关联vpc下的子网。 func (c *Client) DisassociateNetworkAclSubnets(request *DisassociateNetworkAclSubnetsRequest) (response *DisassociateNetworkAclSubnetsResponse, err error) { - if request == nil { - request = NewDisassociateNetworkAclSubnetsRequest() - } - response = NewDisassociateNetworkAclSubnetsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateNetworkAclSubnetsRequest() + } + response = NewDisassociateNetworkAclSubnetsResponse() + err = c.Send(request, response) + return } func NewDisassociateNetworkInterfaceSecurityGroupsRequest() (request *DisassociateNetworkInterfaceSecurityGroupsRequest) { - request = &DisassociateNetworkInterfaceSecurityGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisassociateNetworkInterfaceSecurityGroups") - return + request = &DisassociateNetworkInterfaceSecurityGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisassociateNetworkInterfaceSecurityGroups") + return } func NewDisassociateNetworkInterfaceSecurityGroupsResponse() (response *DisassociateNetworkInterfaceSecurityGroupsResponse) { - response = &DisassociateNetworkInterfaceSecurityGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateNetworkInterfaceSecurityGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisassociateNetworkInterfaceSecurityGroups）用于弹性网卡解绑安全组。支持弹性网卡完全解绑安全组。 func (c *Client) DisassociateNetworkInterfaceSecurityGroups(request *DisassociateNetworkInterfaceSecurityGroupsRequest) (response *DisassociateNetworkInterfaceSecurityGroupsResponse, err error) { - if request == nil { - request = NewDisassociateNetworkInterfaceSecurityGroupsRequest() - } - response = NewDisassociateNetworkInterfaceSecurityGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateNetworkInterfaceSecurityGroupsRequest() + } + response = NewDisassociateNetworkInterfaceSecurityGroupsResponse() + err = c.Send(request, response) + return } func NewDownloadCustomerGatewayConfigurationRequest() (request *DownloadCustomerGatewayConfigurationRequest) { - request = &DownloadCustomerGatewayConfigurationRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DownloadCustomerGatewayConfiguration") - return + request = &DownloadCustomerGatewayConfigurationRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DownloadCustomerGatewayConfiguration") + return } func NewDownloadCustomerGatewayConfigurationResponse() (response *DownloadCustomerGatewayConfigurationResponse) { - response = &DownloadCustomerGatewayConfigurationResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DownloadCustomerGatewayConfigurationResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DownloadCustomerGatewayConfiguration)用于下载VPN通道配置。 func (c *Client) DownloadCustomerGatewayConfiguration(request *DownloadCustomerGatewayConfigurationRequest) (response *DownloadCustomerGatewayConfigurationResponse, err error) { - if request == nil { - request = NewDownloadCustomerGatewayConfigurationRequest() - } - response = NewDownloadCustomerGatewayConfigurationResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDownloadCustomerGatewayConfigurationRequest() + } + response = NewDownloadCustomerGatewayConfigurationResponse() + err = c.Send(request, response) + return } func NewEnableCcnRoutesRequest() (request *EnableCcnRoutesRequest) { - request = &EnableCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "EnableCcnRoutes") - return + request = &EnableCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "EnableCcnRoutes") + return } func NewEnableCcnRoutesResponse() (response *EnableCcnRoutesResponse) { - response = &EnableCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &EnableCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（EnableCcnRoutes）用于启用已经加入云联网（CCN）的路由。
    // 本接口会校验启用后，是否与已有路由冲突，如果冲突，则无法启用，失败处理。路由冲突时，需要先禁用与之冲突的路由，才能启用该路由。 func (c *Client) EnableCcnRoutes(request *EnableCcnRoutesRequest) (response *EnableCcnRoutesResponse, err error) { - if request == nil { - request = NewEnableCcnRoutesRequest() - } - response = NewEnableCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewEnableCcnRoutesRequest() + } + response = NewEnableCcnRoutesResponse() + err = c.Send(request, response) + return } func NewEnableGatewayFlowMonitorRequest() (request *EnableGatewayFlowMonitorRequest) { - request = &EnableGatewayFlowMonitorRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "EnableGatewayFlowMonitor") - return + request = &EnableGatewayFlowMonitorRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "EnableGatewayFlowMonitor") + return } func NewEnableGatewayFlowMonitorResponse() (response *EnableGatewayFlowMonitorResponse) { - response = &EnableGatewayFlowMonitorResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &EnableGatewayFlowMonitorResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（EnableGatewayFlowMonitor）用于开启网关流量监控。 func (c *Client) EnableGatewayFlowMonitor(request *EnableGatewayFlowMonitorRequest) (response *EnableGatewayFlowMonitorResponse, err error) { - if request == nil { - request = NewEnableGatewayFlowMonitorRequest() - } - response = NewEnableGatewayFlowMonitorResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewEnableGatewayFlowMonitorRequest() + } + response = NewEnableGatewayFlowMonitorResponse() + err = c.Send(request, response) + return } func NewEnableRoutesRequest() (request *EnableRoutesRequest) { - request = &EnableRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "EnableRoutes") - return + request = &EnableRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "EnableRoutes") + return } func NewEnableRoutesResponse() (response *EnableRoutesResponse) { - response = &EnableRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &EnableRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（EnableRoutes）用于启用已禁用的子网路由。
    // 本接口会校验启用后，是否与已有路由冲突，如果冲突，则无法启用，失败处理。路由冲突时，需要先禁用与之冲突的路由，才能启用该路由。 func (c *Client) EnableRoutes(request *EnableRoutesRequest) (response *EnableRoutesResponse, err error) { - if request == nil { - request = NewEnableRoutesRequest() - } - response = NewEnableRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewEnableRoutesRequest() + } + response = NewEnableRoutesResponse() + err = c.Send(request, response) + return } func NewGetCcnRegionBandwidthLimitsRequest() (request *GetCcnRegionBandwidthLimitsRequest) { - request = &GetCcnRegionBandwidthLimitsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "GetCcnRegionBandwidthLimits") - return + request = &GetCcnRegionBandwidthLimitsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "GetCcnRegionBandwidthLimits") + return } func NewGetCcnRegionBandwidthLimitsResponse() (response *GetCcnRegionBandwidthLimitsResponse) { - response = &GetCcnRegionBandwidthLimitsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &GetCcnRegionBandwidthLimitsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（GetCcnRegionBandwidthLimits）用于查询云联网相关地域带宽信息，其中预付费模式的云联网仅支持地域间限速，后付费模式的云联网支持地域间限速和地域出口限速。 func (c *Client) GetCcnRegionBandwidthLimits(request *GetCcnRegionBandwidthLimitsRequest) (response *GetCcnRegionBandwidthLimitsResponse, err error) { - if request == nil { - request = NewGetCcnRegionBandwidthLimitsRequest() - } - response = NewGetCcnRegionBandwidthLimitsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewGetCcnRegionBandwidthLimitsRequest() + } + response = NewGetCcnRegionBandwidthLimitsResponse() + err = c.Send(request, response) + return } func NewHaVipAssociateAddressIpRequest() (request *HaVipAssociateAddressIpRequest) { - request = &HaVipAssociateAddressIpRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "HaVipAssociateAddressIp") - return + request = &HaVipAssociateAddressIpRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "HaVipAssociateAddressIp") + return } func NewHaVipAssociateAddressIpResponse() (response *HaVipAssociateAddressIpResponse) { - response = &HaVipAssociateAddressIpResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &HaVipAssociateAddressIpResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（HaVipAssociateAddressIp）用于高可用虚拟IP（HAVIP）绑定弹性公网IP（EIP）
    // 本接口是异步完成，如需查询异步任务执行结果，请使用本接口返回的`RequestId`轮询`QueryTask`接口 func (c *Client) HaVipAssociateAddressIp(request *HaVipAssociateAddressIpRequest) (response *HaVipAssociateAddressIpResponse, err error) { - if request == nil { - request = NewHaVipAssociateAddressIpRequest() - } - response = NewHaVipAssociateAddressIpResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewHaVipAssociateAddressIpRequest() + } + response = NewHaVipAssociateAddressIpResponse() + err = c.Send(request, response) + return } func NewHaVipDisassociateAddressIpRequest() (request *HaVipDisassociateAddressIpRequest) { - request = &HaVipDisassociateAddressIpRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "HaVipDisassociateAddressIp") - return + request = &HaVipDisassociateAddressIpRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "HaVipDisassociateAddressIp") + return } func NewHaVipDisassociateAddressIpResponse() (response *HaVipDisassociateAddressIpResponse) { - response = &HaVipDisassociateAddressIpResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &HaVipDisassociateAddressIpResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（HaVipDisassociateAddressIp）用于将高可用虚拟IP（HAVIP）已绑定的弹性公网IP（EIP）解除绑定
    // 本接口是异步完成，如需查询异步任务执行结果，请使用本接口返回的`RequestId`轮询`QueryTask`接口 func (c *Client) HaVipDisassociateAddressIp(request *HaVipDisassociateAddressIpRequest) (response *HaVipDisassociateAddressIpResponse, err error) { - if request == nil { - request = NewHaVipDisassociateAddressIpRequest() - } - response = NewHaVipDisassociateAddressIpResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewHaVipDisassociateAddressIpRequest() + } + response = NewHaVipDisassociateAddressIpResponse() + err = c.Send(request, response) + return } func NewInquiryPriceCreateVpnGatewayRequest() (request *InquiryPriceCreateVpnGatewayRequest) { - request = &InquiryPriceCreateVpnGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "InquiryPriceCreateVpnGateway") - return + request = &InquiryPriceCreateVpnGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "InquiryPriceCreateVpnGateway") + return } func NewInquiryPriceCreateVpnGatewayResponse() (response *InquiryPriceCreateVpnGatewayResponse) { - response = &InquiryPriceCreateVpnGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceCreateVpnGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（InquiryPriceCreateVpnGateway）用于创建VPN网关询价。 func (c *Client) InquiryPriceCreateVpnGateway(request *InquiryPriceCreateVpnGatewayRequest) (response *InquiryPriceCreateVpnGatewayResponse, err error) { - if request == nil { - request = NewInquiryPriceCreateVpnGatewayRequest() - } - response = NewInquiryPriceCreateVpnGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceCreateVpnGatewayRequest() + } + response = NewInquiryPriceCreateVpnGatewayResponse() + err = c.Send(request, response) + return } func NewInquiryPriceRenewVpnGatewayRequest() (request *InquiryPriceRenewVpnGatewayRequest) { - request = &InquiryPriceRenewVpnGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "InquiryPriceRenewVpnGateway") - return + request = &InquiryPriceRenewVpnGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "InquiryPriceRenewVpnGateway") + return } func NewInquiryPriceRenewVpnGatewayResponse() (response *InquiryPriceRenewVpnGatewayResponse) { - response = &InquiryPriceRenewVpnGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceRenewVpnGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（InquiryPriceRenewVpnGateway）用于续费VPN网关询价。目前仅支持IPSEC类型网关的询价。 func (c *Client) InquiryPriceRenewVpnGateway(request *InquiryPriceRenewVpnGatewayRequest) (response *InquiryPriceRenewVpnGatewayResponse, err error) { - if request == nil { - request = NewInquiryPriceRenewVpnGatewayRequest() - } - response = NewInquiryPriceRenewVpnGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceRenewVpnGatewayRequest() + } + response = NewInquiryPriceRenewVpnGatewayResponse() + err = c.Send(request, response) + return } func NewInquiryPriceResetVpnGatewayInternetMaxBandwidthRequest() (request *InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest) { - request = &InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "InquiryPriceResetVpnGatewayInternetMaxBandwidth") - return + request = &InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "InquiryPriceResetVpnGatewayInternetMaxBandwidth") + return } func NewInquiryPriceResetVpnGatewayInternetMaxBandwidthResponse() (response *InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse) { - response = &InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（InquiryPriceResetVpnGatewayInternetMaxBandwidth）调整VPN网关带宽上限询价。 func (c *Client) InquiryPriceResetVpnGatewayInternetMaxBandwidth(request *InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest) (response *InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse, err error) { - if request == nil { - request = NewInquiryPriceResetVpnGatewayInternetMaxBandwidthRequest() - } - response = NewInquiryPriceResetVpnGatewayInternetMaxBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceResetVpnGatewayInternetMaxBandwidthRequest() + } + response = NewInquiryPriceResetVpnGatewayInternetMaxBandwidthResponse() + err = c.Send(request, response) + return } func NewMigrateNetworkInterfaceRequest() (request *MigrateNetworkInterfaceRequest) { - request = &MigrateNetworkInterfaceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "MigrateNetworkInterface") - return + request = &MigrateNetworkInterfaceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "MigrateNetworkInterface") + return } func NewMigrateNetworkInterfaceResponse() (response *MigrateNetworkInterfaceResponse) { - response = &MigrateNetworkInterfaceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &MigrateNetworkInterfaceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（MigrateNetworkInterface）用于弹性网卡迁移。 func (c *Client) MigrateNetworkInterface(request *MigrateNetworkInterfaceRequest) (response *MigrateNetworkInterfaceResponse, err error) { - if request == nil { - request = NewMigrateNetworkInterfaceRequest() - } - response = NewMigrateNetworkInterfaceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewMigrateNetworkInterfaceRequest() + } + response = NewMigrateNetworkInterfaceResponse() + err = c.Send(request, response) + return } func NewMigratePrivateIpAddressRequest() (request *MigratePrivateIpAddressRequest) { - request = &MigratePrivateIpAddressRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "MigratePrivateIpAddress") - return + request = &MigratePrivateIpAddressRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "MigratePrivateIpAddress") + return } func NewMigratePrivateIpAddressResponse() (response *MigratePrivateIpAddressResponse) { - response = &MigratePrivateIpAddressResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &MigratePrivateIpAddressResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（MigratePrivateIpAddress）用于弹性网卡内网IP迁移。 -// +// // * 该接口用于将一个内网IP从一个弹性网卡上迁移到另外一个弹性网卡，主IP地址不支持迁移。 // * 迁移前后的弹性网卡必须在同一个子网内。 func (c *Client) MigratePrivateIpAddress(request *MigratePrivateIpAddressRequest) (response *MigratePrivateIpAddressResponse, err error) { - if request == nil { - request = NewMigratePrivateIpAddressRequest() - } - response = NewMigratePrivateIpAddressResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewMigratePrivateIpAddressRequest() + } + response = NewMigratePrivateIpAddressResponse() + err = c.Send(request, response) + return } func NewModifyAddressAttributeRequest() (request *ModifyAddressAttributeRequest) { - request = &ModifyAddressAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressAttribute") - return + request = &ModifyAddressAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressAttribute") + return } func NewModifyAddressAttributeResponse() (response *ModifyAddressAttributeResponse) { - response = &ModifyAddressAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyAddressAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyAddressAttribute) 用于修改[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）的名称。 func (c *Client) ModifyAddressAttribute(request *ModifyAddressAttributeRequest) (response *ModifyAddressAttributeResponse, err error) { - if request == nil { - request = NewModifyAddressAttributeRequest() - } - response = NewModifyAddressAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyAddressAttributeRequest() + } + response = NewModifyAddressAttributeResponse() + err = c.Send(request, response) + return } func NewModifyAddressInternetChargeTypeRequest() (request *ModifyAddressInternetChargeTypeRequest) { - request = &ModifyAddressInternetChargeTypeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressInternetChargeType") - return + request = &ModifyAddressInternetChargeTypeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressInternetChargeType") + return } func NewModifyAddressInternetChargeTypeResponse() (response *ModifyAddressInternetChargeTypeResponse) { - response = &ModifyAddressInternetChargeTypeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyAddressInternetChargeTypeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于调整具有带宽属性弹性公网IP的网络计费模式 // * 支持BANDWIDTH_PREPAID_BY_MONTH和TRAFFIC_POSTPAID_BY_HOUR两种网络计费模式之间的切换。 // * 每个弹性公网IP支持调整两次，次数超出则无法调整。 func (c *Client) ModifyAddressInternetChargeType(request *ModifyAddressInternetChargeTypeRequest) (response *ModifyAddressInternetChargeTypeResponse, err error) { - if request == nil { - request = NewModifyAddressInternetChargeTypeRequest() - } - response = NewModifyAddressInternetChargeTypeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyAddressInternetChargeTypeRequest() + } + response = NewModifyAddressInternetChargeTypeResponse() + err = c.Send(request, response) + return } func NewModifyAddressTemplateAttributeRequest() (request *ModifyAddressTemplateAttributeRequest) { - request = &ModifyAddressTemplateAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressTemplateAttribute") - return + request = &ModifyAddressTemplateAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressTemplateAttribute") + return } func NewModifyAddressTemplateAttributeResponse() (response *ModifyAddressTemplateAttributeResponse) { - response = &ModifyAddressTemplateAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyAddressTemplateAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyAddressTemplateAttribute）用于修改IP地址模板 func (c *Client) ModifyAddressTemplateAttribute(request *ModifyAddressTemplateAttributeRequest) (response *ModifyAddressTemplateAttributeResponse, err error) { - if request == nil { - request = NewModifyAddressTemplateAttributeRequest() - } - response = NewModifyAddressTemplateAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyAddressTemplateAttributeRequest() + } + response = NewModifyAddressTemplateAttributeResponse() + err = c.Send(request, response) + return } func NewModifyAddressTemplateGroupAttributeRequest() (request *ModifyAddressTemplateGroupAttributeRequest) { - request = &ModifyAddressTemplateGroupAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressTemplateGroupAttribute") - return + request = &ModifyAddressTemplateGroupAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressTemplateGroupAttribute") + return } func NewModifyAddressTemplateGroupAttributeResponse() (response *ModifyAddressTemplateGroupAttributeResponse) { - response = &ModifyAddressTemplateGroupAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyAddressTemplateGroupAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyAddressTemplateGroupAttribute）用于修改IP地址模板集合 func (c *Client) ModifyAddressTemplateGroupAttribute(request *ModifyAddressTemplateGroupAttributeRequest) (response *ModifyAddressTemplateGroupAttributeResponse, err error) { - if request == nil { - request = NewModifyAddressTemplateGroupAttributeRequest() - } - response = NewModifyAddressTemplateGroupAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyAddressTemplateGroupAttributeRequest() + } + response = NewModifyAddressTemplateGroupAttributeResponse() + err = c.Send(request, response) + return } func NewModifyAddressesBandwidthRequest() (request *ModifyAddressesBandwidthRequest) { - request = &ModifyAddressesBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressesBandwidth") - return + request = &ModifyAddressesBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressesBandwidth") + return } func NewModifyAddressesBandwidthResponse() (response *ModifyAddressesBandwidthResponse) { - response = &ModifyAddressesBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyAddressesBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyAddressesBandwidth）用于调整[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)(简称EIP)带宽，包括后付费EIP, 预付费EIP和带宽包EIP func (c *Client) ModifyAddressesBandwidth(request *ModifyAddressesBandwidthRequest) (response *ModifyAddressesBandwidthResponse, err error) { - if request == nil { - request = NewModifyAddressesBandwidthRequest() - } - response = NewModifyAddressesBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyAddressesBandwidthRequest() + } + response = NewModifyAddressesBandwidthResponse() + err = c.Send(request, response) + return } func NewModifyAssistantCidrRequest() (request *ModifyAssistantCidrRequest) { - request = &ModifyAssistantCidrRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyAssistantCidr") - return + request = &ModifyAssistantCidrRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyAssistantCidr") + return } func NewModifyAssistantCidrResponse() (response *ModifyAssistantCidrResponse) { - response = &ModifyAssistantCidrResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyAssistantCidrResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(ModifyAssistantCidr)用于批量修改辅助CIDR，支持新增和删除。（接口灰度中，如需使用请提工单。） func (c *Client) ModifyAssistantCidr(request *ModifyAssistantCidrRequest) (response *ModifyAssistantCidrResponse, err error) { - if request == nil { - request = NewModifyAssistantCidrRequest() - } - response = NewModifyAssistantCidrResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyAssistantCidrRequest() + } + response = NewModifyAssistantCidrResponse() + err = c.Send(request, response) + return } func NewModifyBandwidthPackageAttributeRequest() (request *ModifyBandwidthPackageAttributeRequest) { - request = &ModifyBandwidthPackageAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyBandwidthPackageAttribute") - return + request = &ModifyBandwidthPackageAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyBandwidthPackageAttribute") + return } func NewModifyBandwidthPackageAttributeResponse() (response *ModifyBandwidthPackageAttributeResponse) { - response = &ModifyBandwidthPackageAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyBandwidthPackageAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口用于修改带宽包属性，包括带宽包名字等 func (c *Client) ModifyBandwidthPackageAttribute(request *ModifyBandwidthPackageAttributeRequest) (response *ModifyBandwidthPackageAttributeResponse, err error) { - if request == nil { - request = NewModifyBandwidthPackageAttributeRequest() - } - response = NewModifyBandwidthPackageAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyBandwidthPackageAttributeRequest() + } + response = NewModifyBandwidthPackageAttributeResponse() + err = c.Send(request, response) + return } func NewModifyCcnAttributeRequest() (request *ModifyCcnAttributeRequest) { - request = &ModifyCcnAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyCcnAttribute") - return + request = &ModifyCcnAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyCcnAttribute") + return } func NewModifyCcnAttributeResponse() (response *ModifyCcnAttributeResponse) { - response = &ModifyCcnAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyCcnAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyCcnAttribute）用于修改云联网（CCN）的相关属性。 func (c *Client) ModifyCcnAttribute(request *ModifyCcnAttributeRequest) (response *ModifyCcnAttributeResponse, err error) { - if request == nil { - request = NewModifyCcnAttributeRequest() - } - response = NewModifyCcnAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyCcnAttributeRequest() + } + response = NewModifyCcnAttributeResponse() + err = c.Send(request, response) + return } func NewModifyCcnRegionBandwidthLimitsTypeRequest() (request *ModifyCcnRegionBandwidthLimitsTypeRequest) { - request = &ModifyCcnRegionBandwidthLimitsTypeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyCcnRegionBandwidthLimitsType") - return + request = &ModifyCcnRegionBandwidthLimitsTypeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyCcnRegionBandwidthLimitsType") + return } func NewModifyCcnRegionBandwidthLimitsTypeResponse() (response *ModifyCcnRegionBandwidthLimitsTypeResponse) { - response = &ModifyCcnRegionBandwidthLimitsTypeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyCcnRegionBandwidthLimitsTypeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyCcnRegionBandwidthLimitsType）用于修改后付费云联网实例修改带宽限速策略。 func (c *Client) ModifyCcnRegionBandwidthLimitsType(request *ModifyCcnRegionBandwidthLimitsTypeRequest) (response *ModifyCcnRegionBandwidthLimitsTypeResponse, err error) { - if request == nil { - request = NewModifyCcnRegionBandwidthLimitsTypeRequest() - } - response = NewModifyCcnRegionBandwidthLimitsTypeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyCcnRegionBandwidthLimitsTypeRequest() + } + response = NewModifyCcnRegionBandwidthLimitsTypeResponse() + err = c.Send(request, response) + return } func NewModifyCustomerGatewayAttributeRequest() (request *ModifyCustomerGatewayAttributeRequest) { - request = &ModifyCustomerGatewayAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyCustomerGatewayAttribute") - return + request = &ModifyCustomerGatewayAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyCustomerGatewayAttribute") + return } func NewModifyCustomerGatewayAttributeResponse() (response *ModifyCustomerGatewayAttributeResponse) { - response = &ModifyCustomerGatewayAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyCustomerGatewayAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyCustomerGatewayAttribute）用于修改对端网关信息。 func (c *Client) ModifyCustomerGatewayAttribute(request *ModifyCustomerGatewayAttributeRequest) (response *ModifyCustomerGatewayAttributeResponse, err error) { - if request == nil { - request = NewModifyCustomerGatewayAttributeRequest() - } - response = NewModifyCustomerGatewayAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyCustomerGatewayAttributeRequest() + } + response = NewModifyCustomerGatewayAttributeResponse() + err = c.Send(request, response) + return } func NewModifyDhcpIpAttributeRequest() (request *ModifyDhcpIpAttributeRequest) { - request = &ModifyDhcpIpAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyDhcpIpAttribute") - return + request = &ModifyDhcpIpAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyDhcpIpAttribute") + return } func NewModifyDhcpIpAttributeResponse() (response *ModifyDhcpIpAttributeResponse) { - response = &ModifyDhcpIpAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyDhcpIpAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyDhcpIpAttribute）用于修改DhcpIp属性 func (c *Client) ModifyDhcpIpAttribute(request *ModifyDhcpIpAttributeRequest) (response *ModifyDhcpIpAttributeResponse, err error) { - if request == nil { - request = NewModifyDhcpIpAttributeRequest() - } - response = NewModifyDhcpIpAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyDhcpIpAttributeRequest() + } + response = NewModifyDhcpIpAttributeResponse() + err = c.Send(request, response) + return } func NewModifyDirectConnectGatewayAttributeRequest() (request *ModifyDirectConnectGatewayAttributeRequest) { - request = &ModifyDirectConnectGatewayAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyDirectConnectGatewayAttribute") - return + request = &ModifyDirectConnectGatewayAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyDirectConnectGatewayAttribute") + return } func NewModifyDirectConnectGatewayAttributeResponse() (response *ModifyDirectConnectGatewayAttributeResponse) { - response = &ModifyDirectConnectGatewayAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyDirectConnectGatewayAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyDirectConnectGatewayAttribute）用于修改专线网关属性 func (c *Client) ModifyDirectConnectGatewayAttribute(request *ModifyDirectConnectGatewayAttributeRequest) (response *ModifyDirectConnectGatewayAttributeResponse, err error) { - if request == nil { - request = NewModifyDirectConnectGatewayAttributeRequest() - } - response = NewModifyDirectConnectGatewayAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyDirectConnectGatewayAttributeRequest() + } + response = NewModifyDirectConnectGatewayAttributeResponse() + err = c.Send(request, response) + return } func NewModifyFlowLogAttributeRequest() (request *ModifyFlowLogAttributeRequest) { - request = &ModifyFlowLogAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyFlowLogAttribute") - return + request = &ModifyFlowLogAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyFlowLogAttribute") + return } func NewModifyFlowLogAttributeResponse() (response *ModifyFlowLogAttributeResponse) { - response = &ModifyFlowLogAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyFlowLogAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyFlowLogAttribute）用于修改流日志属性 func (c *Client) ModifyFlowLogAttribute(request *ModifyFlowLogAttributeRequest) (response *ModifyFlowLogAttributeResponse, err error) { - if request == nil { - request = NewModifyFlowLogAttributeRequest() - } - response = NewModifyFlowLogAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyFlowLogAttributeRequest() + } + response = NewModifyFlowLogAttributeResponse() + err = c.Send(request, response) + return } func NewModifyGatewayFlowQosRequest() (request *ModifyGatewayFlowQosRequest) { - request = &ModifyGatewayFlowQosRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyGatewayFlowQos") - return + request = &ModifyGatewayFlowQosRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyGatewayFlowQos") + return } func NewModifyGatewayFlowQosResponse() (response *ModifyGatewayFlowQosResponse) { - response = &ModifyGatewayFlowQosResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyGatewayFlowQosResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyGatewayFlowQos）用于调整网关流控带宽。 func (c *Client) ModifyGatewayFlowQos(request *ModifyGatewayFlowQosRequest) (response *ModifyGatewayFlowQosResponse, err error) { - if request == nil { - request = NewModifyGatewayFlowQosRequest() - } - response = NewModifyGatewayFlowQosResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyGatewayFlowQosRequest() + } + response = NewModifyGatewayFlowQosResponse() + err = c.Send(request, response) + return } func NewModifyHaVipAttributeRequest() (request *ModifyHaVipAttributeRequest) { - request = &ModifyHaVipAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyHaVipAttribute") - return + request = &ModifyHaVipAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyHaVipAttribute") + return } func NewModifyHaVipAttributeResponse() (response *ModifyHaVipAttributeResponse) { - response = &ModifyHaVipAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyHaVipAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyHaVipAttribute）用于修改高可用虚拟IP（HAVIP）属性 func (c *Client) ModifyHaVipAttribute(request *ModifyHaVipAttributeRequest) (response *ModifyHaVipAttributeResponse, err error) { - if request == nil { - request = NewModifyHaVipAttributeRequest() - } - response = NewModifyHaVipAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyHaVipAttributeRequest() + } + response = NewModifyHaVipAttributeResponse() + err = c.Send(request, response) + return } func NewModifyIp6AddressesBandwidthRequest() (request *ModifyIp6AddressesBandwidthRequest) { - request = &ModifyIp6AddressesBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyIp6AddressesBandwidth") - return + request = &ModifyIp6AddressesBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyIp6AddressesBandwidth") + return } func NewModifyIp6AddressesBandwidthResponse() (response *ModifyIp6AddressesBandwidthResponse) { - response = &ModifyIp6AddressesBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyIp6AddressesBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于修改IPV6地址访问internet的带宽 func (c *Client) ModifyIp6AddressesBandwidth(request *ModifyIp6AddressesBandwidthRequest) (response *ModifyIp6AddressesBandwidthResponse, err error) { - if request == nil { - request = NewModifyIp6AddressesBandwidthRequest() - } - response = NewModifyIp6AddressesBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyIp6AddressesBandwidthRequest() + } + response = NewModifyIp6AddressesBandwidthResponse() + err = c.Send(request, response) + return } func NewModifyIp6RuleRequest() (request *ModifyIp6RuleRequest) { - request = &ModifyIp6RuleRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyIp6Rule") - return + request = &ModifyIp6RuleRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyIp6Rule") + return } func NewModifyIp6RuleResponse() (response *ModifyIp6RuleResponse) { - response = &ModifyIp6RuleResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyIp6RuleResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于修改IPV6转换规则，当前仅支持修改转换规则名称，IPV4地址和IPV4端口号 func (c *Client) ModifyIp6Rule(request *ModifyIp6RuleRequest) (response *ModifyIp6RuleResponse, err error) { - if request == nil { - request = NewModifyIp6RuleRequest() - } - response = NewModifyIp6RuleResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyIp6RuleRequest() + } + response = NewModifyIp6RuleResponse() + err = c.Send(request, response) + return } func NewModifyIp6TranslatorRequest() (request *ModifyIp6TranslatorRequest) { - request = &ModifyIp6TranslatorRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyIp6Translator") - return + request = &ModifyIp6TranslatorRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyIp6Translator") + return } func NewModifyIp6TranslatorResponse() (response *ModifyIp6TranslatorResponse) { - response = &ModifyIp6TranslatorResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyIp6TranslatorResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于修改IP6转换实例属性，当前仅支持修改实例名称。 func (c *Client) ModifyIp6Translator(request *ModifyIp6TranslatorRequest) (response *ModifyIp6TranslatorResponse, err error) { - if request == nil { - request = NewModifyIp6TranslatorRequest() - } - response = NewModifyIp6TranslatorResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyIp6TranslatorRequest() + } + response = NewModifyIp6TranslatorResponse() + err = c.Send(request, response) + return } func NewModifyIpv6AddressesAttributeRequest() (request *ModifyIpv6AddressesAttributeRequest) { - request = &ModifyIpv6AddressesAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyIpv6AddressesAttribute") - return + request = &ModifyIpv6AddressesAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyIpv6AddressesAttribute") + return } func NewModifyIpv6AddressesAttributeResponse() (response *ModifyIpv6AddressesAttributeResponse) { - response = &ModifyIpv6AddressesAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyIpv6AddressesAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyIpv6AddressesAttribute）用于修改弹性网卡内网IPv6地址属性。 func (c *Client) ModifyIpv6AddressesAttribute(request *ModifyIpv6AddressesAttributeRequest) (response *ModifyIpv6AddressesAttributeResponse, err error) { - if request == nil { - request = NewModifyIpv6AddressesAttributeRequest() - } - response = NewModifyIpv6AddressesAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyIpv6AddressesAttributeRequest() + } + response = NewModifyIpv6AddressesAttributeResponse() + err = c.Send(request, response) + return } func NewModifyNatGatewayAttributeRequest() (request *ModifyNatGatewayAttributeRequest) { - request = &ModifyNatGatewayAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyNatGatewayAttribute") - return + request = &ModifyNatGatewayAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyNatGatewayAttribute") + return } func NewModifyNatGatewayAttributeResponse() (response *ModifyNatGatewayAttributeResponse) { - response = &ModifyNatGatewayAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyNatGatewayAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyNatGatewayAttribute）用于修改NAT网关的属性。 func (c *Client) ModifyNatGatewayAttribute(request *ModifyNatGatewayAttributeRequest) (response *ModifyNatGatewayAttributeResponse, err error) { - if request == nil { - request = NewModifyNatGatewayAttributeRequest() - } - response = NewModifyNatGatewayAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyNatGatewayAttributeRequest() + } + response = NewModifyNatGatewayAttributeResponse() + err = c.Send(request, response) + return } func NewModifyNatGatewayDestinationIpPortTranslationNatRuleRequest() (request *ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest) { - request = &ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyNatGatewayDestinationIpPortTranslationNatRule") - return + request = &ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyNatGatewayDestinationIpPortTranslationNatRule") + return } func NewModifyNatGatewayDestinationIpPortTranslationNatRuleResponse() (response *ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse) { - response = &ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyNatGatewayDestinationIpPortTranslationNatRule）用于修改NAT网关端口转发规则。 func (c *Client) ModifyNatGatewayDestinationIpPortTranslationNatRule(request *ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest) (response *ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse, err error) { - if request == nil { - request = NewModifyNatGatewayDestinationIpPortTranslationNatRuleRequest() - } - response = NewModifyNatGatewayDestinationIpPortTranslationNatRuleResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyNatGatewayDestinationIpPortTranslationNatRuleRequest() + } + response = NewModifyNatGatewayDestinationIpPortTranslationNatRuleResponse() + err = c.Send(request, response) + return } func NewModifyNetDetectRequest() (request *ModifyNetDetectRequest) { - request = &ModifyNetDetectRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetDetect") - return + request = &ModifyNetDetectRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetDetect") + return } func NewModifyNetDetectResponse() (response *ModifyNetDetectResponse) { - response = &ModifyNetDetectResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyNetDetectResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(ModifyNetDetect)用于修改网络探测参数。 func (c *Client) ModifyNetDetect(request *ModifyNetDetectRequest) (response *ModifyNetDetectResponse, err error) { - if request == nil { - request = NewModifyNetDetectRequest() - } - response = NewModifyNetDetectResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyNetDetectRequest() + } + response = NewModifyNetDetectResponse() + err = c.Send(request, response) + return } func NewModifyNetworkAclAttributeRequest() (request *ModifyNetworkAclAttributeRequest) { - request = &ModifyNetworkAclAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetworkAclAttribute") - return + request = &ModifyNetworkAclAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetworkAclAttribute") + return } func NewModifyNetworkAclAttributeResponse() (response *ModifyNetworkAclAttributeResponse) { - response = &ModifyNetworkAclAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyNetworkAclAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyNetworkAclAttribute）用于修改网络ACL属性。 func (c *Client) ModifyNetworkAclAttribute(request *ModifyNetworkAclAttributeRequest) (response *ModifyNetworkAclAttributeResponse, err error) { - if request == nil { - request = NewModifyNetworkAclAttributeRequest() - } - response = NewModifyNetworkAclAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyNetworkAclAttributeRequest() + } + response = NewModifyNetworkAclAttributeResponse() + err = c.Send(request, response) + return } func NewModifyNetworkAclEntriesRequest() (request *ModifyNetworkAclEntriesRequest) { - request = &ModifyNetworkAclEntriesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetworkAclEntries") - return + request = &ModifyNetworkAclEntriesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetworkAclEntries") + return } func NewModifyNetworkAclEntriesResponse() (response *ModifyNetworkAclEntriesResponse) { - response = &ModifyNetworkAclEntriesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyNetworkAclEntriesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyNetworkAclEntries）用于修改（包括添加和删除）网络ACL的入站规则和出站规则。在NetworkAclEntrySet参数中： // * 若同时传入入站规则和出站规则，则重置原有的入站规则和出站规则，并分别导入传入的规则。 // * 若仅传入入站规则，则仅重置原有的入站规则，并导入传入的规则，不影响原有的出站规则（若仅传入出站规则，处理方式类似入站方向）。 func (c *Client) ModifyNetworkAclEntries(request *ModifyNetworkAclEntriesRequest) (response *ModifyNetworkAclEntriesResponse, err error) { - if request == nil { - request = NewModifyNetworkAclEntriesRequest() - } - response = NewModifyNetworkAclEntriesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyNetworkAclEntriesRequest() + } + response = NewModifyNetworkAclEntriesResponse() + err = c.Send(request, response) + return } func NewModifyNetworkInterfaceAttributeRequest() (request *ModifyNetworkInterfaceAttributeRequest) { - request = &ModifyNetworkInterfaceAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetworkInterfaceAttribute") - return + request = &ModifyNetworkInterfaceAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetworkInterfaceAttribute") + return } func NewModifyNetworkInterfaceAttributeResponse() (response *ModifyNetworkInterfaceAttributeResponse) { - response = &ModifyNetworkInterfaceAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyNetworkInterfaceAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyNetworkInterfaceAttribute）用于修改弹性网卡属性。 func (c *Client) ModifyNetworkInterfaceAttribute(request *ModifyNetworkInterfaceAttributeRequest) (response *ModifyNetworkInterfaceAttributeResponse, err error) { - if request == nil { - request = NewModifyNetworkInterfaceAttributeRequest() - } - response = NewModifyNetworkInterfaceAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyNetworkInterfaceAttributeRequest() + } + response = NewModifyNetworkInterfaceAttributeResponse() + err = c.Send(request, response) + return } func NewModifyPrivateIpAddressesAttributeRequest() (request *ModifyPrivateIpAddressesAttributeRequest) { - request = &ModifyPrivateIpAddressesAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyPrivateIpAddressesAttribute") - return + request = &ModifyPrivateIpAddressesAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyPrivateIpAddressesAttribute") + return } func NewModifyPrivateIpAddressesAttributeResponse() (response *ModifyPrivateIpAddressesAttributeResponse) { - response = &ModifyPrivateIpAddressesAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyPrivateIpAddressesAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyPrivateIpAddressesAttribute）用于修改弹性网卡内网IP属性。 func (c *Client) ModifyPrivateIpAddressesAttribute(request *ModifyPrivateIpAddressesAttributeRequest) (response *ModifyPrivateIpAddressesAttributeResponse, err error) { - if request == nil { - request = NewModifyPrivateIpAddressesAttributeRequest() - } - response = NewModifyPrivateIpAddressesAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyPrivateIpAddressesAttributeRequest() + } + response = NewModifyPrivateIpAddressesAttributeResponse() + err = c.Send(request, response) + return } func NewModifyRouteTableAttributeRequest() (request *ModifyRouteTableAttributeRequest) { - request = &ModifyRouteTableAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyRouteTableAttribute") - return + request = &ModifyRouteTableAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyRouteTableAttribute") + return } func NewModifyRouteTableAttributeResponse() (response *ModifyRouteTableAttributeResponse) { - response = &ModifyRouteTableAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyRouteTableAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyRouteTableAttribute）用于修改路由表（RouteTable）属性。 func (c *Client) ModifyRouteTableAttribute(request *ModifyRouteTableAttributeRequest) (response *ModifyRouteTableAttributeResponse, err error) { - if request == nil { - request = NewModifyRouteTableAttributeRequest() - } - response = NewModifyRouteTableAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyRouteTableAttributeRequest() + } + response = NewModifyRouteTableAttributeResponse() + err = c.Send(request, response) + return } func NewModifySecurityGroupAttributeRequest() (request *ModifySecurityGroupAttributeRequest) { - request = &ModifySecurityGroupAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifySecurityGroupAttribute") - return + request = &ModifySecurityGroupAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifySecurityGroupAttribute") + return } func NewModifySecurityGroupAttributeResponse() (response *ModifySecurityGroupAttributeResponse) { - response = &ModifySecurityGroupAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifySecurityGroupAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifySecurityGroupAttribute）用于修改安全组（SecurityGroupPolicy）属性。 func (c *Client) ModifySecurityGroupAttribute(request *ModifySecurityGroupAttributeRequest) (response *ModifySecurityGroupAttributeResponse, err error) { - if request == nil { - request = NewModifySecurityGroupAttributeRequest() - } - response = NewModifySecurityGroupAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifySecurityGroupAttributeRequest() + } + response = NewModifySecurityGroupAttributeResponse() + err = c.Send(request, response) + return } func NewModifySecurityGroupPoliciesRequest() (request *ModifySecurityGroupPoliciesRequest) { - request = &ModifySecurityGroupPoliciesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifySecurityGroupPolicies") - return + request = &ModifySecurityGroupPoliciesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifySecurityGroupPolicies") + return } func NewModifySecurityGroupPoliciesResponse() (response *ModifySecurityGroupPoliciesResponse) { - response = &ModifySecurityGroupPoliciesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifySecurityGroupPoliciesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifySecurityGroupPolicies）用于重置安全组出站和入站规则（SecurityGroupPolicy）。 -// +// //
      //
    • 接口是先删除当前所有的出入站规则，然后再添加 Egress 和 Ingress 规则，不支持自定义索引 PolicyIndex。
      • //
    • 在 SecurityGroupPolicySet 参数中：
        @@ -4849,721 +4848,721 @@ func NewModifySecurityGroupPoliciesResponse() (response *ModifySecurityGroupPoli //
    // func (c *Client) ModifySecurityGroupPolicies(request *ModifySecurityGroupPoliciesRequest) (response *ModifySecurityGroupPoliciesResponse, err error) { - if request == nil { - request = NewModifySecurityGroupPoliciesRequest() - } - response = NewModifySecurityGroupPoliciesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifySecurityGroupPoliciesRequest() + } + response = NewModifySecurityGroupPoliciesResponse() + err = c.Send(request, response) + return } func NewModifyServiceTemplateAttributeRequest() (request *ModifyServiceTemplateAttributeRequest) { - request = &ModifyServiceTemplateAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyServiceTemplateAttribute") - return + request = &ModifyServiceTemplateAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyServiceTemplateAttribute") + return } func NewModifyServiceTemplateAttributeResponse() (response *ModifyServiceTemplateAttributeResponse) { - response = &ModifyServiceTemplateAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyServiceTemplateAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyServiceTemplateAttribute）用于修改协议端口模板 func (c *Client) ModifyServiceTemplateAttribute(request *ModifyServiceTemplateAttributeRequest) (response *ModifyServiceTemplateAttributeResponse, err error) { - if request == nil { - request = NewModifyServiceTemplateAttributeRequest() - } - response = NewModifyServiceTemplateAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyServiceTemplateAttributeRequest() + } + response = NewModifyServiceTemplateAttributeResponse() + err = c.Send(request, response) + return } func NewModifyServiceTemplateGroupAttributeRequest() (request *ModifyServiceTemplateGroupAttributeRequest) { - request = &ModifyServiceTemplateGroupAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyServiceTemplateGroupAttribute") - return + request = &ModifyServiceTemplateGroupAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyServiceTemplateGroupAttribute") + return } func NewModifyServiceTemplateGroupAttributeResponse() (response *ModifyServiceTemplateGroupAttributeResponse) { - response = &ModifyServiceTemplateGroupAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyServiceTemplateGroupAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyServiceTemplateGroupAttribute）用于修改协议端口模板集合。 func (c *Client) ModifyServiceTemplateGroupAttribute(request *ModifyServiceTemplateGroupAttributeRequest) (response *ModifyServiceTemplateGroupAttributeResponse, err error) { - if request == nil { - request = NewModifyServiceTemplateGroupAttributeRequest() - } - response = NewModifyServiceTemplateGroupAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyServiceTemplateGroupAttributeRequest() + } + response = NewModifyServiceTemplateGroupAttributeResponse() + err = c.Send(request, response) + return } func NewModifySubnetAttributeRequest() (request *ModifySubnetAttributeRequest) { - request = &ModifySubnetAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifySubnetAttribute") - return + request = &ModifySubnetAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifySubnetAttribute") + return } func NewModifySubnetAttributeResponse() (response *ModifySubnetAttributeResponse) { - response = &ModifySubnetAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifySubnetAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifySubnetAttribute）用于修改子网属性。 func (c *Client) ModifySubnetAttribute(request *ModifySubnetAttributeRequest) (response *ModifySubnetAttributeResponse, err error) { - if request == nil { - request = NewModifySubnetAttributeRequest() - } - response = NewModifySubnetAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifySubnetAttributeRequest() + } + response = NewModifySubnetAttributeResponse() + err = c.Send(request, response) + return } func NewModifyVpcAttributeRequest() (request *ModifyVpcAttributeRequest) { - request = &ModifyVpcAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpcAttribute") - return + request = &ModifyVpcAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpcAttribute") + return } func NewModifyVpcAttributeResponse() (response *ModifyVpcAttributeResponse) { - response = &ModifyVpcAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyVpcAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyVpcAttribute）用于修改私有网络（VPC）的相关属性。 func (c *Client) ModifyVpcAttribute(request *ModifyVpcAttributeRequest) (response *ModifyVpcAttributeResponse, err error) { - if request == nil { - request = NewModifyVpcAttributeRequest() - } - response = NewModifyVpcAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyVpcAttributeRequest() + } + response = NewModifyVpcAttributeResponse() + err = c.Send(request, response) + return } func NewModifyVpnConnectionAttributeRequest() (request *ModifyVpnConnectionAttributeRequest) { - request = &ModifyVpnConnectionAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpnConnectionAttribute") - return + request = &ModifyVpnConnectionAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpnConnectionAttribute") + return } func NewModifyVpnConnectionAttributeResponse() (response *ModifyVpnConnectionAttributeResponse) { - response = &ModifyVpnConnectionAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyVpnConnectionAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyVpnConnectionAttribute）用于修改VPN通道。 func (c *Client) ModifyVpnConnectionAttribute(request *ModifyVpnConnectionAttributeRequest) (response *ModifyVpnConnectionAttributeResponse, err error) { - if request == nil { - request = NewModifyVpnConnectionAttributeRequest() - } - response = NewModifyVpnConnectionAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyVpnConnectionAttributeRequest() + } + response = NewModifyVpnConnectionAttributeResponse() + err = c.Send(request, response) + return } func NewModifyVpnGatewayAttributeRequest() (request *ModifyVpnGatewayAttributeRequest) { - request = &ModifyVpnGatewayAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpnGatewayAttribute") - return + request = &ModifyVpnGatewayAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpnGatewayAttribute") + return } func NewModifyVpnGatewayAttributeResponse() (response *ModifyVpnGatewayAttributeResponse) { - response = &ModifyVpnGatewayAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyVpnGatewayAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyVpnGatewayAttribute）用于修改VPN网关属性。 func (c *Client) ModifyVpnGatewayAttribute(request *ModifyVpnGatewayAttributeRequest) (response *ModifyVpnGatewayAttributeResponse, err error) { - if request == nil { - request = NewModifyVpnGatewayAttributeRequest() - } - response = NewModifyVpnGatewayAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyVpnGatewayAttributeRequest() + } + response = NewModifyVpnGatewayAttributeResponse() + err = c.Send(request, response) + return } func NewModifyVpnGatewayCcnRoutesRequest() (request *ModifyVpnGatewayCcnRoutesRequest) { - request = &ModifyVpnGatewayCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpnGatewayCcnRoutes") - return + request = &ModifyVpnGatewayCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpnGatewayCcnRoutes") + return } func NewModifyVpnGatewayCcnRoutesResponse() (response *ModifyVpnGatewayCcnRoutesResponse) { - response = &ModifyVpnGatewayCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyVpnGatewayCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyVpnGatewayCcnRoutes）用于修改VPN网关云联网路由 func (c *Client) ModifyVpnGatewayCcnRoutes(request *ModifyVpnGatewayCcnRoutesRequest) (response *ModifyVpnGatewayCcnRoutesResponse, err error) { - if request == nil { - request = NewModifyVpnGatewayCcnRoutesRequest() - } - response = NewModifyVpnGatewayCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyVpnGatewayCcnRoutesRequest() + } + response = NewModifyVpnGatewayCcnRoutesResponse() + err = c.Send(request, response) + return } func NewRejectAttachCcnInstancesRequest() (request *RejectAttachCcnInstancesRequest) { - request = &RejectAttachCcnInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "RejectAttachCcnInstances") - return + request = &RejectAttachCcnInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "RejectAttachCcnInstances") + return } func NewRejectAttachCcnInstancesResponse() (response *RejectAttachCcnInstancesResponse) { - response = &RejectAttachCcnInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RejectAttachCcnInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（RejectAttachCcnInstances）用于跨账号关联实例时，云联网所有者拒绝关联操作。 func (c *Client) RejectAttachCcnInstances(request *RejectAttachCcnInstancesRequest) (response *RejectAttachCcnInstancesResponse, err error) { - if request == nil { - request = NewRejectAttachCcnInstancesRequest() - } - response = NewRejectAttachCcnInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRejectAttachCcnInstancesRequest() + } + response = NewRejectAttachCcnInstancesResponse() + err = c.Send(request, response) + return } func NewReleaseAddressesRequest() (request *ReleaseAddressesRequest) { - request = &ReleaseAddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ReleaseAddresses") - return + request = &ReleaseAddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ReleaseAddresses") + return } func NewReleaseAddressesResponse() (response *ReleaseAddressesResponse) { - response = &ReleaseAddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ReleaseAddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ReleaseAddresses) 用于释放一个或多个[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）。 // * 该操作不可逆，释放后 EIP 关联的 IP 地址将不再属于您的名下。 // * 只有状态为 UNBIND 的 EIP 才能进行释放操作。 func (c *Client) ReleaseAddresses(request *ReleaseAddressesRequest) (response *ReleaseAddressesResponse, err error) { - if request == nil { - request = NewReleaseAddressesRequest() - } - response = NewReleaseAddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewReleaseAddressesRequest() + } + response = NewReleaseAddressesResponse() + err = c.Send(request, response) + return } func NewReleaseIp6AddressesBandwidthRequest() (request *ReleaseIp6AddressesBandwidthRequest) { - request = &ReleaseIp6AddressesBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ReleaseIp6AddressesBandwidth") - return + request = &ReleaseIp6AddressesBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ReleaseIp6AddressesBandwidth") + return } func NewReleaseIp6AddressesBandwidthResponse() (response *ReleaseIp6AddressesBandwidthResponse) { - response = &ReleaseIp6AddressesBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ReleaseIp6AddressesBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于给弹性公网IPv6地址释放带宽。 func (c *Client) ReleaseIp6AddressesBandwidth(request *ReleaseIp6AddressesBandwidthRequest) (response *ReleaseIp6AddressesBandwidthResponse, err error) { - if request == nil { - request = NewReleaseIp6AddressesBandwidthRequest() - } - response = NewReleaseIp6AddressesBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewReleaseIp6AddressesBandwidthRequest() + } + response = NewReleaseIp6AddressesBandwidthResponse() + err = c.Send(request, response) + return } func NewRemoveBandwidthPackageResourcesRequest() (request *RemoveBandwidthPackageResourcesRequest) { - request = &RemoveBandwidthPackageResourcesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "RemoveBandwidthPackageResources") - return + request = &RemoveBandwidthPackageResourcesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "RemoveBandwidthPackageResources") + return } func NewRemoveBandwidthPackageResourcesResponse() (response *RemoveBandwidthPackageResourcesResponse) { - response = &RemoveBandwidthPackageResourcesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RemoveBandwidthPackageResourcesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口用于删除带宽包资源，包括[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)和[负载均衡](https://cloud.tencent.com/document/product/214/517)等 func (c *Client) RemoveBandwidthPackageResources(request *RemoveBandwidthPackageResourcesRequest) (response *RemoveBandwidthPackageResourcesResponse, err error) { - if request == nil { - request = NewRemoveBandwidthPackageResourcesRequest() - } - response = NewRemoveBandwidthPackageResourcesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRemoveBandwidthPackageResourcesRequest() + } + response = NewRemoveBandwidthPackageResourcesResponse() + err = c.Send(request, response) + return } func NewRemoveIp6RulesRequest() (request *RemoveIp6RulesRequest) { - request = &RemoveIp6RulesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "RemoveIp6Rules") - return + request = &RemoveIp6RulesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "RemoveIp6Rules") + return } func NewRemoveIp6RulesResponse() (response *RemoveIp6RulesResponse) { - response = &RemoveIp6RulesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RemoveIp6RulesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 1. 该接口用于删除IPV6转换规则 // 2. 支持批量删除同一个转换实例下的多个转换规则 func (c *Client) RemoveIp6Rules(request *RemoveIp6RulesRequest) (response *RemoveIp6RulesResponse, err error) { - if request == nil { - request = NewRemoveIp6RulesRequest() - } - response = NewRemoveIp6RulesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRemoveIp6RulesRequest() + } + response = NewRemoveIp6RulesResponse() + err = c.Send(request, response) + return } func NewRenewVpnGatewayRequest() (request *RenewVpnGatewayRequest) { - request = &RenewVpnGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "RenewVpnGateway") - return + request = &RenewVpnGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "RenewVpnGateway") + return } func NewRenewVpnGatewayResponse() (response *RenewVpnGatewayResponse) { - response = &RenewVpnGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RenewVpnGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（RenewVpnGateway）用于预付费（包年包月）VPN网关续费。目前只支持IPSEC网关。 func (c *Client) RenewVpnGateway(request *RenewVpnGatewayRequest) (response *RenewVpnGatewayResponse, err error) { - if request == nil { - request = NewRenewVpnGatewayRequest() - } - response = NewRenewVpnGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRenewVpnGatewayRequest() + } + response = NewRenewVpnGatewayResponse() + err = c.Send(request, response) + return } func NewReplaceDirectConnectGatewayCcnRoutesRequest() (request *ReplaceDirectConnectGatewayCcnRoutesRequest) { - request = &ReplaceDirectConnectGatewayCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ReplaceDirectConnectGatewayCcnRoutes") - return + request = &ReplaceDirectConnectGatewayCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ReplaceDirectConnectGatewayCcnRoutes") + return } func NewReplaceDirectConnectGatewayCcnRoutesResponse() (response *ReplaceDirectConnectGatewayCcnRoutesResponse) { - response = &ReplaceDirectConnectGatewayCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ReplaceDirectConnectGatewayCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ReplaceDirectConnectGatewayCcnRoutes）根据路由ID（RouteId）修改指定的路由（Route），支持批量修改。 func (c *Client) ReplaceDirectConnectGatewayCcnRoutes(request *ReplaceDirectConnectGatewayCcnRoutesRequest) (response *ReplaceDirectConnectGatewayCcnRoutesResponse, err error) { - if request == nil { - request = NewReplaceDirectConnectGatewayCcnRoutesRequest() - } - response = NewReplaceDirectConnectGatewayCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewReplaceDirectConnectGatewayCcnRoutesRequest() + } + response = NewReplaceDirectConnectGatewayCcnRoutesResponse() + err = c.Send(request, response) + return } func NewReplaceRouteTableAssociationRequest() (request *ReplaceRouteTableAssociationRequest) { - request = &ReplaceRouteTableAssociationRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ReplaceRouteTableAssociation") - return + request = &ReplaceRouteTableAssociationRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ReplaceRouteTableAssociation") + return } func NewReplaceRouteTableAssociationResponse() (response *ReplaceRouteTableAssociationResponse) { - response = &ReplaceRouteTableAssociationResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ReplaceRouteTableAssociationResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ReplaceRouteTableAssociation)用于修改子网（Subnet）关联的路由表（RouteTable）。 // * 一个子网只能关联一个路由表。 func (c *Client) ReplaceRouteTableAssociation(request *ReplaceRouteTableAssociationRequest) (response *ReplaceRouteTableAssociationResponse, err error) { - if request == nil { - request = NewReplaceRouteTableAssociationRequest() - } - response = NewReplaceRouteTableAssociationResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewReplaceRouteTableAssociationRequest() + } + response = NewReplaceRouteTableAssociationResponse() + err = c.Send(request, response) + return } func NewReplaceRoutesRequest() (request *ReplaceRoutesRequest) { - request = &ReplaceRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ReplaceRoutes") - return + request = &ReplaceRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ReplaceRoutes") + return } func NewReplaceRoutesResponse() (response *ReplaceRoutesResponse) { - response = &ReplaceRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ReplaceRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ReplaceRoutes）根据路由策略ID（RouteId）修改指定的路由策略（Route），支持批量修改。 func (c *Client) ReplaceRoutes(request *ReplaceRoutesRequest) (response *ReplaceRoutesResponse, err error) { - if request == nil { - request = NewReplaceRoutesRequest() - } - response = NewReplaceRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewReplaceRoutesRequest() + } + response = NewReplaceRoutesResponse() + err = c.Send(request, response) + return } func NewReplaceSecurityGroupPolicyRequest() (request *ReplaceSecurityGroupPolicyRequest) { - request = &ReplaceSecurityGroupPolicyRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ReplaceSecurityGroupPolicy") - return + request = &ReplaceSecurityGroupPolicyRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ReplaceSecurityGroupPolicy") + return } func NewReplaceSecurityGroupPolicyResponse() (response *ReplaceSecurityGroupPolicyResponse) { - response = &ReplaceSecurityGroupPolicyResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ReplaceSecurityGroupPolicyResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ReplaceSecurityGroupPolicy）用于替换单条安全组规则（SecurityGroupPolicy）。 // 单个请求中只能替换单个方向的一条规则, 必须要指定索引（PolicyIndex）。 func (c *Client) ReplaceSecurityGroupPolicy(request *ReplaceSecurityGroupPolicyRequest) (response *ReplaceSecurityGroupPolicyResponse, err error) { - if request == nil { - request = NewReplaceSecurityGroupPolicyRequest() - } - response = NewReplaceSecurityGroupPolicyResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewReplaceSecurityGroupPolicyRequest() + } + response = NewReplaceSecurityGroupPolicyResponse() + err = c.Send(request, response) + return } func NewResetAttachCcnInstancesRequest() (request *ResetAttachCcnInstancesRequest) { - request = &ResetAttachCcnInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ResetAttachCcnInstances") - return + request = &ResetAttachCcnInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ResetAttachCcnInstances") + return } func NewResetAttachCcnInstancesResponse() (response *ResetAttachCcnInstancesResponse) { - response = &ResetAttachCcnInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetAttachCcnInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ResetAttachCcnInstances）用于跨账号关联实例申请过期时，重新申请关联操作。 func (c *Client) ResetAttachCcnInstances(request *ResetAttachCcnInstancesRequest) (response *ResetAttachCcnInstancesResponse, err error) { - if request == nil { - request = NewResetAttachCcnInstancesRequest() - } - response = NewResetAttachCcnInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetAttachCcnInstancesRequest() + } + response = NewResetAttachCcnInstancesResponse() + err = c.Send(request, response) + return } func NewResetNatGatewayConnectionRequest() (request *ResetNatGatewayConnectionRequest) { - request = &ResetNatGatewayConnectionRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ResetNatGatewayConnection") - return + request = &ResetNatGatewayConnectionRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ResetNatGatewayConnection") + return } func NewResetNatGatewayConnectionResponse() (response *ResetNatGatewayConnectionResponse) { - response = &ResetNatGatewayConnectionResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetNatGatewayConnectionResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ResetNatGatewayConnection）用来NAT网关并发连接上限。 func (c *Client) ResetNatGatewayConnection(request *ResetNatGatewayConnectionRequest) (response *ResetNatGatewayConnectionResponse, err error) { - if request == nil { - request = NewResetNatGatewayConnectionRequest() - } - response = NewResetNatGatewayConnectionResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetNatGatewayConnectionRequest() + } + response = NewResetNatGatewayConnectionResponse() + err = c.Send(request, response) + return } func NewResetRoutesRequest() (request *ResetRoutesRequest) { - request = &ResetRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ResetRoutes") - return + request = &ResetRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ResetRoutes") + return } func NewResetRoutesResponse() (response *ResetRoutesResponse) { - response = &ResetRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ResetRoutes）用于对某个路由表名称和所有路由策略（Route）进行重新设置。
    // 注意: 调用本接口是先删除当前路由表中所有路由策略, 再保存新提交的路由策略内容, 会引起网络中断。 func (c *Client) ResetRoutes(request *ResetRoutesRequest) (response *ResetRoutesResponse, err error) { - if request == nil { - request = NewResetRoutesRequest() - } - response = NewResetRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetRoutesRequest() + } + response = NewResetRoutesResponse() + err = c.Send(request, response) + return } func NewResetVpnConnectionRequest() (request *ResetVpnConnectionRequest) { - request = &ResetVpnConnectionRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ResetVpnConnection") - return + request = &ResetVpnConnectionRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ResetVpnConnection") + return } func NewResetVpnConnectionResponse() (response *ResetVpnConnectionResponse) { - response = &ResetVpnConnectionResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetVpnConnectionResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(ResetVpnConnection)用于重置VPN通道。 func (c *Client) ResetVpnConnection(request *ResetVpnConnectionRequest) (response *ResetVpnConnectionResponse, err error) { - if request == nil { - request = NewResetVpnConnectionRequest() - } - response = NewResetVpnConnectionResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetVpnConnectionRequest() + } + response = NewResetVpnConnectionResponse() + err = c.Send(request, response) + return } func NewResetVpnGatewayInternetMaxBandwidthRequest() (request *ResetVpnGatewayInternetMaxBandwidthRequest) { - request = &ResetVpnGatewayInternetMaxBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ResetVpnGatewayInternetMaxBandwidth") - return + request = &ResetVpnGatewayInternetMaxBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ResetVpnGatewayInternetMaxBandwidth") + return } func NewResetVpnGatewayInternetMaxBandwidthResponse() (response *ResetVpnGatewayInternetMaxBandwidthResponse) { - response = &ResetVpnGatewayInternetMaxBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetVpnGatewayInternetMaxBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ResetVpnGatewayInternetMaxBandwidth）调整VPN网关带宽上限。目前支持升级配置，如果是包年包月VPN网关需要在有效期内。 func (c *Client) ResetVpnGatewayInternetMaxBandwidth(request *ResetVpnGatewayInternetMaxBandwidthRequest) (response *ResetVpnGatewayInternetMaxBandwidthResponse, err error) { - if request == nil { - request = NewResetVpnGatewayInternetMaxBandwidthRequest() - } - response = NewResetVpnGatewayInternetMaxBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetVpnGatewayInternetMaxBandwidthRequest() + } + response = NewResetVpnGatewayInternetMaxBandwidthResponse() + err = c.Send(request, response) + return } func NewSetCcnRegionBandwidthLimitsRequest() (request *SetCcnRegionBandwidthLimitsRequest) { - request = &SetCcnRegionBandwidthLimitsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "SetCcnRegionBandwidthLimits") - return + request = &SetCcnRegionBandwidthLimitsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "SetCcnRegionBandwidthLimits") + return } func NewSetCcnRegionBandwidthLimitsResponse() (response *SetCcnRegionBandwidthLimitsResponse) { - response = &SetCcnRegionBandwidthLimitsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &SetCcnRegionBandwidthLimitsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（SetCcnRegionBandwidthLimits）用于设置云联网（CCN）各地域出带宽上限，或者地域间带宽上限。 func (c *Client) SetCcnRegionBandwidthLimits(request *SetCcnRegionBandwidthLimitsRequest) (response *SetCcnRegionBandwidthLimitsResponse, err error) { - if request == nil { - request = NewSetCcnRegionBandwidthLimitsRequest() - } - response = NewSetCcnRegionBandwidthLimitsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewSetCcnRegionBandwidthLimitsRequest() + } + response = NewSetCcnRegionBandwidthLimitsResponse() + err = c.Send(request, response) + return } func NewTransformAddressRequest() (request *TransformAddressRequest) { - request = &TransformAddressRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "TransformAddress") - return + request = &TransformAddressRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "TransformAddress") + return } func NewTransformAddressResponse() (response *TransformAddressResponse) { - response = &TransformAddressResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &TransformAddressResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (TransformAddress) 用于将实例的普通公网 IP 转换为[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）。 // * 平台对用户每地域每日解绑 EIP 重新分配普通公网 IP 次数有所限制（可参见 [EIP 产品简介](/document/product/213/1941)）。上述配额可通过 [DescribeAddressQuota](https://cloud.tencent.com/document/api/213/1378) 接口获取。 func (c *Client) TransformAddress(request *TransformAddressRequest) (response *TransformAddressResponse, err error) { - if request == nil { - request = NewTransformAddressRequest() - } - response = NewTransformAddressResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewTransformAddressRequest() + } + response = NewTransformAddressResponse() + err = c.Send(request, response) + return } func NewUnassignIpv6AddressesRequest() (request *UnassignIpv6AddressesRequest) { - request = &UnassignIpv6AddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "UnassignIpv6Addresses") - return + request = &UnassignIpv6AddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "UnassignIpv6Addresses") + return } func NewUnassignIpv6AddressesResponse() (response *UnassignIpv6AddressesResponse) { - response = &UnassignIpv6AddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &UnassignIpv6AddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（UnassignIpv6Addresses）用于释放弹性网卡`IPv6`地址。
    // 本接口是异步完成，如需查询异步任务执行结果，请使用本接口返回的`RequestId`轮询`QueryTask`接口。 func (c *Client) UnassignIpv6Addresses(request *UnassignIpv6AddressesRequest) (response *UnassignIpv6AddressesResponse, err error) { - if request == nil { - request = NewUnassignIpv6AddressesRequest() - } - response = NewUnassignIpv6AddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewUnassignIpv6AddressesRequest() + } + response = NewUnassignIpv6AddressesResponse() + err = c.Send(request, response) + return } func NewUnassignIpv6CidrBlockRequest() (request *UnassignIpv6CidrBlockRequest) { - request = &UnassignIpv6CidrBlockRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "UnassignIpv6CidrBlock") - return + request = &UnassignIpv6CidrBlockRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "UnassignIpv6CidrBlock") + return } func NewUnassignIpv6CidrBlockResponse() (response *UnassignIpv6CidrBlockResponse) { - response = &UnassignIpv6CidrBlockResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &UnassignIpv6CidrBlockResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（UnassignIpv6CidrBlock）用于释放IPv6网段。
    // 网段如果还有IP占用且未回收，则网段无法释放。 func (c *Client) UnassignIpv6CidrBlock(request *UnassignIpv6CidrBlockRequest) (response *UnassignIpv6CidrBlockResponse, err error) { - if request == nil { - request = NewUnassignIpv6CidrBlockRequest() - } - response = NewUnassignIpv6CidrBlockResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewUnassignIpv6CidrBlockRequest() + } + response = NewUnassignIpv6CidrBlockResponse() + err = c.Send(request, response) + return } func NewUnassignIpv6SubnetCidrBlockRequest() (request *UnassignIpv6SubnetCidrBlockRequest) { - request = &UnassignIpv6SubnetCidrBlockRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "UnassignIpv6SubnetCidrBlock") - return + request = &UnassignIpv6SubnetCidrBlockRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "UnassignIpv6SubnetCidrBlock") + return } func NewUnassignIpv6SubnetCidrBlockResponse() (response *UnassignIpv6SubnetCidrBlockResponse) { - response = &UnassignIpv6SubnetCidrBlockResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &UnassignIpv6SubnetCidrBlockResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（UnassignIpv6SubnetCidrBlock）用于释放IPv6子网段。
    // 子网段如果还有IP占用且未回收，则子网段无法释放。 func (c *Client) UnassignIpv6SubnetCidrBlock(request *UnassignIpv6SubnetCidrBlockRequest) (response *UnassignIpv6SubnetCidrBlockResponse, err error) { - if request == nil { - request = NewUnassignIpv6SubnetCidrBlockRequest() - } - response = NewUnassignIpv6SubnetCidrBlockResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewUnassignIpv6SubnetCidrBlockRequest() + } + response = NewUnassignIpv6SubnetCidrBlockResponse() + err = c.Send(request, response) + return } func NewUnassignPrivateIpAddressesRequest() (request *UnassignPrivateIpAddressesRequest) { - request = &UnassignPrivateIpAddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "UnassignPrivateIpAddresses") - return + request = &UnassignPrivateIpAddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "UnassignPrivateIpAddresses") + return } func NewUnassignPrivateIpAddressesResponse() (response *UnassignPrivateIpAddressesResponse) { - response = &UnassignPrivateIpAddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &UnassignPrivateIpAddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（UnassignPrivateIpAddresses）用于弹性网卡退还内网 IP。 // * 退还弹性网卡上的辅助内网IP，接口自动解关联弹性公网 IP。不能退还弹性网卡的主内网IP。 func (c *Client) UnassignPrivateIpAddresses(request *UnassignPrivateIpAddressesRequest) (response *UnassignPrivateIpAddressesResponse, err error) { - if request == nil { - request = NewUnassignPrivateIpAddressesRequest() - } - response = NewUnassignPrivateIpAddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewUnassignPrivateIpAddressesRequest() + } + response = NewUnassignPrivateIpAddressesResponse() + err = c.Send(request, response) + return } diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/models.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/models.go index d84343bc2..f91795756 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/models.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/models.go @@ -15,9 +15,9 @@ package v20170312 import ( - "encoding/json" + "encoding/json" - tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" + tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" ) type AcceptAttachCcnInstancesRequest struct { @@ -31,12 +31,12 @@ type AcceptAttachCcnInstancesRequest struct { } func (r *AcceptAttachCcnInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AcceptAttachCcnInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AcceptAttachCcnInstancesResponse struct { @@ -49,12 +49,12 @@ type AcceptAttachCcnInstancesResponse struct { } func (r *AcceptAttachCcnInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AcceptAttachCcnInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AccountAttribute struct { @@ -86,12 +86,12 @@ type AddBandwidthPackageResourcesRequest struct { } func (r *AddBandwidthPackageResourcesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AddBandwidthPackageResourcesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AddBandwidthPackageResourcesResponse struct { @@ -104,12 +104,12 @@ type AddBandwidthPackageResourcesResponse struct { } func (r *AddBandwidthPackageResourcesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AddBandwidthPackageResourcesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AddIp6RulesRequest struct { @@ -126,12 +126,12 @@ type AddIp6RulesRequest struct { } func (r *AddIp6RulesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AddIp6RulesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AddIp6RulesResponse struct { @@ -147,12 +147,12 @@ type AddIp6RulesResponse struct { } func (r *AddIp6RulesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AddIp6RulesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type Address struct { @@ -320,12 +320,12 @@ type AllocateAddressesRequest struct { } func (r *AllocateAddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AllocateAddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AllocateAddressesResponse struct { @@ -344,12 +344,12 @@ type AllocateAddressesResponse struct { } func (r *AllocateAddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AllocateAddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AllocateIp6AddressesBandwidthRequest struct { @@ -366,12 +366,12 @@ type AllocateIp6AddressesBandwidthRequest struct { } func (r *AllocateIp6AddressesBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AllocateIp6AddressesBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AllocateIp6AddressesBandwidthResponse struct { @@ -390,12 +390,12 @@ type AllocateIp6AddressesBandwidthResponse struct { } func (r *AllocateIp6AddressesBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AllocateIp6AddressesBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignIpv6AddressesRequest struct { @@ -412,12 +412,12 @@ type AssignIpv6AddressesRequest struct { } func (r *AssignIpv6AddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignIpv6AddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignIpv6AddressesResponse struct { @@ -433,12 +433,12 @@ type AssignIpv6AddressesResponse struct { } func (r *AssignIpv6AddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignIpv6AddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignIpv6CidrBlockRequest struct { @@ -449,12 +449,12 @@ type AssignIpv6CidrBlockRequest struct { } func (r *AssignIpv6CidrBlockRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignIpv6CidrBlockRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignIpv6CidrBlockResponse struct { @@ -470,12 +470,12 @@ type AssignIpv6CidrBlockResponse struct { } func (r *AssignIpv6CidrBlockResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignIpv6CidrBlockResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignIpv6SubnetCidrBlockRequest struct { @@ -489,12 +489,12 @@ type AssignIpv6SubnetCidrBlockRequest struct { } func (r *AssignIpv6SubnetCidrBlockRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignIpv6SubnetCidrBlockRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignIpv6SubnetCidrBlockResponse struct { @@ -510,12 +510,12 @@ type AssignIpv6SubnetCidrBlockResponse struct { } func (r *AssignIpv6SubnetCidrBlockResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignIpv6SubnetCidrBlockResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignPrivateIpAddressesRequest struct { @@ -532,12 +532,12 @@ type AssignPrivateIpAddressesRequest struct { } func (r *AssignPrivateIpAddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignPrivateIpAddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignPrivateIpAddressesResponse struct { @@ -553,12 +553,12 @@ type AssignPrivateIpAddressesResponse struct { } func (r *AssignPrivateIpAddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignPrivateIpAddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssistantCidr struct { @@ -594,12 +594,12 @@ type AssociateAddressRequest struct { } func (r *AssociateAddressRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateAddressRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateAddressResponse struct { @@ -615,12 +615,12 @@ type AssociateAddressResponse struct { } func (r *AssociateAddressResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateAddressResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateDhcpIpWithAddressIpRequest struct { @@ -634,12 +634,12 @@ type AssociateDhcpIpWithAddressIpRequest struct { } func (r *AssociateDhcpIpWithAddressIpRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateDhcpIpWithAddressIpRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateDhcpIpWithAddressIpResponse struct { @@ -652,12 +652,12 @@ type AssociateDhcpIpWithAddressIpResponse struct { } func (r *AssociateDhcpIpWithAddressIpResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateDhcpIpWithAddressIpResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateNatGatewayAddressRequest struct { @@ -677,12 +677,12 @@ type AssociateNatGatewayAddressRequest struct { } func (r *AssociateNatGatewayAddressRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateNatGatewayAddressRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateNatGatewayAddressResponse struct { @@ -695,12 +695,12 @@ type AssociateNatGatewayAddressResponse struct { } func (r *AssociateNatGatewayAddressResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateNatGatewayAddressResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateNetworkAclSubnetsRequest struct { @@ -714,12 +714,12 @@ type AssociateNetworkAclSubnetsRequest struct { } func (r *AssociateNetworkAclSubnetsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateNetworkAclSubnetsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateNetworkAclSubnetsResponse struct { @@ -732,12 +732,12 @@ type AssociateNetworkAclSubnetsResponse struct { } func (r *AssociateNetworkAclSubnetsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateNetworkAclSubnetsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateNetworkInterfaceSecurityGroupsRequest struct { @@ -751,12 +751,12 @@ type AssociateNetworkInterfaceSecurityGroupsRequest struct { } func (r *AssociateNetworkInterfaceSecurityGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateNetworkInterfaceSecurityGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateNetworkInterfaceSecurityGroupsResponse struct { @@ -769,12 +769,12 @@ type AssociateNetworkInterfaceSecurityGroupsResponse struct { } func (r *AssociateNetworkInterfaceSecurityGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateNetworkInterfaceSecurityGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AttachCcnInstancesRequest struct { @@ -791,12 +791,12 @@ type AttachCcnInstancesRequest struct { } func (r *AttachCcnInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AttachCcnInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AttachCcnInstancesResponse struct { @@ -809,12 +809,12 @@ type AttachCcnInstancesResponse struct { } func (r *AttachCcnInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AttachCcnInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AttachClassicLinkVpcRequest struct { @@ -828,12 +828,12 @@ type AttachClassicLinkVpcRequest struct { } func (r *AttachClassicLinkVpcRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AttachClassicLinkVpcRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AttachClassicLinkVpcResponse struct { @@ -846,12 +846,12 @@ type AttachClassicLinkVpcResponse struct { } func (r *AttachClassicLinkVpcResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AttachClassicLinkVpcResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AttachNetworkInterfaceRequest struct { @@ -865,12 +865,12 @@ type AttachNetworkInterfaceRequest struct { } func (r *AttachNetworkInterfaceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AttachNetworkInterfaceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AttachNetworkInterfaceResponse struct { @@ -883,12 +883,12 @@ type AttachNetworkInterfaceResponse struct { } func (r *AttachNetworkInterfaceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AttachNetworkInterfaceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type BandwidthPackage struct { @@ -1104,12 +1104,12 @@ type CheckAssistantCidrRequest struct { } func (r *CheckAssistantCidrRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CheckAssistantCidrRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CheckAssistantCidrResponse struct { @@ -1125,12 +1125,12 @@ type CheckAssistantCidrResponse struct { } func (r *CheckAssistantCidrResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CheckAssistantCidrResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CheckDefaultSubnetRequest struct { @@ -1141,12 +1141,12 @@ type CheckDefaultSubnetRequest struct { } func (r *CheckDefaultSubnetRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CheckDefaultSubnetRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CheckDefaultSubnetResponse struct { @@ -1162,12 +1162,12 @@ type CheckDefaultSubnetResponse struct { } func (r *CheckDefaultSubnetResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CheckDefaultSubnetResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CheckNetDetectStateRequest struct { @@ -1206,12 +1206,12 @@ type CheckNetDetectStateRequest struct { } func (r *CheckNetDetectStateRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CheckNetDetectStateRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CheckNetDetectStateResponse struct { @@ -1227,12 +1227,12 @@ type CheckNetDetectStateResponse struct { } func (r *CheckNetDetectStateResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CheckNetDetectStateResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ClassicLinkInstance struct { @@ -1276,12 +1276,12 @@ type CreateAddressTemplateGroupRequest struct { } func (r *CreateAddressTemplateGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAddressTemplateGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAddressTemplateGroupResponse struct { @@ -1297,12 +1297,12 @@ type CreateAddressTemplateGroupResponse struct { } func (r *CreateAddressTemplateGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAddressTemplateGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAddressTemplateRequest struct { @@ -1316,12 +1316,12 @@ type CreateAddressTemplateRequest struct { } func (r *CreateAddressTemplateRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAddressTemplateRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAddressTemplateResponse struct { @@ -1337,12 +1337,12 @@ type CreateAddressTemplateResponse struct { } func (r *CreateAddressTemplateResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAddressTemplateResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAndAttachNetworkInterfaceRequest struct { @@ -1377,12 +1377,12 @@ type CreateAndAttachNetworkInterfaceRequest struct { } func (r *CreateAndAttachNetworkInterfaceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAndAttachNetworkInterfaceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAndAttachNetworkInterfaceResponse struct { @@ -1398,12 +1398,12 @@ type CreateAndAttachNetworkInterfaceResponse struct { } func (r *CreateAndAttachNetworkInterfaceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAndAttachNetworkInterfaceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAssistantCidrRequest struct { @@ -1417,12 +1417,12 @@ type CreateAssistantCidrRequest struct { } func (r *CreateAssistantCidrRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAssistantCidrRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAssistantCidrResponse struct { @@ -1430,7 +1430,7 @@ type CreateAssistantCidrResponse struct { Response *struct { // 辅助CIDR数组。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 AssistantCidrSet []*AssistantCidr `json:"AssistantCidrSet,omitempty" name:"AssistantCidrSet" list` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -1439,12 +1439,12 @@ type CreateAssistantCidrResponse struct { } func (r *CreateAssistantCidrResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAssistantCidrResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateBandwidthPackageRequest struct { @@ -1473,12 +1473,12 @@ type CreateBandwidthPackageRequest struct { } func (r *CreateBandwidthPackageRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateBandwidthPackageRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateBandwidthPackageResponse struct { @@ -1497,12 +1497,12 @@ type CreateBandwidthPackageResponse struct { } func (r *CreateBandwidthPackageResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateBandwidthPackageResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateCcnRequest struct { @@ -1528,12 +1528,12 @@ type CreateCcnRequest struct { } func (r *CreateCcnRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateCcnRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateCcnResponse struct { @@ -1549,12 +1549,12 @@ type CreateCcnResponse struct { } func (r *CreateCcnResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateCcnResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateCustomerGatewayRequest struct { @@ -1568,12 +1568,12 @@ type CreateCustomerGatewayRequest struct { } func (r *CreateCustomerGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateCustomerGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateCustomerGatewayResponse struct { @@ -1589,12 +1589,12 @@ type CreateCustomerGatewayResponse struct { } func (r *CreateCustomerGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateCustomerGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDefaultSecurityGroupRequest struct { @@ -1605,12 +1605,12 @@ type CreateDefaultSecurityGroupRequest struct { } func (r *CreateDefaultSecurityGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDefaultSecurityGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDefaultSecurityGroupResponse struct { @@ -1626,12 +1626,12 @@ type CreateDefaultSecurityGroupResponse struct { } func (r *CreateDefaultSecurityGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDefaultSecurityGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDefaultVpcRequest struct { @@ -1645,12 +1645,12 @@ type CreateDefaultVpcRequest struct { } func (r *CreateDefaultVpcRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDefaultVpcRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDefaultVpcResponse struct { @@ -1666,12 +1666,12 @@ type CreateDefaultVpcResponse struct { } func (r *CreateDefaultVpcResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDefaultVpcResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDhcpIpRequest struct { @@ -1691,12 +1691,12 @@ type CreateDhcpIpRequest struct { } func (r *CreateDhcpIpRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDhcpIpRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDhcpIpResponse struct { @@ -1712,12 +1712,12 @@ type CreateDhcpIpResponse struct { } func (r *CreateDhcpIpResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDhcpIpResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDirectConnectGatewayCcnRoutesRequest struct { @@ -1731,12 +1731,12 @@ type CreateDirectConnectGatewayCcnRoutesRequest struct { } func (r *CreateDirectConnectGatewayCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDirectConnectGatewayCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDirectConnectGatewayCcnRoutesResponse struct { @@ -1749,12 +1749,12 @@ type CreateDirectConnectGatewayCcnRoutesResponse struct { } func (r *CreateDirectConnectGatewayCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDirectConnectGatewayCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDirectConnectGatewayRequest struct { @@ -1779,12 +1779,12 @@ type CreateDirectConnectGatewayRequest struct { } func (r *CreateDirectConnectGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDirectConnectGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDirectConnectGatewayResponse struct { @@ -1800,12 +1800,12 @@ type CreateDirectConnectGatewayResponse struct { } func (r *CreateDirectConnectGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDirectConnectGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateFlowLogRequest struct { @@ -1834,12 +1834,12 @@ type CreateFlowLogRequest struct { } func (r *CreateFlowLogRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateFlowLogRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateFlowLogResponse struct { @@ -1855,12 +1855,12 @@ type CreateFlowLogResponse struct { } func (r *CreateFlowLogResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateFlowLogResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateHaVipRequest struct { @@ -1880,12 +1880,12 @@ type CreateHaVipRequest struct { } func (r *CreateHaVipRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateHaVipRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateHaVipResponse struct { @@ -1901,12 +1901,12 @@ type CreateHaVipResponse struct { } func (r *CreateHaVipResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateHaVipResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateIp6TranslatorsRequest struct { @@ -1923,12 +1923,12 @@ type CreateIp6TranslatorsRequest struct { } func (r *CreateIp6TranslatorsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateIp6TranslatorsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateIp6TranslatorsResponse struct { @@ -1944,12 +1944,12 @@ type CreateIp6TranslatorsResponse struct { } func (r *CreateIp6TranslatorsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateIp6TranslatorsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNatGatewayDestinationIpPortTranslationNatRuleRequest struct { @@ -1963,12 +1963,12 @@ type CreateNatGatewayDestinationIpPortTranslationNatRuleRequest struct { } func (r *CreateNatGatewayDestinationIpPortTranslationNatRuleRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNatGatewayDestinationIpPortTranslationNatRuleRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNatGatewayDestinationIpPortTranslationNatRuleResponse struct { @@ -1981,12 +1981,12 @@ type CreateNatGatewayDestinationIpPortTranslationNatRuleResponse struct { } func (r *CreateNatGatewayDestinationIpPortTranslationNatRuleResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNatGatewayDestinationIpPortTranslationNatRuleResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNatGatewayRequest struct { @@ -2018,12 +2018,12 @@ type CreateNatGatewayRequest struct { } func (r *CreateNatGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNatGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNatGatewayResponse struct { @@ -2042,12 +2042,12 @@ type CreateNatGatewayResponse struct { } func (r *CreateNatGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNatGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNetDetectRequest struct { @@ -2086,12 +2086,12 @@ type CreateNetDetectRequest struct { } func (r *CreateNetDetectRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNetDetectRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNetDetectResponse struct { @@ -2107,12 +2107,12 @@ type CreateNetDetectResponse struct { } func (r *CreateNetDetectResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNetDetectResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNetworkAclRequest struct { @@ -2126,12 +2126,12 @@ type CreateNetworkAclRequest struct { } func (r *CreateNetworkAclRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNetworkAclRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNetworkAclResponse struct { @@ -2147,12 +2147,12 @@ type CreateNetworkAclResponse struct { } func (r *CreateNetworkAclResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNetworkAclResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNetworkInterfaceRequest struct { @@ -2184,12 +2184,12 @@ type CreateNetworkInterfaceRequest struct { } func (r *CreateNetworkInterfaceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNetworkInterfaceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNetworkInterfaceResponse struct { @@ -2205,12 +2205,12 @@ type CreateNetworkInterfaceResponse struct { } func (r *CreateNetworkInterfaceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNetworkInterfaceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateRouteTableRequest struct { @@ -2227,12 +2227,12 @@ type CreateRouteTableRequest struct { } func (r *CreateRouteTableRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateRouteTableRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateRouteTableResponse struct { @@ -2248,12 +2248,12 @@ type CreateRouteTableResponse struct { } func (r *CreateRouteTableResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateRouteTableResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateRoutesRequest struct { @@ -2267,12 +2267,12 @@ type CreateRoutesRequest struct { } func (r *CreateRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateRoutesResponse struct { @@ -2291,12 +2291,12 @@ type CreateRoutesResponse struct { } func (r *CreateRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSecurityGroupPoliciesRequest struct { @@ -2310,12 +2310,12 @@ type CreateSecurityGroupPoliciesRequest struct { } func (r *CreateSecurityGroupPoliciesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSecurityGroupPoliciesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSecurityGroupPoliciesResponse struct { @@ -2328,12 +2328,12 @@ type CreateSecurityGroupPoliciesResponse struct { } func (r *CreateSecurityGroupPoliciesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSecurityGroupPoliciesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSecurityGroupRequest struct { @@ -2353,12 +2353,12 @@ type CreateSecurityGroupRequest struct { } func (r *CreateSecurityGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSecurityGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSecurityGroupResponse struct { @@ -2374,12 +2374,12 @@ type CreateSecurityGroupResponse struct { } func (r *CreateSecurityGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSecurityGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSecurityGroupWithPoliciesRequest struct { @@ -2399,12 +2399,12 @@ type CreateSecurityGroupWithPoliciesRequest struct { } func (r *CreateSecurityGroupWithPoliciesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSecurityGroupWithPoliciesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSecurityGroupWithPoliciesResponse struct { @@ -2420,12 +2420,12 @@ type CreateSecurityGroupWithPoliciesResponse struct { } func (r *CreateSecurityGroupWithPoliciesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSecurityGroupWithPoliciesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateServiceTemplateGroupRequest struct { @@ -2439,12 +2439,12 @@ type CreateServiceTemplateGroupRequest struct { } func (r *CreateServiceTemplateGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateServiceTemplateGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateServiceTemplateGroupResponse struct { @@ -2460,12 +2460,12 @@ type CreateServiceTemplateGroupResponse struct { } func (r *CreateServiceTemplateGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateServiceTemplateGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateServiceTemplateRequest struct { @@ -2479,12 +2479,12 @@ type CreateServiceTemplateRequest struct { } func (r *CreateServiceTemplateRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateServiceTemplateRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateServiceTemplateResponse struct { @@ -2500,12 +2500,12 @@ type CreateServiceTemplateResponse struct { } func (r *CreateServiceTemplateResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateServiceTemplateResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSubnetRequest struct { @@ -2528,12 +2528,12 @@ type CreateSubnetRequest struct { } func (r *CreateSubnetRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSubnetRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSubnetResponse struct { @@ -2549,12 +2549,12 @@ type CreateSubnetResponse struct { } func (r *CreateSubnetResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSubnetResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSubnetsRequest struct { @@ -2571,12 +2571,12 @@ type CreateSubnetsRequest struct { } func (r *CreateSubnetsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSubnetsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSubnetsResponse struct { @@ -2592,12 +2592,12 @@ type CreateSubnetsResponse struct { } func (r *CreateSubnetsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSubnetsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateVpcRequest struct { @@ -2623,12 +2623,12 @@ type CreateVpcRequest struct { } func (r *CreateVpcRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateVpcRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateVpcResponse struct { @@ -2644,12 +2644,12 @@ type CreateVpcResponse struct { } func (r *CreateVpcResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateVpcResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateVpnConnectionRequest struct { @@ -2681,12 +2681,12 @@ type CreateVpnConnectionRequest struct { } func (r *CreateVpnConnectionRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateVpnConnectionRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateVpnConnectionResponse struct { @@ -2702,12 +2702,12 @@ type CreateVpnConnectionResponse struct { } func (r *CreateVpnConnectionResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateVpnConnectionResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateVpnGatewayRequest struct { @@ -2736,12 +2736,12 @@ type CreateVpnGatewayRequest struct { } func (r *CreateVpnGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateVpnGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateVpnGatewayResponse struct { @@ -2757,12 +2757,12 @@ type CreateVpnGatewayResponse struct { } func (r *CreateVpnGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateVpnGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CustomerGateway struct { @@ -2848,12 +2848,12 @@ type DeleteAddressTemplateGroupRequest struct { } func (r *DeleteAddressTemplateGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteAddressTemplateGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteAddressTemplateGroupResponse struct { @@ -2866,12 +2866,12 @@ type DeleteAddressTemplateGroupResponse struct { } func (r *DeleteAddressTemplateGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteAddressTemplateGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteAddressTemplateRequest struct { @@ -2882,12 +2882,12 @@ type DeleteAddressTemplateRequest struct { } func (r *DeleteAddressTemplateRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteAddressTemplateRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteAddressTemplateResponse struct { @@ -2900,12 +2900,12 @@ type DeleteAddressTemplateResponse struct { } func (r *DeleteAddressTemplateResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteAddressTemplateResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteAssistantCidrRequest struct { @@ -2919,12 +2919,12 @@ type DeleteAssistantCidrRequest struct { } func (r *DeleteAssistantCidrRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteAssistantCidrRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteAssistantCidrResponse struct { @@ -2937,12 +2937,12 @@ type DeleteAssistantCidrResponse struct { } func (r *DeleteAssistantCidrResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteAssistantCidrResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteBandwidthPackageRequest struct { @@ -2953,12 +2953,12 @@ type DeleteBandwidthPackageRequest struct { } func (r *DeleteBandwidthPackageRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteBandwidthPackageRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteBandwidthPackageResponse struct { @@ -2971,12 +2971,12 @@ type DeleteBandwidthPackageResponse struct { } func (r *DeleteBandwidthPackageResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteBandwidthPackageResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteCcnRequest struct { @@ -2987,12 +2987,12 @@ type DeleteCcnRequest struct { } func (r *DeleteCcnRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteCcnRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteCcnResponse struct { @@ -3005,12 +3005,12 @@ type DeleteCcnResponse struct { } func (r *DeleteCcnResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteCcnResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteCustomerGatewayRequest struct { @@ -3021,12 +3021,12 @@ type DeleteCustomerGatewayRequest struct { } func (r *DeleteCustomerGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteCustomerGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteCustomerGatewayResponse struct { @@ -3039,12 +3039,12 @@ type DeleteCustomerGatewayResponse struct { } func (r *DeleteCustomerGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteCustomerGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDhcpIpRequest struct { @@ -3055,12 +3055,12 @@ type DeleteDhcpIpRequest struct { } func (r *DeleteDhcpIpRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDhcpIpRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDhcpIpResponse struct { @@ -3073,12 +3073,12 @@ type DeleteDhcpIpResponse struct { } func (r *DeleteDhcpIpResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDhcpIpResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDirectConnectGatewayCcnRoutesRequest struct { @@ -3092,12 +3092,12 @@ type DeleteDirectConnectGatewayCcnRoutesRequest struct { } func (r *DeleteDirectConnectGatewayCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDirectConnectGatewayCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDirectConnectGatewayCcnRoutesResponse struct { @@ -3110,12 +3110,12 @@ type DeleteDirectConnectGatewayCcnRoutesResponse struct { } func (r *DeleteDirectConnectGatewayCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDirectConnectGatewayCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDirectConnectGatewayRequest struct { @@ -3126,12 +3126,12 @@ type DeleteDirectConnectGatewayRequest struct { } func (r *DeleteDirectConnectGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDirectConnectGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDirectConnectGatewayResponse struct { @@ -3144,12 +3144,12 @@ type DeleteDirectConnectGatewayResponse struct { } func (r *DeleteDirectConnectGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDirectConnectGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteFlowLogRequest struct { @@ -3163,12 +3163,12 @@ type DeleteFlowLogRequest struct { } func (r *DeleteFlowLogRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteFlowLogRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteFlowLogResponse struct { @@ -3181,12 +3181,12 @@ type DeleteFlowLogResponse struct { } func (r *DeleteFlowLogResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteFlowLogResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteHaVipRequest struct { @@ -3197,12 +3197,12 @@ type DeleteHaVipRequest struct { } func (r *DeleteHaVipRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteHaVipRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteHaVipResponse struct { @@ -3215,12 +3215,12 @@ type DeleteHaVipResponse struct { } func (r *DeleteHaVipResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteHaVipResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteIp6TranslatorsRequest struct { @@ -3231,12 +3231,12 @@ type DeleteIp6TranslatorsRequest struct { } func (r *DeleteIp6TranslatorsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteIp6TranslatorsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteIp6TranslatorsResponse struct { @@ -3249,12 +3249,12 @@ type DeleteIp6TranslatorsResponse struct { } func (r *DeleteIp6TranslatorsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteIp6TranslatorsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest struct { @@ -3268,12 +3268,12 @@ type DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest struct { } func (r *DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse struct { @@ -3286,12 +3286,12 @@ type DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse struct { } func (r *DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNatGatewayRequest struct { @@ -3302,12 +3302,12 @@ type DeleteNatGatewayRequest struct { } func (r *DeleteNatGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNatGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNatGatewayResponse struct { @@ -3320,12 +3320,12 @@ type DeleteNatGatewayResponse struct { } func (r *DeleteNatGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNatGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNetDetectRequest struct { @@ -3336,12 +3336,12 @@ type DeleteNetDetectRequest struct { } func (r *DeleteNetDetectRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNetDetectRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNetDetectResponse struct { @@ -3354,12 +3354,12 @@ type DeleteNetDetectResponse struct { } func (r *DeleteNetDetectResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNetDetectResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNetworkAclRequest struct { @@ -3370,12 +3370,12 @@ type DeleteNetworkAclRequest struct { } func (r *DeleteNetworkAclRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNetworkAclRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNetworkAclResponse struct { @@ -3388,12 +3388,12 @@ type DeleteNetworkAclResponse struct { } func (r *DeleteNetworkAclResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNetworkAclResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNetworkInterfaceRequest struct { @@ -3404,12 +3404,12 @@ type DeleteNetworkInterfaceRequest struct { } func (r *DeleteNetworkInterfaceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNetworkInterfaceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNetworkInterfaceResponse struct { @@ -3422,12 +3422,12 @@ type DeleteNetworkInterfaceResponse struct { } func (r *DeleteNetworkInterfaceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNetworkInterfaceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteRouteTableRequest struct { @@ -3438,12 +3438,12 @@ type DeleteRouteTableRequest struct { } func (r *DeleteRouteTableRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteRouteTableRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteRouteTableResponse struct { @@ -3456,12 +3456,12 @@ type DeleteRouteTableResponse struct { } func (r *DeleteRouteTableResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteRouteTableResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteRoutesRequest struct { @@ -3475,12 +3475,12 @@ type DeleteRoutesRequest struct { } func (r *DeleteRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteRoutesResponse struct { @@ -3493,12 +3493,12 @@ type DeleteRoutesResponse struct { } func (r *DeleteRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteSecurityGroupPoliciesRequest struct { @@ -3512,12 +3512,12 @@ type DeleteSecurityGroupPoliciesRequest struct { } func (r *DeleteSecurityGroupPoliciesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteSecurityGroupPoliciesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteSecurityGroupPoliciesResponse struct { @@ -3530,12 +3530,12 @@ type DeleteSecurityGroupPoliciesResponse struct { } func (r *DeleteSecurityGroupPoliciesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteSecurityGroupPoliciesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteSecurityGroupRequest struct { @@ -3546,12 +3546,12 @@ type DeleteSecurityGroupRequest struct { } func (r *DeleteSecurityGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteSecurityGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteSecurityGroupResponse struct { @@ -3564,12 +3564,12 @@ type DeleteSecurityGroupResponse struct { } func (r *DeleteSecurityGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteSecurityGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteServiceTemplateGroupRequest struct { @@ -3580,12 +3580,12 @@ type DeleteServiceTemplateGroupRequest struct { } func (r *DeleteServiceTemplateGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteServiceTemplateGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteServiceTemplateGroupResponse struct { @@ -3598,12 +3598,12 @@ type DeleteServiceTemplateGroupResponse struct { } func (r *DeleteServiceTemplateGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteServiceTemplateGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteServiceTemplateRequest struct { @@ -3614,12 +3614,12 @@ type DeleteServiceTemplateRequest struct { } func (r *DeleteServiceTemplateRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteServiceTemplateRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteServiceTemplateResponse struct { @@ -3632,12 +3632,12 @@ type DeleteServiceTemplateResponse struct { } func (r *DeleteServiceTemplateResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteServiceTemplateResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteSubnetRequest struct { @@ -3648,12 +3648,12 @@ type DeleteSubnetRequest struct { } func (r *DeleteSubnetRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteSubnetRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteSubnetResponse struct { @@ -3666,12 +3666,12 @@ type DeleteSubnetResponse struct { } func (r *DeleteSubnetResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteSubnetResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteVpcRequest struct { @@ -3682,12 +3682,12 @@ type DeleteVpcRequest struct { } func (r *DeleteVpcRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteVpcRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteVpcResponse struct { @@ -3700,12 +3700,12 @@ type DeleteVpcResponse struct { } func (r *DeleteVpcResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteVpcResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteVpnConnectionRequest struct { @@ -3719,12 +3719,12 @@ type DeleteVpnConnectionRequest struct { } func (r *DeleteVpnConnectionRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteVpnConnectionRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteVpnConnectionResponse struct { @@ -3737,12 +3737,12 @@ type DeleteVpnConnectionResponse struct { } func (r *DeleteVpnConnectionResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteVpnConnectionResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteVpnGatewayRequest struct { @@ -3753,12 +3753,12 @@ type DeleteVpnGatewayRequest struct { } func (r *DeleteVpnGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteVpnGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteVpnGatewayResponse struct { @@ -3771,12 +3771,12 @@ type DeleteVpnGatewayResponse struct { } func (r *DeleteVpnGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteVpnGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAccountAttributesRequest struct { @@ -3784,12 +3784,12 @@ type DescribeAccountAttributesRequest struct { } func (r *DescribeAccountAttributesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAccountAttributesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAccountAttributesResponse struct { @@ -3805,12 +3805,12 @@ type DescribeAccountAttributesResponse struct { } func (r *DescribeAccountAttributesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAccountAttributesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressQuotaRequest struct { @@ -3818,12 +3818,12 @@ type DescribeAddressQuotaRequest struct { } func (r *DescribeAddressQuotaRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressQuotaRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressQuotaResponse struct { @@ -3839,12 +3839,12 @@ type DescribeAddressQuotaResponse struct { } func (r *DescribeAddressQuotaResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressQuotaResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressTemplateGroupsRequest struct { @@ -3863,12 +3863,12 @@ type DescribeAddressTemplateGroupsRequest struct { } func (r *DescribeAddressTemplateGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressTemplateGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressTemplateGroupsResponse struct { @@ -3887,12 +3887,12 @@ type DescribeAddressTemplateGroupsResponse struct { } func (r *DescribeAddressTemplateGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressTemplateGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressTemplatesRequest struct { @@ -3911,12 +3911,12 @@ type DescribeAddressTemplatesRequest struct { } func (r *DescribeAddressTemplatesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressTemplatesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressTemplatesResponse struct { @@ -3935,12 +3935,12 @@ type DescribeAddressTemplatesResponse struct { } func (r *DescribeAddressTemplatesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressTemplatesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressesRequest struct { @@ -3968,12 +3968,12 @@ type DescribeAddressesRequest struct { } func (r *DescribeAddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressesResponse struct { @@ -3992,12 +3992,12 @@ type DescribeAddressesResponse struct { } func (r *DescribeAddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAssistantCidrRequest struct { @@ -4018,12 +4018,12 @@ type DescribeAssistantCidrRequest struct { } func (r *DescribeAssistantCidrRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAssistantCidrRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAssistantCidrResponse struct { @@ -4031,7 +4031,7 @@ type DescribeAssistantCidrResponse struct { Response *struct { // 符合条件的辅助CIDR数组。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 AssistantCidrSet []*AssistantCidr `json:"AssistantCidrSet,omitempty" name:"AssistantCidrSet" list` // 符合条件的实例数量。 @@ -4043,12 +4043,12 @@ type DescribeAssistantCidrResponse struct { } func (r *DescribeAssistantCidrResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAssistantCidrResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeBandwidthPackageQuotaRequest struct { @@ -4056,12 +4056,12 @@ type DescribeBandwidthPackageQuotaRequest struct { } func (r *DescribeBandwidthPackageQuotaRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeBandwidthPackageQuotaRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeBandwidthPackageQuotaResponse struct { @@ -4077,12 +4077,12 @@ type DescribeBandwidthPackageQuotaResponse struct { } func (r *DescribeBandwidthPackageQuotaResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeBandwidthPackageQuotaResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeBandwidthPackagesRequest struct { @@ -4109,12 +4109,12 @@ type DescribeBandwidthPackagesRequest struct { } func (r *DescribeBandwidthPackagesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeBandwidthPackagesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeBandwidthPackagesResponse struct { @@ -4133,12 +4133,12 @@ type DescribeBandwidthPackagesResponse struct { } func (r *DescribeBandwidthPackagesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeBandwidthPackagesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnAttachedInstancesRequest struct { @@ -4168,12 +4168,12 @@ type DescribeCcnAttachedInstancesRequest struct { } func (r *DescribeCcnAttachedInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnAttachedInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnAttachedInstancesResponse struct { @@ -4192,12 +4192,12 @@ type DescribeCcnAttachedInstancesResponse struct { } func (r *DescribeCcnAttachedInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnAttachedInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnRegionBandwidthLimitsRequest struct { @@ -4208,12 +4208,12 @@ type DescribeCcnRegionBandwidthLimitsRequest struct { } func (r *DescribeCcnRegionBandwidthLimitsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnRegionBandwidthLimitsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnRegionBandwidthLimitsResponse struct { @@ -4229,12 +4229,12 @@ type DescribeCcnRegionBandwidthLimitsResponse struct { } func (r *DescribeCcnRegionBandwidthLimitsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnRegionBandwidthLimitsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnRoutesRequest struct { @@ -4262,12 +4262,12 @@ type DescribeCcnRoutesRequest struct { } func (r *DescribeCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnRoutesResponse struct { @@ -4286,12 +4286,12 @@ type DescribeCcnRoutesResponse struct { } func (r *DescribeCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnsRequest struct { @@ -4323,12 +4323,12 @@ type DescribeCcnsRequest struct { } func (r *DescribeCcnsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnsResponse struct { @@ -4347,12 +4347,12 @@ type DescribeCcnsResponse struct { } func (r *DescribeCcnsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeClassicLinkInstancesRequest struct { @@ -4371,12 +4371,12 @@ type DescribeClassicLinkInstancesRequest struct { } func (r *DescribeClassicLinkInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeClassicLinkInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeClassicLinkInstancesResponse struct { @@ -4395,12 +4395,12 @@ type DescribeClassicLinkInstancesResponse struct { } func (r *DescribeClassicLinkInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeClassicLinkInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCustomerGatewayVendorsRequest struct { @@ -4408,12 +4408,12 @@ type DescribeCustomerGatewayVendorsRequest struct { } func (r *DescribeCustomerGatewayVendorsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCustomerGatewayVendorsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCustomerGatewayVendorsResponse struct { @@ -4429,12 +4429,12 @@ type DescribeCustomerGatewayVendorsResponse struct { } func (r *DescribeCustomerGatewayVendorsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCustomerGatewayVendorsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCustomerGatewaysRequest struct { @@ -4457,12 +4457,12 @@ type DescribeCustomerGatewaysRequest struct { } func (r *DescribeCustomerGatewaysRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCustomerGatewaysRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCustomerGatewaysResponse struct { @@ -4481,12 +4481,12 @@ type DescribeCustomerGatewaysResponse struct { } func (r *DescribeCustomerGatewaysResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCustomerGatewaysResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDhcpIpsRequest struct { @@ -4511,12 +4511,12 @@ type DescribeDhcpIpsRequest struct { } func (r *DescribeDhcpIpsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDhcpIpsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDhcpIpsResponse struct { @@ -4535,12 +4535,12 @@ type DescribeDhcpIpsResponse struct { } func (r *DescribeDhcpIpsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDhcpIpsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDirectConnectGatewayCcnRoutesRequest struct { @@ -4562,12 +4562,12 @@ type DescribeDirectConnectGatewayCcnRoutesRequest struct { } func (r *DescribeDirectConnectGatewayCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDirectConnectGatewayCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDirectConnectGatewayCcnRoutesResponse struct { @@ -4586,12 +4586,12 @@ type DescribeDirectConnectGatewayCcnRoutesResponse struct { } func (r *DescribeDirectConnectGatewayCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDirectConnectGatewayCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDirectConnectGatewaysRequest struct { @@ -4618,12 +4618,12 @@ type DescribeDirectConnectGatewaysRequest struct { } func (r *DescribeDirectConnectGatewaysRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDirectConnectGatewaysRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDirectConnectGatewaysResponse struct { @@ -4642,12 +4642,12 @@ type DescribeDirectConnectGatewaysResponse struct { } func (r *DescribeDirectConnectGatewaysResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDirectConnectGatewaysResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeFlowLogRequest struct { @@ -4661,12 +4661,12 @@ type DescribeFlowLogRequest struct { } func (r *DescribeFlowLogRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeFlowLogRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeFlowLogResponse struct { @@ -4682,12 +4682,12 @@ type DescribeFlowLogResponse struct { } func (r *DescribeFlowLogResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeFlowLogResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeFlowLogsRequest struct { @@ -4736,12 +4736,12 @@ type DescribeFlowLogsRequest struct { } func (r *DescribeFlowLogsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeFlowLogsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeFlowLogsResponse struct { @@ -4760,12 +4760,12 @@ type DescribeFlowLogsResponse struct { } func (r *DescribeFlowLogsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeFlowLogsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeGatewayFlowMonitorDetailRequest struct { @@ -4800,12 +4800,12 @@ type DescribeGatewayFlowMonitorDetailRequest struct { } func (r *DescribeGatewayFlowMonitorDetailRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeGatewayFlowMonitorDetailRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeGatewayFlowMonitorDetailResponse struct { @@ -4824,12 +4824,12 @@ type DescribeGatewayFlowMonitorDetailResponse struct { } func (r *DescribeGatewayFlowMonitorDetailResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeGatewayFlowMonitorDetailResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeGatewayFlowQosRequest struct { @@ -4852,12 +4852,12 @@ type DescribeGatewayFlowQosRequest struct { } func (r *DescribeGatewayFlowQosRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeGatewayFlowQosRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeGatewayFlowQosResponse struct { @@ -4876,12 +4876,12 @@ type DescribeGatewayFlowQosResponse struct { } func (r *DescribeGatewayFlowQosResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeGatewayFlowQosResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeHaVipsRequest struct { @@ -4907,12 +4907,12 @@ type DescribeHaVipsRequest struct { } func (r *DescribeHaVipsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeHaVipsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeHaVipsResponse struct { @@ -4931,12 +4931,12 @@ type DescribeHaVipsResponse struct { } func (r *DescribeHaVipsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeHaVipsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeIp6AddressesRequest struct { @@ -4958,12 +4958,12 @@ type DescribeIp6AddressesRequest struct { } func (r *DescribeIp6AddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeIp6AddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeIp6AddressesResponse struct { @@ -4982,12 +4982,12 @@ type DescribeIp6AddressesResponse struct { } func (r *DescribeIp6AddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeIp6AddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeIp6TranslatorQuotaRequest struct { @@ -4998,12 +4998,12 @@ type DescribeIp6TranslatorQuotaRequest struct { } func (r *DescribeIp6TranslatorQuotaRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeIp6TranslatorQuotaRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeIp6TranslatorQuotaResponse struct { @@ -5011,7 +5011,7 @@ type DescribeIp6TranslatorQuotaResponse struct { Response *struct { // 账户在指定地域的IPV6转换实例及规则配额信息 - // QUOTAID属性是TOTAL_TRANSLATOR_QUOTA，表示账户在指定地域的IPV6转换实例配额信息；QUOTAID属性是IPV6转换实例唯一ID（形如ip6-xxxxxxxx），表示账户在该转换实例允许创建的转换规则配额 + // QUOTAID属性是TOTAL_TRANSLATOR_QUOTA，表示账户在指定地域的IPV6转换实例配额信息；QUOTAID属性是IPV6转换实例唯一ID（形如ip6-xxxxxxxx），表示账户在该转换实例允许创建的转换规则配额 QuotaSet []*Quota `json:"QuotaSet,omitempty" name:"QuotaSet" list` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -5020,12 +5020,12 @@ type DescribeIp6TranslatorQuotaResponse struct { } func (r *DescribeIp6TranslatorQuotaResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeIp6TranslatorQuotaResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeIp6TranslatorsRequest struct { @@ -5049,12 +5049,12 @@ type DescribeIp6TranslatorsRequest struct { } func (r *DescribeIp6TranslatorsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeIp6TranslatorsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeIp6TranslatorsResponse struct { @@ -5073,12 +5073,12 @@ type DescribeIp6TranslatorsResponse struct { } func (r *DescribeIp6TranslatorsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeIp6TranslatorsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest struct { @@ -5106,12 +5106,12 @@ type DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest struct { } func (r *DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse struct { @@ -5130,12 +5130,12 @@ type DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse struct { } func (r *DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNatGatewaysRequest struct { @@ -5158,12 +5158,12 @@ type DescribeNatGatewaysRequest struct { } func (r *DescribeNatGatewaysRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNatGatewaysRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNatGatewaysResponse struct { @@ -5182,12 +5182,12 @@ type DescribeNatGatewaysResponse struct { } func (r *DescribeNatGatewaysResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNatGatewaysResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetDetectStatesRequest struct { @@ -5208,12 +5208,12 @@ type DescribeNetDetectStatesRequest struct { } func (r *DescribeNetDetectStatesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetDetectStatesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetDetectStatesResponse struct { @@ -5221,11 +5221,11 @@ type DescribeNetDetectStatesResponse struct { Response *struct { // 符合条件的网络探测验证结果对象数组。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 NetDetectStateSet []*NetDetectState `json:"NetDetectStateSet,omitempty" name:"NetDetectStateSet" list` // 符合条件的网络探测验证结果对象数量。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 TotalCount *uint64 `json:"TotalCount,omitempty" name:"TotalCount"` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -5234,12 +5234,12 @@ type DescribeNetDetectStatesResponse struct { } func (r *DescribeNetDetectStatesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetDetectStatesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetDetectsRequest struct { @@ -5263,12 +5263,12 @@ type DescribeNetDetectsRequest struct { } func (r *DescribeNetDetectsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetDetectsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetDetectsResponse struct { @@ -5276,11 +5276,11 @@ type DescribeNetDetectsResponse struct { Response *struct { // 符合条件的网络探测对象数组。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 NetDetectSet []*NetDetect `json:"NetDetectSet,omitempty" name:"NetDetectSet" list` // 符合条件的网络探测对象数量。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 TotalCount *uint64 `json:"TotalCount,omitempty" name:"TotalCount"` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -5289,12 +5289,12 @@ type DescribeNetDetectsResponse struct { } func (r *DescribeNetDetectsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetDetectsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetworkAclsRequest struct { @@ -5317,12 +5317,12 @@ type DescribeNetworkAclsRequest struct { } func (r *DescribeNetworkAclsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetworkAclsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetworkAclsResponse struct { @@ -5341,12 +5341,12 @@ type DescribeNetworkAclsResponse struct { } func (r *DescribeNetworkAclsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetworkAclsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetworkInterfaceLimitRequest struct { @@ -5357,12 +5357,12 @@ type DescribeNetworkInterfaceLimitRequest struct { } func (r *DescribeNetworkInterfaceLimitRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetworkInterfaceLimitRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetworkInterfaceLimitResponse struct { @@ -5381,12 +5381,12 @@ type DescribeNetworkInterfaceLimitResponse struct { } func (r *DescribeNetworkInterfaceLimitResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetworkInterfaceLimitResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetworkInterfacesRequest struct { @@ -5418,12 +5418,12 @@ type DescribeNetworkInterfacesRequest struct { } func (r *DescribeNetworkInterfacesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetworkInterfacesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetworkInterfacesResponse struct { @@ -5442,12 +5442,12 @@ type DescribeNetworkInterfacesResponse struct { } func (r *DescribeNetworkInterfacesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetworkInterfacesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeRouteConflictsRequest struct { @@ -5461,12 +5461,12 @@ type DescribeRouteConflictsRequest struct { } func (r *DescribeRouteConflictsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeRouteConflictsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeRouteConflictsResponse struct { @@ -5482,12 +5482,12 @@ type DescribeRouteConflictsResponse struct { } func (r *DescribeRouteConflictsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeRouteConflictsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeRouteTablesRequest struct { @@ -5513,12 +5513,12 @@ type DescribeRouteTablesRequest struct { } func (r *DescribeRouteTablesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeRouteTablesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeRouteTablesResponse struct { @@ -5537,12 +5537,12 @@ type DescribeRouteTablesResponse struct { } func (r *DescribeRouteTablesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeRouteTablesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupAssociationStatisticsRequest struct { @@ -5553,12 +5553,12 @@ type DescribeSecurityGroupAssociationStatisticsRequest struct { } func (r *DescribeSecurityGroupAssociationStatisticsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupAssociationStatisticsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupAssociationStatisticsResponse struct { @@ -5574,12 +5574,12 @@ type DescribeSecurityGroupAssociationStatisticsResponse struct { } func (r *DescribeSecurityGroupAssociationStatisticsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupAssociationStatisticsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupLimitsRequest struct { @@ -5587,12 +5587,12 @@ type DescribeSecurityGroupLimitsRequest struct { } func (r *DescribeSecurityGroupLimitsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupLimitsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupLimitsResponse struct { @@ -5608,12 +5608,12 @@ type DescribeSecurityGroupLimitsResponse struct { } func (r *DescribeSecurityGroupLimitsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupLimitsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupPoliciesRequest struct { @@ -5624,12 +5624,12 @@ type DescribeSecurityGroupPoliciesRequest struct { } func (r *DescribeSecurityGroupPoliciesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupPoliciesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupPoliciesResponse struct { @@ -5645,12 +5645,12 @@ type DescribeSecurityGroupPoliciesResponse struct { } func (r *DescribeSecurityGroupPoliciesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupPoliciesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupReferencesRequest struct { @@ -5661,12 +5661,12 @@ type DescribeSecurityGroupReferencesRequest struct { } func (r *DescribeSecurityGroupReferencesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupReferencesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupReferencesResponse struct { @@ -5682,12 +5682,12 @@ type DescribeSecurityGroupReferencesResponse struct { } func (r *DescribeSecurityGroupReferencesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupReferencesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupsRequest struct { @@ -5712,12 +5712,12 @@ type DescribeSecurityGroupsRequest struct { } func (r *DescribeSecurityGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupsResponse struct { @@ -5736,12 +5736,12 @@ type DescribeSecurityGroupsResponse struct { } func (r *DescribeSecurityGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeServiceTemplateGroupsRequest struct { @@ -5760,12 +5760,12 @@ type DescribeServiceTemplateGroupsRequest struct { } func (r *DescribeServiceTemplateGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeServiceTemplateGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeServiceTemplateGroupsResponse struct { @@ -5784,12 +5784,12 @@ type DescribeServiceTemplateGroupsResponse struct { } func (r *DescribeServiceTemplateGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeServiceTemplateGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeServiceTemplatesRequest struct { @@ -5808,12 +5808,12 @@ type DescribeServiceTemplatesRequest struct { } func (r *DescribeServiceTemplatesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeServiceTemplatesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeServiceTemplatesResponse struct { @@ -5832,12 +5832,12 @@ type DescribeServiceTemplatesResponse struct { } func (r *DescribeServiceTemplatesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeServiceTemplatesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSubnetsRequest struct { @@ -5866,12 +5866,12 @@ type DescribeSubnetsRequest struct { } func (r *DescribeSubnetsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSubnetsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSubnetsResponse struct { @@ -5890,12 +5890,12 @@ type DescribeSubnetsResponse struct { } func (r *DescribeSubnetsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSubnetsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeTaskResultRequest struct { @@ -5909,12 +5909,12 @@ type DescribeTaskResultRequest struct { } func (r *DescribeTaskResultRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeTaskResultRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeTaskResultResponse struct { @@ -5933,12 +5933,12 @@ type DescribeTaskResultResponse struct { } func (r *DescribeTaskResultResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeTaskResultResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeTemplateLimitsRequest struct { @@ -5946,12 +5946,12 @@ type DescribeTemplateLimitsRequest struct { } func (r *DescribeTemplateLimitsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeTemplateLimitsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeTemplateLimitsResponse struct { @@ -5967,12 +5967,12 @@ type DescribeTemplateLimitsResponse struct { } func (r *DescribeTemplateLimitsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeTemplateLimitsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcInstancesRequest struct { @@ -5992,12 +5992,12 @@ type DescribeVpcInstancesRequest struct { } func (r *DescribeVpcInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcInstancesResponse struct { @@ -6016,12 +6016,12 @@ type DescribeVpcInstancesResponse struct { } func (r *DescribeVpcInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcIpv6AddressesRequest struct { @@ -6041,12 +6041,12 @@ type DescribeVpcIpv6AddressesRequest struct { } func (r *DescribeVpcIpv6AddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcIpv6AddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcIpv6AddressesResponse struct { @@ -6065,12 +6065,12 @@ type DescribeVpcIpv6AddressesResponse struct { } func (r *DescribeVpcIpv6AddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcIpv6AddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcLimitsRequest struct { @@ -6081,12 +6081,12 @@ type DescribeVpcLimitsRequest struct { } func (r *DescribeVpcLimitsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcLimitsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcLimitsResponse struct { @@ -6102,12 +6102,12 @@ type DescribeVpcLimitsResponse struct { } func (r *DescribeVpcLimitsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcLimitsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcPrivateIpAddressesRequest struct { @@ -6121,12 +6121,12 @@ type DescribeVpcPrivateIpAddressesRequest struct { } func (r *DescribeVpcPrivateIpAddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcPrivateIpAddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcPrivateIpAddressesResponse struct { @@ -6142,12 +6142,12 @@ type DescribeVpcPrivateIpAddressesResponse struct { } func (r *DescribeVpcPrivateIpAddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcPrivateIpAddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcResourceDashboardRequest struct { @@ -6158,12 +6158,12 @@ type DescribeVpcResourceDashboardRequest struct { } func (r *DescribeVpcResourceDashboardRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcResourceDashboardRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcResourceDashboardResponse struct { @@ -6179,12 +6179,12 @@ type DescribeVpcResourceDashboardResponse struct { } func (r *DescribeVpcResourceDashboardResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcResourceDashboardResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcsRequest struct { @@ -6210,12 +6210,12 @@ type DescribeVpcsRequest struct { } func (r *DescribeVpcsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcsResponse struct { @@ -6234,12 +6234,12 @@ type DescribeVpcsResponse struct { } func (r *DescribeVpcsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpnConnectionsRequest struct { @@ -6264,12 +6264,12 @@ type DescribeVpnConnectionsRequest struct { } func (r *DescribeVpnConnectionsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpnConnectionsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpnConnectionsResponse struct { @@ -6288,12 +6288,12 @@ type DescribeVpnConnectionsResponse struct { } func (r *DescribeVpnConnectionsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpnConnectionsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpnGatewayCcnRoutesRequest struct { @@ -6310,12 +6310,12 @@ type DescribeVpnGatewayCcnRoutesRequest struct { } func (r *DescribeVpnGatewayCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpnGatewayCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpnGatewayCcnRoutesResponse struct { @@ -6334,12 +6334,12 @@ type DescribeVpnGatewayCcnRoutesResponse struct { } func (r *DescribeVpnGatewayCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpnGatewayCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpnGatewaysRequest struct { @@ -6366,12 +6366,12 @@ type DescribeVpnGatewaysRequest struct { } func (r *DescribeVpnGatewaysRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpnGatewaysRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpnGatewaysResponse struct { @@ -6390,12 +6390,12 @@ type DescribeVpnGatewaysResponse struct { } func (r *DescribeVpnGatewaysResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpnGatewaysResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DestinationIpPortTranslationNatRule struct { @@ -6430,12 +6430,12 @@ type DetachCcnInstancesRequest struct { } func (r *DetachCcnInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DetachCcnInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DetachCcnInstancesResponse struct { @@ -6448,12 +6448,12 @@ type DetachCcnInstancesResponse struct { } func (r *DetachCcnInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DetachCcnInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DetachClassicLinkVpcRequest struct { @@ -6467,12 +6467,12 @@ type DetachClassicLinkVpcRequest struct { } func (r *DetachClassicLinkVpcRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DetachClassicLinkVpcRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DetachClassicLinkVpcResponse struct { @@ -6485,12 +6485,12 @@ type DetachClassicLinkVpcResponse struct { } func (r *DetachClassicLinkVpcResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DetachClassicLinkVpcResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DetachNetworkInterfaceRequest struct { @@ -6504,12 +6504,12 @@ type DetachNetworkInterfaceRequest struct { } func (r *DetachNetworkInterfaceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DetachNetworkInterfaceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DetachNetworkInterfaceResponse struct { @@ -6522,12 +6522,12 @@ type DetachNetworkInterfaceResponse struct { } func (r *DetachNetworkInterfaceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DetachNetworkInterfaceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DhcpIp struct { @@ -6636,12 +6636,12 @@ type DisableCcnRoutesRequest struct { } func (r *DisableCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisableCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisableCcnRoutesResponse struct { @@ -6654,12 +6654,12 @@ type DisableCcnRoutesResponse struct { } func (r *DisableCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisableCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisableGatewayFlowMonitorRequest struct { @@ -6673,12 +6673,12 @@ type DisableGatewayFlowMonitorRequest struct { } func (r *DisableGatewayFlowMonitorRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisableGatewayFlowMonitorRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisableGatewayFlowMonitorResponse struct { @@ -6691,12 +6691,12 @@ type DisableGatewayFlowMonitorResponse struct { } func (r *DisableGatewayFlowMonitorResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisableGatewayFlowMonitorResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisableRoutesRequest struct { @@ -6713,12 +6713,12 @@ type DisableRoutesRequest struct { } func (r *DisableRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisableRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisableRoutesResponse struct { @@ -6731,12 +6731,12 @@ type DisableRoutesResponse struct { } func (r *DisableRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisableRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateAddressRequest struct { @@ -6750,12 +6750,12 @@ type DisassociateAddressRequest struct { } func (r *DisassociateAddressRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateAddressRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateAddressResponse struct { @@ -6771,12 +6771,12 @@ type DisassociateAddressResponse struct { } func (r *DisassociateAddressResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateAddressResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateDhcpIpWithAddressIpRequest struct { @@ -6787,12 +6787,12 @@ type DisassociateDhcpIpWithAddressIpRequest struct { } func (r *DisassociateDhcpIpWithAddressIpRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateDhcpIpWithAddressIpRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateDhcpIpWithAddressIpResponse struct { @@ -6805,12 +6805,12 @@ type DisassociateDhcpIpWithAddressIpResponse struct { } func (r *DisassociateDhcpIpWithAddressIpResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateDhcpIpWithAddressIpResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateNatGatewayAddressRequest struct { @@ -6824,12 +6824,12 @@ type DisassociateNatGatewayAddressRequest struct { } func (r *DisassociateNatGatewayAddressRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateNatGatewayAddressRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateNatGatewayAddressResponse struct { @@ -6842,12 +6842,12 @@ type DisassociateNatGatewayAddressResponse struct { } func (r *DisassociateNatGatewayAddressResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateNatGatewayAddressResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateNetworkAclSubnetsRequest struct { @@ -6861,12 +6861,12 @@ type DisassociateNetworkAclSubnetsRequest struct { } func (r *DisassociateNetworkAclSubnetsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateNetworkAclSubnetsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateNetworkAclSubnetsResponse struct { @@ -6879,12 +6879,12 @@ type DisassociateNetworkAclSubnetsResponse struct { } func (r *DisassociateNetworkAclSubnetsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateNetworkAclSubnetsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateNetworkInterfaceSecurityGroupsRequest struct { @@ -6898,12 +6898,12 @@ type DisassociateNetworkInterfaceSecurityGroupsRequest struct { } func (r *DisassociateNetworkInterfaceSecurityGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateNetworkInterfaceSecurityGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateNetworkInterfaceSecurityGroupsResponse struct { @@ -6916,12 +6916,12 @@ type DisassociateNetworkInterfaceSecurityGroupsResponse struct { } func (r *DisassociateNetworkInterfaceSecurityGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateNetworkInterfaceSecurityGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DownloadCustomerGatewayConfigurationRequest struct { @@ -6941,12 +6941,12 @@ type DownloadCustomerGatewayConfigurationRequest struct { } func (r *DownloadCustomerGatewayConfigurationRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DownloadCustomerGatewayConfigurationRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DownloadCustomerGatewayConfigurationResponse struct { @@ -6962,12 +6962,12 @@ type DownloadCustomerGatewayConfigurationResponse struct { } func (r *DownloadCustomerGatewayConfigurationResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DownloadCustomerGatewayConfigurationResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type EnableCcnRoutesRequest struct { @@ -6981,12 +6981,12 @@ type EnableCcnRoutesRequest struct { } func (r *EnableCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *EnableCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type EnableCcnRoutesResponse struct { @@ -6999,12 +6999,12 @@ type EnableCcnRoutesResponse struct { } func (r *EnableCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *EnableCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type EnableGatewayFlowMonitorRequest struct { @@ -7018,12 +7018,12 @@ type EnableGatewayFlowMonitorRequest struct { } func (r *EnableGatewayFlowMonitorRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *EnableGatewayFlowMonitorRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type EnableGatewayFlowMonitorResponse struct { @@ -7036,12 +7036,12 @@ type EnableGatewayFlowMonitorResponse struct { } func (r *EnableGatewayFlowMonitorResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *EnableGatewayFlowMonitorResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type EnableRoutesRequest struct { @@ -7058,12 +7058,12 @@ type EnableRoutesRequest struct { } func (r *EnableRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *EnableRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type EnableRoutesResponse struct { @@ -7076,12 +7076,12 @@ type EnableRoutesResponse struct { } func (r *EnableRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *EnableRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type Filter struct { @@ -7193,12 +7193,12 @@ type GetCcnRegionBandwidthLimitsRequest struct { } func (r *GetCcnRegionBandwidthLimitsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *GetCcnRegionBandwidthLimitsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type GetCcnRegionBandwidthLimitsResponse struct { @@ -7206,11 +7206,11 @@ type GetCcnRegionBandwidthLimitsResponse struct { Response *struct { // 云联网（CCN）各地域出带宽带宽详情。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 CcnBandwidthSet []*CcnBandwidthInfo `json:"CcnBandwidthSet,omitempty" name:"CcnBandwidthSet" list` // 符合条件的对象数。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 TotalCount *uint64 `json:"TotalCount,omitempty" name:"TotalCount"` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -7219,12 +7219,12 @@ type GetCcnRegionBandwidthLimitsResponse struct { } func (r *GetCcnRegionBandwidthLimitsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *GetCcnRegionBandwidthLimitsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type HaVip struct { @@ -7276,12 +7276,12 @@ type HaVipAssociateAddressIpRequest struct { } func (r *HaVipAssociateAddressIpRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *HaVipAssociateAddressIpRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type HaVipAssociateAddressIpResponse struct { @@ -7294,12 +7294,12 @@ type HaVipAssociateAddressIpResponse struct { } func (r *HaVipAssociateAddressIpResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *HaVipAssociateAddressIpResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type HaVipDisassociateAddressIpRequest struct { @@ -7310,12 +7310,12 @@ type HaVipDisassociateAddressIpRequest struct { } func (r *HaVipDisassociateAddressIpRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *HaVipDisassociateAddressIpRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type HaVipDisassociateAddressIpResponse struct { @@ -7328,12 +7328,12 @@ type HaVipDisassociateAddressIpResponse struct { } func (r *HaVipDisassociateAddressIpResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *HaVipDisassociateAddressIpResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type IKEOptionsSpecification struct { @@ -7407,12 +7407,12 @@ type InquiryPriceCreateVpnGatewayRequest struct { } func (r *InquiryPriceCreateVpnGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceCreateVpnGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceCreateVpnGatewayResponse struct { @@ -7428,12 +7428,12 @@ type InquiryPriceCreateVpnGatewayResponse struct { } func (r *InquiryPriceCreateVpnGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceCreateVpnGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceRenewVpnGatewayRequest struct { @@ -7447,12 +7447,12 @@ type InquiryPriceRenewVpnGatewayRequest struct { } func (r *InquiryPriceRenewVpnGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceRenewVpnGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceRenewVpnGatewayResponse struct { @@ -7468,12 +7468,12 @@ type InquiryPriceRenewVpnGatewayResponse struct { } func (r *InquiryPriceRenewVpnGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceRenewVpnGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest struct { @@ -7487,12 +7487,12 @@ type InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest struct { } func (r *InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse struct { @@ -7508,12 +7508,12 @@ type InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse struct { } func (r *InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InstanceChargePrepaid struct { @@ -7669,12 +7669,12 @@ type MigrateNetworkInterfaceRequest struct { } func (r *MigrateNetworkInterfaceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *MigrateNetworkInterfaceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type MigrateNetworkInterfaceResponse struct { @@ -7687,12 +7687,12 @@ type MigrateNetworkInterfaceResponse struct { } func (r *MigrateNetworkInterfaceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *MigrateNetworkInterfaceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type MigratePrivateIpAddressRequest struct { @@ -7709,12 +7709,12 @@ type MigratePrivateIpAddressRequest struct { } func (r *MigratePrivateIpAddressRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *MigratePrivateIpAddressRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type MigratePrivateIpAddressResponse struct { @@ -7727,12 +7727,12 @@ type MigratePrivateIpAddressResponse struct { } func (r *MigratePrivateIpAddressResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *MigratePrivateIpAddressResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressAttributeRequest struct { @@ -7749,12 +7749,12 @@ type ModifyAddressAttributeRequest struct { } func (r *ModifyAddressAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressAttributeResponse struct { @@ -7767,12 +7767,12 @@ type ModifyAddressAttributeResponse struct { } func (r *ModifyAddressAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressInternetChargeTypeRequest struct { @@ -7792,12 +7792,12 @@ type ModifyAddressInternetChargeTypeRequest struct { } func (r *ModifyAddressInternetChargeTypeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressInternetChargeTypeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressInternetChargeTypeResponse struct { @@ -7810,12 +7810,12 @@ type ModifyAddressInternetChargeTypeResponse struct { } func (r *ModifyAddressInternetChargeTypeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressInternetChargeTypeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressTemplateAttributeRequest struct { @@ -7832,12 +7832,12 @@ type ModifyAddressTemplateAttributeRequest struct { } func (r *ModifyAddressTemplateAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressTemplateAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressTemplateAttributeResponse struct { @@ -7850,12 +7850,12 @@ type ModifyAddressTemplateAttributeResponse struct { } func (r *ModifyAddressTemplateAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressTemplateAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressTemplateGroupAttributeRequest struct { @@ -7872,12 +7872,12 @@ type ModifyAddressTemplateGroupAttributeRequest struct { } func (r *ModifyAddressTemplateGroupAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressTemplateGroupAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressTemplateGroupAttributeResponse struct { @@ -7890,12 +7890,12 @@ type ModifyAddressTemplateGroupAttributeResponse struct { } func (r *ModifyAddressTemplateGroupAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressTemplateGroupAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressesBandwidthRequest struct { @@ -7915,12 +7915,12 @@ type ModifyAddressesBandwidthRequest struct { } func (r *ModifyAddressesBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressesBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressesBandwidthResponse struct { @@ -7936,12 +7936,12 @@ type ModifyAddressesBandwidthResponse struct { } func (r *ModifyAddressesBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressesBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAssistantCidrRequest struct { @@ -7958,12 +7958,12 @@ type ModifyAssistantCidrRequest struct { } func (r *ModifyAssistantCidrRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAssistantCidrRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAssistantCidrResponse struct { @@ -7971,7 +7971,7 @@ type ModifyAssistantCidrResponse struct { Response *struct { // 辅助CIDR数组。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 AssistantCidrSet []*AssistantCidr `json:"AssistantCidrSet,omitempty" name:"AssistantCidrSet" list` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -7980,12 +7980,12 @@ type ModifyAssistantCidrResponse struct { } func (r *ModifyAssistantCidrResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAssistantCidrResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyBandwidthPackageAttributeRequest struct { @@ -8002,12 +8002,12 @@ type ModifyBandwidthPackageAttributeRequest struct { } func (r *ModifyBandwidthPackageAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyBandwidthPackageAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyBandwidthPackageAttributeResponse struct { @@ -8020,12 +8020,12 @@ type ModifyBandwidthPackageAttributeResponse struct { } func (r *ModifyBandwidthPackageAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyBandwidthPackageAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyCcnAttributeRequest struct { @@ -8042,12 +8042,12 @@ type ModifyCcnAttributeRequest struct { } func (r *ModifyCcnAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyCcnAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyCcnAttributeResponse struct { @@ -8060,12 +8060,12 @@ type ModifyCcnAttributeResponse struct { } func (r *ModifyCcnAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyCcnAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyCcnRegionBandwidthLimitsTypeRequest struct { @@ -8079,12 +8079,12 @@ type ModifyCcnRegionBandwidthLimitsTypeRequest struct { } func (r *ModifyCcnRegionBandwidthLimitsTypeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyCcnRegionBandwidthLimitsTypeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyCcnRegionBandwidthLimitsTypeResponse struct { @@ -8097,12 +8097,12 @@ type ModifyCcnRegionBandwidthLimitsTypeResponse struct { } func (r *ModifyCcnRegionBandwidthLimitsTypeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyCcnRegionBandwidthLimitsTypeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyCustomerGatewayAttributeRequest struct { @@ -8116,12 +8116,12 @@ type ModifyCustomerGatewayAttributeRequest struct { } func (r *ModifyCustomerGatewayAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyCustomerGatewayAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyCustomerGatewayAttributeResponse struct { @@ -8134,12 +8134,12 @@ type ModifyCustomerGatewayAttributeResponse struct { } func (r *ModifyCustomerGatewayAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyCustomerGatewayAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyDhcpIpAttributeRequest struct { @@ -8153,12 +8153,12 @@ type ModifyDhcpIpAttributeRequest struct { } func (r *ModifyDhcpIpAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyDhcpIpAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyDhcpIpAttributeResponse struct { @@ -8171,12 +8171,12 @@ type ModifyDhcpIpAttributeResponse struct { } func (r *ModifyDhcpIpAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyDhcpIpAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyDirectConnectGatewayAttributeRequest struct { @@ -8193,12 +8193,12 @@ type ModifyDirectConnectGatewayAttributeRequest struct { } func (r *ModifyDirectConnectGatewayAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyDirectConnectGatewayAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyDirectConnectGatewayAttributeResponse struct { @@ -8211,12 +8211,12 @@ type ModifyDirectConnectGatewayAttributeResponse struct { } func (r *ModifyDirectConnectGatewayAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyDirectConnectGatewayAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyFlowLogAttributeRequest struct { @@ -8236,12 +8236,12 @@ type ModifyFlowLogAttributeRequest struct { } func (r *ModifyFlowLogAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyFlowLogAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyFlowLogAttributeResponse struct { @@ -8254,12 +8254,12 @@ type ModifyFlowLogAttributeResponse struct { } func (r *ModifyFlowLogAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyFlowLogAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyGatewayFlowQosRequest struct { @@ -8279,12 +8279,12 @@ type ModifyGatewayFlowQosRequest struct { } func (r *ModifyGatewayFlowQosRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyGatewayFlowQosRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyGatewayFlowQosResponse struct { @@ -8297,12 +8297,12 @@ type ModifyGatewayFlowQosResponse struct { } func (r *ModifyGatewayFlowQosResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyGatewayFlowQosResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyHaVipAttributeRequest struct { @@ -8316,12 +8316,12 @@ type ModifyHaVipAttributeRequest struct { } func (r *ModifyHaVipAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyHaVipAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyHaVipAttributeResponse struct { @@ -8334,12 +8334,12 @@ type ModifyHaVipAttributeResponse struct { } func (r *ModifyHaVipAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyHaVipAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIp6AddressesBandwidthRequest struct { @@ -8356,12 +8356,12 @@ type ModifyIp6AddressesBandwidthRequest struct { } func (r *ModifyIp6AddressesBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIp6AddressesBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIp6AddressesBandwidthResponse struct { @@ -8374,12 +8374,12 @@ type ModifyIp6AddressesBandwidthResponse struct { } func (r *ModifyIp6AddressesBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIp6AddressesBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIp6RuleRequest struct { @@ -8402,12 +8402,12 @@ type ModifyIp6RuleRequest struct { } func (r *ModifyIp6RuleRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIp6RuleRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIp6RuleResponse struct { @@ -8420,12 +8420,12 @@ type ModifyIp6RuleResponse struct { } func (r *ModifyIp6RuleResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIp6RuleResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIp6TranslatorRequest struct { @@ -8439,12 +8439,12 @@ type ModifyIp6TranslatorRequest struct { } func (r *ModifyIp6TranslatorRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIp6TranslatorRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIp6TranslatorResponse struct { @@ -8457,12 +8457,12 @@ type ModifyIp6TranslatorResponse struct { } func (r *ModifyIp6TranslatorResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIp6TranslatorResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIpv6AddressesAttributeRequest struct { @@ -8476,12 +8476,12 @@ type ModifyIpv6AddressesAttributeRequest struct { } func (r *ModifyIpv6AddressesAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIpv6AddressesAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIpv6AddressesAttributeResponse struct { @@ -8494,12 +8494,12 @@ type ModifyIpv6AddressesAttributeResponse struct { } func (r *ModifyIpv6AddressesAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIpv6AddressesAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNatGatewayAttributeRequest struct { @@ -8516,12 +8516,12 @@ type ModifyNatGatewayAttributeRequest struct { } func (r *ModifyNatGatewayAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNatGatewayAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNatGatewayAttributeResponse struct { @@ -8534,12 +8534,12 @@ type ModifyNatGatewayAttributeResponse struct { } func (r *ModifyNatGatewayAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNatGatewayAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest struct { @@ -8556,12 +8556,12 @@ type ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest struct { } func (r *ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse struct { @@ -8574,12 +8574,12 @@ type ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse struct { } func (r *ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetDetectRequest struct { @@ -8615,12 +8615,12 @@ type ModifyNetDetectRequest struct { } func (r *ModifyNetDetectRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetDetectRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetDetectResponse struct { @@ -8633,12 +8633,12 @@ type ModifyNetDetectResponse struct { } func (r *ModifyNetDetectResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetDetectResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetworkAclAttributeRequest struct { @@ -8652,12 +8652,12 @@ type ModifyNetworkAclAttributeRequest struct { } func (r *ModifyNetworkAclAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetworkAclAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetworkAclAttributeResponse struct { @@ -8670,12 +8670,12 @@ type ModifyNetworkAclAttributeResponse struct { } func (r *ModifyNetworkAclAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetworkAclAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetworkAclEntriesRequest struct { @@ -8689,12 +8689,12 @@ type ModifyNetworkAclEntriesRequest struct { } func (r *ModifyNetworkAclEntriesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetworkAclEntriesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetworkAclEntriesResponse struct { @@ -8707,12 +8707,12 @@ type ModifyNetworkAclEntriesResponse struct { } func (r *ModifyNetworkAclEntriesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetworkAclEntriesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetworkInterfaceAttributeRequest struct { @@ -8732,12 +8732,12 @@ type ModifyNetworkInterfaceAttributeRequest struct { } func (r *ModifyNetworkInterfaceAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetworkInterfaceAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetworkInterfaceAttributeResponse struct { @@ -8750,12 +8750,12 @@ type ModifyNetworkInterfaceAttributeResponse struct { } func (r *ModifyNetworkInterfaceAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetworkInterfaceAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyPrivateIpAddressesAttributeRequest struct { @@ -8769,12 +8769,12 @@ type ModifyPrivateIpAddressesAttributeRequest struct { } func (r *ModifyPrivateIpAddressesAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyPrivateIpAddressesAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyPrivateIpAddressesAttributeResponse struct { @@ -8787,12 +8787,12 @@ type ModifyPrivateIpAddressesAttributeResponse struct { } func (r *ModifyPrivateIpAddressesAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyPrivateIpAddressesAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyRouteTableAttributeRequest struct { @@ -8806,12 +8806,12 @@ type ModifyRouteTableAttributeRequest struct { } func (r *ModifyRouteTableAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyRouteTableAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyRouteTableAttributeResponse struct { @@ -8824,12 +8824,12 @@ type ModifyRouteTableAttributeResponse struct { } func (r *ModifyRouteTableAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyRouteTableAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifySecurityGroupAttributeRequest struct { @@ -8846,12 +8846,12 @@ type ModifySecurityGroupAttributeRequest struct { } func (r *ModifySecurityGroupAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifySecurityGroupAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifySecurityGroupAttributeResponse struct { @@ -8864,12 +8864,12 @@ type ModifySecurityGroupAttributeResponse struct { } func (r *ModifySecurityGroupAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifySecurityGroupAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifySecurityGroupPoliciesRequest struct { @@ -8886,12 +8886,12 @@ type ModifySecurityGroupPoliciesRequest struct { } func (r *ModifySecurityGroupPoliciesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifySecurityGroupPoliciesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifySecurityGroupPoliciesResponse struct { @@ -8904,12 +8904,12 @@ type ModifySecurityGroupPoliciesResponse struct { } func (r *ModifySecurityGroupPoliciesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifySecurityGroupPoliciesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyServiceTemplateAttributeRequest struct { @@ -8926,12 +8926,12 @@ type ModifyServiceTemplateAttributeRequest struct { } func (r *ModifyServiceTemplateAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyServiceTemplateAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyServiceTemplateAttributeResponse struct { @@ -8944,12 +8944,12 @@ type ModifyServiceTemplateAttributeResponse struct { } func (r *ModifyServiceTemplateAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyServiceTemplateAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyServiceTemplateGroupAttributeRequest struct { @@ -8966,12 +8966,12 @@ type ModifyServiceTemplateGroupAttributeRequest struct { } func (r *ModifyServiceTemplateGroupAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyServiceTemplateGroupAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyServiceTemplateGroupAttributeResponse struct { @@ -8984,12 +8984,12 @@ type ModifyServiceTemplateGroupAttributeResponse struct { } func (r *ModifyServiceTemplateGroupAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyServiceTemplateGroupAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifySubnetAttributeRequest struct { @@ -9006,12 +9006,12 @@ type ModifySubnetAttributeRequest struct { } func (r *ModifySubnetAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifySubnetAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifySubnetAttributeResponse struct { @@ -9024,12 +9024,12 @@ type ModifySubnetAttributeResponse struct { } func (r *ModifySubnetAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifySubnetAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpcAttributeRequest struct { @@ -9052,12 +9052,12 @@ type ModifyVpcAttributeRequest struct { } func (r *ModifyVpcAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpcAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpcAttributeResponse struct { @@ -9070,12 +9070,12 @@ type ModifyVpcAttributeResponse struct { } func (r *ModifyVpcAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpcAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpnConnectionAttributeRequest struct { @@ -9101,12 +9101,12 @@ type ModifyVpnConnectionAttributeRequest struct { } func (r *ModifyVpnConnectionAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpnConnectionAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpnConnectionAttributeResponse struct { @@ -9119,12 +9119,12 @@ type ModifyVpnConnectionAttributeResponse struct { } func (r *ModifyVpnConnectionAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpnConnectionAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpnGatewayAttributeRequest struct { @@ -9141,12 +9141,12 @@ type ModifyVpnGatewayAttributeRequest struct { } func (r *ModifyVpnGatewayAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpnGatewayAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpnGatewayAttributeResponse struct { @@ -9159,12 +9159,12 @@ type ModifyVpnGatewayAttributeResponse struct { } func (r *ModifyVpnGatewayAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpnGatewayAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpnGatewayCcnRoutesRequest struct { @@ -9178,12 +9178,12 @@ type ModifyVpnGatewayCcnRoutesRequest struct { } func (r *ModifyVpnGatewayCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpnGatewayCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpnGatewayCcnRoutesResponse struct { @@ -9196,12 +9196,12 @@ type ModifyVpnGatewayCcnRoutesResponse struct { } func (r *ModifyVpnGatewayCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpnGatewayCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type NatGateway struct { @@ -9569,12 +9569,12 @@ type RejectAttachCcnInstancesRequest struct { } func (r *RejectAttachCcnInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RejectAttachCcnInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RejectAttachCcnInstancesResponse struct { @@ -9587,12 +9587,12 @@ type RejectAttachCcnInstancesResponse struct { } func (r *RejectAttachCcnInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RejectAttachCcnInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReleaseAddressesRequest struct { @@ -9603,12 +9603,12 @@ type ReleaseAddressesRequest struct { } func (r *ReleaseAddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReleaseAddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReleaseAddressesResponse struct { @@ -9624,12 +9624,12 @@ type ReleaseAddressesResponse struct { } func (r *ReleaseAddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReleaseAddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReleaseIp6AddressesBandwidthRequest struct { @@ -9643,12 +9643,12 @@ type ReleaseIp6AddressesBandwidthRequest struct { } func (r *ReleaseIp6AddressesBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReleaseIp6AddressesBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReleaseIp6AddressesBandwidthResponse struct { @@ -9664,12 +9664,12 @@ type ReleaseIp6AddressesBandwidthResponse struct { } func (r *ReleaseIp6AddressesBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReleaseIp6AddressesBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RemoveBandwidthPackageResourcesRequest struct { @@ -9686,12 +9686,12 @@ type RemoveBandwidthPackageResourcesRequest struct { } func (r *RemoveBandwidthPackageResourcesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RemoveBandwidthPackageResourcesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RemoveBandwidthPackageResourcesResponse struct { @@ -9704,12 +9704,12 @@ type RemoveBandwidthPackageResourcesResponse struct { } func (r *RemoveBandwidthPackageResourcesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RemoveBandwidthPackageResourcesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RemoveIp6RulesRequest struct { @@ -9723,12 +9723,12 @@ type RemoveIp6RulesRequest struct { } func (r *RemoveIp6RulesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RemoveIp6RulesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RemoveIp6RulesResponse struct { @@ -9741,12 +9741,12 @@ type RemoveIp6RulesResponse struct { } func (r *RemoveIp6RulesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RemoveIp6RulesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RenewVpnGatewayRequest struct { @@ -9760,12 +9760,12 @@ type RenewVpnGatewayRequest struct { } func (r *RenewVpnGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RenewVpnGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RenewVpnGatewayResponse struct { @@ -9778,12 +9778,12 @@ type RenewVpnGatewayResponse struct { } func (r *RenewVpnGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RenewVpnGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceDirectConnectGatewayCcnRoutesRequest struct { @@ -9797,12 +9797,12 @@ type ReplaceDirectConnectGatewayCcnRoutesRequest struct { } func (r *ReplaceDirectConnectGatewayCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceDirectConnectGatewayCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceDirectConnectGatewayCcnRoutesResponse struct { @@ -9815,12 +9815,12 @@ type ReplaceDirectConnectGatewayCcnRoutesResponse struct { } func (r *ReplaceDirectConnectGatewayCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceDirectConnectGatewayCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceRouteTableAssociationRequest struct { @@ -9834,12 +9834,12 @@ type ReplaceRouteTableAssociationRequest struct { } func (r *ReplaceRouteTableAssociationRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceRouteTableAssociationRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceRouteTableAssociationResponse struct { @@ -9852,12 +9852,12 @@ type ReplaceRouteTableAssociationResponse struct { } func (r *ReplaceRouteTableAssociationResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceRouteTableAssociationResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceRoutesRequest struct { @@ -9871,12 +9871,12 @@ type ReplaceRoutesRequest struct { } func (r *ReplaceRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceRoutesResponse struct { @@ -9889,12 +9889,12 @@ type ReplaceRoutesResponse struct { } func (r *ReplaceRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceSecurityGroupPolicyRequest struct { @@ -9908,12 +9908,12 @@ type ReplaceSecurityGroupPolicyRequest struct { } func (r *ReplaceSecurityGroupPolicyRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceSecurityGroupPolicyRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceSecurityGroupPolicyResponse struct { @@ -9926,12 +9926,12 @@ type ReplaceSecurityGroupPolicyResponse struct { } func (r *ReplaceSecurityGroupPolicyResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceSecurityGroupPolicyResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetAttachCcnInstancesRequest struct { @@ -9948,12 +9948,12 @@ type ResetAttachCcnInstancesRequest struct { } func (r *ResetAttachCcnInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetAttachCcnInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetAttachCcnInstancesResponse struct { @@ -9966,12 +9966,12 @@ type ResetAttachCcnInstancesResponse struct { } func (r *ResetAttachCcnInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetAttachCcnInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetNatGatewayConnectionRequest struct { @@ -9985,12 +9985,12 @@ type ResetNatGatewayConnectionRequest struct { } func (r *ResetNatGatewayConnectionRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetNatGatewayConnectionRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetNatGatewayConnectionResponse struct { @@ -10003,12 +10003,12 @@ type ResetNatGatewayConnectionResponse struct { } func (r *ResetNatGatewayConnectionResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetNatGatewayConnectionResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetRoutesRequest struct { @@ -10025,12 +10025,12 @@ type ResetRoutesRequest struct { } func (r *ResetRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetRoutesResponse struct { @@ -10043,12 +10043,12 @@ type ResetRoutesResponse struct { } func (r *ResetRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetVpnConnectionRequest struct { @@ -10062,12 +10062,12 @@ type ResetVpnConnectionRequest struct { } func (r *ResetVpnConnectionRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetVpnConnectionRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetVpnConnectionResponse struct { @@ -10080,12 +10080,12 @@ type ResetVpnConnectionResponse struct { } func (r *ResetVpnConnectionResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetVpnConnectionResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetVpnGatewayInternetMaxBandwidthRequest struct { @@ -10099,12 +10099,12 @@ type ResetVpnGatewayInternetMaxBandwidthRequest struct { } func (r *ResetVpnGatewayInternetMaxBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetVpnGatewayInternetMaxBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetVpnGatewayInternetMaxBandwidthResponse struct { @@ -10117,12 +10117,12 @@ type ResetVpnGatewayInternetMaxBandwidthResponse struct { } func (r *ResetVpnGatewayInternetMaxBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetVpnGatewayInternetMaxBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type Resource struct { @@ -10277,7 +10277,7 @@ type Route struct { // DIRECTCONNECT：专线网关； // PEERCONNECTION：对等连接； // SSLVPN：sslvpn网关； - // NAT：NAT网关; + // NAT：NAT网关; // NORMAL_CVM：普通云服务器； // EIP：云服务器的公网IP； // CCN：云联网。 @@ -10540,12 +10540,12 @@ type SetCcnRegionBandwidthLimitsRequest struct { } func (r *SetCcnRegionBandwidthLimitsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *SetCcnRegionBandwidthLimitsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type SetCcnRegionBandwidthLimitsResponse struct { @@ -10558,12 +10558,12 @@ type SetCcnRegionBandwidthLimitsResponse struct { } func (r *SetCcnRegionBandwidthLimitsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *SetCcnRegionBandwidthLimitsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type Subnet struct { @@ -10663,12 +10663,12 @@ type TransformAddressRequest struct { } func (r *TransformAddressRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *TransformAddressRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type TransformAddressResponse struct { @@ -10681,12 +10681,12 @@ type TransformAddressResponse struct { } func (r *TransformAddressResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *TransformAddressResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignIpv6AddressesRequest struct { @@ -10700,12 +10700,12 @@ type UnassignIpv6AddressesRequest struct { } func (r *UnassignIpv6AddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignIpv6AddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignIpv6AddressesResponse struct { @@ -10718,12 +10718,12 @@ type UnassignIpv6AddressesResponse struct { } func (r *UnassignIpv6AddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignIpv6AddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignIpv6CidrBlockRequest struct { @@ -10737,12 +10737,12 @@ type UnassignIpv6CidrBlockRequest struct { } func (r *UnassignIpv6CidrBlockRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignIpv6CidrBlockRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignIpv6CidrBlockResponse struct { @@ -10755,12 +10755,12 @@ type UnassignIpv6CidrBlockResponse struct { } func (r *UnassignIpv6CidrBlockResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignIpv6CidrBlockResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignIpv6SubnetCidrBlockRequest struct { @@ -10774,12 +10774,12 @@ type UnassignIpv6SubnetCidrBlockRequest struct { } func (r *UnassignIpv6SubnetCidrBlockRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignIpv6SubnetCidrBlockRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignIpv6SubnetCidrBlockResponse struct { @@ -10792,12 +10792,12 @@ type UnassignIpv6SubnetCidrBlockResponse struct { } func (r *UnassignIpv6SubnetCidrBlockResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignIpv6SubnetCidrBlockResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignPrivateIpAddressesRequest struct { @@ -10811,12 +10811,12 @@ type UnassignPrivateIpAddressesRequest struct { } func (r *UnassignPrivateIpAddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignPrivateIpAddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignPrivateIpAddressesResponse struct { @@ -10829,12 +10829,12 @@ type UnassignPrivateIpAddressesResponse struct { } func (r *UnassignPrivateIpAddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignPrivateIpAddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type Vpc struct { diff --git a/vendor/github.com/ufilesdk-dev/ufile-gosdk/file.go b/vendor/github.com/ufilesdk-dev/ufile-gosdk/file.go index 1cca94d8e..106fd4c0f 100644 --- a/vendor/github.com/ufilesdk-dev/ufile-gosdk/file.go +++ b/vendor/github.com/ufilesdk-dev/ufile-gosdk/file.go @@ -2,8 +2,8 @@ package ufsdk import ( "bytes" - "encoding/base64" "crypto/md5" + "encoding/base64" "encoding/json" "fmt" "io" @@ -205,7 +205,6 @@ func (u *UFileRequest) PutFileWithPolicy(filePath, keyName, mimeType string, pol return u.request(req) } - //DeleteFile 删除一个文件，如果删除成功 statuscode 会返回 204，否则会返回 404 表示文件不存在。 //keyName 表示传到 ufile 的文件名。 func (u *UFileRequest) DeleteFile(keyName string) error { @@ -411,7 +410,7 @@ func (u *UFileRequest) Copy(dstkeyName, srcBucketName, srcKeyName string) (err e if err != nil { return err } - req.Header.Add("X-Ufile-Copy-Source", "/" + srcBucketName + "/" + srcKeyName) + req.Header.Add("X-Ufile-Copy-Source", "/"+srcBucketName+"/"+srcKeyName) authorization := u.Auth.Authorization("PUT", u.BucketName, dstkeyName, req.Header) req.Header.Add("authorization", authorization) diff --git a/vendor/github.com/ufilesdk-dev/ufile-gosdk/file_mutipart_upload_with_policy.go b/vendor/github.com/ufilesdk-dev/ufile-gosdk/file_mutipart_upload_with_policy.go index 51d29fa0d..6457d1753 100644 --- a/vendor/github.com/ufilesdk-dev/ufile-gosdk/file_mutipart_upload_with_policy.go +++ b/vendor/github.com/ufilesdk-dev/ufile-gosdk/file_mutipart_upload_with_policy.go @@ -2,8 +2,8 @@ package ufsdk import ( "bytes" + "encoding/base64" "io" - "encoding/base64" "net/http" "net/url" "strconv" @@ -131,7 +131,6 @@ func (u *UFileRequest) AsyncUploadWithPolicy(filePath, keyName, mimeType string, return u.FinishMultipartUploadWithPolicy(state, policy_json) } - //FinishMultipartUpload 完成分片上传。分片上传必须要调用的接口。 //state 参数是 InitiateMultipartUpload 返回的 func (u *UFileRequest) FinishMultipartUploadWithPolicy(state *MultipartState, policy_json string) error { @@ -151,7 +150,7 @@ func (u *UFileRequest) FinishMultipartUploadWithPolicy(state *MultipartState, po if err != nil { return err } - + req.Header.Add("Content-Type", state.mimeType) policy := base64.URLEncoding.EncodeToString([]byte(policy_json)) @@ -162,5 +161,3 @@ func (u *UFileRequest) FinishMultipartUploadWithPolicy(state *MultipartState, po return u.request(req) } - - diff --git a/vendor/github.com/ufilesdk-dev/ufile-gosdk/request.go b/vendor/github.com/ufilesdk-dev/ufile-gosdk/request.go index f69c2bc52..4a43ef880 100644 --- a/vendor/github.com/ufilesdk-dev/ufile-gosdk/request.go +++ b/vendor/github.com/ufilesdk-dev/ufile-gosdk/request.go @@ -22,13 +22,13 @@ import ( //4.远端请求返回值统一返回一个 error，如果为 nil 表示无错。LastResponseStatus，LastResponseHeader，LastResponseBody 可以查看具体的 HTTP 返回信息（）。如果你想少敲几行代码可以直接调用 DumpResponse(true) 查看详细返回。 // type UFileRequest struct { - Auth Auth - BucketName string - Host string - Client *http.Client - Context context.Context - baseURL *url.URL - RequestHeader http.Header + Auth Auth + BucketName string + Host string + Client *http.Client + Context context.Context + baseURL *url.URL + RequestHeader http.Header LastResponseStatus int LastResponseHeader http.Header @@ -65,7 +65,7 @@ func NewFileRequest(config *Config, client *http.Client) (*UFileRequest, error) //client 这里你可以传空，会使用默认的 http.Client。如果你需要设置超时以及一些其他相关的网络配置选项请传入一个自定义的 client。 func NewFileRequestWithHeader(config *Config, header http.Header, client *http.Client) (*UFileRequest, error) { req, err := NewFileRequest(config, client) - if err != nil{ + if err != nil { return nil, err } req.RequestHeader = header diff --git a/vendor/github.com/ugorji/go/codec/0doc.go b/vendor/github.com/ugorji/go/codec/0doc.go index bd7361c87..5286c7d42 100644 --- a/vendor/github.com/ugorji/go/codec/0doc.go +++ b/vendor/github.com/ugorji/go/codec/0doc.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license found in the LICENSE file. /* -High Performance, Feature-Rich Idiomatic Go codec/encoding library for +High Performance, Feature-Rich Idiomatic Go codec/encoding library for binc, msgpack, cbor, json. Supported Serialization formats are: @@ -11,7 +11,7 @@ Supported Serialization formats are: - binc: http://github.com/ugorji/binc - cbor: http://cbor.io http://tools.ietf.org/html/rfc7049 - json: http://json.org http://tools.ietf.org/html/rfc7159 - - simple: + - simple: To install: @@ -19,7 +19,7 @@ To install: This package understands the 'unsafe' tag, to allow using unsafe semantics: - - When decoding into a struct, you need to read the field name as a string + - When decoding into a struct, you need to read the field name as a string so you can find the struct field it is mapped to. Using `unsafe` will bypass the allocation and copying overhead of []byte->string conversion. @@ -38,9 +38,9 @@ Rich Feature Set includes: - Very High Performance. Our extensive benchmarks show us outperforming Gob, Json, Bson, etc by 2-4X. - Multiple conversions: - Package coerces types where appropriate + Package coerces types where appropriate e.g. decode an int in the stream into a float, etc. - - Corner Cases: + - Corner Cases: Overflows, nil maps/slices, nil values in streams are handled correctly - Standard field renaming via tags - Support for omitting empty fields during an encoding @@ -56,7 +56,7 @@ Rich Feature Set includes: - Fast (no-reflection) encoding/decoding of common maps and slices - Code-generation for faster performance. - Support binary (e.g. messagepack, cbor) and text (e.g. json) formats - - Support indefinite-length formats to enable true streaming + - Support indefinite-length formats to enable true streaming (for formats which support it e.g. json, cbor) - Support canonical encoding, where a value is ALWAYS encoded as same sequence of bytes. This mostly applies to maps, where iteration order is non-deterministic. @@ -68,12 +68,12 @@ Rich Feature Set includes: - Encode/Decode from/to chan types (for iterative streaming support) - Drop-in replacement for encoding/json. `json:` key in struct tag supported. - Provides a RPC Server and Client Codec for net/rpc communication protocol. - - Handle unique idiosynchracies of codecs e.g. - - For messagepack, configure how ambiguities in handling raw bytes are resolved - - For messagepack, provide rpc server/client codec to support + - Handle unique idiosynchracies of codecs e.g. + - For messagepack, configure how ambiguities in handling raw bytes are resolved + - For messagepack, provide rpc server/client codec to support msgpack-rpc protocol defined at: https://github.com/msgpack-rpc/msgpack-rpc/blob/master/spec.md - + Extension Support Users can register a function to handle the encoding or decoding of diff --git a/vendor/github.com/ugorji/go/codec/gen.generated.go b/vendor/github.com/ugorji/go/codec/gen.generated.go index 2ace97b78..b130ed67d 100644 --- a/vendor/github.com/ugorji/go/codec/gen.generated.go +++ b/vendor/github.com/ugorji/go/codec/gen.generated.go @@ -172,4 +172,3 @@ if {{var "l"}} == 0 { *{{ .Varname }} = {{var "v"}} }{{end}} ` - diff --git a/vendor/github.com/zclconf/go-cty-yaml/readerc.go b/vendor/github.com/zclconf/go-cty-yaml/readerc.go index 7c1f5fac3..b0c436c4a 100644 --- a/vendor/github.com/zclconf/go-cty-yaml/readerc.go +++ b/vendor/github.com/zclconf/go-cty-yaml/readerc.go @@ -95,7 +95,7 @@ func yaml_parser_update_buffer(parser *yaml_parser_t, length int) bool { // [Go] This function was changed to guarantee the requested length size at EOF. // The fact we need to do this is pretty awful, but the description above implies - // for that to be the case, and there are tests + // for that to be the case, and there are tests // If the EOF flag is set and the raw buffer is empty, do nothing. if parser.eof && parser.raw_buffer_pos == len(parser.raw_buffer) { diff --git a/vendor/github.com/zclconf/go-cty/cty/function/stdlib/string.go b/vendor/github.com/zclconf/go-cty/cty/function/stdlib/string.go index 01ebc47fd..1cbea9c70 100644 --- a/vendor/github.com/zclconf/go-cty/cty/function/stdlib/string.go +++ b/vendor/github.com/zclconf/go-cty/cty/function/stdlib/string.go @@ -151,7 +151,6 @@ var SubstrFunc = function.New(&function.Spec{ return cty.StringVal(""), nil } - sub := in pos := 0 var i int diff --git a/vendor/gopkg.in/ini.v1/key.go b/vendor/gopkg.in/ini.v1/key.go index 0fee0dc7e..7dd74fd47 100644 --- a/vendor/gopkg.in/ini.v1/key.go +++ b/vendor/gopkg.in/ini.v1/key.go @@ -186,8 +186,8 @@ func (k *Key) Float64() (float64, error) { // Int returns int type value. func (k *Key) Int() (int, error) { - v, err := strconv.ParseInt(k.String(), 0, 64) - return int(v), err + v, err := strconv.ParseInt(k.String(), 0, 64) + return int(v), err } // Int64 returns int64 type value. @@ -669,7 +669,7 @@ func (k *Key) parseInts(strs []string, addInvalid, returnOnInvalid bool) ([]int, vals := make([]int, 0, len(strs)) for _, str := range strs { valInt64, err := strconv.ParseInt(str, 0, 64) - val := int(valInt64) + val := int(valInt64) if err != nil && returnOnInvalid { return nil, err } diff --git a/vendor/gopkg.in/yaml.v2/readerc.go b/vendor/gopkg.in/yaml.v2/readerc.go index 7c1f5fac3..b0c436c4a 100644 --- a/vendor/gopkg.in/yaml.v2/readerc.go +++ b/vendor/gopkg.in/yaml.v2/readerc.go @@ -95,7 +95,7 @@ func yaml_parser_update_buffer(parser *yaml_parser_t, length int) bool { // [Go] This function was changed to guarantee the requested length size at EOF. // The fact we need to do this is pretty awful, but the description above implies - // for that to be the case, and there are tests + // for that to be the case, and there are tests // If the EOF flag is set and the raw buffer is empty, do nothing. if parser.eof && parser.raw_buffer_pos == len(parser.raw_buffer) { diff --git a/vendor/gopkg.in/yaml.v2/resolve.go b/vendor/gopkg.in/yaml.v2/resolve.go index 4120e0c91..e29c364b3 100644 --- a/vendor/gopkg.in/yaml.v2/resolve.go +++ b/vendor/gopkg.in/yaml.v2/resolve.go @@ -180,7 +180,7 @@ func resolve(tag string, in string) (rtag string, out interface{}) { return yaml_INT_TAG, uintv } } else if strings.HasPrefix(plain, "-0b") { - intv, err := strconv.ParseInt("-" + plain[3:], 2, 64) + intv, err := strconv.ParseInt("-"+plain[3:], 2, 64) if err == nil { if true || intv == int64(int(intv)) { return yaml_INT_TAG, int(intv) diff --git a/vendor/gopkg.in/yaml.v2/sorter.go b/vendor/gopkg.in/yaml.v2/sorter.go index 4c45e660a..2edd73405 100644 --- a/vendor/gopkg.in/yaml.v2/sorter.go +++ b/vendor/gopkg.in/yaml.v2/sorter.go @@ -52,7 +52,7 @@ func (l keyList) Less(i, j int) bool { var ai, bi int var an, bn int64 if ar[i] == '0' || br[i] == '0' { - for j := i-1; j >= 0 && unicode.IsDigit(ar[j]); j-- { + for j := i - 1; j >= 0 && unicode.IsDigit(ar[j]); j-- { if ar[j] != '0' { an = 1 bn = 1 diff --git a/website/pages/partials/common/CDConfig-not-required.mdx b/website/pages/partials/common/commonsteps/CDConfig-not-required.mdx similarity index 96% rename from website/pages/partials/common/CDConfig-not-required.mdx rename to website/pages/partials/common/commonsteps/CDConfig-not-required.mdx index 11e4b8fc6..9fc2cdc23 100644 --- a/website/pages/partials/common/CDConfig-not-required.mdx +++ b/website/pages/partials/common/commonsteps/CDConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `cd_files` ([]string) - A list of files to place onto a CD that is attached when the VM is booted. This can include either files or directories; any directories diff --git a/website/pages/partials/common/CDConfig.mdx b/website/pages/partials/common/commonsteps/CDConfig.mdx similarity index 87% rename from website/pages/partials/common/CDConfig.mdx rename to website/pages/partials/common/commonsteps/CDConfig.mdx index b234df3eb..a139db6a4 100644 --- a/website/pages/partials/common/CDConfig.mdx +++ b/website/pages/partials/common/commonsteps/CDConfig.mdx @@ -1,4 +1,4 @@ - + An iso (CD) containing custom files can be made available for your build. diff --git a/website/pages/partials/common/FloppyConfig-not-required.mdx b/website/pages/partials/common/commonsteps/FloppyConfig-not-required.mdx similarity index 93% rename from website/pages/partials/common/FloppyConfig-not-required.mdx rename to website/pages/partials/common/commonsteps/FloppyConfig-not-required.mdx index 9c6fcda8a..c81d3f61f 100644 --- a/website/pages/partials/common/FloppyConfig-not-required.mdx +++ b/website/pages/partials/common/commonsteps/FloppyConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `floppy_files` ([]string) - A list of files to place onto a floppy disk that is attached when the VM is booted. Currently, no support exists for creating sub-directories on diff --git a/website/pages/partials/common/FloppyConfig.mdx b/website/pages/partials/common/commonsteps/FloppyConfig.mdx similarity index 90% rename from website/pages/partials/common/FloppyConfig.mdx rename to website/pages/partials/common/commonsteps/FloppyConfig.mdx index bca819832..8db59da19 100644 --- a/website/pages/partials/common/FloppyConfig.mdx +++ b/website/pages/partials/common/commonsteps/FloppyConfig.mdx @@ -1,4 +1,4 @@ - + A floppy can be made available for your build. This is most useful for unattended Windows installs, which look for an Autounattend.xml file on diff --git a/website/pages/partials/common/HTTPConfig-not-required.mdx b/website/pages/partials/common/commonsteps/HTTPConfig-not-required.mdx similarity index 94% rename from website/pages/partials/common/HTTPConfig-not-required.mdx rename to website/pages/partials/common/commonsteps/HTTPConfig-not-required.mdx index 4a3238ad4..aece4b6de 100644 --- a/website/pages/partials/common/HTTPConfig-not-required.mdx +++ b/website/pages/partials/common/commonsteps/HTTPConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `http_directory` (string) - Path to a directory to serve using an HTTP server. The files in this directory will be available over HTTP that will be requestable from the diff --git a/website/pages/partials/common/HTTPConfig.mdx b/website/pages/partials/common/commonsteps/HTTPConfig.mdx similarity index 85% rename from website/pages/partials/common/HTTPConfig.mdx rename to website/pages/partials/common/commonsteps/HTTPConfig.mdx index 27c79796b..f841432a8 100644 --- a/website/pages/partials/common/HTTPConfig.mdx +++ b/website/pages/partials/common/commonsteps/HTTPConfig.mdx @@ -1,4 +1,4 @@ - + Packer will create an http server serving `http_directory` when it is set, a random free port will be selected and the architecture of the directory diff --git a/website/pages/partials/common/ISOConfig-not-required.mdx b/website/pages/partials/common/commonsteps/ISOConfig-not-required.mdx similarity index 92% rename from website/pages/partials/common/ISOConfig-not-required.mdx rename to website/pages/partials/common/commonsteps/ISOConfig-not-required.mdx index b93fdafd5..9d0744786 100644 --- a/website/pages/partials/common/ISOConfig-not-required.mdx +++ b/website/pages/partials/common/commonsteps/ISOConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `iso_urls` ([]string) - Multiple URLs for the ISO to download. Packer will try these in order. If anything goes wrong attempting to download or while downloading a diff --git a/website/pages/partials/common/ISOConfig-required.mdx b/website/pages/partials/common/commonsteps/ISOConfig-required.mdx similarity index 95% rename from website/pages/partials/common/ISOConfig-required.mdx rename to website/pages/partials/common/commonsteps/ISOConfig-required.mdx index 1611af8ca..a2c27df83 100644 --- a/website/pages/partials/common/ISOConfig-required.mdx +++ b/website/pages/partials/common/commonsteps/ISOConfig-required.mdx @@ -1,4 +1,4 @@ - + - `iso_checksum` (string) - The checksum for the ISO file or virtual hard drive file. The type of the checksum is specified within the checksum field as a prefix, ex: diff --git a/website/pages/partials/common/ISOConfig.mdx b/website/pages/partials/common/commonsteps/ISOConfig.mdx similarity index 96% rename from website/pages/partials/common/ISOConfig.mdx rename to website/pages/partials/common/commonsteps/ISOConfig.mdx index 4dfbd19f2..548bffa0b 100644 --- a/website/pages/partials/common/ISOConfig.mdx +++ b/website/pages/partials/common/commonsteps/ISOConfig.mdx @@ -1,4 +1,4 @@ - + By default, Packer will symlink, download or copy image files to the Packer cache into a "`hash($iso_url+$iso_checksum).$iso_target_extension`" file. From c4d0c5505a2050fa0db0b8a0c11c59b1a76cfbe6 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Fri, 13 Nov 2020 13:11:45 -0800 Subject: [PATCH 68/93] fix tests regenerate code regenerate code, revendor fix website --- builder/qemu/step_run_test.go | 1 + builder/vsphere/clone/config.hcl2spec.go | 2 + builder/vsphere/iso/config.hcl2spec.go | 2 + .../test-fixtures/SomeDir/myfile.txt | 0 .../test-fixtures/floppy-hier/test-0/file1 | 0 .../test-fixtures/floppy-hier/test-0/file2 | 0 .../test-fixtures/floppy-hier/test-0/file3 | 0 .../floppy-hier/test-1/dir1/file1 | 0 .../floppy-hier/test-1/dir1/file2 | 0 .../floppy-hier/test-1/dir1/file3 | 0 .../floppy-hier/test-2/dir1/file1 | 0 .../floppy-hier/test-2/dir1/subdir1/file1 | 0 .../floppy-hier/test-2/dir1/subdir1/file2 | 0 .../floppy-hier/test-2/dir2/subdir1/file1 | 0 .../floppy-hier/test-2/dir2/subdir1/file2 | 0 .../test-fixtures/root/another.txt | 0 .../test-fixtures/root/another.txt.sha1sum | 0 .../test-fixtures/root/basic.txt | 0 .../test-fixtures/root/basic.txt.sha1sum | 0 .../test-fixtures/root/subfolder.sum | 0 common/test-fixtures/fileurl/cake | 1 - provisioner/ansible/provisioner_test.go | 1 + provisioner/powershell/provisioner_test.go | 1 + provisioner/shell/provisioner_test.go | 1 + provisioner/windows-shell/provisioner_test.go | 1 + .../oneandone-cloudserver-sdk-go/errors.go | 4 +- .../services/server/access_control_group.go | 10 +- .../services/server/access_control_rule.go | 14 +- .../add_nas_volume_access_control_request.go | 6 +- .../add_nas_volume_access_control_response.go | 11 +- .../add_port_forwarding_rules_request.go | 4 +- .../add_port_forwarding_rules_response.go | 19 +- .../services/server/api_client.go | 6 +- .../services/server/api_response.go | 8 +- ..._public_ip_with_server_instance_request.go | 4 +- ...public_ip_with_server_instance_response.go | 11 +- .../attach_block_storage_instance_request.go | 4 +- .../attach_block_storage_instance_response.go | 11 +- .../attach_network_interface_request.go | 4 +- .../attach_network_interface_response.go | 7 +- .../services/server/block_storage_instance.go | 38 +- .../server/block_storage_snapshot_instance.go | 24 +- .../server/change_nas_volume_size_request.go | 4 +- .../server/change_nas_volume_size_response.go | 11 +- .../change_server_instance_spec_request.go | 4 +- .../change_server_instance_spec_response.go | 11 +- .../services/server/common_code.go | 4 +- .../create_block_storage_instance_request.go | 10 +- .../create_block_storage_instance_response.go | 11 +- ...block_storage_snapshot_instance_request.go | 6 +- ...lock_storage_snapshot_instance_response.go | 11 +- .../server/create_instance_tags_request.go | 4 +- .../server/create_instance_tags_response.go | 11 +- .../server/create_login_key_request.go | 2 +- .../server/create_login_key_response.go | 9 +- .../create_member_server_image_request.go | 6 +- .../create_member_server_image_response.go | 11 +- .../create_nas_volume_instance_request.go | 20 +- .../create_nas_volume_instance_response.go | 11 +- .../create_network_interface_request.go | 14 +- .../create_network_interface_response.go | 7 +- .../create_public_ip_instance_request.go | 10 +- .../create_public_ip_instance_response.go | 11 +- .../server/create_server_instances_request.go | 32 +- .../create_server_instances_response.go | 11 +- .../delete_block_storage_instances_request.go | 2 +- ...delete_block_storage_instances_response.go | 11 +- ...lock_storage_snapshot_instances_request.go | 2 +- ...ock_storage_snapshot_instances_response.go | 11 +- .../server/delete_instance_tags_request.go | 4 +- .../server/delete_instance_tags_response.go | 9 +- .../server/delete_login_key_request.go | 2 +- .../server/delete_login_key_response.go | 7 +- .../delete_member_server_images_request.go | 2 +- .../delete_member_server_images_response.go | 11 +- .../delete_nas_volume_instance_request.go | 2 +- .../delete_nas_volume_instance_response.go | 11 +- .../delete_network_interface_request.go | 2 +- .../delete_network_interface_response.go | 7 +- .../delete_port_forwarding_rules_request.go | 4 +- .../delete_port_forwarding_rules_response.go | 12 +- .../delete_public_ip_instances_request.go | 2 +- .../delete_public_ip_instances_response.go | 11 +- .../detach_block_storage_instances_request.go | 2 +- ...detach_block_storage_instances_response.go | 11 +- .../detach_network_interface_request.go | 4 +- .../detach_network_interface_response.go | 7 +- ..._public_ip_from_server_instance_request.go | 2 +- ...public_ip_from_server_instance_response.go | 11 +- .../get_access_control_group_list_request.go | 10 +- .../get_access_control_group_list_response.go | 11 +- ...trol_group_server_instance_list_request.go | 2 +- ...rol_group_server_instance_list_response.go | 11 +- .../get_access_control_rule_list_request.go | 2 +- .../get_access_control_rule_list_response.go | 11 +- ...get_block_storage_instance_list_request.go | 28 +- ...et_block_storage_instance_list_response.go | 11 +- ..._storage_snapshot_instance_list_request.go | 10 +- ...storage_snapshot_instance_list_response.go | 11 +- .../server/get_instance_tag_list_request.go | 10 +- .../server/get_instance_tag_list_response.go | 11 +- .../server/get_login_key_list_request.go | 6 +- .../server/get_login_key_list_response.go | 11 +- .../get_member_server_image_list_request.go | 14 +- .../get_member_server_image_list_response.go | 11 +- .../get_nas_volume_instance_list_request.go | 12 +- .../get_nas_volume_instance_list_response.go | 11 +- ...nas_volume_instance_rating_list_request.go | 8 +- ...as_volume_instance_rating_list_response.go | 11 +- .../get_network_interface_list_request.go | 8 +- .../get_network_interface_list_response.go | 11 +- .../get_port_forwarding_rule_list_request.go | 6 +- .../get_port_forwarding_rule_list_response.go | 12 +- ...et_private_subnet_instance_list_request.go | 6 +- ...t_private_subnet_instance_list_response.go | 11 +- .../get_public_ip_instance_list_request.go | 24 +- .../get_public_ip_instance_list_response.go | 11 +- ..._ip_target_server_instance_list_request.go | 6 +- ...ip_target_server_instance_list_response.go | 11 +- .../services/server/get_raid_list_response.go | 11 +- .../server/get_region_list_response.go | 11 +- .../server/get_root_password_request.go | 4 +- .../server/get_root_password_response.go | 11 +- .../get_server_image_product_list_request.go | 12 +- .../get_server_image_product_list_response.go | 11 +- .../get_server_instance_list_request.go | 32 +- .../get_server_instance_list_response.go | 11 +- .../server/get_server_product_list_request.go | 12 +- .../get_server_product_list_response.go | 11 +- .../services/server/get_zone_list_request.go | 2 +- .../services/server/get_zone_list_response.go | 9 +- .../server/import_login_key_request.go | 4 +- .../server/import_login_key_response.go | 11 +- .../services/server/instance_tag.go | 8 +- .../services/server/instance_tag_parameter.go | 4 +- .../services/server/login_key.go | 6 +- .../services/server/member_server_image.go | 38 +- .../services/server/nas_volume_instance.go | 50 +- .../server/nas_volume_instance_custom_ip.go | 2 +- .../server/nas_volume_instance_rating.go | 42 +- .../services/server/network_interface.go | 16 +- .../services/server/port_forwarding_rule.go | 6 +- .../server/port_forwarding_rule_parameter.go | 6 +- .../server/private_subnet_instance.go | 18 +- .../services/server/product.go | 28 +- .../services/server/public_ip_instance.go | 24 +- .../ncloud-sdk-go-v2/services/server/raid.go | 4 +- .../server/reboot_server_instances_request.go | 2 +- .../reboot_server_instances_response.go | 11 +- .../recreate_server_instance_request.go | 10 +- .../recreate_server_instance_response.go | 11 +- .../services/server/region.go | 7 +- ...emove_nas_volume_access_control_request.go | 6 +- ...move_nas_volume_access_control_response.go | 11 +- .../services/server/server_instance.go | 64 +- .../set_nas_volume_access_control_request.go | 6 +- .../set_nas_volume_access_control_response.go | 11 +- .../server/start_server_instances_request.go | 2 +- .../server/start_server_instances_response.go | 11 +- .../server/stop_server_instances_request.go | 2 +- .../server/stop_server_instances_response.go | 11 +- .../terminate_server_instances_request.go | 2 +- .../terminate_server_instances_response.go | 11 +- .../services/server/v2_api.go | 1338 ++-- .../ncloud-sdk-go-v2/services/server/zone.go | 10 +- .../sdk/endpoints/endpoints_config.go | 4 +- .../sdk/responses/response.go | 1 - .../aliyun/aliyun-oss-go-sdk/oss/type.go | 6 +- vendor/github.com/chzyer/readline/runebuf.go | 6 +- .../internal/constants/constants.gen.go | 1 + .../digitalocean/go-libvirt/libvirt.gen.go | 2979 ++++---- .../digitalocean/go-libvirt/units.go | 8 +- .../collections/stack/stack.go | 19 +- .../hashicorp/go-getter/gcs/v2/get_gcs.go | 2 +- .../hashicorp/go-sockaddr/ifaddrs.go | 3 +- .../go-sockaddr/route_info_android.go | 1 + vendor/github.com/hashicorp/go-uuid/uuid.go | 3 +- .../golang-lru/simplelru/lru_interface.go | 4 +- .../jdcloud-api/jdcloud-sdk-go/core/Config.go | 2 +- .../jdcloud-api/jdcloud-sdk-go/core/Const.go | 1 + .../jdcloud-sdk-go/core/JdcloudClient.go | 6 +- .../jdcloud-api/jdcloud-sdk-go/core/Logger.go | 7 +- .../jdcloud-sdk-go/core/ParameterBuilder.go | 10 +- .../jdcloud-sdk-go/core/ResponseProcessor.go | 6 +- .../jdcloud-api/jdcloud-sdk-go/core/Signer.go | 27 +- .../jdcloud-api/jdcloud-sdk-go/core/Utils.go | 2 +- .../services/charge/models/Charge.go | 21 +- .../services/charge/models/ChargeSpec.go | 13 +- .../services/common/models/Filter.go | 13 +- .../services/common/models/Quota.go | 13 +- .../services/common/models/SimpleResponses.go | 5 +- .../services/common/models/Sort.go | 9 +- .../services/common/models/TagFilter.go | 9 +- .../services/disk/models/Disk.go | 68 +- .../services/disk/models/DiskAttachment.go | 25 +- .../services/disk/models/DiskSpec.go | 36 +- .../services/disk/models/DiskSpecification.go | 45 +- .../services/disk/models/Quota.go | 9 +- .../services/disk/models/ShareInfo.go | 9 +- .../services/disk/models/Snapshot.go | 45 +- .../services/disk/models/SnapshotSpec.go | 13 +- .../services/disk/models/Soldout.go | 13 +- .../services/disk/models/Tag.go | 9 +- .../services/disk/models/TagFilter.go | 9 +- .../services/vm/apis/AssociateElasticIp.go | 91 +- .../services/vm/apis/AttachDisk.go | 111 +- .../vm/apis/AttachNetworkInterface.go | 101 +- .../services/vm/apis/CopyImages.go | 95 +- .../services/vm/apis/CreateImage.go | 119 +- .../services/vm/apis/CreateInstances.go | 111 +- .../services/vm/apis/CreateKeypair.go | 89 +- .../services/vm/apis/DeleteImage.go | 77 +- .../services/vm/apis/DeleteInstance.go | 77 +- .../services/vm/apis/DeleteKeypair.go | 77 +- .../services/vm/apis/DescribeImage.go | 81 +- .../vm/apis/DescribeImageConstraints.go | 81 +- .../vm/apis/DescribeImageConstraintsBatch.go | 77 +- .../services/vm/apis/DescribeImageMembers.go | 79 +- .../services/vm/apis/DescribeImages.go | 139 +- .../services/vm/apis/DescribeInstance.go | 81 +- .../apis/DescribeInstancePrivateIpAddress.go | 119 +- .../vm/apis/DescribeInstanceStatus.go | 119 +- .../services/vm/apis/DescribeInstanceTypes.go | 89 +- .../vm/apis/DescribeInstanceVncUrl.go | 79 +- .../services/vm/apis/DescribeInstances.go | 125 +- .../services/vm/apis/DescribeKeypairs.go | 105 +- .../services/vm/apis/DescribeQuotas.go | 93 +- .../services/vm/apis/DetachDisk.go | 101 +- .../vm/apis/DetachNetworkInterface.go | 91 +- .../services/vm/apis/DisassociateElasticIp.go | 91 +- .../services/vm/apis/ImportKeypair.go | 101 +- .../services/vm/apis/ModifyImageAttribute.go | 97 +- .../vm/apis/ModifyInstanceAttribute.go | 97 +- .../vm/apis/ModifyInstanceDiskAttribute.go | 89 +- .../vm/apis/ModifyInstanceNetworkAttribute.go | 89 +- .../vm/apis/ModifyInstancePassword.go | 91 +- .../services/vm/apis/RebootInstance.go | 77 +- .../services/vm/apis/RebuildInstance.go | 111 +- .../services/vm/apis/ResizeInstance.go | 91 +- .../services/vm/apis/ShareImage.go | 87 +- .../services/vm/apis/StartInstance.go | 77 +- .../services/vm/apis/StopInstance.go | 77 +- .../services/vm/apis/UnShareImage.go | 87 +- .../services/vm/client/VmClient.go | 1177 +-- .../jdcloud-sdk-go/services/vm/models/Ag.go | 9 +- .../services/vm/models/CopyImage.go | 9 +- .../jdcloud-sdk-go/services/vm/models/Gpu.go | 9 +- .../services/vm/models/Image.go | 69 +- .../services/vm/models/ImageConstraint.go | 9 +- .../vm/models/ImageInstanceTypeConstraint.go | 9 +- .../services/vm/models/Instance.go | 88 +- .../vm/models/InstanceDiskAttachment.go | 36 +- .../vm/models/InstanceDiskAttachmentSpec.go | 40 +- .../vm/models/InstanceDiskAttribute.go | 15 +- .../vm/models/InstanceNetworkAttribute.go | 9 +- .../vm/models/InstanceNetworkInterface.go | 32 +- .../InstanceNetworkInterfaceAttachment.go | 13 +- .../InstanceNetworkInterfaceAttachmentSpec.go | 8 +- .../vm/models/InstancePrivateIpAddress.go | 9 +- .../services/vm/models/InstanceSpec.go | 64 +- .../services/vm/models/InstanceStatus.go | 9 +- .../services/vm/models/InstanceTemplate.go | 25 +- .../vm/models/InstanceTemplateData.go | 37 +- .../vm/models/InstanceTemplateDisk.go | 13 +- .../models/InstanceTemplateDiskAttachment.go | 41 +- .../InstanceTemplateDiskAttachmentSpec.go | 37 +- .../vm/models/InstanceTemplateDiskSpec.go | 13 +- .../vm/models/InstanceTemplateElasticIp.go | 13 +- .../models/InstanceTemplateElasticIpSpec.go | 13 +- ...eTemplateNetworkInterfaceAttachmentSpec.go | 13 +- .../InstanceTemplateNetworkInterfaceSpec.go | 13 +- .../vm/models/InstanceTemplateSpec.go | 33 +- .../services/vm/models/InstanceType.go | 37 +- .../services/vm/models/InstanceTypeState.go | 9 +- .../services/vm/models/Keypair.go | 13 +- .../services/vm/models/LocalDisk.go | 9 +- .../services/vm/models/Quota.go | 13 +- .../services/vm/models/SecurityGroupSimple.go | 9 +- .../jdcloud-sdk-go/services/vm/models/Tag.go | 9 +- .../services/vm/models/TagFilter.go | 9 +- .../services/vpc/apis/AddNetworkAclRules.go | 93 +- .../vpc/apis/AddNetworkSecurityGroupRules.go | 93 +- .../services/vpc/apis/AddRouteTableRules.go | 93 +- .../services/vpc/apis/AssignSecondaryIps.go | 107 +- .../services/vpc/apis/AssociateElasticIp.go | 107 +- .../services/vpc/apis/AssociateNetworkAcl.go | 91 +- .../services/vpc/apis/AssociateRouteTable.go | 91 +- .../services/vpc/apis/CreateElasticIps.go | 107 +- .../services/vpc/apis/CreateNetworkAcl.go | 103 +- .../vpc/apis/CreateNetworkInterface.go | 159 +- .../vpc/apis/CreateNetworkSecurityGroup.go | 103 +- .../services/vpc/apis/CreateRouteTable.go | 103 +- .../services/vpc/apis/CreateSubnet.go | 127 +- .../services/vpc/apis/CreateVpc.go | 99 +- .../services/vpc/apis/CreateVpcPeering.go | 119 +- .../services/vpc/apis/DeleteElasticIp.go | 77 +- .../services/vpc/apis/DeleteNetworkAcl.go | 77 +- .../vpc/apis/DeleteNetworkInterface.go | 77 +- .../vpc/apis/DeleteNetworkSecurityGroup.go | 77 +- .../services/vpc/apis/DeleteRouteTable.go | 77 +- .../services/vpc/apis/DeleteSubnet.go | 77 +- .../services/vpc/apis/DeleteVpc.go | 77 +- .../services/vpc/apis/DeleteVpcPeering.go | 77 +- .../services/vpc/apis/DescribeElasticIp.go | 81 +- .../services/vpc/apis/DescribeElasticIps.go | 109 +- .../services/vpc/apis/DescribeNetworkAcl.go | 81 +- .../services/vpc/apis/DescribeNetworkAcls.go | 109 +- .../vpc/apis/DescribeNetworkInterface.go | 81 +- .../vpc/apis/DescribeNetworkInterfaces.go | 113 +- .../vpc/apis/DescribeNetworkSecurityGroup.go | 81 +- .../vpc/apis/DescribeNetworkSecurityGroups.go | 109 +- .../services/vpc/apis/DescribeQuota.go | 89 +- .../services/vpc/apis/DescribeRouteTable.go | 81 +- .../services/vpc/apis/DescribeRouteTables.go | 109 +- .../services/vpc/apis/DescribeSubnet.go | 81 +- .../services/vpc/apis/DescribeSubnets.go | 113 +- .../services/vpc/apis/DescribeVpc.go | 81 +- .../services/vpc/apis/DescribeVpcPeering.go | 81 +- .../services/vpc/apis/DescribeVpcPeerings.go | 111 +- .../services/vpc/apis/DescribeVpcs.go | 107 +- .../vpc/apis/DisassociateElasticIp.go | 97 +- .../vpc/apis/DisassociateNetworkAcl.go | 91 +- .../vpc/apis/DisassociateRouteTable.go | 91 +- .../services/vpc/apis/ModifyElasticIp.go | 91 +- .../services/vpc/apis/ModifyNetworkAcl.go | 97 +- .../vpc/apis/ModifyNetworkAclRules.go | 93 +- .../vpc/apis/ModifyNetworkInterface.go | 107 +- .../vpc/apis/ModifyNetworkSecurityGroup.go | 97 +- .../apis/ModifyNetworkSecurityGroupRules.go | 93 +- .../services/vpc/apis/ModifyRouteTable.go | 97 +- .../vpc/apis/ModifyRouteTableRules.go | 93 +- .../services/vpc/apis/ModifySubnet.go | 97 +- .../services/vpc/apis/ModifyVpc.go | 97 +- .../services/vpc/apis/ModifyVpcPeering.go | 97 +- .../vpc/apis/RemoveNetworkAclRules.go | 91 +- .../apis/RemoveNetworkSecurityGroupRules.go | 91 +- .../vpc/apis/RemoveRouteTableRules.go | 91 +- .../services/vpc/apis/UnassignSecondaryIps.go | 87 +- .../services/vpc/client/VpcClient.go | 1665 ++--- .../vpc/models/AddNetworkAclRuleSpec.go | 33 +- .../vpc/models/AddNetworkAclRulesSpec.go | 5 +- .../AddNetworkSecurityGroupRulesSpec.go | 5 +- .../services/vpc/models/AddRouteTableRules.go | 17 +- .../vpc/models/AddRouteTableRulesSpec.go | 5 +- .../vpc/models/AddSecurityGroupRules.go | 25 +- .../vpc/models/AssignSecondaryIpsSpec.go | 13 +- .../vpc/models/AssociateElasticIpSpec.go | 13 +- .../vpc/models/AssociateRouteTableSpec.go | 5 +- .../vpc/models/CreateElasticIpSpec.go | 13 +- .../vpc/models/CreateVpcPeeringSpec.go | 17 +- .../vpc/models/DisassociateElasticIpSpec.go | 9 +- .../vpc/models/DisassociateRouteTableSpec.go | 5 +- .../services/vpc/models/ElasticIp.go | 44 +- .../services/vpc/models/ElasticIpSpec.go | 12 +- .../vpc/models/ModifyElasticIpSpec.go | 5 +- .../vpc/models/ModifyNetworkAclRuleSpec.go | 33 +- .../vpc/models/ModifyNetworkAclRuleSpecs.go | 5 +- .../vpc/models/ModifyNetworkAclRulesSpec.go | 5 +- .../vpc/models/ModifyNetworkAclSpec.go | 9 +- .../vpc/models/ModifyNetworkInterfaceSpec.go | 13 +- .../models/ModifyNetworkSecurityGroupSpec.go | 9 +- .../services/vpc/models/ModifyQuotaSpec.go | 13 +- .../vpc/models/ModifyRouteTableRules.go | 21 +- .../vpc/models/ModifyRouteTableRulesSpec.go | 5 +- .../vpc/models/ModifyRouteTableSpec.go | 9 +- .../vpc/models/ModifySecurityGroupRuleSpec.go | 5 +- .../vpc/models/ModifySecurityGroupRules.go | 25 +- .../services/vpc/models/ModifySubnetSpec.go | 9 +- .../vpc/models/ModifyVpcPeeringSpec.go | 9 +- .../services/vpc/models/ModifyVpcSpec.go | 9 +- .../services/vpc/models/NetworkAcl.go | 29 +- .../services/vpc/models/NetworkAclRule.go | 41 +- .../services/vpc/models/NetworkAclSpec.go | 13 +- .../services/vpc/models/NetworkInterface.go | 69 +- .../vpc/models/NetworkInterfacePrivateIp.go | 13 +- .../vpc/models/NetworkInterfaceSpec.go | 37 +- .../vpc/models/NetworkSecurityGroup.go | 25 +- .../vpc/models/NetworkSecurityGroupSpec.go | 13 +- .../services/vpc/models/Quota.go | 17 +- .../services/vpc/models/RouteTable.go | 33 +- .../services/vpc/models/RouteTableRule.go | 21 +- .../services/vpc/models/RouteTableSpec.go | 13 +- .../services/vpc/models/SecurityGroupRule.go | 37 +- .../services/vpc/models/Segment.go | 33 +- .../services/vpc/models/Subnet.go | 45 +- .../services/vpc/models/SubnetSpec.go | 21 +- .../vpc/models/UnassignSecondaryIpsSpec.go | 5 +- .../jdcloud-sdk-go/services/vpc/models/Vpc.go | 33 +- .../services/vpc/models/VpcPeering.go | 29 +- .../services/vpc/models/VpcPeeringVpcInfo.go | 13 +- .../services/vpc/models/VpcSpec.go | 13 +- .../masterzen/simplexml/dom/document.go | 12 +- .../masterzen/simplexml/dom/element.go | 53 +- vendor/github.com/masterzen/winrm/ntlm.go | 5 +- vendor/github.com/mattn/go-tty/tty_plan9.go | 2 +- vendor/github.com/mattn/go-tty/tty_windows.go | 2 +- .../mitchellh/go-vnc/client_auth.go | 4 +- vendor/github.com/modern-go/concurrent/log.go | 6 +- .../concurrent/unbounded_executor.go | 2 +- .../github.com/modern-go/reflect2/reflect2.go | 6 +- vendor/github.com/nu7hatch/gouuid/uuid.go | 2 +- .../outscale/osc-sdk-go/osc/api_access_key.go | 22 +- .../outscale/osc-sdk-go/osc/api_account.go | 26 +- .../outscale/osc-sdk-go/osc/api_api_log.go | 6 +- .../osc-sdk-go/osc/api_client_gateway.go | 14 +- .../outscale/osc-sdk-go/osc/api_default.go | 6 +- .../osc-sdk-go/osc/api_dhcp_option.go | 14 +- .../osc-sdk-go/osc/api_direct_link.go | 14 +- .../osc/api_direct_link_interface.go | 14 +- .../osc-sdk-go/osc/api_flexible_gpu.go | 30 +- .../outscale/osc-sdk-go/osc/api_image.go | 26 +- .../osc-sdk-go/osc/api_internet_service.go | 22 +- .../outscale/osc-sdk-go/osc/api_keypair.go | 14 +- .../outscale/osc-sdk-go/osc/api_listener.go | 26 +- .../osc-sdk-go/osc/api_load_balancer.go | 42 +- .../osc/api_load_balancer_policy.go | 10 +- .../outscale/osc-sdk-go/osc/api_location.go | 6 +- .../osc-sdk-go/osc/api_nat_service.go | 14 +- .../outscale/osc-sdk-go/osc/api_net.go | 18 +- .../osc-sdk-go/osc/api_net_access_point.go | 22 +- .../osc-sdk-go/osc/api_net_peering.go | 22 +- .../outscale/osc-sdk-go/osc/api_nic.go | 34 +- .../osc-sdk-go/osc/api_product_type.go | 6 +- .../outscale/osc-sdk-go/osc/api_public_ip.go | 26 +- .../outscale/osc-sdk-go/osc/api_quota.go | 6 +- .../outscale/osc-sdk-go/osc/api_region.go | 6 +- .../outscale/osc-sdk-go/osc/api_route.go | 14 +- .../osc-sdk-go/osc/api_route_table.go | 22 +- .../osc-sdk-go/osc/api_security_group.go | 14 +- .../osc-sdk-go/osc/api_security_group_rule.go | 10 +- .../osc-sdk-go/osc/api_server_certificate.go | 18 +- .../outscale/osc-sdk-go/osc/api_snapshot.go | 26 +- .../outscale/osc-sdk-go/osc/api_subnet.go | 18 +- .../outscale/osc-sdk-go/osc/api_subregion.go | 6 +- .../outscale/osc-sdk-go/osc/api_tag.go | 14 +- .../outscale/osc-sdk-go/osc/api_task.go | 6 +- .../osc-sdk-go/osc/api_virtual_gateway.go | 26 +- .../outscale/osc-sdk-go/osc/api_vm.go | 46 +- .../outscale/osc-sdk-go/osc/api_volume.go | 22 +- .../osc-sdk-go/osc/api_vpn_connection.go | 22 +- .../outscale/osc-sdk-go/osc/client.go | 9 +- .../outscale/osc-sdk-go/osc/configuration.go | 20 +- .../osc/model_accept_net_peering_request.go | 1 - .../osc/model_accept_net_peering_response.go | 3 +- .../osc-sdk-go/osc/model_accepter_net.go | 1 - .../osc-sdk-go/osc/model_access_key.go | 1 - .../osc/model_access_key_secret_key.go | 1 - .../osc-sdk-go/osc/model_access_log.go | 1 - .../outscale/osc-sdk-go/osc/model_account.go | 1 - .../model_application_sticky_cookie_policy.go | 1 - .../osc-sdk-go/osc/model_backend_vm_health.go | 1 - .../osc/model_block_device_mapping_created.go | 1 - .../osc/model_block_device_mapping_image.go | 1 - .../model_block_device_mapping_vm_creation.go | 1 - .../model_block_device_mapping_vm_update.go | 1 - .../osc-sdk-go/osc/model_bsu_created.go | 1 - .../osc-sdk-go/osc/model_bsu_to_create.go | 1 - .../osc-sdk-go/osc/model_bsu_to_update_vm.go | 1 - .../osc/model_check_authentication_request.go | 1 - .../model_check_authentication_response.go | 1 - .../osc-sdk-go/osc/model_client_gateway.go | 1 - .../osc-sdk-go/osc/model_consumption_entry.go | 1 - .../osc/model_create_access_key_request.go | 1 - .../osc/model_create_access_key_response.go | 5 +- .../osc/model_create_account_request.go | 1 - .../osc/model_create_account_response.go | 3 +- .../model_create_client_gateway_request.go | 1 - .../model_create_client_gateway_response.go | 3 +- .../osc/model_create_dhcp_options_request.go | 1 - .../osc/model_create_dhcp_options_response.go | 3 +- ...el_create_direct_link_interface_request.go | 3 +- ...l_create_direct_link_interface_response.go | 3 +- .../osc/model_create_direct_link_request.go | 1 - .../osc/model_create_direct_link_response.go | 3 +- .../osc/model_create_flexible_gpu_request.go | 1 - .../osc/model_create_flexible_gpu_response.go | 3 +- .../model_create_image_export_task_request.go | 3 +- ...model_create_image_export_task_response.go | 1 - .../osc/model_create_image_request.go | 1 - .../osc/model_create_image_response.go | 3 +- .../model_create_internet_service_request.go | 1 - .../model_create_internet_service_response.go | 1 - .../osc/model_create_keypair_request.go | 1 - .../osc/model_create_keypair_response.go | 3 +- .../osc/model_create_listener_rule_request.go | 5 +- .../model_create_listener_rule_response.go | 3 +- ..._create_load_balancer_listeners_request.go | 1 - ...create_load_balancer_listeners_response.go | 3 +- ...del_create_load_balancer_policy_request.go | 1 - ...el_create_load_balancer_policy_response.go | 3 +- .../osc/model_create_load_balancer_request.go | 1 - .../model_create_load_balancer_response.go | 3 +- ...model_create_load_balancer_tags_request.go | 1 - ...odel_create_load_balancer_tags_response.go | 1 - .../osc/model_create_nat_service_request.go | 1 - .../osc/model_create_nat_service_response.go | 3 +- .../model_create_net_access_point_request.go | 1 - .../model_create_net_access_point_response.go | 3 +- .../osc/model_create_net_peering_request.go | 1 - .../osc/model_create_net_peering_response.go | 3 +- .../osc/model_create_net_request.go | 1 - .../osc/model_create_net_response.go | 3 +- .../osc/model_create_nic_request.go | 1 - .../osc/model_create_nic_response.go | 3 +- .../osc/model_create_public_ip_request.go | 1 - .../osc/model_create_public_ip_response.go | 3 +- .../osc/model_create_route_request.go | 1 - .../osc/model_create_route_response.go | 3 +- .../osc/model_create_route_table_request.go | 1 - .../osc/model_create_route_table_response.go | 3 +- .../model_create_security_group_request.go | 1 - .../model_create_security_group_response.go | 3 +- ...odel_create_security_group_rule_request.go | 1 - ...del_create_security_group_rule_response.go | 3 +- ...model_create_server_certificate_request.go | 1 - ...odel_create_server_certificate_response.go | 3 +- ...del_create_snapshot_export_task_request.go | 3 +- ...el_create_snapshot_export_task_response.go | 3 +- .../osc/model_create_snapshot_request.go | 1 - .../osc/model_create_snapshot_response.go | 3 +- .../osc/model_create_subnet_request.go | 1 - .../osc/model_create_subnet_response.go | 3 +- .../osc/model_create_tags_request.go | 1 - .../osc/model_create_tags_response.go | 1 - .../model_create_virtual_gateway_request.go | 1 - .../model_create_virtual_gateway_response.go | 3 +- .../osc/model_create_vms_request.go | 5 +- .../osc/model_create_vms_response.go | 1 - .../osc/model_create_volume_request.go | 3 +- .../osc/model_create_volume_response.go | 3 +- .../model_create_vpn_connection_request.go | 1 - .../model_create_vpn_connection_response.go | 3 +- ...del_create_vpn_connection_route_request.go | 1 - ...el_create_vpn_connection_route_response.go | 1 - .../osc/model_delete_access_key_request.go | 1 - .../osc/model_delete_access_key_response.go | 1 - .../model_delete_client_gateway_request.go | 1 - .../model_delete_client_gateway_response.go | 1 - .../osc/model_delete_dhcp_options_request.go | 1 - .../osc/model_delete_dhcp_options_response.go | 1 - ...el_delete_direct_link_interface_request.go | 1 - ...l_delete_direct_link_interface_response.go | 1 - .../osc/model_delete_direct_link_request.go | 1 - .../osc/model_delete_direct_link_response.go | 1 - .../osc/model_delete_export_task_request.go | 1 - .../osc/model_delete_export_task_response.go | 1 - .../osc/model_delete_flexible_gpu_request.go | 1 - .../osc/model_delete_flexible_gpu_response.go | 1 - .../osc/model_delete_image_request.go | 1 - .../osc/model_delete_image_response.go | 1 - .../model_delete_internet_service_request.go | 1 - .../model_delete_internet_service_response.go | 1 - .../osc/model_delete_keypair_request.go | 1 - .../osc/model_delete_keypair_response.go | 1 - .../osc/model_delete_listener_rule_request.go | 1 - .../model_delete_listener_rule_response.go | 1 - ..._delete_load_balancer_listeners_request.go | 1 - ...delete_load_balancer_listeners_response.go | 3 +- ...del_delete_load_balancer_policy_request.go | 1 - ...el_delete_load_balancer_policy_response.go | 3 +- .../osc/model_delete_load_balancer_request.go | 1 - .../model_delete_load_balancer_response.go | 1 - ...model_delete_load_balancer_tags_request.go | 1 - ...odel_delete_load_balancer_tags_response.go | 1 - .../osc/model_delete_nat_service_request.go | 1 - .../osc/model_delete_nat_service_response.go | 1 - .../model_delete_net_access_point_request.go | 1 - .../model_delete_net_access_point_response.go | 1 - .../osc/model_delete_net_peering_request.go | 1 - .../osc/model_delete_net_peering_response.go | 1 - .../osc/model_delete_net_request.go | 1 - .../osc/model_delete_net_response.go | 1 - .../osc/model_delete_nic_request.go | 1 - .../osc/model_delete_nic_response.go | 1 - .../osc/model_delete_public_ip_request.go | 1 - .../osc/model_delete_public_ip_response.go | 1 - .../osc/model_delete_route_request.go | 1 - .../osc/model_delete_route_response.go | 3 +- .../osc/model_delete_route_table_request.go | 1 - .../osc/model_delete_route_table_response.go | 1 - .../model_delete_security_group_request.go | 1 - .../model_delete_security_group_response.go | 1 - ...odel_delete_security_group_rule_request.go | 1 - ...del_delete_security_group_rule_response.go | 3 +- ...model_delete_server_certificate_request.go | 1 - ...odel_delete_server_certificate_response.go | 1 - .../osc/model_delete_snapshot_request.go | 1 - .../osc/model_delete_snapshot_response.go | 1 - .../osc/model_delete_subnet_request.go | 1 - .../osc/model_delete_subnet_response.go | 1 - .../osc/model_delete_tags_request.go | 1 - .../osc/model_delete_tags_response.go | 1 - .../model_delete_virtual_gateway_request.go | 1 - .../model_delete_virtual_gateway_response.go | 1 - .../osc/model_delete_vms_request.go | 1 - .../osc/model_delete_vms_response.go | 1 - .../osc/model_delete_volume_request.go | 1 - .../osc/model_delete_volume_response.go | 1 - .../model_delete_vpn_connection_request.go | 1 - .../model_delete_vpn_connection_response.go | 1 - ...del_delete_vpn_connection_route_request.go | 1 - ...el_delete_vpn_connection_route_response.go | 1 - ...deregister_vms_in_load_balancer_request.go | 1 - ...eregister_vms_in_load_balancer_response.go | 1 - .../osc-sdk-go/osc/model_dhcp_options_set.go | 1 - .../osc-sdk-go/osc/model_direct_link.go | 1 - .../osc/model_direct_link_interface.go | 1 - .../osc/model_direct_link_interfaces.go | 1 - .../osc-sdk-go/osc/model_error_response.go | 3 +- .../outscale/osc-sdk-go/osc/model_errors.go | 1 - .../osc/model_filters_access_keys.go | 1 - .../osc-sdk-go/osc/model_filters_api_log.go | 1 - .../osc/model_filters_client_gateway.go | 1 - .../osc/model_filters_dhcp_options.go | 1 - .../osc/model_filters_direct_link.go | 1 - .../model_filters_direct_link_interface.go | 1 - .../osc/model_filters_export_task.go | 1 - .../osc/model_filters_flexible_gpu.go | 1 - .../osc-sdk-go/osc/model_filters_image.go | 1 - .../osc/model_filters_internet_service.go | 1 - .../osc-sdk-go/osc/model_filters_keypair.go | 1 - .../osc/model_filters_listener_rule.go | 1 - .../osc/model_filters_load_balancer.go | 1 - .../osc/model_filters_nat_service.go | 1 - .../osc-sdk-go/osc/model_filters_net.go | 1 - .../osc/model_filters_net_access_point.go | 1 - .../osc/model_filters_net_peering.go | 1 - .../osc-sdk-go/osc/model_filters_nic.go | 1 - .../osc/model_filters_product_type.go | 1 - .../osc-sdk-go/osc/model_filters_public_ip.go | 1 - .../osc-sdk-go/osc/model_filters_quota.go | 1 - .../osc/model_filters_route_table.go | 1 - .../osc/model_filters_security_group.go | 1 - .../osc/model_filters_server_certificate.go | 1 - .../osc-sdk-go/osc/model_filters_service.go | 1 - .../osc-sdk-go/osc/model_filters_snapshot.go | 1 - .../osc-sdk-go/osc/model_filters_subnet.go | 1 - .../osc-sdk-go/osc/model_filters_subregion.go | 1 - .../osc-sdk-go/osc/model_filters_tag.go | 1 - .../osc/model_filters_virtual_gateway.go | 1 - .../osc-sdk-go/osc/model_filters_vm.go | 1 - .../osc-sdk-go/osc/model_filters_vm_type.go | 1 - .../osc-sdk-go/osc/model_filters_vms_state.go | 1 - .../osc-sdk-go/osc/model_filters_volume.go | 1 - .../osc/model_filters_vpn_connection.go | 1 - .../osc-sdk-go/osc/model_flexible_gpu.go | 1 - .../osc/model_flexible_gpu_catalog.go | 1 - .../osc-sdk-go/osc/model_health_check.go | 1 - .../outscale/osc-sdk-go/osc/model_image.go | 5 +- .../osc-sdk-go/osc/model_image_export_task.go | 3 +- .../osc-sdk-go/osc/model_internet_service.go | 1 - .../outscale/osc-sdk-go/osc/model_keypair.go | 1 - .../osc-sdk-go/osc/model_keypair_created.go | 1 - .../osc/model_link_flexible_gpu_request.go | 1 - .../osc/model_link_flexible_gpu_response.go | 1 - .../model_link_internet_service_request.go | 1 - .../model_link_internet_service_response.go | 1 - .../outscale/osc-sdk-go/osc/model_link_nic.go | 1 - .../osc-sdk-go/osc/model_link_nic_light.go | 1 - .../osc-sdk-go/osc/model_link_nic_request.go | 1 - .../osc-sdk-go/osc/model_link_nic_response.go | 3 +- .../osc/model_link_nic_to_update.go | 1 - .../osc/model_link_private_ips_request.go | 1 - .../osc/model_link_private_ips_response.go | 1 - .../osc-sdk-go/osc/model_link_public_ip.go | 1 - .../osc/model_link_public_ip_light_for_vm.go | 1 - .../osc/model_link_public_ip_request.go | 1 - .../osc/model_link_public_ip_response.go | 3 +- .../osc-sdk-go/osc/model_link_route_table.go | 1 - .../osc/model_link_route_table_request.go | 1 - .../osc/model_link_route_table_response.go | 5 +- .../osc/model_link_virtual_gateway_request.go | 1 - .../model_link_virtual_gateway_response.go | 3 +- .../osc/model_link_volume_request.go | 1 - .../osc/model_link_volume_response.go | 1 - .../osc-sdk-go/osc/model_linked_volume.go | 1 - .../outscale/osc-sdk-go/osc/model_listener.go | 1 - .../osc/model_listener_for_creation.go | 1 - .../osc-sdk-go/osc/model_listener_rule.go | 1 - .../osc/model_listener_rule_for_creation.go | 3 +- .../osc-sdk-go/osc/model_load_balancer.go | 5 +- .../osc/model_load_balancer_light.go | 1 - ...odel_load_balancer_sticky_cookie_policy.go | 1 - .../osc-sdk-go/osc/model_load_balancer_tag.go | 1 - .../outscale/osc-sdk-go/osc/model_location.go | 1 - .../outscale/osc-sdk-go/osc/model_log.go | 1 - .../osc-sdk-go/osc/model_maintenance_event.go | 1 - .../osc-sdk-go/osc/model_nat_service.go | 1 - .../outscale/osc-sdk-go/osc/model_net.go | 1 - .../osc-sdk-go/osc/model_net_access_point.go | 1 - .../osc-sdk-go/osc/model_net_peering.go | 7 +- .../osc-sdk-go/osc/model_net_peering_state.go | 1 - .../osc/model_net_to_virtual_gateway_link.go | 1 - .../outscale/osc-sdk-go/osc/model_nic.go | 7 +- .../osc/model_nic_for_vm_creation.go | 1 - .../osc-sdk-go/osc/model_nic_light.go | 7 +- .../osc-sdk-go/osc/model_osu_api_key.go | 1 - .../osc-sdk-go/osc/model_osu_export.go | 5 +- .../osc/model_permissions_on_resource.go | 1 - .../model_permissions_on_resource_creation.go | 3 +- .../osc-sdk-go/osc/model_placement.go | 1 - .../osc-sdk-go/osc/model_private_ip.go | 3 +- .../osc-sdk-go/osc/model_private_ip_light.go | 1 - .../osc/model_private_ip_light_for_vm.go | 3 +- .../osc-sdk-go/osc/model_product_type.go | 1 - .../osc-sdk-go/osc/model_public_ip.go | 1 - .../osc-sdk-go/osc/model_public_ip_light.go | 1 - .../outscale/osc-sdk-go/osc/model_quota.go | 1 - .../osc-sdk-go/osc/model_quota_types.go | 1 - .../osc/model_read_access_keys_request.go | 3 +- .../osc/model_read_access_keys_response.go | 3 +- .../osc/model_read_accounts_request.go | 1 - .../osc/model_read_accounts_response.go | 3 +- .../osc/model_read_admin_password_request.go | 1 - .../osc/model_read_admin_password_response.go | 3 +- .../osc/model_read_api_logs_request.go | 5 +- .../osc/model_read_api_logs_response.go | 3 +- .../osc/model_read_client_gateways_request.go | 3 +- .../model_read_client_gateways_response.go | 3 +- .../osc/model_read_console_output_request.go | 1 - .../osc/model_read_console_output_response.go | 3 +- .../model_read_consumption_account_request.go | 1 - ...model_read_consumption_account_response.go | 3 +- .../osc/model_read_dhcp_options_request.go | 3 +- .../osc/model_read_dhcp_options_response.go | 3 +- ...del_read_direct_link_interfaces_request.go | 3 +- ...el_read_direct_link_interfaces_response.go | 3 +- .../osc/model_read_direct_links_request.go | 3 +- .../osc/model_read_direct_links_response.go | 3 +- ...model_read_flexible_gpu_catalog_request.go | 1 - ...odel_read_flexible_gpu_catalog_response.go | 3 +- .../osc/model_read_flexible_gpus_request.go | 3 +- .../osc/model_read_flexible_gpus_response.go | 3 +- .../model_read_image_export_tasks_request.go | 3 +- .../model_read_image_export_tasks_response.go | 3 +- .../osc/model_read_images_request.go | 3 +- .../osc/model_read_images_response.go | 3 +- .../model_read_internet_services_request.go | 3 +- .../model_read_internet_services_response.go | 3 +- .../osc/model_read_keypairs_request.go | 3 +- .../osc/model_read_keypairs_response.go | 3 +- .../osc/model_read_listener_rules_request.go | 3 +- .../osc/model_read_listener_rules_response.go | 3 +- .../model_read_load_balancer_tags_request.go | 1 - .../model_read_load_balancer_tags_response.go | 1 - .../osc/model_read_load_balancers_request.go | 3 +- .../osc/model_read_load_balancers_response.go | 3 +- .../osc/model_read_locations_request.go | 1 - .../osc/model_read_locations_response.go | 3 +- .../osc/model_read_nat_services_request.go | 3 +- .../osc/model_read_nat_services_response.go | 3 +- ..._read_net_access_point_services_request.go | 3 +- ...read_net_access_point_services_response.go | 1 - .../model_read_net_access_points_request.go | 3 +- .../model_read_net_access_points_response.go | 3 +- .../osc/model_read_net_peerings_request.go | 3 +- .../osc/model_read_net_peerings_response.go | 3 +- .../osc-sdk-go/osc/model_read_nets_request.go | 3 +- .../osc/model_read_nets_response.go | 3 +- .../osc-sdk-go/osc/model_read_nics_request.go | 3 +- .../osc/model_read_nics_response.go | 3 +- .../osc/model_read_product_types_request.go | 3 +- .../osc/model_read_product_types_response.go | 3 +- .../model_read_public_ip_ranges_request.go | 1 - .../model_read_public_ip_ranges_response.go | 3 +- .../osc/model_read_public_ips_request.go | 3 +- .../osc/model_read_public_ips_response.go | 3 +- .../osc/model_read_quotas_request.go | 3 +- .../osc/model_read_quotas_response.go | 3 +- .../osc/model_read_regions_request.go | 1 - .../osc/model_read_regions_response.go | 3 +- .../osc/model_read_route_tables_request.go | 3 +- .../osc/model_read_route_tables_response.go | 1 - .../model_read_secret_access_key_request.go | 1 - .../model_read_secret_access_key_response.go | 5 +- .../osc/model_read_security_groups_request.go | 3 +- .../model_read_security_groups_response.go | 1 - .../model_read_server_certificates_request.go | 3 +- ...model_read_server_certificates_response.go | 1 - ...odel_read_snapshot_export_tasks_request.go | 3 +- ...del_read_snapshot_export_tasks_response.go | 1 - .../osc/model_read_snapshots_request.go | 3 +- .../osc/model_read_snapshots_response.go | 1 - .../osc/model_read_subnets_request.go | 3 +- .../osc/model_read_subnets_response.go | 1 - .../osc/model_read_subregions_request.go | 3 +- .../osc/model_read_subregions_response.go | 1 - .../osc-sdk-go/osc/model_read_tags_request.go | 3 +- .../osc/model_read_tags_response.go | 1 - .../model_read_virtual_gateways_request.go | 3 +- .../model_read_virtual_gateways_response.go | 1 - .../osc/model_read_vm_types_request.go | 3 +- .../osc/model_read_vm_types_response.go | 1 - .../osc/model_read_vms_health_request.go | 1 - .../osc/model_read_vms_health_response.go | 3 +- .../osc-sdk-go/osc/model_read_vms_request.go | 3 +- .../osc-sdk-go/osc/model_read_vms_response.go | 1 - .../osc/model_read_vms_state_request.go | 3 +- .../osc/model_read_vms_state_response.go | 1 - .../osc/model_read_volumes_request.go | 3 +- .../osc/model_read_volumes_response.go | 1 - .../osc/model_read_vpn_connections_request.go | 3 +- .../model_read_vpn_connections_response.go | 1 - .../osc/model_reboot_vms_request.go | 1 - .../osc/model_reboot_vms_response.go | 1 - .../outscale/osc-sdk-go/osc/model_region.go | 1 - ...l_register_vms_in_load_balancer_request.go | 1 - ..._register_vms_in_load_balancer_response.go | 1 - .../osc/model_reject_net_peering_request.go | 1 - .../osc/model_reject_net_peering_response.go | 1 - .../model_reset_account_password_request.go | 1 - .../model_reset_account_password_response.go | 1 - .../osc/model_resource_load_balancer_tag.go | 1 - .../osc-sdk-go/osc/model_resource_tag.go | 1 - .../osc-sdk-go/osc/model_response_context.go | 1 - .../outscale/osc-sdk-go/osc/model_route.go | 1 - .../osc-sdk-go/osc/model_route_light.go | 1 - ...model_route_propagating_virtual_gateway.go | 1 - .../osc-sdk-go/osc/model_route_table.go | 1 - .../osc-sdk-go/osc/model_security_group.go | 1 - .../osc/model_security_group_light.go | 1 - .../osc/model_security_group_rule.go | 1 - .../osc/model_security_groups_member.go | 1 - ...model_send_reset_password_email_request.go | 1 - ...odel_send_reset_password_email_response.go | 1 - .../osc/model_server_certificate.go | 1 - .../outscale/osc-sdk-go/osc/model_service.go | 1 - .../outscale/osc-sdk-go/osc/model_snapshot.go | 3 +- .../osc/model_snapshot_export_task.go | 3 +- .../osc-sdk-go/osc/model_source_net.go | 1 - .../osc/model_source_security_group.go | 1 - .../osc-sdk-go/osc/model_start_vms_request.go | 1 - .../osc/model_start_vms_response.go | 1 - .../osc-sdk-go/osc/model_state_comment.go | 1 - .../osc-sdk-go/osc/model_stop_vms_request.go | 1 - .../osc-sdk-go/osc/model_stop_vms_response.go | 1 - .../outscale/osc-sdk-go/osc/model_subnet.go | 1 - .../osc-sdk-go/osc/model_subregion.go | 1 - .../outscale/osc-sdk-go/osc/model_tag.go | 1 - .../osc/model_unlink_flexible_gpu_request.go | 1 - .../osc/model_unlink_flexible_gpu_response.go | 1 - .../model_unlink_internet_service_request.go | 1 - .../model_unlink_internet_service_response.go | 1 - .../osc/model_unlink_nic_request.go | 1 - .../osc/model_unlink_nic_response.go | 1 - .../osc/model_unlink_private_ips_request.go | 1 - .../osc/model_unlink_private_ips_response.go | 1 - .../osc/model_unlink_public_ip_request.go | 1 - .../osc/model_unlink_public_ip_response.go | 1 - .../osc/model_unlink_route_table_request.go | 1 - .../osc/model_unlink_route_table_response.go | 1 - .../model_unlink_virtual_gateway_request.go | 1 - .../model_unlink_virtual_gateway_response.go | 1 - .../osc/model_unlink_volume_request.go | 1 - .../osc/model_unlink_volume_response.go | 1 - .../osc/model_update_access_key_request.go | 1 - .../osc/model_update_access_key_response.go | 3 +- .../osc/model_update_account_request.go | 1 - .../osc/model_update_account_response.go | 3 +- .../osc/model_update_flexible_gpu_request.go | 1 - .../osc/model_update_flexible_gpu_response.go | 3 +- .../osc/model_update_image_request.go | 3 +- .../osc/model_update_image_response.go | 3 +- .../osc/model_update_listener_rule_request.go | 1 - .../model_update_listener_rule_response.go | 3 +- .../osc/model_update_load_balancer_request.go | 3 +- .../model_update_load_balancer_response.go | 3 +- .../model_update_net_access_point_request.go | 1 - .../model_update_net_access_point_response.go | 3 +- .../osc/model_update_net_request.go | 1 - .../osc/model_update_net_response.go | 3 +- .../osc/model_update_nic_request.go | 3 +- .../osc/model_update_nic_response.go | 3 +- .../model_update_route_propagation_request.go | 1 - ...model_update_route_propagation_response.go | 3 +- .../osc/model_update_route_request.go | 1 - .../osc/model_update_route_response.go | 3 +- ...model_update_server_certificate_request.go | 1 - ...odel_update_server_certificate_response.go | 3 +- .../osc/model_update_snapshot_request.go | 3 +- .../osc/model_update_snapshot_response.go | 3 +- .../osc/model_update_subnet_request.go | 1 - .../osc/model_update_subnet_response.go | 3 +- .../osc-sdk-go/osc/model_update_vm_request.go | 1 - .../osc/model_update_vm_response.go | 3 +- .../osc-sdk-go/osc/model_virtual_gateway.go | 1 - .../outscale/osc-sdk-go/osc/model_vm.go | 5 +- .../outscale/osc-sdk-go/osc/model_vm_state.go | 1 - .../osc-sdk-go/osc/model_vm_states.go | 1 - .../outscale/osc-sdk-go/osc/model_vm_type.go | 1 - .../outscale/osc-sdk-go/osc/model_volume.go | 1 - .../osc-sdk-go/osc/model_vpn_connection.go | 1 - .../outscale/osc-sdk-go/osc/model_with.go | 1 - vendor/github.com/shirou/w32/constants.go | 146 +- .../sirupsen/logrus/terminal_check_bsd.go | 1 + .../sirupsen/logrus/terminal_check_unix.go | 1 + .../tencentcloud/cvm/v20170312/client.go | 2063 +++--- .../tencentcloud/cvm/v20170312/models.go | 792 +- .../tencentcloud/vpc/v20170312/client.go | 6431 +++++++++-------- .../tencentcloud/vpc/v20170312/models.go | 2582 +++---- .../ufilesdk-dev/ufile-gosdk/file.go | 5 +- .../file_mutipart_upload_with_policy.go | 7 +- .../ufilesdk-dev/ufile-gosdk/request.go | 16 +- vendor/github.com/ugorji/go/codec/0doc.go | 20 +- .../ugorji/go/codec/gen.generated.go | 1 + .../github.com/zclconf/go-cty-yaml/readerc.go | 2 +- .../go-cty/cty/function/stdlib/string.go | 1 + vendor/golang.org/x/net/html/const.go | 2 +- vendor/golang.org/x/net/html/foreign.go | 119 +- vendor/golang.org/x/net/html/render.go | 2 +- .../golang.org/x/net/http/httpproxy/proxy.go | 6 +- vendor/golang.org/x/net/http2/server.go | 1 + vendor/golang.org/x/net/http2/transport.go | 10 + vendor/golang.org/x/sys/cpu/cpu.go | 60 +- vendor/golang.org/x/sys/cpu/cpu_arm64.go | 2 +- vendor/golang.org/x/sys/cpu/cpu_x86.go | 51 +- vendor/golang.org/x/sys/unix/gccgo.go | 2 - vendor/golang.org/x/sys/unix/gccgo_c.c | 6 + vendor/golang.org/x/sys/unix/mkerrors.sh | 1 + .../x/sys/unix/sockcmsg_unix_other.go | 6 +- vendor/golang.org/x/sys/unix/syscall_bsd.go | 17 +- .../golang.org/x/sys/unix/syscall_darwin.go | 73 +- .../x/sys/unix/syscall_dragonfly.go | 15 - .../golang.org/x/sys/unix/syscall_freebsd.go | 15 - .../golang.org/x/sys/unix/syscall_illumos.go | 2 +- vendor/golang.org/x/sys/unix/syscall_linux.go | 25 + .../golang.org/x/sys/unix/syscall_netbsd.go | 15 - .../golang.org/x/sys/unix/syscall_openbsd.go | 15 - vendor/golang.org/x/sys/unix/zerrors_linux.go | 1 + .../x/sys/unix/zerrors_linux_386.go | 2 + .../x/sys/unix/zerrors_linux_amd64.go | 2 + .../x/sys/unix/zerrors_linux_arm.go | 2 + .../x/sys/unix/zerrors_linux_arm64.go | 2 + .../x/sys/unix/zerrors_linux_mips.go | 2 + .../x/sys/unix/zerrors_linux_mips64.go | 2 + .../x/sys/unix/zerrors_linux_mips64le.go | 2 + .../x/sys/unix/zerrors_linux_mipsle.go | 2 + .../x/sys/unix/zerrors_linux_ppc64.go | 2 + .../x/sys/unix/zerrors_linux_ppc64le.go | 2 + .../x/sys/unix/zerrors_linux_riscv64.go | 2 + .../x/sys/unix/zerrors_linux_s390x.go | 2 + .../x/sys/unix/zerrors_linux_sparc64.go | 2 + .../x/sys/unix/zsyscall_darwin_386.go | 37 +- .../x/sys/unix/zsyscall_darwin_386.s | 4 +- .../x/sys/unix/zsyscall_darwin_amd64.go | 37 +- .../x/sys/unix/zsyscall_darwin_amd64.s | 4 +- .../x/sys/unix/zsyscall_darwin_arm.go | 37 +- .../x/sys/unix/zsyscall_darwin_arm.s | 4 +- .../x/sys/unix/zsyscall_darwin_arm64.go | 37 +- .../x/sys/unix/zsyscall_darwin_arm64.s | 4 +- .../x/sys/unix/zsyscall_illumos_amd64.go | 2 +- .../x/sys/unix/ztypes_darwin_386.go | 4 + .../x/sys/unix/ztypes_darwin_amd64.go | 4 + .../x/sys/unix/ztypes_darwin_arm.go | 4 + .../x/sys/unix/ztypes_darwin_arm64.go | 4 + vendor/golang.org/x/sys/unix/ztypes_linux.go | 15 + .../go/internal/gcimporter/gcimporter.go | 2 +- .../tools/go/internal/packagesdriver/sizes.go | 26 +- .../golang.org/x/tools/go/packages/golist.go | 289 +- .../x/tools/go/packages/golist_overlay.go | 6 +- .../x/tools/go/packages/packages.go | 23 +- .../x/tools/internal/gocommand/invoke.go | 43 +- .../x/tools/internal/gocommand/version.go | 40 + .../x/tools/internal/imports/fix.go | 34 +- .../x/tools/internal/imports/mod.go | 35 +- .../internal/packagesinternal/packages.go | 3 + .../tools/internal/typesinternal/errorcode.go | 1358 ++++ .../typesinternal/errorcode_string.go | 152 + vendor/gopkg.in/ini.v1/key.go | 6 +- vendor/gopkg.in/yaml.v2/readerc.go | 2 +- vendor/gopkg.in/yaml.v2/resolve.go | 2 +- vendor/gopkg.in/yaml.v2/sorter.go | 2 +- vendor/modules.txt | 8 +- website/pages/docs/builders/cloudstack.mdx | 4 +- website/pages/docs/builders/hyperv/iso.mdx | 16 +- website/pages/docs/builders/hyperv/vmcx.mdx | 14 +- website/pages/docs/builders/parallels/iso.mdx | 6 +- website/pages/docs/builders/proxmox/iso.mdx | 4 +- website/pages/docs/builders/qemu.mdx | 18 +- .../pages/docs/builders/virtualbox/iso.mdx | 18 +- .../pages/docs/builders/virtualbox/ovf.mdx | 12 +- website/pages/docs/builders/virtualbox/vm.mdx | 12 +- website/pages/docs/builders/vmware/iso.mdx | 16 +- website/pages/docs/builders/vmware/vmx.mdx | 12 +- .../docs/builders/vmware/vsphere-clone.mdx | 8 +- .../docs/builders/vmware/vsphere-iso.mdx | 14 +- 986 files changed, 19275 insertions(+), 17331 deletions(-) rename common/{ => commonsteps}/test-fixtures/SomeDir/myfile.txt (100%) rename common/{ => commonsteps}/test-fixtures/floppy-hier/test-0/file1 (100%) rename common/{ => commonsteps}/test-fixtures/floppy-hier/test-0/file2 (100%) rename common/{ => commonsteps}/test-fixtures/floppy-hier/test-0/file3 (100%) rename common/{ => commonsteps}/test-fixtures/floppy-hier/test-1/dir1/file1 (100%) rename common/{ => commonsteps}/test-fixtures/floppy-hier/test-1/dir1/file2 (100%) rename common/{ => commonsteps}/test-fixtures/floppy-hier/test-1/dir1/file3 (100%) rename common/{ => commonsteps}/test-fixtures/floppy-hier/test-2/dir1/file1 (100%) rename common/{ => commonsteps}/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 (100%) rename common/{ => commonsteps}/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 (100%) rename common/{ => commonsteps}/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 (100%) rename common/{ => commonsteps}/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 (100%) rename common/{ => commonsteps}/test-fixtures/root/another.txt (100%) rename common/{ => commonsteps}/test-fixtures/root/another.txt.sha1sum (100%) rename common/{ => commonsteps}/test-fixtures/root/basic.txt (100%) rename common/{ => commonsteps}/test-fixtures/root/basic.txt.sha1sum (100%) rename common/{ => commonsteps}/test-fixtures/root/subfolder.sum (100%) delete mode 100644 common/test-fixtures/fileurl/cake create mode 100644 vendor/golang.org/x/tools/internal/gocommand/version.go create mode 100644 vendor/golang.org/x/tools/internal/typesinternal/errorcode.go create mode 100644 vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go diff --git a/builder/qemu/step_run_test.go b/builder/qemu/step_run_test.go index 2b59448ec..194ebf541 100644 --- a/builder/qemu/step_run_test.go +++ b/builder/qemu/step_run_test.go @@ -4,6 +4,7 @@ import ( "fmt" "testing" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" diff --git a/builder/vsphere/clone/config.hcl2spec.go b/builder/vsphere/clone/config.hcl2spec.go index 21d0c1a51..ec26d8d42 100644 --- a/builder/vsphere/clone/config.hcl2spec.go +++ b/builder/vsphere/clone/config.hcl2spec.go @@ -64,6 +64,7 @@ type FlatConfig struct { CdromType *string `mapstructure:"cdrom_type" cty:"cdrom_type" hcl:"cdrom_type"` ISOPaths []string `mapstructure:"iso_paths" cty:"iso_paths" hcl:"iso_paths"` RemoveCdrom *bool `mapstructure:"remove_cdrom" cty:"remove_cdrom" hcl:"remove_cdrom"` + FloppyIMGPath *string `mapstructure:"floppy_img_path" cty:"floppy_img_path" hcl:"floppy_img_path"` FloppyFiles []string `mapstructure:"floppy_files" cty:"floppy_files" hcl:"floppy_files"` FloppyDirectories []string `mapstructure:"floppy_dirs" cty:"floppy_dirs" hcl:"floppy_dirs"` FloppyLabel *string `mapstructure:"floppy_label" cty:"floppy_label" hcl:"floppy_label"` @@ -200,6 +201,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "cdrom_type": &hcldec.AttrSpec{Name: "cdrom_type", Type: cty.String, Required: false}, "iso_paths": &hcldec.AttrSpec{Name: "iso_paths", Type: cty.List(cty.String), Required: false}, "remove_cdrom": &hcldec.AttrSpec{Name: "remove_cdrom", Type: cty.Bool, Required: false}, + "floppy_img_path": &hcldec.AttrSpec{Name: "floppy_img_path", Type: cty.String, Required: false}, "floppy_files": &hcldec.AttrSpec{Name: "floppy_files", Type: cty.List(cty.String), Required: false}, "floppy_dirs": &hcldec.AttrSpec{Name: "floppy_dirs", Type: cty.List(cty.String), Required: false}, "floppy_label": &hcldec.AttrSpec{Name: "floppy_label", Type: cty.String, Required: false}, diff --git a/builder/vsphere/iso/config.hcl2spec.go b/builder/vsphere/iso/config.hcl2spec.go index f55cff6d6..41061b95a 100644 --- a/builder/vsphere/iso/config.hcl2spec.go +++ b/builder/vsphere/iso/config.hcl2spec.go @@ -69,6 +69,7 @@ type FlatConfig struct { CdromType *string `mapstructure:"cdrom_type" cty:"cdrom_type" hcl:"cdrom_type"` ISOPaths []string `mapstructure:"iso_paths" cty:"iso_paths" hcl:"iso_paths"` RemoveCdrom *bool `mapstructure:"remove_cdrom" cty:"remove_cdrom" hcl:"remove_cdrom"` + FloppyIMGPath *string `mapstructure:"floppy_img_path" cty:"floppy_img_path" hcl:"floppy_img_path"` FloppyFiles []string `mapstructure:"floppy_files" cty:"floppy_files" hcl:"floppy_files"` FloppyDirectories []string `mapstructure:"floppy_dirs" cty:"floppy_dirs" hcl:"floppy_dirs"` FloppyLabel *string `mapstructure:"floppy_label" cty:"floppy_label" hcl:"floppy_label"` @@ -209,6 +210,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "cdrom_type": &hcldec.AttrSpec{Name: "cdrom_type", Type: cty.String, Required: false}, "iso_paths": &hcldec.AttrSpec{Name: "iso_paths", Type: cty.List(cty.String), Required: false}, "remove_cdrom": &hcldec.AttrSpec{Name: "remove_cdrom", Type: cty.Bool, Required: false}, + "floppy_img_path": &hcldec.AttrSpec{Name: "floppy_img_path", Type: cty.String, Required: false}, "floppy_files": &hcldec.AttrSpec{Name: "floppy_files", Type: cty.List(cty.String), Required: false}, "floppy_dirs": &hcldec.AttrSpec{Name: "floppy_dirs", Type: cty.List(cty.String), Required: false}, "floppy_label": &hcldec.AttrSpec{Name: "floppy_label", Type: cty.String, Required: false}, diff --git a/common/test-fixtures/SomeDir/myfile.txt b/common/commonsteps/test-fixtures/SomeDir/myfile.txt similarity index 100% rename from common/test-fixtures/SomeDir/myfile.txt rename to common/commonsteps/test-fixtures/SomeDir/myfile.txt diff --git a/common/test-fixtures/floppy-hier/test-0/file1 b/common/commonsteps/test-fixtures/floppy-hier/test-0/file1 similarity index 100% rename from common/test-fixtures/floppy-hier/test-0/file1 rename to common/commonsteps/test-fixtures/floppy-hier/test-0/file1 diff --git a/common/test-fixtures/floppy-hier/test-0/file2 b/common/commonsteps/test-fixtures/floppy-hier/test-0/file2 similarity index 100% rename from common/test-fixtures/floppy-hier/test-0/file2 rename to common/commonsteps/test-fixtures/floppy-hier/test-0/file2 diff --git a/common/test-fixtures/floppy-hier/test-0/file3 b/common/commonsteps/test-fixtures/floppy-hier/test-0/file3 similarity index 100% rename from common/test-fixtures/floppy-hier/test-0/file3 rename to common/commonsteps/test-fixtures/floppy-hier/test-0/file3 diff --git a/common/test-fixtures/floppy-hier/test-1/dir1/file1 b/common/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 similarity index 100% rename from common/test-fixtures/floppy-hier/test-1/dir1/file1 rename to common/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 diff --git a/common/test-fixtures/floppy-hier/test-1/dir1/file2 b/common/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 similarity index 100% rename from common/test-fixtures/floppy-hier/test-1/dir1/file2 rename to common/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 diff --git a/common/test-fixtures/floppy-hier/test-1/dir1/file3 b/common/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 similarity index 100% rename from common/test-fixtures/floppy-hier/test-1/dir1/file3 rename to common/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 diff --git a/common/test-fixtures/floppy-hier/test-2/dir1/file1 b/common/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 similarity index 100% rename from common/test-fixtures/floppy-hier/test-2/dir1/file1 rename to common/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 diff --git a/common/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 b/common/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 similarity index 100% rename from common/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 rename to common/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 diff --git a/common/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 b/common/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 similarity index 100% rename from common/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 rename to common/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 diff --git a/common/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 b/common/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 similarity index 100% rename from common/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 rename to common/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 diff --git a/common/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 b/common/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 similarity index 100% rename from common/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 rename to common/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 diff --git a/common/test-fixtures/root/another.txt b/common/commonsteps/test-fixtures/root/another.txt similarity index 100% rename from common/test-fixtures/root/another.txt rename to common/commonsteps/test-fixtures/root/another.txt diff --git a/common/test-fixtures/root/another.txt.sha1sum b/common/commonsteps/test-fixtures/root/another.txt.sha1sum similarity index 100% rename from common/test-fixtures/root/another.txt.sha1sum rename to common/commonsteps/test-fixtures/root/another.txt.sha1sum diff --git a/common/test-fixtures/root/basic.txt b/common/commonsteps/test-fixtures/root/basic.txt similarity index 100% rename from common/test-fixtures/root/basic.txt rename to common/commonsteps/test-fixtures/root/basic.txt diff --git a/common/test-fixtures/root/basic.txt.sha1sum b/common/commonsteps/test-fixtures/root/basic.txt.sha1sum similarity index 100% rename from common/test-fixtures/root/basic.txt.sha1sum rename to common/commonsteps/test-fixtures/root/basic.txt.sha1sum diff --git a/common/test-fixtures/root/subfolder.sum b/common/commonsteps/test-fixtures/root/subfolder.sum similarity index 100% rename from common/test-fixtures/root/subfolder.sum rename to common/commonsteps/test-fixtures/root/subfolder.sum diff --git a/common/test-fixtures/fileurl/cake b/common/test-fixtures/fileurl/cake deleted file mode 100644 index e800d1ffb..000000000 --- a/common/test-fixtures/fileurl/cake +++ /dev/null @@ -1 +0,0 @@ -delicious chocolate cake diff --git a/provisioner/ansible/provisioner_test.go b/provisioner/ansible/provisioner_test.go index bce35b227..18da6d92a 100644 --- a/provisioner/ansible/provisioner_test.go +++ b/provisioner/ansible/provisioner_test.go @@ -14,6 +14,7 @@ import ( "strings" "testing" + "github.com/hashicorp/packer/common/commonsteps" confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/stretchr/testify/assert" diff --git a/provisioner/powershell/provisioner_test.go b/provisioner/powershell/provisioner_test.go index fcacd7919..f6eb73d64 100644 --- a/provisioner/powershell/provisioner_test.go +++ b/provisioner/powershell/provisioner_test.go @@ -11,6 +11,7 @@ import ( "testing" "time" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/packer" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/shell/provisioner_test.go b/provisioner/shell/provisioner_test.go index e59130ef7..b26f744c7 100644 --- a/provisioner/shell/provisioner_test.go +++ b/provisioner/shell/provisioner_test.go @@ -7,6 +7,7 @@ import ( "strings" "testing" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/packer" ) diff --git a/provisioner/windows-shell/provisioner_test.go b/provisioner/windows-shell/provisioner_test.go index af1b45a4d..158ce31f5 100644 --- a/provisioner/windows-shell/provisioner_test.go +++ b/provisioner/windows-shell/provisioner_test.go @@ -9,6 +9,7 @@ import ( "strings" "testing" + "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/packer" ) diff --git a/vendor/github.com/1and1/oneandone-cloudserver-sdk-go/errors.go b/vendor/github.com/1and1/oneandone-cloudserver-sdk-go/errors.go index 62e8170c1..08cc9c250 100644 --- a/vendor/github.com/1and1/oneandone-cloudserver-sdk-go/errors.go +++ b/vendor/github.com/1and1/oneandone-cloudserver-sdk-go/errors.go @@ -5,8 +5,8 @@ import ( ) type errorResponse struct { - Type string `json:"type"` - Message string `json:"message"` + Type string `json:"type"` + Message string `json:"message"` } type apiError struct { diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_group.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_group.go index e0a1b2fb9..001ddadb6 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_group.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_group.go @@ -12,17 +12,17 @@ package server type AccessControlGroup struct { // 접근제어그룹설정번호 - AccessControlGroupConfigurationNo *string `json:"accessControlGroupConfigurationNo,omitempty"` +AccessControlGroupConfigurationNo *string `json:"accessControlGroupConfigurationNo,omitempty"` // 접근제어그룹명 - AccessControlGroupName *string `json:"accessControlGroupName,omitempty"` +AccessControlGroupName *string `json:"accessControlGroupName,omitempty"` // 접근제어그룹설명 - AccessControlGroupDescription *string `json:"accessControlGroupDescription,omitempty"` +AccessControlGroupDescription *string `json:"accessControlGroupDescription,omitempty"` // 디폴트그룹여부 - IsDefaultGroup *bool `json:"isDefaultGroup,omitempty"` +IsDefaultGroup *bool `json:"isDefaultGroup,omitempty"` // 생성일자 - CreateDate *string `json:"createDate,omitempty"` +CreateDate *string `json:"createDate,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_rule.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_rule.go index ee225cf52..ec2eb27e0 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_rule.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/access_control_rule.go @@ -12,23 +12,23 @@ package server type AccessControlRule struct { // 접근제어RULE설정번호 - AccessControlRuleConfigurationNo *string `json:"accessControlRuleConfigurationNo,omitempty"` +AccessControlRuleConfigurationNo *string `json:"accessControlRuleConfigurationNo,omitempty"` // 프로토콜구분 - ProtocolType *CommonCode `json:"protocolType,omitempty"` +ProtocolType *CommonCode `json:"protocolType,omitempty"` // 소스IP - SourceIp *string `json:"sourceIp,omitempty"` +SourceIp *string `json:"sourceIp,omitempty"` // 소스접근제어그룹번호 - SourceAccessControlRuleConfigurationNo *string `json:"sourceAccessControlRuleConfigurationNo,omitempty"` +SourceAccessControlRuleConfigurationNo *string `json:"sourceAccessControlRuleConfigurationNo,omitempty"` // 소스접근제어그룹이름 - SourceAccessControlRuleName *string `json:"sourceAccessControlRuleName,omitempty"` +SourceAccessControlRuleName *string `json:"sourceAccessControlRuleName,omitempty"` // 목적지포트 - DestinationPort *string `json:"destinationPort,omitempty"` +DestinationPort *string `json:"destinationPort,omitempty"` // 접근제어RULE설명 - AccessControlRuleDescription *string `json:"accessControlRuleDescription,omitempty"` +AccessControlRuleDescription *string `json:"accessControlRuleDescription,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_request.go index 68e3cc515..07e6540aa 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_request.go @@ -12,11 +12,11 @@ package server type AddNasVolumeAccessControlRequest struct { // NAS볼륨인스턴스번호 - NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` +NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` // 서버인스턴스번호리스트 - ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` +ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` // 커스텀IP리스트 - CustomIpList []*string `json:"customIpList,omitempty"` +CustomIpList []*string `json:"customIpList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_response.go index 7a9ff15b7..e1e0ff73f 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_nas_volume_access_control_response.go @@ -10,13 +10,14 @@ package server type AddNasVolumeAccessControlResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_request.go index dd1f38704..6f737fb7b 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_request.go @@ -12,8 +12,8 @@ package server type AddPortForwardingRulesRequest struct { // 포트포워딩설정번호 - PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo"` +PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo"` // 포트포워딩RULE리스트 - PortForwardingRuleList []*PortForwardingRuleParameter `json:"portForwardingRuleList"` +PortForwardingRuleList []*PortForwardingRuleParameter `json:"portForwardingRuleList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_response.go index a7ba004e6..13d3eeb8e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/add_port_forwarding_rules_response.go @@ -10,25 +10,26 @@ package server type AddPortForwardingRulesResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` + +ReturnMessage *string `json:"returnMessage,omitempty"` // 포트포워딩설정번호 - PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo,omitempty"` +PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo,omitempty"` // 포트포워딩공인IP - PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` +PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` // ZONE - Zone *Zone `json:"zone,omitempty"` +Zone *Zone `json:"zone,omitempty"` // 인터넷회선구분 - InternetLineType *CommonCode `json:"internetLineType,omitempty"` +InternetLineType *CommonCode `json:"internetLineType,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` - PortForwardingRuleList []*PortForwardingRule `json:"portForwardingRuleList,omitempty"` +PortForwardingRuleList []*PortForwardingRule `json:"portForwardingRuleList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_client.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_client.go index 7ba923d8b..45924823c 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_client.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_client.go @@ -326,7 +326,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e if f.Kind() == reflect.Ptr { switch f.Type().String() { case "*string": - result += fmt.Sprintf("&%s=%s", key, url.QueryEscape(ncloud.StringValue(f.Interface().(*string)))) + result += fmt.Sprintf("&%s=%s", key, url.QueryEscape(ncloud.StringValue(f.Interface().(*string)))) case "*bool": result += fmt.Sprintf("&%s=%t", key, ncloud.BoolValue(f.Interface().(*bool))) case "*int": @@ -352,7 +352,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e switch subItem.Type().String() { case "*string": - result += fmt.Sprintf("&%s.%d.%s=%s", key, i+1, subKey, url.QueryEscape(ncloud.StringValue(subItem.Interface().(*string)))) + result += fmt.Sprintf("&%s.%d.%s=%s", key, i+1, subKey, url.QueryEscape(ncloud.StringValue(subItem.Interface().(*string)))) case "*bool": result += fmt.Sprintf("&%s.%d.%s=%t", key, i+1, subKey, ncloud.BoolValue(subItem.Interface().(*bool))) case "*int": @@ -368,7 +368,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e } else { switch item.Type().String() { case "*string": - result += fmt.Sprintf("&%s.%d=%s", key, i+1, url.QueryEscape(*item.Interface().(*string))) + result += fmt.Sprintf("&%s.%d=%s", key, i+1, url.QueryEscape(*item.Interface().(*string))) case "*bool": result += fmt.Sprintf("&%s.%d.%s=%t", key, i+1, ncloud.BoolValue(item.Interface().(*bool))) case "*int": diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_response.go index fdae16c3d..923b00b44 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/api_response.go @@ -15,15 +15,15 @@ import ( type APIResponse struct { *http.Response `json:"-"` - Message string `json:"message,omitempty"` + Message string `json:"message,omitempty"` // Operation is the name of the swagger operation. - Operation string `json:"operation,omitempty"` + Operation string `json:"operation,omitempty"` // RequestURL is the request URL. This value is always available, even if the // embedded *http.Response is nil. - RequestURL string `json:"url,omitempty"` + RequestURL string `json:"url,omitempty"` // Method is the HTTP method used for the request. This value is always // available, even if the embedded *http.Response is nil. - Method string `json:"method,omitempty"` + Method string `json:"method,omitempty"` // Payload holds the contents of the response body (which may be nil or empty). // This is provided here as the raw response.Body() reader will have already // been drained. diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_request.go index c505179f8..473ff97ce 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_request.go @@ -12,8 +12,8 @@ package server type AssociatePublicIpWithServerInstanceRequest struct { // 공인IP인스턴스번호 - PublicIpInstanceNo *string `json:"publicIpInstanceNo"` +PublicIpInstanceNo *string `json:"publicIpInstanceNo"` // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo"` +ServerInstanceNo *string `json:"serverInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_response.go index 01fc32d05..3f4dfb459 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/associate_public_ip_with_server_instance_response.go @@ -10,13 +10,14 @@ package server type AssociatePublicIpWithServerInstanceResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_request.go index 303b30552..003eb9f14 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_request.go @@ -12,8 +12,8 @@ package server type AttachBlockStorageInstanceRequest struct { // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo"` +ServerInstanceNo *string `json:"serverInstanceNo"` // 블록스토리지인스턴스번호 - BlockStorageInstanceNo *string `json:"blockStorageInstanceNo"` +BlockStorageInstanceNo *string `json:"blockStorageInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_response.go index 4193b3cbc..3d278fde4 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_block_storage_instance_response.go @@ -10,13 +10,14 @@ package server type AttachBlockStorageInstanceResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_request.go index 58d416234..e92c035ae 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_request.go @@ -12,8 +12,8 @@ package server type AttachNetworkInterfaceRequest struct { // Network Interface번호 - NetworkInterfaceNo *string `json:"networkInterfaceNo"` +NetworkInterfaceNo *string `json:"networkInterfaceNo"` // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo"` +ServerInstanceNo *string `json:"serverInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_response.go index 6554ad11a..9b0609313 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/attach_network_interface_response.go @@ -10,9 +10,10 @@ package server type AttachNetworkInterfaceResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` + +ReturnMessage *string `json:"returnMessage,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_instance.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_instance.go index 4a0af3c24..9f0eeb912 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_instance.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_instance.go @@ -12,57 +12,57 @@ package server type BlockStorageInstance struct { // 블록스토리지인스턴스번호 - BlockStorageInstanceNo *string `json:"blockStorageInstanceNo,omitempty"` +BlockStorageInstanceNo *string `json:"blockStorageInstanceNo,omitempty"` // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` +ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` // 서버명 - ServerName *string `json:"serverName,omitempty"` +ServerName *string `json:"serverName,omitempty"` // 블록스토리지구분 - BlockStorageType *CommonCode `json:"blockStorageType,omitempty"` +BlockStorageType *CommonCode `json:"blockStorageType,omitempty"` // 블록스토리지명 - BlockStorageName *string `json:"blockStorageName,omitempty"` +BlockStorageName *string `json:"blockStorageName,omitempty"` // 블록스토리지사이즈 - BlockStorageSize *int64 `json:"blockStorageSize,omitempty"` +BlockStorageSize *int64 `json:"blockStorageSize,omitempty"` // 디바이스명 - DeviceName *string `json:"deviceName,omitempty"` +DeviceName *string `json:"deviceName,omitempty"` // 회원서버이미지번호 - MemberServerImageNo *string `json:"memberServerImageNo,omitempty"` +MemberServerImageNo *string `json:"memberServerImageNo,omitempty"` // 블록스토리지상품코드 - BlockStorageProductCode *string `json:"blockStorageProductCode,omitempty"` +BlockStorageProductCode *string `json:"blockStorageProductCode,omitempty"` // 블록스토리지인스턴스상태 - BlockStorageInstanceStatus *CommonCode `json:"blockStorageInstanceStatus,omitempty"` +BlockStorageInstanceStatus *CommonCode `json:"blockStorageInstanceStatus,omitempty"` // 블록스토리지인스턴스OP - BlockStorageInstanceOperation *CommonCode `json:"blockStorageInstanceOperation,omitempty"` +BlockStorageInstanceOperation *CommonCode `json:"blockStorageInstanceOperation,omitempty"` // 블록스토리지인스턴스상태명 - BlockStorageInstanceStatusName *string `json:"blockStorageInstanceStatusName,omitempty"` +BlockStorageInstanceStatusName *string `json:"blockStorageInstanceStatusName,omitempty"` // 생성일시 - CreateDate *string `json:"createDate,omitempty"` +CreateDate *string `json:"createDate,omitempty"` // 블록스토리지인스턴스설명 - BlockStorageInstanceDescription *string `json:"blockStorageInstanceDescription,omitempty"` +BlockStorageInstanceDescription *string `json:"blockStorageInstanceDescription,omitempty"` // 디스크유형 - DiskType *CommonCode `json:"diskType,omitempty"` +DiskType *CommonCode `json:"diskType,omitempty"` // 디스크상세유형 - DiskDetailType *CommonCode `json:"diskDetailType,omitempty"` +DiskDetailType *CommonCode `json:"diskDetailType,omitempty"` // 최대 IOPS - MaxIopsThroughput *int32 `json:"maxIopsThroughput,omitempty"` +MaxIopsThroughput *int32 `json:"maxIopsThroughput,omitempty"` - Region *Region `json:"region,omitempty"` +Region *Region `json:"region,omitempty"` - Zone *Zone `json:"zone,omitempty"` +Zone *Zone `json:"zone,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_snapshot_instance.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_snapshot_instance.go index da7cd155a..a9295d496 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_snapshot_instance.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/block_storage_snapshot_instance.go @@ -12,37 +12,37 @@ package server type BlockStorageSnapshotInstance struct { // 블록스토리지스냅샷인스턴스번호 - BlockStorageSnapshotInstanceNo *string `json:"blockStorageSnapshotInstanceNo,omitempty"` +BlockStorageSnapshotInstanceNo *string `json:"blockStorageSnapshotInstanceNo,omitempty"` // 블록스토리지스냅샷명 - BlockStorageSnapshotName *string `json:"blockStorageSnapshotName,omitempty"` +BlockStorageSnapshotName *string `json:"blockStorageSnapshotName,omitempty"` // 블록스토지리볼륨사이즈 - BlockStorageSnapshotVolumeSize *int64 `json:"blockStorageSnapshotVolumeSize,omitempty"` +BlockStorageSnapshotVolumeSize *int64 `json:"blockStorageSnapshotVolumeSize,omitempty"` // 원본블록스토리지인스턴스번호 - OriginalBlockStorageInstanceNo *string `json:"originalBlockStorageInstanceNo,omitempty"` +OriginalBlockStorageInstanceNo *string `json:"originalBlockStorageInstanceNo,omitempty"` // 원본블록스토리지명 - OriginalBlockStorageName *string `json:"originalBlockStorageName,omitempty"` +OriginalBlockStorageName *string `json:"originalBlockStorageName,omitempty"` // 블록스토리지스냅샷인스턴스상태 - BlockStorageSnapshotInstanceStatus *CommonCode `json:"blockStorageSnapshotInstanceStatus,omitempty"` +BlockStorageSnapshotInstanceStatus *CommonCode `json:"blockStorageSnapshotInstanceStatus,omitempty"` // 블록스토리지스냅샷인스턴스OP - BlockStorageSnapshotInstanceOperation *CommonCode `json:"blockStorageSnapshotInstanceOperation,omitempty"` +BlockStorageSnapshotInstanceOperation *CommonCode `json:"blockStorageSnapshotInstanceOperation,omitempty"` - BlockStorageSnapshotInstanceStatusName *string `json:"blockStorageSnapshotInstanceStatusName,omitempty"` +BlockStorageSnapshotInstanceStatusName *string `json:"blockStorageSnapshotInstanceStatusName,omitempty"` // 생성일시 - CreateDate *string `json:"createDate,omitempty"` +CreateDate *string `json:"createDate,omitempty"` // 블록스토리지스냅샷인스턴스설명 - BlockStorageSnapshotInstanceDescription *string `json:"blockStorageSnapshotInstanceDescription,omitempty"` +BlockStorageSnapshotInstanceDescription *string `json:"blockStorageSnapshotInstanceDescription,omitempty"` // 서버이미지상품코드 - ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` +ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` // OS정보 - OsInformation *string `json:"osInformation,omitempty"` +OsInformation *string `json:"osInformation,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_request.go index fbdee3124..e950be26c 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_request.go @@ -12,8 +12,8 @@ package server type ChangeNasVolumeSizeRequest struct { // NAS볼륨인스턴스번호 - NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` +NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` // NAS볼륨사이즈 - VolumeSize *int32 `json:"volumeSize"` +VolumeSize *int32 `json:"volumeSize"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_response.go index 8b657ffc1..8ed5df3a0 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_nas_volume_size_response.go @@ -10,13 +10,14 @@ package server type ChangeNasVolumeSizeResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_request.go index c638d6303..8e8dba077 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_request.go @@ -12,8 +12,8 @@ package server type ChangeServerInstanceSpecRequest struct { // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo"` +ServerInstanceNo *string `json:"serverInstanceNo"` // 서버상품코드 - ServerProductCode *string `json:"serverProductCode"` +ServerProductCode *string `json:"serverProductCode"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_response.go index c6f1bac01..6d650f1a1 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/change_server_instance_spec_response.go @@ -10,13 +10,14 @@ package server type ChangeServerInstanceSpecResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/common_code.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/common_code.go index 7f5395831..10fbd3438 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/common_code.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/common_code.go @@ -12,8 +12,8 @@ package server type CommonCode struct { // 코드 - Code *string `json:"code,omitempty"` +Code *string `json:"code,omitempty"` // 코드명 - CodeName *string `json:"codeName,omitempty"` +CodeName *string `json:"codeName,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_request.go index e14ca48ad..ab88a441e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_request.go @@ -12,17 +12,17 @@ package server type CreateBlockStorageInstanceRequest struct { // 블럭스토리지명 - BlockStorageName *string `json:"blockStorageName,omitempty"` +BlockStorageName *string `json:"blockStorageName,omitempty"` // 블럭스토리지사이즈 - BlockStorageSize *int64 `json:"blockStorageSize"` +BlockStorageSize *int64 `json:"blockStorageSize"` // 블럭스토리지설명 - BlockStorageDescription *string `json:"blockStorageDescription,omitempty"` +BlockStorageDescription *string `json:"blockStorageDescription,omitempty"` // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo"` +ServerInstanceNo *string `json:"serverInstanceNo"` // 디스크상세유형코드 - DiskDetailTypeCode *string `json:"diskDetailTypeCode,omitempty"` +DiskDetailTypeCode *string `json:"diskDetailTypeCode,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_response.go index c70a4dec7..d6c3e2995 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_instance_response.go @@ -10,13 +10,14 @@ package server type CreateBlockStorageInstanceResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_request.go index 254410abd..670825e6c 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_request.go @@ -12,11 +12,11 @@ package server type CreateBlockStorageSnapshotInstanceRequest struct { // 블록스토리지인스턴스번호 - BlockStorageInstanceNo *string `json:"blockStorageInstanceNo"` +BlockStorageInstanceNo *string `json:"blockStorageInstanceNo"` // 블록스토리지스냅샷이름 - BlockStorageSnapshotName *string `json:"blockStorageSnapshotName,omitempty"` +BlockStorageSnapshotName *string `json:"blockStorageSnapshotName,omitempty"` // 블록스토리지스냅샷설명 - BlockStorageSnapshotDescription *string `json:"blockStorageSnapshotDescription,omitempty"` +BlockStorageSnapshotDescription *string `json:"blockStorageSnapshotDescription,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_response.go index ae6717bfc..c14fc00fc 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_block_storage_snapshot_instance_response.go @@ -10,13 +10,14 @@ package server type CreateBlockStorageSnapshotInstanceResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - BlockStorageSnapshotInstanceList []*BlockStorageSnapshotInstance `json:"blockStorageSnapshotInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +BlockStorageSnapshotInstanceList []*BlockStorageSnapshotInstance `json:"blockStorageSnapshotInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_request.go index 58b9a02a5..202eef78f 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_request.go @@ -12,8 +12,8 @@ package server type CreateInstanceTagsRequest struct { // 인스턴스번호리스트 - InstanceNoList []*string `json:"instanceNoList"` +InstanceNoList []*string `json:"instanceNoList"` // 인스턴스태그리스트 - InstanceTagList []*InstanceTagParameter `json:"instanceTagList"` +InstanceTagList []*InstanceTagParameter `json:"instanceTagList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_response.go index f2cc37c69..3ff1e5e23 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_instance_tags_response.go @@ -10,13 +10,14 @@ package server type CreateInstanceTagsResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - InstanceTagList []*InstanceTag `json:"instanceTagList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +InstanceTagList []*InstanceTag `json:"instanceTagList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_request.go index 256d93cf9..306387ed8 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_request.go @@ -12,5 +12,5 @@ package server type CreateLoginKeyRequest struct { // 키명 - KeyName *string `json:"keyName"` +KeyName *string `json:"keyName"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_response.go index 41dfbc490..7f24b48ab 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_login_key_response.go @@ -10,11 +10,12 @@ package server type CreateLoginKeyResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - PrivateKey *string `json:"privateKey,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` + +PrivateKey *string `json:"privateKey,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_request.go index f67f1e46c..86699e939 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_request.go @@ -12,11 +12,11 @@ package server type CreateMemberServerImageRequest struct { // 회원서버이미지설명 - MemberServerImageDescription *string `json:"memberServerImageDescription,omitempty"` +MemberServerImageDescription *string `json:"memberServerImageDescription,omitempty"` // 회원서버이미지명 - MemberServerImageName *string `json:"memberServerImageName,omitempty"` +MemberServerImageName *string `json:"memberServerImageName,omitempty"` // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo"` +ServerInstanceNo *string `json:"serverInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_response.go index c7ad6806c..eceaa0ca2 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_member_server_image_response.go @@ -10,13 +10,14 @@ package server type CreateMemberServerImageResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - MemberServerImageList []*MemberServerImage `json:"memberServerImageList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +MemberServerImageList []*MemberServerImage `json:"memberServerImageList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_request.go index c542a8e58..c67f389a3 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_request.go @@ -12,32 +12,32 @@ package server type CreateNasVolumeInstanceRequest struct { // 볼륨이름 - VolumeName *string `json:"volumeName"` +VolumeName *string `json:"volumeName"` // NAS볼륨사이즈 - VolumeSize *int32 `json:"volumeSize"` +VolumeSize *int32 `json:"volumeSize"` // 볼륨할당프로토콜유형코드 - VolumeAllotmentProtocolTypeCode *string `json:"volumeAllotmentProtocolTypeCode"` +VolumeAllotmentProtocolTypeCode *string `json:"volumeAllotmentProtocolTypeCode"` // 서버인스턴스번호리스트 - ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` +ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` // 커스텀IP리스트 - CustomIpList []*string `json:"customIpList,omitempty"` +CustomIpList []*string `json:"customIpList,omitempty"` // CIFS유저이름 - CifsUserName *string `json:"cifsUserName,omitempty"` +CifsUserName *string `json:"cifsUserName,omitempty"` // CIFS유저비밀번호 - CifsUserPassword *string `json:"cifsUserPassword,omitempty"` +CifsUserPassword *string `json:"cifsUserPassword,omitempty"` // NAS볼륨설명 - NasVolumeDescription *string `json:"nasVolumeDescription,omitempty"` +NasVolumeDescription *string `json:"nasVolumeDescription,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 - ZoneNo *string `json:"zoneNo,omitempty"` +ZoneNo *string `json:"zoneNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_response.go index 0e979e7c9..abce946fc 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_nas_volume_instance_response.go @@ -10,13 +10,14 @@ package server type CreateNasVolumeInstanceResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_request.go index ce1ebc906..d3bc1b367 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_request.go @@ -12,23 +12,23 @@ package server type CreateNetworkInterfaceRequest struct { // Private Subnet인스턴스번호 - PrivateSubnetInstanceNo *string `json:"privateSubnetInstanceNo"` +PrivateSubnetInstanceNo *string `json:"privateSubnetInstanceNo"` // Network Interface이름 - NetworkInterfaceName *string `json:"networkInterfaceName"` +NetworkInterfaceName *string `json:"networkInterfaceName"` // Network Interface IP - NetworkInterfaceIp *string `json:"networkInterfaceIp"` +NetworkInterfaceIp *string `json:"networkInterfaceIp"` // Network Interface설명 - NetworkInterfaceDescription *string `json:"networkInterfaceDescription,omitempty"` +NetworkInterfaceDescription *string `json:"networkInterfaceDescription,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 - ZoneNo *string `json:"zoneNo,omitempty"` +ZoneNo *string `json:"zoneNo,omitempty"` // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` +ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_response.go index c7f71aeb0..8a6eb49e0 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_network_interface_response.go @@ -10,9 +10,10 @@ package server type CreateNetworkInterfaceResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` + +ReturnMessage *string `json:"returnMessage,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_request.go index 2cfb19585..c0a6114ce 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_request.go @@ -12,17 +12,17 @@ package server type CreatePublicIpInstanceRequest struct { // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` +ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` // 공인IP설명 - PublicIpDescription *string `json:"publicIpDescription,omitempty"` +PublicIpDescription *string `json:"publicIpDescription,omitempty"` // 인터넷라인구분코드 - InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` +InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 - ZoneNo *string `json:"zoneNo,omitempty"` +ZoneNo *string `json:"zoneNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_response.go index d21cc60d9..29d511c42 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_public_ip_instance_response.go @@ -10,13 +10,14 @@ package server type CreatePublicIpInstanceResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_request.go index aa7dbc1b0..fdcbdbb1e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_request.go @@ -12,50 +12,50 @@ package server type CreateServerInstancesRequest struct { // 서버이미지상품코드 - ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` +ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` // 서버상품코드 - ServerProductCode *string `json:"serverProductCode,omitempty"` +ServerProductCode *string `json:"serverProductCode,omitempty"` // 회원서버이미지번호 - MemberServerImageNo *string `json:"memberServerImageNo,omitempty"` +MemberServerImageNo *string `json:"memberServerImageNo,omitempty"` // 서버명 - ServerName *string `json:"serverName,omitempty"` +ServerName *string `json:"serverName,omitempty"` // 서버설명 - ServerDescription *string `json:"serverDescription,omitempty"` +ServerDescription *string `json:"serverDescription,omitempty"` // 로그인키명 - LoginKeyName *string `json:"loginKeyName,omitempty"` +LoginKeyName *string `json:"loginKeyName,omitempty"` // 반납보호여부 - IsProtectServerTermination *bool `json:"isProtectServerTermination,omitempty"` +IsProtectServerTermination *bool `json:"isProtectServerTermination,omitempty"` // 서버생성갯수 - ServerCreateCount *int32 `json:"serverCreateCount,omitempty"` +ServerCreateCount *int32 `json:"serverCreateCount,omitempty"` // 서버생성시작번호 - ServerCreateStartNo *int32 `json:"serverCreateStartNo,omitempty"` +ServerCreateStartNo *int32 `json:"serverCreateStartNo,omitempty"` // 인터넷라인구분코드 - InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` +InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 요금제구분코드 - FeeSystemTypeCode *string `json:"feeSystemTypeCode,omitempty"` +FeeSystemTypeCode *string `json:"feeSystemTypeCode,omitempty"` // 사용자데이터 - UserData *string `json:"userData,omitempty"` +UserData *string `json:"userData,omitempty"` // ZONE번호 - ZoneNo *string `json:"zoneNo,omitempty"` +ZoneNo *string `json:"zoneNo,omitempty"` // ACG설정번호리스트 - AccessControlGroupConfigurationNoList []*string `json:"accessControlGroupConfigurationNoList,omitempty"` +AccessControlGroupConfigurationNoList []*string `json:"accessControlGroupConfigurationNoList,omitempty"` // RAID구분이름 - RaidTypeName *string `json:"raidTypeName,omitempty"` +RaidTypeName *string `json:"raidTypeName,omitempty"` // 인스턴스태그리스트 - InstanceTagList []*InstanceTagParameter `json:"instanceTagList,omitempty"` +InstanceTagList []*InstanceTagParameter `json:"instanceTagList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_response.go index 024bac03e..70e700062 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/create_server_instances_response.go @@ -10,13 +10,14 @@ package server type CreateServerInstancesResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_request.go index a13eedb97..bd0840bf5 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_request.go @@ -12,5 +12,5 @@ package server type DeleteBlockStorageInstancesRequest struct { // 블록스토리지인스턴스번호리스트 - BlockStorageInstanceNoList []*string `json:"blockStorageInstanceNoList"` +BlockStorageInstanceNoList []*string `json:"blockStorageInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_response.go index 5edfc667f..04b779821 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_instances_response.go @@ -10,13 +10,14 @@ package server type DeleteBlockStorageInstancesResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_request.go index 90838c6e1..20099c3d9 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_request.go @@ -12,5 +12,5 @@ package server type DeleteBlockStorageSnapshotInstancesRequest struct { // 블록스토리지스냅샷인스턴스번호리스트 - BlockStorageSnapshotInstanceNoList []*string `json:"blockStorageSnapshotInstanceNoList"` +BlockStorageSnapshotInstanceNoList []*string `json:"blockStorageSnapshotInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_response.go index bb3b47430..acf19b1e7 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_block_storage_snapshot_instances_response.go @@ -10,13 +10,14 @@ package server type DeleteBlockStorageSnapshotInstancesResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - BlockStorageSnapshotInstanceList []*BlockStorageSnapshotInstance `json:"blockStorageSnapshotInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +BlockStorageSnapshotInstanceList []*BlockStorageSnapshotInstance `json:"blockStorageSnapshotInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_request.go index 59203d0b3..1f3e52b7e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_request.go @@ -12,8 +12,8 @@ package server type DeleteInstanceTagsRequest struct { // 인스턴스번호리스트 - InstanceNoList []*string `json:"instanceNoList"` +InstanceNoList []*string `json:"instanceNoList"` // 인스턴스태그리스트 - InstanceTagList []*InstanceTagParameter `json:"instanceTagList,omitempty"` +InstanceTagList []*InstanceTagParameter `json:"instanceTagList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_response.go index 0fc4c5947..9acaa4618 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_instance_tags_response.go @@ -10,11 +10,12 @@ package server type DeleteInstanceTagsResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` + +TotalRows *int32 `json:"totalRows,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_request.go index e2d00fe8f..7f7c6a037 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_request.go @@ -12,5 +12,5 @@ package server type DeleteLoginKeyRequest struct { // 키명 - KeyName *string `json:"keyName"` +KeyName *string `json:"keyName"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_response.go index 290bc222d..4bbf72c90 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_login_key_response.go @@ -10,9 +10,10 @@ package server type DeleteLoginKeyResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` + +ReturnMessage *string `json:"returnMessage,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_request.go index c3d9d79e3..ca250875e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_request.go @@ -12,5 +12,5 @@ package server type DeleteMemberServerImagesRequest struct { // 회원서버이미지번호리스트 - MemberServerImageNoList []*string `json:"memberServerImageNoList"` +MemberServerImageNoList []*string `json:"memberServerImageNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_response.go index 18d57875e..3d80d546e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_member_server_images_response.go @@ -10,13 +10,14 @@ package server type DeleteMemberServerImagesResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - MemberServerImageList []*MemberServerImage `json:"memberServerImageList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +MemberServerImageList []*MemberServerImage `json:"memberServerImageList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_request.go index ad500078a..a511394f1 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_request.go @@ -12,5 +12,5 @@ package server type DeleteNasVolumeInstanceRequest struct { // NAS볼륨인스턴스번호 - NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` +NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_response.go index aab2b51d7..43913e6d9 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_nas_volume_instance_response.go @@ -10,13 +10,14 @@ package server type DeleteNasVolumeInstanceResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_request.go index 9649eaf1b..cc80eaeac 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_request.go @@ -12,5 +12,5 @@ package server type DeleteNetworkInterfaceRequest struct { // Network Interface번호 - NetworkInterfaceNo *string `json:"networkInterfaceNo"` +NetworkInterfaceNo *string `json:"networkInterfaceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_response.go index 05ffa6715..958f49635 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_network_interface_response.go @@ -10,9 +10,10 @@ package server type DeleteNetworkInterfaceResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` + +ReturnMessage *string `json:"returnMessage,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_request.go index 0d8aa1494..aa71def5c 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_request.go @@ -12,8 +12,8 @@ package server type DeletePortForwardingRulesRequest struct { // 포트포워딩설정번호 - PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo"` +PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo"` // 포트포워딩RULE리스트 - PortForwardingRuleList []*PortForwardingRuleParameter `json:"portForwardingRuleList"` +PortForwardingRuleList []*PortForwardingRuleParameter `json:"portForwardingRuleList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_response.go index 40224e94f..1e2ccf90c 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_port_forwarding_rules_response.go @@ -12,18 +12,18 @@ package server type DeletePortForwardingRulesResponse struct { // 포트포워딩설정번호 - PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo,omitempty"` +PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo,omitempty"` // 포트포워딩공인IP - PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` +PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` // ZONE - Zone *Zone `json:"zone,omitempty"` +Zone *Zone `json:"zone,omitempty"` // 인터넷회선구분 - InternetLineType *CommonCode `json:"internetLineType,omitempty"` +InternetLineType *CommonCode `json:"internetLineType,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` - PortForwardingRuleList []*PortForwardingRule `json:"portForwardingRuleList,omitempty"` +PortForwardingRuleList []*PortForwardingRule `json:"portForwardingRuleList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_request.go index eb3a5d163..712da61c5 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_request.go @@ -12,5 +12,5 @@ package server type DeletePublicIpInstancesRequest struct { // 공인IP인스턴스번호리스트 - PublicIpInstanceNoList []*string `json:"publicIpInstanceNoList"` +PublicIpInstanceNoList []*string `json:"publicIpInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_response.go index ce5cb8989..0ee8e3b4e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/delete_public_ip_instances_response.go @@ -10,13 +10,14 @@ package server type DeletePublicIpInstancesResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_request.go index 9883d2800..2c85b7156 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_request.go @@ -12,5 +12,5 @@ package server type DetachBlockStorageInstancesRequest struct { // 블록스토리지인스턴스번호리스트 - BlockStorageInstanceNoList []*string `json:"blockStorageInstanceNoList"` +BlockStorageInstanceNoList []*string `json:"blockStorageInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_response.go index b7bdc4de1..4f3740a4d 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_block_storage_instances_response.go @@ -10,13 +10,14 @@ package server type DetachBlockStorageInstancesResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_request.go index 148b7c741..112180724 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_request.go @@ -12,8 +12,8 @@ package server type DetachNetworkInterfaceRequest struct { // Network Interface번호 - NetworkInterfaceNo *string `json:"networkInterfaceNo"` +NetworkInterfaceNo *string `json:"networkInterfaceNo"` // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo"` +ServerInstanceNo *string `json:"serverInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_response.go index e7e0ab8d1..4a0187266 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/detach_network_interface_response.go @@ -10,9 +10,10 @@ package server type DetachNetworkInterfaceResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` + +ReturnMessage *string `json:"returnMessage,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_request.go index 43f20a285..585c72822 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_request.go @@ -12,5 +12,5 @@ package server type DisassociatePublicIpFromServerInstanceRequest struct { // 공인IP인스턴스번호 - PublicIpInstanceNo *string `json:"publicIpInstanceNo"` +PublicIpInstanceNo *string `json:"publicIpInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_response.go index 9b77cd57f..42ba25f6a 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/disassociate_public_ip_from_server_instance_response.go @@ -10,13 +10,14 @@ package server type DisassociatePublicIpFromServerInstanceResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_request.go index 83e77ca5a..aab8176c1 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_request.go @@ -12,17 +12,17 @@ package server type GetAccessControlGroupListRequest struct { // 접근제어그룹설정번호리스트 - AccessControlGroupConfigurationNoList []*string `json:"accessControlGroupConfigurationNoList,omitempty"` +AccessControlGroupConfigurationNoList []*string `json:"accessControlGroupConfigurationNoList,omitempty"` // 디폴트여부 - IsDefault *bool `json:"isDefault,omitempty"` +IsDefault *bool `json:"isDefault,omitempty"` // 접근제어그룹명 - AccessControlGroupName *string `json:"accessControlGroupName,omitempty"` +AccessControlGroupName *string `json:"accessControlGroupName,omitempty"` // 페이지번호 - PageNo *int32 `json:"pageNo,omitempty"` +PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 - PageSize *int32 `json:"pageSize,omitempty"` +PageSize *int32 `json:"pageSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_response.go index 5e0038ba2..5f56c9f9f 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_list_response.go @@ -10,13 +10,14 @@ package server type GetAccessControlGroupListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - AccessControlGroupList []*AccessControlGroup `json:"accessControlGroupList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +AccessControlGroupList []*AccessControlGroup `json:"accessControlGroupList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_request.go index 9793efe9d..f48d17c21 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_request.go @@ -12,5 +12,5 @@ package server type GetAccessControlGroupServerInstanceListRequest struct { // 접근제어그룹설정번호 - AccessControlGroupConfigurationNo *string `json:"accessControlGroupConfigurationNo"` +AccessControlGroupConfigurationNo *string `json:"accessControlGroupConfigurationNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_response.go index 5dd6afbe8..385e9aa8f 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_group_server_instance_list_response.go @@ -10,13 +10,14 @@ package server type GetAccessControlGroupServerInstanceListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_request.go index e7f45f653..263ce55ab 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_request.go @@ -12,5 +12,5 @@ package server type GetAccessControlRuleListRequest struct { // 접근제어그룹설정번호 - AccessControlGroupConfigurationNo *string `json:"accessControlGroupConfigurationNo"` +AccessControlGroupConfigurationNo *string `json:"accessControlGroupConfigurationNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_response.go index b15d84e96..875964d6c 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_access_control_rule_list_response.go @@ -10,13 +10,14 @@ package server type GetAccessControlRuleListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - AccessControlRuleList []*AccessControlRule `json:"accessControlRuleList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +AccessControlRuleList []*AccessControlRule `json:"accessControlRuleList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_request.go index 11ac8f6e0..3feceb7f8 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_request.go @@ -12,44 +12,44 @@ package server type GetBlockStorageInstanceListRequest struct { // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` +ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` // 블록스토리지인스턴스번호리스트 - BlockStorageInstanceNoList []*string `json:"blockStorageInstanceNoList,omitempty"` +BlockStorageInstanceNoList []*string `json:"blockStorageInstanceNoList,omitempty"` // 검색할필터명 - SearchFilterName *string `json:"searchFilterName,omitempty"` +SearchFilterName *string `json:"searchFilterName,omitempty"` // 검색할필터값 - SearchFilterValue *string `json:"searchFilterValue,omitempty"` +SearchFilterValue *string `json:"searchFilterValue,omitempty"` // 블록스토리지구분코드리스트 - BlockStorageTypeCodeList []*string `json:"blockStorageTypeCodeList,omitempty"` +BlockStorageTypeCodeList []*string `json:"blockStorageTypeCodeList,omitempty"` // 페이지번호 - PageNo *int32 `json:"pageNo,omitempty"` +PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 - PageSize *int32 `json:"pageSize,omitempty"` +PageSize *int32 `json:"pageSize,omitempty"` // 블록스토리지인스턴스상태코드 - BlockStorageInstanceStatusCode *string `json:"blockStorageInstanceStatusCode,omitempty"` +BlockStorageInstanceStatusCode *string `json:"blockStorageInstanceStatusCode,omitempty"` // 디스크유형코드 - DiskTypeCode *string `json:"diskTypeCode,omitempty"` +DiskTypeCode *string `json:"diskTypeCode,omitempty"` // 디스크유형상세코드 - DiskDetailTypeCode *string `json:"diskDetailTypeCode,omitempty"` +DiskDetailTypeCode *string `json:"diskDetailTypeCode,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 - ZoneNo *string `json:"zoneNo,omitempty"` +ZoneNo *string `json:"zoneNo,omitempty"` // 소팅대상 - SortedBy *string `json:"sortedBy,omitempty"` +SortedBy *string `json:"sortedBy,omitempty"` // 소팅순서 - SortingOrder *string `json:"sortingOrder,omitempty"` +SortingOrder *string `json:"sortingOrder,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_response.go index 33916064c..036130b29 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_instance_list_response.go @@ -10,13 +10,14 @@ package server type GetBlockStorageInstanceListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +BlockStorageInstanceList []*BlockStorageInstance `json:"blockStorageInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_request.go index 624ab17c7..3a8a86e69 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_request.go @@ -12,17 +12,17 @@ package server type GetBlockStorageSnapshotInstanceListRequest struct { // 블록스토리지스냅샷인스턴스번호리스트 - BlockStorageSnapshotInstanceNoList []*string `json:"blockStorageSnapshotInstanceNoList,omitempty"` +BlockStorageSnapshotInstanceNoList []*string `json:"blockStorageSnapshotInstanceNoList,omitempty"` // 원본블록스토리지인스턴스번호리스트 - OriginalBlockStorageInstanceNoList []*string `json:"originalBlockStorageInstanceNoList,omitempty"` +OriginalBlockStorageInstanceNoList []*string `json:"originalBlockStorageInstanceNoList,omitempty"` // 페이지번호 - PageNo *int32 `json:"pageNo,omitempty"` +PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 - PageSize *int32 `json:"pageSize,omitempty"` +PageSize *int32 `json:"pageSize,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_response.go index 2f7defe91..bbe5eec69 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_block_storage_snapshot_instance_list_response.go @@ -10,13 +10,14 @@ package server type GetBlockStorageSnapshotInstanceListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - BlockStorageSnapshotInstanceList []*BlockStorageSnapshotInstance `json:"blockStorageSnapshotInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +BlockStorageSnapshotInstanceList []*BlockStorageSnapshotInstance `json:"blockStorageSnapshotInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_request.go index 948be4e6a..b9d53df0c 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_request.go @@ -12,17 +12,17 @@ package server type GetInstanceTagListRequest struct { // 인스턴스번호리스트 - InstanceNoList []*string `json:"instanceNoList,omitempty"` +InstanceNoList []*string `json:"instanceNoList,omitempty"` // 태그키리스트 - TagKeyList []*string `json:"tagKeyList,omitempty"` +TagKeyList []*string `json:"tagKeyList,omitempty"` // 태그값리스트 - TagValueList []*string `json:"tagValueList,omitempty"` +TagValueList []*string `json:"tagValueList,omitempty"` // 페이지번호 - PageNo *int32 `json:"pageNo,omitempty"` +PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 - PageSize *int32 `json:"pageSize,omitempty"` +PageSize *int32 `json:"pageSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_response.go index 1666349cf..a3bcd8af0 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_instance_tag_list_response.go @@ -10,13 +10,14 @@ package server type GetInstanceTagListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - InstanceTagList []*InstanceTag `json:"instanceTagList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +InstanceTagList []*InstanceTag `json:"instanceTagList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_request.go index e691472c9..cff138262 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_request.go @@ -12,11 +12,11 @@ package server type GetLoginKeyListRequest struct { // 키명 - KeyName *string `json:"keyName,omitempty"` +KeyName *string `json:"keyName,omitempty"` // 페이지번호 - PageNo *int32 `json:"pageNo,omitempty"` +PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 - PageSize *int32 `json:"pageSize,omitempty"` +PageSize *int32 `json:"pageSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_response.go index 701f33f2d..c7c15ff06 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_login_key_list_response.go @@ -10,13 +10,14 @@ package server type GetLoginKeyListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - LoginKeyList []*LoginKey `json:"loginKeyList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +LoginKeyList []*LoginKey `json:"loginKeyList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_request.go index 2bc80b4c5..8326a6510 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_request.go @@ -12,23 +12,23 @@ package server type GetMemberServerImageListRequest struct { // 회원서버이미지번호리스트 - MemberServerImageNoList []*string `json:"memberServerImageNoList,omitempty"` +MemberServerImageNoList []*string `json:"memberServerImageNoList,omitempty"` // 플랫폼타입코드리스트 - PlatformTypeCodeList []*string `json:"platformTypeCodeList,omitempty"` +PlatformTypeCodeList []*string `json:"platformTypeCodeList,omitempty"` // 페이지번호 - PageNo *int32 `json:"pageNo,omitempty"` +PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 - PageSize *int32 `json:"pageSize,omitempty"` +PageSize *int32 `json:"pageSize,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // 소팅대상 - SortedBy *string `json:"sortedBy,omitempty"` +SortedBy *string `json:"sortedBy,omitempty"` // 소팅순서 - SortingOrder *string `json:"sortingOrder,omitempty"` +SortingOrder *string `json:"sortingOrder,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_response.go index 89ab05c37..45db49c22 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_member_server_image_list_response.go @@ -10,13 +10,14 @@ package server type GetMemberServerImageListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - MemberServerImageList []*MemberServerImage `json:"memberServerImageList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +MemberServerImageList []*MemberServerImage `json:"memberServerImageList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_request.go index 6c6d2fb72..a6ad887dc 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_request.go @@ -12,20 +12,20 @@ package server type GetNasVolumeInstanceListRequest struct { // 볼륨할당프로토콜유형코드 - VolumeAllotmentProtocolTypeCode *string `json:"volumeAllotmentProtocolTypeCode,omitempty"` +VolumeAllotmentProtocolTypeCode *string `json:"volumeAllotmentProtocolTypeCode,omitempty"` // 이벤트설정여부 - IsEventConfiguration *bool `json:"isEventConfiguration,omitempty"` +IsEventConfiguration *bool `json:"isEventConfiguration,omitempty"` // 스냅샷볼륨설정여부 - IsSnapshotConfiguration *bool `json:"isSnapshotConfiguration,omitempty"` +IsSnapshotConfiguration *bool `json:"isSnapshotConfiguration,omitempty"` // NAS볼륨인스턴스번호리스트 - NasVolumeInstanceNoList []*string `json:"nasVolumeInstanceNoList,omitempty"` +NasVolumeInstanceNoList []*string `json:"nasVolumeInstanceNoList,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 - ZoneNo *string `json:"zoneNo,omitempty"` +ZoneNo *string `json:"zoneNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_response.go index 7951eac34..300e2309d 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_list_response.go @@ -10,13 +10,14 @@ package server type GetNasVolumeInstanceListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_request.go index 6739f8773..e66d5df33 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_request.go @@ -12,14 +12,14 @@ package server type GetNasVolumeInstanceRatingListRequest struct { // 측정종료시간 - EndTime *string `json:"endTime"` +EndTime *string `json:"endTime"` // 측정간격 - Interval *string `json:"interval"` +Interval *string `json:"interval"` // NAS볼륨인스턴스번호 - NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` +NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` // 측정시작시간 - StartTime *string `json:"startTime"` +StartTime *string `json:"startTime"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_response.go index 48c786b55..b339fbf51 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_nas_volume_instance_rating_list_response.go @@ -10,13 +10,14 @@ package server type GetNasVolumeInstanceRatingListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - NasVolumeInstanceRatingList []*NasVolumeInstanceRating `json:"nasVolumeInstanceRatingList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +NasVolumeInstanceRatingList []*NasVolumeInstanceRating `json:"nasVolumeInstanceRatingList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_request.go index beba52157..242a129d8 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_request.go @@ -12,14 +12,14 @@ package server type GetNetworkInterfaceListRequest struct { // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 - ZoneNo *string `json:"zoneNo,omitempty"` +ZoneNo *string `json:"zoneNo,omitempty"` // 페이지번호 - PageNo *int32 `json:"pageNo,omitempty"` +PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 - PageSize *int32 `json:"pageSize,omitempty"` +PageSize *int32 `json:"pageSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_response.go index b33c46442..c86fd9770 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_network_interface_list_response.go @@ -10,13 +10,14 @@ package server type GetNetworkInterfaceListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - NetworkInterfaceList []*NetworkInterface `json:"networkInterfaceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +NetworkInterfaceList []*NetworkInterface `json:"networkInterfaceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_request.go index c4cf22d74..4be87bf18 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_request.go @@ -12,11 +12,11 @@ package server type GetPortForwardingRuleListRequest struct { // 인터넷라인구분코드 - InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` +InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 - ZoneNo *string `json:"zoneNo,omitempty"` +ZoneNo *string `json:"zoneNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_response.go index 57ff43c09..bc4da3c51 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_port_forwarding_rule_list_response.go @@ -12,18 +12,18 @@ package server type GetPortForwardingRuleListResponse struct { // 포트포워딩설정번호 - PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo,omitempty"` +PortForwardingConfigurationNo *string `json:"portForwardingConfigurationNo,omitempty"` // 포트포워딩공인IP - PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` +PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` // ZONE객체 - Zone *Zone `json:"zone,omitempty"` +Zone *Zone `json:"zone,omitempty"` // 인터넷라인구분 - InternetLineType *CommonCode `json:"internetLineType,omitempty"` +InternetLineType *CommonCode `json:"internetLineType,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` - PortForwardingRuleList []*PortForwardingRule `json:"portForwardingRuleList,omitempty"` +PortForwardingRuleList []*PortForwardingRule `json:"portForwardingRuleList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_request.go index 6b2d6fa1b..c684987ad 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_request.go @@ -12,11 +12,11 @@ package server type GetPrivateSubnetInstanceListRequest struct { // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // 페이지번호 - PageNo *int32 `json:"pageNo,omitempty"` +PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 - PageSize *int32 `json:"pageSize,omitempty"` +PageSize *int32 `json:"pageSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_response.go index 59777f1d9..c791e7eee 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_private_subnet_instance_list_response.go @@ -10,13 +10,14 @@ package server type GetPrivateSubnetInstanceListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - PrivateSubnetInstanceList []*PrivateSubnetInstance `json:"privateSubnetInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +PrivateSubnetInstanceList []*PrivateSubnetInstance `json:"privateSubnetInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_request.go index 0b16fdd5e..75e5f99e2 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_request.go @@ -12,38 +12,38 @@ package server type GetPublicIpInstanceListRequest struct { // 할당여부 - IsAssociated *bool `json:"isAssociated,omitempty"` +IsAssociated *bool `json:"isAssociated,omitempty"` // 공인IP인스턴스번호리스트 - PublicIpInstanceNoList []*string `json:"publicIpInstanceNoList,omitempty"` +PublicIpInstanceNoList []*string `json:"publicIpInstanceNoList,omitempty"` // 공인IP리스트 - PublicIpList []*string `json:"publicIpList,omitempty"` +PublicIpList []*string `json:"publicIpList,omitempty"` // 검색할필터명 - SearchFilterName *string `json:"searchFilterName,omitempty"` +SearchFilterName *string `json:"searchFilterName,omitempty"` // 검색할필터값 - SearchFilterValue *string `json:"searchFilterValue,omitempty"` +SearchFilterValue *string `json:"searchFilterValue,omitempty"` // 인터넷라인구분코드 - InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` +InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 - ZoneNo *string `json:"zoneNo,omitempty"` +ZoneNo *string `json:"zoneNo,omitempty"` // 페이지번호 - PageNo *int32 `json:"pageNo,omitempty"` +PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 - PageSize *int32 `json:"pageSize,omitempty"` +PageSize *int32 `json:"pageSize,omitempty"` // 소팅대상 - SortedBy *string `json:"sortedBy,omitempty"` +SortedBy *string `json:"sortedBy,omitempty"` // 소팅순서 - SortingOrder *string `json:"sortingOrder,omitempty"` +SortingOrder *string `json:"sortingOrder,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_response.go index 7188847b2..d8dde079b 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_instance_list_response.go @@ -10,13 +10,14 @@ package server type GetPublicIpInstanceListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +PublicIpInstanceList []*PublicIpInstance `json:"publicIpInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_request.go index fa44f590d..44afcd41f 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_request.go @@ -12,11 +12,11 @@ package server type GetPublicIpTargetServerInstanceListRequest struct { // 인터넷라인구분코드 - InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` +InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // ZONE번호 - ZoneNo *string `json:"zoneNo,omitempty"` +ZoneNo *string `json:"zoneNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_response.go index 1b1a72eea..c9f38cf07 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_public_ip_target_server_instance_list_response.go @@ -10,13 +10,14 @@ package server type GetPublicIpTargetServerInstanceListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_raid_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_raid_list_response.go index 225191845..6104a15a9 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_raid_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_raid_list_response.go @@ -10,13 +10,14 @@ package server type GetRaidListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - RaidList []*Raid `json:"raidList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +RaidList []*Raid `json:"raidList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_region_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_region_list_response.go index 2a81b8b84..e8989df66 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_region_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_region_list_response.go @@ -10,13 +10,14 @@ package server type GetRegionListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - RegionList []*Region `json:"regionList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +RegionList []*Region `json:"regionList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_request.go index ff6e62ef1..b10c6eebc 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_request.go @@ -12,8 +12,8 @@ package server type GetRootPasswordRequest struct { // 개인키 - PrivateKey *string `json:"privateKey,omitempty"` +PrivateKey *string `json:"privateKey,omitempty"` // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo"` +ServerInstanceNo *string `json:"serverInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_response.go index e6a1d0c76..fafeb8368 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_root_password_response.go @@ -10,13 +10,14 @@ package server type GetRootPasswordResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - RootPassword *string `json:"rootPassword,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +RootPassword *string `json:"rootPassword,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_request.go index a3fcd1f64..fbab8e083 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_request.go @@ -12,20 +12,20 @@ package server type GetServerImageProductListRequest struct { // 제외할상품코드 - ExclusionProductCode *string `json:"exclusionProductCode,omitempty"` +ExclusionProductCode *string `json:"exclusionProductCode,omitempty"` // 조회할상품코드 - ProductCode *string `json:"productCode,omitempty"` +ProductCode *string `json:"productCode,omitempty"` // 플랫폼유형코드리스트 - PlatformTypeCodeList []*string `json:"platformTypeCodeList,omitempty"` +PlatformTypeCodeList []*string `json:"platformTypeCodeList,omitempty"` // 블록스토리지사이즈 - BlockStorageSize *int32 `json:"blockStorageSize,omitempty"` +BlockStorageSize *int32 `json:"blockStorageSize,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // 인프라자원상세구분코드 - InfraResourceDetailTypeCode *string `json:"infraResourceDetailTypeCode,omitempty"` +InfraResourceDetailTypeCode *string `json:"infraResourceDetailTypeCode,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_response.go index 840e3c453..ef7bf85fe 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_image_product_list_response.go @@ -10,13 +10,14 @@ package server type GetServerImageProductListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - ProductList []*Product `json:"productList,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ProductList []*Product `json:"productList,omitempty"` + +TotalRows *int32 `json:"totalRows,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_request.go index 94b0856e5..f7d8d5feb 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_request.go @@ -12,50 +12,50 @@ package server type GetServerInstanceListRequest struct { // 서버인스턴스번호리스트 - ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` +ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` // 검색필터명 - SearchFilterName *string `json:"searchFilterName,omitempty"` +SearchFilterName *string `json:"searchFilterName,omitempty"` // 검색필터값 - SearchFilterValue *string `json:"searchFilterValue,omitempty"` +SearchFilterValue *string `json:"searchFilterValue,omitempty"` // 페이지번호 - PageNo *int32 `json:"pageNo,omitempty"` +PageNo *int32 `json:"pageNo,omitempty"` // 페이지사이즈 - PageSize *int32 `json:"pageSize,omitempty"` +PageSize *int32 `json:"pageSize,omitempty"` // 서버인스턴스상태코드 - ServerInstanceStatusCode *string `json:"serverInstanceStatusCode,omitempty"` +ServerInstanceStatusCode *string `json:"serverInstanceStatusCode,omitempty"` // 인터넷라인구분코드 - InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` +InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // zone번호 - ZoneNo *string `json:"zoneNo,omitempty"` +ZoneNo *string `json:"zoneNo,omitempty"` // 서버디스크유형코드 - BaseBlockStorageDiskTypeCode *string `json:"baseBlockStorageDiskTypeCode,omitempty"` +BaseBlockStorageDiskTypeCode *string `json:"baseBlockStorageDiskTypeCode,omitempty"` // 서버디스크상세유형코드 - BaseBlockStorageDiskDetailTypeCode *string `json:"baseBlockStorageDiskDetailTypeCode,omitempty"` +BaseBlockStorageDiskDetailTypeCode *string `json:"baseBlockStorageDiskDetailTypeCode,omitempty"` // 소팅대상 - SortedBy *string `json:"sortedBy,omitempty"` +SortedBy *string `json:"sortedBy,omitempty"` // 소팅순서 - SortingOrder *string `json:"sortingOrder,omitempty"` +SortingOrder *string `json:"sortingOrder,omitempty"` // 서비인스턴스구분코드리스트 - ServerInstanceTypeCodeList []*string `json:"serverInstanceTypeCodeList,omitempty"` +ServerInstanceTypeCodeList []*string `json:"serverInstanceTypeCodeList,omitempty"` // 태그키리스트 - TagKeyList []*string `json:"tagKeyList,omitempty"` +TagKeyList []*string `json:"tagKeyList,omitempty"` // 태그값리스트 - TagValueList []*string `json:"tagValueList,omitempty"` +TagValueList []*string `json:"tagValueList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_response.go index a9ffe6073..549c95c3e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_instance_list_response.go @@ -10,13 +10,14 @@ package server type GetServerInstanceListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_request.go index 26d45c06f..e0f1e3dfa 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_request.go @@ -12,20 +12,20 @@ package server type GetServerProductListRequest struct { // 제외할상품코드 - ExclusionProductCode *string `json:"exclusionProductCode,omitempty"` +ExclusionProductCode *string `json:"exclusionProductCode,omitempty"` // 인터넷라인구분코드 - InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` +InternetLineTypeCode *string `json:"internetLineTypeCode,omitempty"` // 조회할상품코드 - ProductCode *string `json:"productCode,omitempty"` +ProductCode *string `json:"productCode,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` // 서버이미지상품코드 - ServerImageProductCode *string `json:"serverImageProductCode"` +ServerImageProductCode *string `json:"serverImageProductCode"` // ZONE번호 - ZoneNo *string `json:"zoneNo,omitempty"` +ZoneNo *string `json:"zoneNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_response.go index 138faa19e..296ff6684 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_server_product_list_response.go @@ -10,13 +10,14 @@ package server type GetServerProductListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - ProductList []*Product `json:"productList,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ProductList []*Product `json:"productList,omitempty"` + +TotalRows *int32 `json:"totalRows,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_request.go index 5bab50cc4..31cb23bde 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_request.go @@ -12,5 +12,5 @@ package server type GetZoneListRequest struct { // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_response.go index 40e089eed..8c77fc482 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/get_zone_list_response.go @@ -10,11 +10,12 @@ package server type GetZoneListResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - ZoneList []*Zone `json:"zoneList,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` + +ZoneList []*Zone `json:"zoneList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_request.go index e581a6635..b2fc8b39d 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_request.go @@ -12,8 +12,8 @@ package server type ImportLoginKeyRequest struct { // 키명 - KeyName *string `json:"keyName"` +KeyName *string `json:"keyName"` // 공개키 - PublicKey *string `json:"publicKey"` +PublicKey *string `json:"publicKey"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_response.go index bf7c8c20c..2d03cbe2e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/import_login_key_response.go @@ -10,13 +10,14 @@ package server type ImportLoginKeyResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - LoginKeyList []*LoginKey `json:"loginKeyList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +LoginKeyList []*LoginKey `json:"loginKeyList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag.go index 01f16b48d..cb9dfde4d 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag.go @@ -12,14 +12,14 @@ package server type InstanceTag struct { // 인스턴스번호 - InstanceNo *string `json:"instanceNo,omitempty"` +InstanceNo *string `json:"instanceNo,omitempty"` // 인스턴스유형 - InstanceType *CommonCode `json:"instanceType,omitempty"` +InstanceType *CommonCode `json:"instanceType,omitempty"` // 태그키 - TagKey *string `json:"tagKey,omitempty"` +TagKey *string `json:"tagKey,omitempty"` // 태그값 - TagValue *string `json:"tagValue,omitempty"` +TagValue *string `json:"tagValue,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag_parameter.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag_parameter.go index e1fab028f..e4207dc67 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag_parameter.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/instance_tag_parameter.go @@ -12,8 +12,8 @@ package server type InstanceTagParameter struct { // 태그키 - TagKey *string `json:"tagKey,omitempty"` +TagKey *string `json:"tagKey,omitempty"` // 태그값 - TagValue *string `json:"tagValue,omitempty"` +TagValue *string `json:"tagValue,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/login_key.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/login_key.go index fee1016b9..0262bd8e9 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/login_key.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/login_key.go @@ -12,11 +12,11 @@ package server type LoginKey struct { // 핑거프린트 - Fingerprint *string `json:"fingerprint,omitempty"` +Fingerprint *string `json:"fingerprint,omitempty"` // 키명 - KeyName *string `json:"keyName,omitempty"` +KeyName *string `json:"keyName,omitempty"` // 생성일자 - CreateDate *string `json:"createDate,omitempty"` +CreateDate *string `json:"createDate,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/member_server_image.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/member_server_image.go index 4fc3e1aa3..1bf825d26 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/member_server_image.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/member_server_image.go @@ -12,59 +12,59 @@ package server type MemberServerImage struct { // 회원서버이미지번호 - MemberServerImageNo *string `json:"memberServerImageNo,omitempty"` +MemberServerImageNo *string `json:"memberServerImageNo,omitempty"` // 회원서버이미지명 - MemberServerImageName *string `json:"memberServerImageName,omitempty"` +MemberServerImageName *string `json:"memberServerImageName,omitempty"` // 회원서버이미지설명 - MemberServerImageDescription *string `json:"memberServerImageDescription,omitempty"` +MemberServerImageDescription *string `json:"memberServerImageDescription,omitempty"` // 원본서버인스턴스번호 - OriginalServerInstanceNo *string `json:"originalServerInstanceNo,omitempty"` +OriginalServerInstanceNo *string `json:"originalServerInstanceNo,omitempty"` // 원본서버상품코드 - OriginalServerProductCode *string `json:"originalServerProductCode,omitempty"` +OriginalServerProductCode *string `json:"originalServerProductCode,omitempty"` // 원본서버명 - OriginalServerName *string `json:"originalServerName,omitempty"` +OriginalServerName *string `json:"originalServerName,omitempty"` // 원본서버기본블록스토리지디스크유형 - OriginalBaseBlockStorageDiskType *CommonCode `json:"originalBaseBlockStorageDiskType,omitempty"` +OriginalBaseBlockStorageDiskType *CommonCode `json:"originalBaseBlockStorageDiskType,omitempty"` // 원본서버이미지상품코드 - OriginalServerImageProductCode *string `json:"originalServerImageProductCode,omitempty"` +OriginalServerImageProductCode *string `json:"originalServerImageProductCode,omitempty"` // 원본OS정보 - OriginalOsInformation *string `json:"originalOsInformation,omitempty"` +OriginalOsInformation *string `json:"originalOsInformation,omitempty"` // 원본서버이미지명 - OriginalServerImageName *string `json:"originalServerImageName,omitempty"` +OriginalServerImageName *string `json:"originalServerImageName,omitempty"` // 원본서버이미지상태명 - MemberServerImageStatusName *string `json:"memberServerImageStatusName,omitempty"` +MemberServerImageStatusName *string `json:"memberServerImageStatusName,omitempty"` // 원본서버이미지상태 - MemberServerImageStatus *CommonCode `json:"memberServerImageStatus,omitempty"` +MemberServerImageStatus *CommonCode `json:"memberServerImageStatus,omitempty"` // 원본서버이미지OP - MemberServerImageOperation *CommonCode `json:"memberServerImageOperation,omitempty"` +MemberServerImageOperation *CommonCode `json:"memberServerImageOperation,omitempty"` // 회원서버이미지플랫폼구분 - MemberServerImagePlatformType *CommonCode `json:"memberServerImagePlatformType,omitempty"` +MemberServerImagePlatformType *CommonCode `json:"memberServerImagePlatformType,omitempty"` // 리전 - Region *Region `json:"region,omitempty"` +Region *Region `json:"region,omitempty"` // ZONE - Zone *Zone `json:"zone,omitempty"` +Zone *Zone `json:"zone,omitempty"` // 생성일시 - CreateDate *string `json:"createDate,omitempty"` +CreateDate *string `json:"createDate,omitempty"` // 회원서버이미지블록스토리지인스턴스총 개수 - MemberServerImageBlockStorageTotalRows *int32 `json:"memberServerImageBlockStorageTotalRows,omitempty"` +MemberServerImageBlockStorageTotalRows *int32 `json:"memberServerImageBlockStorageTotalRows,omitempty"` // 회원서버이미지총사이즈 - MemberServerImageBlockStorageTotalSize *int64 `json:"memberServerImageBlockStorageTotalSize,omitempty"` +MemberServerImageBlockStorageTotalSize *int64 `json:"memberServerImageBlockStorageTotalSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance.go index 104fcbe47..354bea756 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance.go @@ -12,77 +12,77 @@ package server type NasVolumeInstance struct { // NAS볼륨인스턴스번호 - NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo,omitempty"` +NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo,omitempty"` // NAS볼륨인스턴스상태 - NasVolumeInstanceStatus *CommonCode `json:"nasVolumeInstanceStatus,omitempty"` +NasVolumeInstanceStatus *CommonCode `json:"nasVolumeInstanceStatus,omitempty"` // NAS볼륨인스턴스OP - NasVolumeInstanceOperation *CommonCode `json:"nasVolumeInstanceOperation,omitempty"` +NasVolumeInstanceOperation *CommonCode `json:"nasVolumeInstanceOperation,omitempty"` // 볼륨인스턴스상태명 - NasVolumeInstanceStatusName *string `json:"nasVolumeInstanceStatusName,omitempty"` +NasVolumeInstanceStatusName *string `json:"nasVolumeInstanceStatusName,omitempty"` // 생성일시 - CreateDate *string `json:"createDate,omitempty"` +CreateDate *string `json:"createDate,omitempty"` // NAS볼륨인스턴스설명 - NasVolumeInstanceDescription *string `json:"nasVolumeInstanceDescription,omitempty"` +NasVolumeInstanceDescription *string `json:"nasVolumeInstanceDescription,omitempty"` // 마운트정보 - MountInformation *string `json:"mountInformation,omitempty"` +MountInformation *string `json:"mountInformation,omitempty"` // 볼륨할당프로토콜구분 - VolumeAllotmentProtocolType *CommonCode `json:"volumeAllotmentProtocolType,omitempty"` +VolumeAllotmentProtocolType *CommonCode `json:"volumeAllotmentProtocolType,omitempty"` // 볼륨명 - VolumeName *string `json:"volumeName,omitempty"` +VolumeName *string `json:"volumeName,omitempty"` // 볼륨총사이즈 - VolumeTotalSize *int64 `json:"volumeTotalSize,omitempty"` +VolumeTotalSize *int64 `json:"volumeTotalSize,omitempty"` // 볼륨사이즈 - VolumeSize *int64 `json:"volumeSize,omitempty"` +VolumeSize *int64 `json:"volumeSize,omitempty"` // 볼륨사용사이즈 - VolumeUseSize *int64 `json:"volumeUseSize,omitempty"` +VolumeUseSize *int64 `json:"volumeUseSize,omitempty"` // 볼륨사용비율 - VolumeUseRatio *float32 `json:"volumeUseRatio,omitempty"` +VolumeUseRatio *float32 `json:"volumeUseRatio,omitempty"` // 스냅샷볼륨설정비율 - SnapshotVolumeConfigurationRatio *float32 `json:"snapshotVolumeConfigurationRatio,omitempty"` +SnapshotVolumeConfigurationRatio *float32 `json:"snapshotVolumeConfigurationRatio,omitempty"` // 스냅샷볼륨설정기간구분 - SnapshotVolumeConfigPeriodType *CommonCode `json:"snapshotVolumeConfigPeriodType,omitempty"` +SnapshotVolumeConfigPeriodType *CommonCode `json:"snapshotVolumeConfigPeriodType,omitempty"` // 스냅샷볼륨설정시간 - SnapshotVolumeConfigTime *int32 `json:"snapshotVolumeConfigTime,omitempty"` +SnapshotVolumeConfigTime *int32 `json:"snapshotVolumeConfigTime,omitempty"` // 스냅샷사이즈 - SnapshotVolumeSize *int64 `json:"snapshotVolumeSize,omitempty"` +SnapshotVolumeSize *int64 `json:"snapshotVolumeSize,omitempty"` // 스냅사용사이즈 - SnapshotVolumeUseSize *int64 `json:"snapshotVolumeUseSize,omitempty"` +SnapshotVolumeUseSize *int64 `json:"snapshotVolumeUseSize,omitempty"` // 스냅샷사용비율 - SnapshotVolumeUseRatio *float32 `json:"snapshotVolumeUseRatio,omitempty"` +SnapshotVolumeUseRatio *float32 `json:"snapshotVolumeUseRatio,omitempty"` // 스냅샷설정여부 - IsSnapshotConfiguration *bool `json:"isSnapshotConfiguration,omitempty"` +IsSnapshotConfiguration *bool `json:"isSnapshotConfiguration,omitempty"` // 이벤트설정여부 - IsEventConfiguration *bool `json:"isEventConfiguration,omitempty"` +IsEventConfiguration *bool `json:"isEventConfiguration,omitempty"` // 리전 - Region *Region `json:"region,omitempty"` +Region *Region `json:"region,omitempty"` // ZONE - Zone *Zone `json:"zone,omitempty"` +Zone *Zone `json:"zone,omitempty"` // NAS볼륨커스텀IP리스트 - NasVolumeInstanceCustomIpList []*NasVolumeInstanceCustomIp `json:"nasVolumeInstanceCustomIpList,omitempty"` +NasVolumeInstanceCustomIpList []*NasVolumeInstanceCustomIp `json:"nasVolumeInstanceCustomIpList,omitempty"` // NAS볼륨서버인스턴스리스트 - NasVolumeServerInstanceList []*ServerInstance `json:"nasVolumeServerInstanceList,omitempty"` +NasVolumeServerInstanceList []*ServerInstance `json:"nasVolumeServerInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_custom_ip.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_custom_ip.go index 86c7bc697..02bf19927 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_custom_ip.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_custom_ip.go @@ -12,5 +12,5 @@ package server type NasVolumeInstanceCustomIp struct { // 커스텀IP - CustomIp *string `json:"customIp,omitempty"` +CustomIp *string `json:"customIp,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_rating.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_rating.go index 0314b553b..73a3c89a4 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_rating.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/nas_volume_instance_rating.go @@ -12,65 +12,65 @@ package server type NasVolumeInstanceRating struct { // 측정시간 - RatingTime *string `json:"ratingTime,omitempty"` +RatingTime *string `json:"ratingTime,omitempty"` // 볼륨사이즈 - VolumeSize *int64 `json:"volumeSize,omitempty"` +VolumeSize *int64 `json:"volumeSize,omitempty"` // 볼륨사용사이즈 - VolumeUseSize *int64 `json:"volumeUseSize,omitempty"` +VolumeUseSize *int64 `json:"volumeUseSize,omitempty"` // 볼륨사용비율 - VolumeUseRatio *float32 `json:"volumeUseRatio,omitempty"` +VolumeUseRatio *float32 `json:"volumeUseRatio,omitempty"` // 평균볼륨사이즈 - AverageVolumeSize *int64 `json:"averageVolumeSize,omitempty"` +AverageVolumeSize *int64 `json:"averageVolumeSize,omitempty"` // 평균볼륨사용사이즈 - AverageVolumeUseSize *int64 `json:"averageVolumeUseSize,omitempty"` +AverageVolumeUseSize *int64 `json:"averageVolumeUseSize,omitempty"` // 평균볼륨사용비율 - AverageVolumeUseRatio *float32 `json:"averageVolumeUseRatio,omitempty"` +AverageVolumeUseRatio *float32 `json:"averageVolumeUseRatio,omitempty"` // 최대볼륨사용사이즈 - MaxVolumeUseSize *int64 `json:"maxVolumeUseSize,omitempty"` +MaxVolumeUseSize *int64 `json:"maxVolumeUseSize,omitempty"` // 최대볼륨사용비율 - MaxVolumeUseRatio *float32 `json:"maxVolumeUseRatio,omitempty"` +MaxVolumeUseRatio *float32 `json:"maxVolumeUseRatio,omitempty"` // 최소볼륨사용사이즈 - MinVolumeUseSize *int64 `json:"minVolumeUseSize,omitempty"` +MinVolumeUseSize *int64 `json:"minVolumeUseSize,omitempty"` // 최소볼륨사용비율 - MinVolumeUseRatio *float32 `json:"minVolumeUseRatio,omitempty"` +MinVolumeUseRatio *float32 `json:"minVolumeUseRatio,omitempty"` // 스냅샷볼륨사이즈 - SnapshotVolumeSize *int64 `json:"snapshotVolumeSize,omitempty"` +SnapshotVolumeSize *int64 `json:"snapshotVolumeSize,omitempty"` // 스냅샷볼륨사용사이즈 - SnapshotVolumeUseSize *int64 `json:"snapshotVolumeUseSize,omitempty"` +SnapshotVolumeUseSize *int64 `json:"snapshotVolumeUseSize,omitempty"` // 스냅샷볼륨사용비율 - SnapshotVolumeUseRatio *float32 `json:"snapshotVolumeUseRatio,omitempty"` +SnapshotVolumeUseRatio *float32 `json:"snapshotVolumeUseRatio,omitempty"` // 평균스냅샷볼륨사이즈 - SnapshotAverageVolumeSize *int64 `json:"snapshotAverageVolumeSize,omitempty"` +SnapshotAverageVolumeSize *int64 `json:"snapshotAverageVolumeSize,omitempty"` // 평균스냅샷볼륨사용사이즈 - SnapshotAverageVolumeUseSize *int64 `json:"snapshotAverageVolumeUseSize,omitempty"` +SnapshotAverageVolumeUseSize *int64 `json:"snapshotAverageVolumeUseSize,omitempty"` // 평균스냅샷볼륨사용비율 - SnapshotAverageVolumeUseRatio *float32 `json:"snapshotAverageVolumeUseRatio,omitempty"` +SnapshotAverageVolumeUseRatio *float32 `json:"snapshotAverageVolumeUseRatio,omitempty"` // 최대스냅샷볼륨사용사이즈 - SnapshotMaxVolumeUseSize *int64 `json:"snapshotMaxVolumeUseSize,omitempty"` +SnapshotMaxVolumeUseSize *int64 `json:"snapshotMaxVolumeUseSize,omitempty"` // 최대스냅샷볼륨사용비율 - SnapshotMaxVolumeUseRatio *float32 `json:"snapshotMaxVolumeUseRatio,omitempty"` +SnapshotMaxVolumeUseRatio *float32 `json:"snapshotMaxVolumeUseRatio,omitempty"` // 최소스냅샷볼륨사용사이즈 - SnapshotMinVolumeUseSize *int64 `json:"snapshotMinVolumeUseSize,omitempty"` +SnapshotMinVolumeUseSize *int64 `json:"snapshotMinVolumeUseSize,omitempty"` // 최소스냅샷볼륨사용비율 - SnapshotMinVolumeUseRatio *float32 `json:"snapshotMinVolumeUseRatio,omitempty"` +SnapshotMinVolumeUseRatio *float32 `json:"snapshotMinVolumeUseRatio,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/network_interface.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/network_interface.go index 1687e5b73..5ec529080 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/network_interface.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/network_interface.go @@ -12,26 +12,26 @@ package server type NetworkInterface struct { // Network Interface번호 - NetworkInterfaceNo *string `json:"networkInterfaceNo,omitempty"` +NetworkInterfaceNo *string `json:"networkInterfaceNo,omitempty"` // Network Interface이름 - NetworkInterfaceName *string `json:"networkInterfaceName,omitempty"` +NetworkInterfaceName *string `json:"networkInterfaceName,omitempty"` // Network Interface IP - NetworkInterfaceIp *string `json:"networkInterfaceIp,omitempty"` +NetworkInterfaceIp *string `json:"networkInterfaceIp,omitempty"` // Network Interface 설명 - NetworkInterfaceDescription *string `json:"networkInterfaceDescription,omitempty"` +NetworkInterfaceDescription *string `json:"networkInterfaceDescription,omitempty"` // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` +ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` // 상태코드 - StatusCode *string `json:"statusCode,omitempty"` +StatusCode *string `json:"statusCode,omitempty"` // 리전 - Region *Region `json:"region,omitempty"` +Region *Region `json:"region,omitempty"` // ZONE - Zone *Zone `json:"zone,omitempty"` +Zone *Zone `json:"zone,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule.go index 7906b34b8..429f16310 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule.go @@ -12,11 +12,11 @@ package server type PortForwardingRule struct { // 포트포워딩외부포트 - PortForwardingExternalPort *int32 `json:"portForwardingExternalPort,omitempty"` +PortForwardingExternalPort *int32 `json:"portForwardingExternalPort,omitempty"` // 포트포워딩내부포트 - PortForwardingInternalPort *int32 `json:"portForwardingInternalPort,omitempty"` +PortForwardingInternalPort *int32 `json:"portForwardingInternalPort,omitempty"` // 서버인스턴스 - ServerInstance *ServerInstance `json:"serverInstance,omitempty"` +ServerInstance *ServerInstance `json:"serverInstance,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule_parameter.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule_parameter.go index 307657123..ebd3c05d8 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule_parameter.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/port_forwarding_rule_parameter.go @@ -12,11 +12,11 @@ package server type PortForwardingRuleParameter struct { // 포트포워딩외부포트 - PortForwardingExternalPort *int32 `json:"portForwardingExternalPort"` +PortForwardingExternalPort *int32 `json:"portForwardingExternalPort"` // 포트포워딩내부포트 - PortForwardingInternalPort *int32 `json:"portForwardingInternalPort"` +PortForwardingInternalPort *int32 `json:"portForwardingInternalPort"` // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo"` +ServerInstanceNo *string `json:"serverInstanceNo"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/private_subnet_instance.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/private_subnet_instance.go index 66bc292aa..176bd706b 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/private_subnet_instance.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/private_subnet_instance.go @@ -12,29 +12,29 @@ package server type PrivateSubnetInstance struct { // Private Subnet인스턴스번호 - PrivateSubnetInstanceNo *string `json:"privateSubnetInstanceNo,omitempty"` +PrivateSubnetInstanceNo *string `json:"privateSubnetInstanceNo,omitempty"` // 서브넷 - Subnet *string `json:"subnet,omitempty"` +Subnet *string `json:"subnet,omitempty"` // Private Subnet설명 - PrivateSubnetDescription *string `json:"privateSubnetDescription,omitempty"` +PrivateSubnetDescription *string `json:"privateSubnetDescription,omitempty"` // 생성일시 - CreateDate *string `json:"createDate,omitempty"` +CreateDate *string `json:"createDate,omitempty"` // Private Subnet인스턴스상태 - PrivateSubnetInstanceStatus *CommonCode `json:"privateSubnetInstanceStatus,omitempty"` +PrivateSubnetInstanceStatus *CommonCode `json:"privateSubnetInstanceStatus,omitempty"` // Private Subnet OP - PrivateSubnetInstanceOperation *CommonCode `json:"privateSubnetInstanceOperation,omitempty"` +PrivateSubnetInstanceOperation *CommonCode `json:"privateSubnetInstanceOperation,omitempty"` // Private Subnet상태이름 - PrivateSubnetInstanceStatusName *string `json:"privateSubnetInstanceStatusName,omitempty"` +PrivateSubnetInstanceStatusName *string `json:"privateSubnetInstanceStatusName,omitempty"` // 리전 - Region *Region `json:"region,omitempty"` +Region *Region `json:"region,omitempty"` // ZONE - Zone *Zone `json:"zone,omitempty"` +Zone *Zone `json:"zone,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/product.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/product.go index dacd4e44d..312d086fd 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/product.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/product.go @@ -12,44 +12,44 @@ package server type Product struct { // 상품코드 - ProductCode *string `json:"productCode,omitempty"` +ProductCode *string `json:"productCode,omitempty"` // 상품명 - ProductName *string `json:"productName,omitempty"` +ProductName *string `json:"productName,omitempty"` // 상품유형 - ProductType *CommonCode `json:"productType,omitempty"` +ProductType *CommonCode `json:"productType,omitempty"` // 상품설명 - ProductDescription *string `json:"productDescription,omitempty"` +ProductDescription *string `json:"productDescription,omitempty"` // 인프라자원구분 - InfraResourceType *CommonCode `json:"infraResourceType,omitempty"` +InfraResourceType *CommonCode `json:"infraResourceType,omitempty"` // 인프라자원상세구분 - InfraResourceDetailType *CommonCode `json:"infraResourceDetailType,omitempty"` +InfraResourceDetailType *CommonCode `json:"infraResourceDetailType,omitempty"` // CPU수 - CpuCount *int32 `json:"cpuCount,omitempty"` +CpuCount *int32 `json:"cpuCount,omitempty"` // 메모리사이즈 - MemorySize *int64 `json:"memorySize,omitempty"` +MemorySize *int64 `json:"memorySize,omitempty"` // 기본블록스토리지사이즈 - BaseBlockStorageSize *int64 `json:"baseBlockStorageSize,omitempty"` +BaseBlockStorageSize *int64 `json:"baseBlockStorageSize,omitempty"` // 플랫폼구분 - PlatformType *CommonCode `json:"platformType,omitempty"` +PlatformType *CommonCode `json:"platformType,omitempty"` // OS정보 - OsInformation *string `json:"osInformation,omitempty"` +OsInformation *string `json:"osInformation,omitempty"` // 디스크유형 - DiskType *CommonCode `json:"diskType,omitempty"` +DiskType *CommonCode `json:"diskType,omitempty"` // DB유형코드 - DbKindCode *string `json:"dbKindCode,omitempty"` +DbKindCode *string `json:"dbKindCode,omitempty"` // 추가블록스토리지사이즈 - AddBlockStorageSize *int64 `json:"addBlockStorageSize,omitempty"` +AddBlockStorageSize *int64 `json:"addBlockStorageSize,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/public_ip_instance.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/public_ip_instance.go index affd66672..de3fe4239 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/public_ip_instance.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/public_ip_instance.go @@ -12,38 +12,38 @@ package server type PublicIpInstance struct { // 공인IP인스턴스번호 - PublicIpInstanceNo *string `json:"publicIpInstanceNo,omitempty"` +PublicIpInstanceNo *string `json:"publicIpInstanceNo,omitempty"` // 공인IP - PublicIp *string `json:"publicIp,omitempty"` +PublicIp *string `json:"publicIp,omitempty"` // 공인IP설명 - PublicIpDescription *string `json:"publicIpDescription,omitempty"` +PublicIpDescription *string `json:"publicIpDescription,omitempty"` // 생성일시 - CreateDate *string `json:"createDate,omitempty"` +CreateDate *string `json:"createDate,omitempty"` // 인터넷라인구분 - InternetLineType *CommonCode `json:"internetLineType,omitempty"` +InternetLineType *CommonCode `json:"internetLineType,omitempty"` // 공인IP인스턴스상태명 - PublicIpInstanceStatusName *string `json:"publicIpInstanceStatusName,omitempty"` +PublicIpInstanceStatusName *string `json:"publicIpInstanceStatusName,omitempty"` // 공인IP인스턴스상태 - PublicIpInstanceStatus *CommonCode `json:"publicIpInstanceStatus,omitempty"` +PublicIpInstanceStatus *CommonCode `json:"publicIpInstanceStatus,omitempty"` // 공인IP인스턴스OP - PublicIpInstanceOperation *CommonCode `json:"publicIpInstanceOperation,omitempty"` +PublicIpInstanceOperation *CommonCode `json:"publicIpInstanceOperation,omitempty"` // 공인IP종류구분 - PublicIpKindType *CommonCode `json:"publicIpKindType,omitempty"` +PublicIpKindType *CommonCode `json:"publicIpKindType,omitempty"` // 공인IP할당된서버인스턴스 - ServerInstanceAssociatedWithPublicIp *ServerInstance `json:"serverInstanceAssociatedWithPublicIp,omitempty"` +ServerInstanceAssociatedWithPublicIp *ServerInstance `json:"serverInstanceAssociatedWithPublicIp,omitempty"` // 리전 - Region *Region `json:"region,omitempty"` +Region *Region `json:"region,omitempty"` // ZONE - Zone *Zone `json:"zone,omitempty"` +Zone *Zone `json:"zone,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/raid.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/raid.go index a5afed30a..511f46bdb 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/raid.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/raid.go @@ -12,8 +12,8 @@ package server type Raid struct { // RAID구분이름 - RaidTypeName *string `json:"raidTypeName,omitempty"` +RaidTypeName *string `json:"raidTypeName,omitempty"` // RAID이름 - RaidName *string `json:"raidName,omitempty"` +RaidName *string `json:"raidName,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_request.go index 6f2a724b5..b52489d01 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_request.go @@ -12,5 +12,5 @@ package server type RebootServerInstancesRequest struct { // 서버인스턴스번호리스트 - ServerInstanceNoList []*string `json:"serverInstanceNoList"` +ServerInstanceNoList []*string `json:"serverInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_response.go index 95f45c014..a21cdb8a4 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/reboot_server_instances_response.go @@ -10,13 +10,14 @@ package server type RebootServerInstancesResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_request.go index 0333ce1ff..b8baf6722 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_request.go @@ -12,17 +12,17 @@ package server type RecreateServerInstanceRequest struct { // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` +ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` // 서버인스턴스이름 - ServerInstanceName *string `json:"serverInstanceName,omitempty"` +ServerInstanceName *string `json:"serverInstanceName,omitempty"` // 서버이미지상품코드 - ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` +ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` // 사용자데이터 - UserData *string `json:"userData,omitempty"` +UserData *string `json:"userData,omitempty"` // 인스턴스태그리스트 - InstanceTagList []*InstanceTagParameter `json:"instanceTagList,omitempty"` +InstanceTagList []*InstanceTagParameter `json:"instanceTagList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_response.go index 76d10ec17..3b1160706 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/recreate_server_instance_response.go @@ -10,13 +10,14 @@ package server type RecreateServerInstanceResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/region.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/region.go index 60d923ca0..2aa755c5e 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/region.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/region.go @@ -10,9 +10,10 @@ package server type Region struct { - RegionNo *string `json:"regionNo,omitempty"` - RegionCode *string `json:"regionCode,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` - RegionName *string `json:"regionName,omitempty"` +RegionCode *string `json:"regionCode,omitempty"` + +RegionName *string `json:"regionName,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_request.go index 9a7cfbbe6..8077e0953 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_request.go @@ -12,11 +12,11 @@ package server type RemoveNasVolumeAccessControlRequest struct { // NAS볼륨인스턴스번호 - NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` +NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` // 서버인스턴스번호리스트 - ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` +ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` // 커스텀IP리스트 - CustomIpList []*string `json:"customIpList,omitempty"` +CustomIpList []*string `json:"customIpList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_response.go index 08e0b88d9..adbfcef80 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/remove_nas_volume_access_control_response.go @@ -10,13 +10,14 @@ package server type RemoveNasVolumeAccessControlResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/server_instance.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/server_instance.go index beb697d89..318b37418 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/server_instance.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/server_instance.go @@ -12,98 +12,98 @@ package server type ServerInstance struct { // 서버인스턴스번호 - ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` +ServerInstanceNo *string `json:"serverInstanceNo,omitempty"` // 서버명 - ServerName *string `json:"serverName,omitempty"` +ServerName *string `json:"serverName,omitempty"` // 서버설명 - ServerDescription *string `json:"serverDescription,omitempty"` +ServerDescription *string `json:"serverDescription,omitempty"` // CPU수 - CpuCount *int32 `json:"cpuCount,omitempty"` +CpuCount *int32 `json:"cpuCount,omitempty"` // 메모리사이즈 - MemorySize *int64 `json:"memorySize,omitempty"` +MemorySize *int64 `json:"memorySize,omitempty"` // 기본블럭스토리지사이즈 - BaseBlockStorageSize *int64 `json:"baseBlockStorageSize,omitempty"` +BaseBlockStorageSize *int64 `json:"baseBlockStorageSize,omitempty"` // 플랫폼구분 - PlatformType *CommonCode `json:"platformType,omitempty"` +PlatformType *CommonCode `json:"platformType,omitempty"` // 로그인키명 - LoginKeyName *string `json:"loginKeyName,omitempty"` +LoginKeyName *string `json:"loginKeyName,omitempty"` // 유료모니터링여부 - IsFeeChargingMonitoring *bool `json:"isFeeChargingMonitoring,omitempty"` +IsFeeChargingMonitoring *bool `json:"isFeeChargingMonitoring,omitempty"` // 공인IP - PublicIp *string `json:"publicIp,omitempty"` +PublicIp *string `json:"publicIp,omitempty"` // 사설IP - PrivateIp *string `json:"privateIp,omitempty"` +PrivateIp *string `json:"privateIp,omitempty"` // 서버이미지명 - ServerImageName *string `json:"serverImageName,omitempty"` +ServerImageName *string `json:"serverImageName,omitempty"` // 서버인스턴스상태 - ServerInstanceStatus *CommonCode `json:"serverInstanceStatus,omitempty"` +ServerInstanceStatus *CommonCode `json:"serverInstanceStatus,omitempty"` // 서버인스턴스OP - ServerInstanceOperation *CommonCode `json:"serverInstanceOperation,omitempty"` +ServerInstanceOperation *CommonCode `json:"serverInstanceOperation,omitempty"` // 서버인스턴스상태명 - ServerInstanceStatusName *string `json:"serverInstanceStatusName,omitempty"` +ServerInstanceStatusName *string `json:"serverInstanceStatusName,omitempty"` // 생성일자 - CreateDate *string `json:"createDate,omitempty"` +CreateDate *string `json:"createDate,omitempty"` // UPTIME - Uptime *string `json:"uptime,omitempty"` +Uptime *string `json:"uptime,omitempty"` // 서버이미지상품코드 - ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` +ServerImageProductCode *string `json:"serverImageProductCode,omitempty"` // 서버상품코드 - ServerProductCode *string `json:"serverProductCode,omitempty"` +ServerProductCode *string `json:"serverProductCode,omitempty"` // 반납보호여부 - IsProtectServerTermination *bool `json:"isProtectServerTermination,omitempty"` +IsProtectServerTermination *bool `json:"isProtectServerTermination,omitempty"` // portForwarding 공인 Ip - PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` +PortForwardingPublicIp *string `json:"portForwardingPublicIp,omitempty"` // portForwarding 외부 포트 - PortForwardingExternalPort *int32 `json:"portForwardingExternalPort,omitempty"` +PortForwardingExternalPort *int32 `json:"portForwardingExternalPort,omitempty"` // portForwarding 내부 포트 - PortForwardingInternalPort *int32 `json:"portForwardingInternalPort,omitempty"` +PortForwardingInternalPort *int32 `json:"portForwardingInternalPort,omitempty"` // Zone - Zone *Zone `json:"zone,omitempty"` +Zone *Zone `json:"zone,omitempty"` // 리전 - Region *Region `json:"region,omitempty"` +Region *Region `json:"region,omitempty"` // 기본블록스토리지디스크유형 - BaseBlockStorageDiskType *CommonCode `json:"baseBlockStorageDiskType,omitempty"` +BaseBlockStorageDiskType *CommonCode `json:"baseBlockStorageDiskType,omitempty"` // 기본블록스토리지디스크상세유형 - BaseBlockStroageDiskDetailType *CommonCode `json:"baseBlockStroageDiskDetailType,omitempty"` +BaseBlockStroageDiskDetailType *CommonCode `json:"baseBlockStroageDiskDetailType,omitempty"` // 인터넷라인구분 - InternetLineType *CommonCode `json:"internetLineType,omitempty"` +InternetLineType *CommonCode `json:"internetLineType,omitempty"` // 서버인스턴스구분 - ServerInstanceType *CommonCode `json:"serverInstanceType,omitempty"` +ServerInstanceType *CommonCode `json:"serverInstanceType,omitempty"` // 사용자데이타 - UserData *string `json:"userData,omitempty"` +UserData *string `json:"userData,omitempty"` // ACG리스트 - AccessControlGroupList []*AccessControlGroup `json:"accessControlGroupList,omitempty"` +AccessControlGroupList []*AccessControlGroup `json:"accessControlGroupList,omitempty"` // 인스턴스태그리스트 - InstanceTagList []*InstanceTag `json:"instanceTagList,omitempty"` +InstanceTagList []*InstanceTag `json:"instanceTagList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_request.go index ff27c19ee..fdf5e2771 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_request.go @@ -12,11 +12,11 @@ package server type SetNasVolumeAccessControlRequest struct { // NAS볼륨인스턴스번호 - NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` +NasVolumeInstanceNo *string `json:"nasVolumeInstanceNo"` // 서버인스턴스번호리스트 - ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` +ServerInstanceNoList []*string `json:"serverInstanceNoList,omitempty"` // 커스텀IP리스트 - CustomIpList []*string `json:"customIpList,omitempty"` +CustomIpList []*string `json:"customIpList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_response.go index 8d2d84dd5..c3ccd6d82 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/set_nas_volume_access_control_response.go @@ -10,13 +10,14 @@ package server type SetNasVolumeAccessControlResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +NasVolumeInstanceList []*NasVolumeInstance `json:"nasVolumeInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_request.go index 7b6483d94..1db9d3a03 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_request.go @@ -12,5 +12,5 @@ package server type StartServerInstancesRequest struct { // 서버인스턴스번호리스트 - ServerInstanceNoList []*string `json:"serverInstanceNoList"` +ServerInstanceNoList []*string `json:"serverInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_response.go index 79d6476e3..01e2e4c83 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/start_server_instances_response.go @@ -10,13 +10,14 @@ package server type StartServerInstancesResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_request.go index 217adcfa1..55d28540f 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_request.go @@ -12,5 +12,5 @@ package server type StopServerInstancesRequest struct { // 서버인스턴스번호리스트 - ServerInstanceNoList []*string `json:"serverInstanceNoList"` +ServerInstanceNoList []*string `json:"serverInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_response.go index 18063efd8..8a3a02a66 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/stop_server_instances_response.go @@ -10,13 +10,14 @@ package server type StopServerInstancesResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_request.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_request.go index 2b5428aa5..0b8112c2b 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_request.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_request.go @@ -12,5 +12,5 @@ package server type TerminateServerInstancesRequest struct { // 서버인스턴스번호리스트 - ServerInstanceNoList []*string `json:"serverInstanceNoList"` +ServerInstanceNoList []*string `json:"serverInstanceNoList"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_response.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_response.go index 5c40698e1..e626df1e1 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_response.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/terminate_server_instances_response.go @@ -10,13 +10,14 @@ package server type TerminateServerInstancesResponse struct { - RequestId *string `json:"requestId,omitempty"` - ReturnCode *string `json:"returnCode,omitempty"` +RequestId *string `json:"requestId,omitempty"` - ReturnMessage *string `json:"returnMessage,omitempty"` +ReturnCode *string `json:"returnCode,omitempty"` - TotalRows *int32 `json:"totalRows,omitempty"` +ReturnMessage *string `json:"returnMessage,omitempty"` - ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` +TotalRows *int32 `json:"totalRows,omitempty"` + +ServerInstanceList []*ServerInstance `json:"serverInstanceList,omitempty"` } diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/v2_api.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/v2_api.go index bc6aaa072..f023b2236 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/v2_api.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/v2_api.go @@ -10,13 +10,13 @@ package server import ( - "bytes" "encoding/base64" "encoding/json" "io/ioutil" "net/url" "reflect" "strings" + "bytes" "golang.org/x/net/context" ) @@ -28,17 +28,18 @@ var ( type V2ApiService service -/* V2ApiService -NAS볼륨인스턴스접근제어추가 -@param addNasVolumeAccessControlRequest addNasVolumeAccessControlRequest -@return *AddNasVolumeAccessControlResponse*/ + +/* V2ApiService + NAS볼륨인스턴스접근제어추가 + @param addNasVolumeAccessControlRequest addNasVolumeAccessControlRequest + @return *AddNasVolumeAccessControlResponse*/ func (a *V2ApiService) AddNasVolumeAccessControl(addNasVolumeAccessControlRequest *AddNasVolumeAccessControlRequest) (*AddNasVolumeAccessControlResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload AddNasVolumeAccessControlResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload AddNasVolumeAccessControlResponse ) // create path and map variables @@ -48,8 +49,9 @@ func (a *V2ApiService) AddNasVolumeAccessControl(addNasVolumeAccessControlReques localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -58,7 +60,8 @@ func (a *V2ApiService) AddNasVolumeAccessControl(addNasVolumeAccessControlReques } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -96,20 +99,21 @@ func (a *V2ApiService) AddNasVolumeAccessControl(addNasVolumeAccessControlReques } } + return &successPayload, err } -/* V2ApiService -포트포워딩Rule추가 -@param addPortForwardingRulesRequest addPortForwardingRulesRequest -@return *AddPortForwardingRulesResponse*/ +/* V2ApiService + 포트포워딩Rule추가 + @param addPortForwardingRulesRequest addPortForwardingRulesRequest + @return *AddPortForwardingRulesResponse*/ func (a *V2ApiService) AddPortForwardingRules(addPortForwardingRulesRequest *AddPortForwardingRulesRequest) (*AddPortForwardingRulesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload AddPortForwardingRulesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload AddPortForwardingRulesResponse ) // create path and map variables @@ -119,8 +123,9 @@ func (a *V2ApiService) AddPortForwardingRules(addPortForwardingRulesRequest *Add localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -129,7 +134,8 @@ func (a *V2ApiService) AddPortForwardingRules(addPortForwardingRulesRequest *Add } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -167,20 +173,21 @@ func (a *V2ApiService) AddPortForwardingRules(addPortForwardingRulesRequest *Add } } + return &successPayload, err } -/* V2ApiService -공인IP를서버인스턴스에할당 -@param associatePublicIpWithServerInstanceRequest associatePublicIpWithServerInstanceRequest -@return *AssociatePublicIpWithServerInstanceResponse*/ +/* V2ApiService + 공인IP를서버인스턴스에할당 + @param associatePublicIpWithServerInstanceRequest associatePublicIpWithServerInstanceRequest + @return *AssociatePublicIpWithServerInstanceResponse*/ func (a *V2ApiService) AssociatePublicIpWithServerInstance(associatePublicIpWithServerInstanceRequest *AssociatePublicIpWithServerInstanceRequest) (*AssociatePublicIpWithServerInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload AssociatePublicIpWithServerInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload AssociatePublicIpWithServerInstanceResponse ) // create path and map variables @@ -190,8 +197,9 @@ func (a *V2ApiService) AssociatePublicIpWithServerInstance(associatePublicIpWith localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -200,7 +208,8 @@ func (a *V2ApiService) AssociatePublicIpWithServerInstance(associatePublicIpWith } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -238,20 +247,21 @@ func (a *V2ApiService) AssociatePublicIpWithServerInstance(associatePublicIpWith } } + return &successPayload, err } -/* V2ApiService -블록스토리지인스턴스할당 -@param attachBlockStorageInstanceRequest attachBlockStorageInstanceRequest -@return *AttachBlockStorageInstanceResponse*/ +/* V2ApiService + 블록스토리지인스턴스할당 + @param attachBlockStorageInstanceRequest attachBlockStorageInstanceRequest + @return *AttachBlockStorageInstanceResponse*/ func (a *V2ApiService) AttachBlockStorageInstance(attachBlockStorageInstanceRequest *AttachBlockStorageInstanceRequest) (*AttachBlockStorageInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload AttachBlockStorageInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload AttachBlockStorageInstanceResponse ) // create path and map variables @@ -261,8 +271,9 @@ func (a *V2ApiService) AttachBlockStorageInstance(attachBlockStorageInstanceRequ localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -271,7 +282,8 @@ func (a *V2ApiService) AttachBlockStorageInstance(attachBlockStorageInstanceRequ } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -309,20 +321,21 @@ func (a *V2ApiService) AttachBlockStorageInstance(attachBlockStorageInstanceRequ } } + return &successPayload, err } -/* V2ApiService -Network Interface Attach -@param attachNetworkInterfaceRequest attachNetworkInterfaceRequest -@return *AttachNetworkInterfaceResponse*/ +/* V2ApiService + Network Interface Attach + @param attachNetworkInterfaceRequest attachNetworkInterfaceRequest + @return *AttachNetworkInterfaceResponse*/ func (a *V2ApiService) AttachNetworkInterface(attachNetworkInterfaceRequest *AttachNetworkInterfaceRequest) (*AttachNetworkInterfaceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload AttachNetworkInterfaceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload AttachNetworkInterfaceResponse ) // create path and map variables @@ -332,8 +345,9 @@ func (a *V2ApiService) AttachNetworkInterface(attachNetworkInterfaceRequest *Att localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -342,7 +356,8 @@ func (a *V2ApiService) AttachNetworkInterface(attachNetworkInterfaceRequest *Att } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -380,20 +395,21 @@ func (a *V2ApiService) AttachNetworkInterface(attachNetworkInterfaceRequest *Att } } + return &successPayload, err } -/* V2ApiService -NAS볼륨사이즈변경 -@param changeNasVolumeSizeRequest changeNasVolumeSizeRequest -@return *ChangeNasVolumeSizeResponse*/ +/* V2ApiService + NAS볼륨사이즈변경 + @param changeNasVolumeSizeRequest changeNasVolumeSizeRequest + @return *ChangeNasVolumeSizeResponse*/ func (a *V2ApiService) ChangeNasVolumeSize(changeNasVolumeSizeRequest *ChangeNasVolumeSizeRequest) (*ChangeNasVolumeSizeResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload ChangeNasVolumeSizeResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload ChangeNasVolumeSizeResponse ) // create path and map variables @@ -403,8 +419,9 @@ func (a *V2ApiService) ChangeNasVolumeSize(changeNasVolumeSizeRequest *ChangeNas localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -413,7 +430,8 @@ func (a *V2ApiService) ChangeNasVolumeSize(changeNasVolumeSizeRequest *ChangeNas } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -451,20 +469,21 @@ func (a *V2ApiService) ChangeNasVolumeSize(changeNasVolumeSizeRequest *ChangeNas } } + return &successPayload, err } -/* V2ApiService -서버인스턴스스팩변경 -@param changeServerInstanceSpecRequest changeServerInstanceSpecRequest -@return *ChangeServerInstanceSpecResponse*/ +/* V2ApiService + 서버인스턴스스팩변경 + @param changeServerInstanceSpecRequest changeServerInstanceSpecRequest + @return *ChangeServerInstanceSpecResponse*/ func (a *V2ApiService) ChangeServerInstanceSpec(changeServerInstanceSpecRequest *ChangeServerInstanceSpecRequest) (*ChangeServerInstanceSpecResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload ChangeServerInstanceSpecResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload ChangeServerInstanceSpecResponse ) // create path and map variables @@ -474,8 +493,9 @@ func (a *V2ApiService) ChangeServerInstanceSpec(changeServerInstanceSpecRequest localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -484,7 +504,8 @@ func (a *V2ApiService) ChangeServerInstanceSpec(changeServerInstanceSpecRequest } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -522,20 +543,21 @@ func (a *V2ApiService) ChangeServerInstanceSpec(changeServerInstanceSpecRequest } } + return &successPayload, err } -/* V2ApiService -블록스토리지인스턴스생성 -@param createBlockStorageInstanceRequest createBlockStorageInstanceRequest -@return *CreateBlockStorageInstanceResponse*/ +/* V2ApiService + 블록스토리지인스턴스생성 + @param createBlockStorageInstanceRequest createBlockStorageInstanceRequest + @return *CreateBlockStorageInstanceResponse*/ func (a *V2ApiService) CreateBlockStorageInstance(createBlockStorageInstanceRequest *CreateBlockStorageInstanceRequest) (*CreateBlockStorageInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateBlockStorageInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateBlockStorageInstanceResponse ) // create path and map variables @@ -545,8 +567,9 @@ func (a *V2ApiService) CreateBlockStorageInstance(createBlockStorageInstanceRequ localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -555,7 +578,8 @@ func (a *V2ApiService) CreateBlockStorageInstance(createBlockStorageInstanceRequ } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -593,20 +617,21 @@ func (a *V2ApiService) CreateBlockStorageInstance(createBlockStorageInstanceRequ } } + return &successPayload, err } -/* V2ApiService -블록스토리지스냅샷인스턴스생성 -@param createBlockStorageSnapshotInstanceRequest createBlockStorageSnapshotInstanceRequest -@return *CreateBlockStorageSnapshotInstanceResponse*/ +/* V2ApiService + 블록스토리지스냅샷인스턴스생성 + @param createBlockStorageSnapshotInstanceRequest createBlockStorageSnapshotInstanceRequest + @return *CreateBlockStorageSnapshotInstanceResponse*/ func (a *V2ApiService) CreateBlockStorageSnapshotInstance(createBlockStorageSnapshotInstanceRequest *CreateBlockStorageSnapshotInstanceRequest) (*CreateBlockStorageSnapshotInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateBlockStorageSnapshotInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateBlockStorageSnapshotInstanceResponse ) // create path and map variables @@ -616,8 +641,9 @@ func (a *V2ApiService) CreateBlockStorageSnapshotInstance(createBlockStorageSnap localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -626,7 +652,8 @@ func (a *V2ApiService) CreateBlockStorageSnapshotInstance(createBlockStorageSnap } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -664,20 +691,21 @@ func (a *V2ApiService) CreateBlockStorageSnapshotInstance(createBlockStorageSnap } } + return &successPayload, err } -/* V2ApiService -인스턴스태그생성 -@param createInstanceTagsRequest createInstanceTagsRequest -@return *CreateInstanceTagsResponse*/ +/* V2ApiService + 인스턴스태그생성 + @param createInstanceTagsRequest createInstanceTagsRequest + @return *CreateInstanceTagsResponse*/ func (a *V2ApiService) CreateInstanceTags(createInstanceTagsRequest *CreateInstanceTagsRequest) (*CreateInstanceTagsResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateInstanceTagsResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateInstanceTagsResponse ) // create path and map variables @@ -687,8 +715,9 @@ func (a *V2ApiService) CreateInstanceTags(createInstanceTagsRequest *CreateInsta localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -697,7 +726,8 @@ func (a *V2ApiService) CreateInstanceTags(createInstanceTagsRequest *CreateInsta } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -735,20 +765,21 @@ func (a *V2ApiService) CreateInstanceTags(createInstanceTagsRequest *CreateInsta } } + return &successPayload, err } -/* V2ApiService -로그인키생성 -@param createLoginKeyRequest createLoginKeyRequest -@return *CreateLoginKeyResponse*/ +/* V2ApiService + 로그인키생성 + @param createLoginKeyRequest createLoginKeyRequest + @return *CreateLoginKeyResponse*/ func (a *V2ApiService) CreateLoginKey(createLoginKeyRequest *CreateLoginKeyRequest) (*CreateLoginKeyResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateLoginKeyResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateLoginKeyResponse ) // create path and map variables @@ -758,8 +789,9 @@ func (a *V2ApiService) CreateLoginKey(createLoginKeyRequest *CreateLoginKeyReque localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -768,7 +800,8 @@ func (a *V2ApiService) CreateLoginKey(createLoginKeyRequest *CreateLoginKeyReque } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -806,20 +839,21 @@ func (a *V2ApiService) CreateLoginKey(createLoginKeyRequest *CreateLoginKeyReque } } + return &successPayload, err } -/* V2ApiService -회원서버이미지생성 -@param createMemberServerImageRequest createMemberServerImageRequest -@return *CreateMemberServerImageResponse*/ +/* V2ApiService + 회원서버이미지생성 + @param createMemberServerImageRequest createMemberServerImageRequest + @return *CreateMemberServerImageResponse*/ func (a *V2ApiService) CreateMemberServerImage(createMemberServerImageRequest *CreateMemberServerImageRequest) (*CreateMemberServerImageResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateMemberServerImageResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateMemberServerImageResponse ) // create path and map variables @@ -829,8 +863,9 @@ func (a *V2ApiService) CreateMemberServerImage(createMemberServerImageRequest *C localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -839,7 +874,8 @@ func (a *V2ApiService) CreateMemberServerImage(createMemberServerImageRequest *C } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -877,20 +913,21 @@ func (a *V2ApiService) CreateMemberServerImage(createMemberServerImageRequest *C } } + return &successPayload, err } -/* V2ApiService -NAS볼륨인스턴스생성 -@param createNasVolumeInstanceRequest createNasVolumeInstanceRequest -@return *CreateNasVolumeInstanceResponse*/ +/* V2ApiService + NAS볼륨인스턴스생성 + @param createNasVolumeInstanceRequest createNasVolumeInstanceRequest + @return *CreateNasVolumeInstanceResponse*/ func (a *V2ApiService) CreateNasVolumeInstance(createNasVolumeInstanceRequest *CreateNasVolumeInstanceRequest) (*CreateNasVolumeInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateNasVolumeInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateNasVolumeInstanceResponse ) // create path and map variables @@ -900,8 +937,9 @@ func (a *V2ApiService) CreateNasVolumeInstance(createNasVolumeInstanceRequest *C localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -910,7 +948,8 @@ func (a *V2ApiService) CreateNasVolumeInstance(createNasVolumeInstanceRequest *C } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -948,20 +987,21 @@ func (a *V2ApiService) CreateNasVolumeInstance(createNasVolumeInstanceRequest *C } } + return &successPayload, err } -/* V2ApiService -Network Interface 생성 -@param createNetworkInterfaceRequest createNetworkInterfaceRequest -@return *CreateNetworkInterfaceResponse*/ +/* V2ApiService + Network Interface 생성 + @param createNetworkInterfaceRequest createNetworkInterfaceRequest + @return *CreateNetworkInterfaceResponse*/ func (a *V2ApiService) CreateNetworkInterface(createNetworkInterfaceRequest *CreateNetworkInterfaceRequest) (*CreateNetworkInterfaceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateNetworkInterfaceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateNetworkInterfaceResponse ) // create path and map variables @@ -971,8 +1011,9 @@ func (a *V2ApiService) CreateNetworkInterface(createNetworkInterfaceRequest *Cre localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -981,7 +1022,8 @@ func (a *V2ApiService) CreateNetworkInterface(createNetworkInterfaceRequest *Cre } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1019,20 +1061,21 @@ func (a *V2ApiService) CreateNetworkInterface(createNetworkInterfaceRequest *Cre } } + return &successPayload, err } -/* V2ApiService -공인IP인스턴스생성 -@param createPublicIpInstanceRequest createPublicIpInstanceRequest -@return *CreatePublicIpInstanceResponse*/ +/* V2ApiService + 공인IP인스턴스생성 + @param createPublicIpInstanceRequest createPublicIpInstanceRequest + @return *CreatePublicIpInstanceResponse*/ func (a *V2ApiService) CreatePublicIpInstance(createPublicIpInstanceRequest *CreatePublicIpInstanceRequest) (*CreatePublicIpInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreatePublicIpInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreatePublicIpInstanceResponse ) // create path and map variables @@ -1042,8 +1085,9 @@ func (a *V2ApiService) CreatePublicIpInstance(createPublicIpInstanceRequest *Cre localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1052,7 +1096,8 @@ func (a *V2ApiService) CreatePublicIpInstance(createPublicIpInstanceRequest *Cre } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1090,20 +1135,21 @@ func (a *V2ApiService) CreatePublicIpInstance(createPublicIpInstanceRequest *Cre } } + return &successPayload, err } -/* V2ApiService -서버인스턴스생성 -@param createServerInstancesRequest createServerInstancesRequest -@return *CreateServerInstancesResponse*/ +/* V2ApiService + 서버인스턴스생성 + @param createServerInstancesRequest createServerInstancesRequest + @return *CreateServerInstancesResponse*/ func (a *V2ApiService) CreateServerInstances(createServerInstancesRequest *CreateServerInstancesRequest) (*CreateServerInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload CreateServerInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload CreateServerInstancesResponse ) // create path and map variables @@ -1113,8 +1159,9 @@ func (a *V2ApiService) CreateServerInstances(createServerInstancesRequest *Creat localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1123,7 +1170,8 @@ func (a *V2ApiService) CreateServerInstances(createServerInstancesRequest *Creat } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1161,20 +1209,21 @@ func (a *V2ApiService) CreateServerInstances(createServerInstancesRequest *Creat } } + return &successPayload, err } -/* V2ApiService -블록스토리지인스턴스삭제 -@param deleteBlockStorageInstancesRequest deleteBlockStorageInstancesRequest -@return *DeleteBlockStorageInstancesResponse*/ +/* V2ApiService + 블록스토리지인스턴스삭제 + @param deleteBlockStorageInstancesRequest deleteBlockStorageInstancesRequest + @return *DeleteBlockStorageInstancesResponse*/ func (a *V2ApiService) DeleteBlockStorageInstances(deleteBlockStorageInstancesRequest *DeleteBlockStorageInstancesRequest) (*DeleteBlockStorageInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteBlockStorageInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteBlockStorageInstancesResponse ) // create path and map variables @@ -1184,8 +1233,9 @@ func (a *V2ApiService) DeleteBlockStorageInstances(deleteBlockStorageInstancesRe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1194,7 +1244,8 @@ func (a *V2ApiService) DeleteBlockStorageInstances(deleteBlockStorageInstancesRe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1232,20 +1283,21 @@ func (a *V2ApiService) DeleteBlockStorageInstances(deleteBlockStorageInstancesRe } } + return &successPayload, err } -/* V2ApiService -블록스토리지스냅샷인스턴스삭제 -@param deleteBlockStorageSnapshotInstancesRequest deleteBlockStorageSnapshotInstancesRequest -@return *DeleteBlockStorageSnapshotInstancesResponse*/ +/* V2ApiService + 블록스토리지스냅샷인스턴스삭제 + @param deleteBlockStorageSnapshotInstancesRequest deleteBlockStorageSnapshotInstancesRequest + @return *DeleteBlockStorageSnapshotInstancesResponse*/ func (a *V2ApiService) DeleteBlockStorageSnapshotInstances(deleteBlockStorageSnapshotInstancesRequest *DeleteBlockStorageSnapshotInstancesRequest) (*DeleteBlockStorageSnapshotInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteBlockStorageSnapshotInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteBlockStorageSnapshotInstancesResponse ) // create path and map variables @@ -1255,8 +1307,9 @@ func (a *V2ApiService) DeleteBlockStorageSnapshotInstances(deleteBlockStorageSna localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1265,7 +1318,8 @@ func (a *V2ApiService) DeleteBlockStorageSnapshotInstances(deleteBlockStorageSna } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1303,20 +1357,21 @@ func (a *V2ApiService) DeleteBlockStorageSnapshotInstances(deleteBlockStorageSna } } + return &successPayload, err } -/* V2ApiService -인스턴스태그삭제 -@param deleteInstanceTagsRequest deleteInstanceTagsRequest -@return *DeleteInstanceTagsResponse*/ +/* V2ApiService + 인스턴스태그삭제 + @param deleteInstanceTagsRequest deleteInstanceTagsRequest + @return *DeleteInstanceTagsResponse*/ func (a *V2ApiService) DeleteInstanceTags(deleteInstanceTagsRequest *DeleteInstanceTagsRequest) (*DeleteInstanceTagsResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteInstanceTagsResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteInstanceTagsResponse ) // create path and map variables @@ -1326,8 +1381,9 @@ func (a *V2ApiService) DeleteInstanceTags(deleteInstanceTagsRequest *DeleteInsta localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1336,7 +1392,8 @@ func (a *V2ApiService) DeleteInstanceTags(deleteInstanceTagsRequest *DeleteInsta } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1374,20 +1431,21 @@ func (a *V2ApiService) DeleteInstanceTags(deleteInstanceTagsRequest *DeleteInsta } } + return &successPayload, err } -/* V2ApiService -로그인키삭제 -@param deleteLoginKeyRequest deleteLoginKeyRequest -@return *DeleteLoginKeyResponse*/ +/* V2ApiService + 로그인키삭제 + @param deleteLoginKeyRequest deleteLoginKeyRequest + @return *DeleteLoginKeyResponse*/ func (a *V2ApiService) DeleteLoginKey(deleteLoginKeyRequest *DeleteLoginKeyRequest) (*DeleteLoginKeyResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteLoginKeyResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteLoginKeyResponse ) // create path and map variables @@ -1397,8 +1455,9 @@ func (a *V2ApiService) DeleteLoginKey(deleteLoginKeyRequest *DeleteLoginKeyReque localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1407,7 +1466,8 @@ func (a *V2ApiService) DeleteLoginKey(deleteLoginKeyRequest *DeleteLoginKeyReque } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1445,20 +1505,21 @@ func (a *V2ApiService) DeleteLoginKey(deleteLoginKeyRequest *DeleteLoginKeyReque } } + return &successPayload, err } -/* V2ApiService -회원서버이미지삭제 -@param deleteMemberServerImagesRequest deleteMemberServerImagesRequest -@return *DeleteMemberServerImagesResponse*/ +/* V2ApiService + 회원서버이미지삭제 + @param deleteMemberServerImagesRequest deleteMemberServerImagesRequest + @return *DeleteMemberServerImagesResponse*/ func (a *V2ApiService) DeleteMemberServerImages(deleteMemberServerImagesRequest *DeleteMemberServerImagesRequest) (*DeleteMemberServerImagesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteMemberServerImagesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteMemberServerImagesResponse ) // create path and map variables @@ -1468,8 +1529,9 @@ func (a *V2ApiService) DeleteMemberServerImages(deleteMemberServerImagesRequest localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1478,7 +1540,8 @@ func (a *V2ApiService) DeleteMemberServerImages(deleteMemberServerImagesRequest } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1516,20 +1579,21 @@ func (a *V2ApiService) DeleteMemberServerImages(deleteMemberServerImagesRequest } } + return &successPayload, err } -/* V2ApiService -NAS볼륨인스턴스삭제 -@param deleteNasVolumeInstanceRequest deleteNasVolumeInstanceRequest -@return *DeleteNasVolumeInstanceResponse*/ +/* V2ApiService + NAS볼륨인스턴스삭제 + @param deleteNasVolumeInstanceRequest deleteNasVolumeInstanceRequest + @return *DeleteNasVolumeInstanceResponse*/ func (a *V2ApiService) DeleteNasVolumeInstance(deleteNasVolumeInstanceRequest *DeleteNasVolumeInstanceRequest) (*DeleteNasVolumeInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteNasVolumeInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteNasVolumeInstanceResponse ) // create path and map variables @@ -1539,8 +1603,9 @@ func (a *V2ApiService) DeleteNasVolumeInstance(deleteNasVolumeInstanceRequest *D localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1549,7 +1614,8 @@ func (a *V2ApiService) DeleteNasVolumeInstance(deleteNasVolumeInstanceRequest *D } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1587,20 +1653,21 @@ func (a *V2ApiService) DeleteNasVolumeInstance(deleteNasVolumeInstanceRequest *D } } + return &successPayload, err } -/* V2ApiService -Network Interface 삭제 -@param deleteNetworkInterfaceRequest deleteNetworkInterfaceRequest -@return *DeleteNetworkInterfaceResponse*/ +/* V2ApiService + Network Interface 삭제 + @param deleteNetworkInterfaceRequest deleteNetworkInterfaceRequest + @return *DeleteNetworkInterfaceResponse*/ func (a *V2ApiService) DeleteNetworkInterface(deleteNetworkInterfaceRequest *DeleteNetworkInterfaceRequest) (*DeleteNetworkInterfaceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeleteNetworkInterfaceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeleteNetworkInterfaceResponse ) // create path and map variables @@ -1610,8 +1677,9 @@ func (a *V2ApiService) DeleteNetworkInterface(deleteNetworkInterfaceRequest *Del localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1620,7 +1688,8 @@ func (a *V2ApiService) DeleteNetworkInterface(deleteNetworkInterfaceRequest *Del } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1658,20 +1727,21 @@ func (a *V2ApiService) DeleteNetworkInterface(deleteNetworkInterfaceRequest *Del } } + return &successPayload, err } -/* V2ApiService -포트포워딩Rule삭제 -@param deletePortForwardingRulesRequest deletePortForwardingRulesRequest -@return *DeletePortForwardingRulesResponse*/ +/* V2ApiService + 포트포워딩Rule삭제 + @param deletePortForwardingRulesRequest deletePortForwardingRulesRequest + @return *DeletePortForwardingRulesResponse*/ func (a *V2ApiService) DeletePortForwardingRules(deletePortForwardingRulesRequest *DeletePortForwardingRulesRequest) (*DeletePortForwardingRulesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeletePortForwardingRulesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeletePortForwardingRulesResponse ) // create path and map variables @@ -1681,8 +1751,9 @@ func (a *V2ApiService) DeletePortForwardingRules(deletePortForwardingRulesReques localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1691,7 +1762,8 @@ func (a *V2ApiService) DeletePortForwardingRules(deletePortForwardingRulesReques } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1729,20 +1801,21 @@ func (a *V2ApiService) DeletePortForwardingRules(deletePortForwardingRulesReques } } + return &successPayload, err } -/* V2ApiService -공인IP인스턴스삭제 -@param deletePublicIpInstancesRequest deletePublicIpInstancesRequest -@return *DeletePublicIpInstancesResponse*/ +/* V2ApiService + 공인IP인스턴스삭제 + @param deletePublicIpInstancesRequest deletePublicIpInstancesRequest + @return *DeletePublicIpInstancesResponse*/ func (a *V2ApiService) DeletePublicIpInstances(deletePublicIpInstancesRequest *DeletePublicIpInstancesRequest) (*DeletePublicIpInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DeletePublicIpInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DeletePublicIpInstancesResponse ) // create path and map variables @@ -1752,8 +1825,9 @@ func (a *V2ApiService) DeletePublicIpInstances(deletePublicIpInstancesRequest *D localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1762,7 +1836,8 @@ func (a *V2ApiService) DeletePublicIpInstances(deletePublicIpInstancesRequest *D } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1800,20 +1875,21 @@ func (a *V2ApiService) DeletePublicIpInstances(deletePublicIpInstancesRequest *D } } + return &successPayload, err } -/* V2ApiService -블록스토리지인스턴스할당해제 -@param detachBlockStorageInstancesRequest detachBlockStorageInstancesRequest -@return *DetachBlockStorageInstancesResponse*/ +/* V2ApiService + 블록스토리지인스턴스할당해제 + @param detachBlockStorageInstancesRequest detachBlockStorageInstancesRequest + @return *DetachBlockStorageInstancesResponse*/ func (a *V2ApiService) DetachBlockStorageInstances(detachBlockStorageInstancesRequest *DetachBlockStorageInstancesRequest) (*DetachBlockStorageInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DetachBlockStorageInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DetachBlockStorageInstancesResponse ) // create path and map variables @@ -1823,8 +1899,9 @@ func (a *V2ApiService) DetachBlockStorageInstances(detachBlockStorageInstancesRe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1833,7 +1910,8 @@ func (a *V2ApiService) DetachBlockStorageInstances(detachBlockStorageInstancesRe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1871,20 +1949,21 @@ func (a *V2ApiService) DetachBlockStorageInstances(detachBlockStorageInstancesRe } } + return &successPayload, err } -/* V2ApiService -Network Interface Detach -@param detachNetworkInterfaceRequest detachNetworkInterfaceRequest -@return *DetachNetworkInterfaceResponse*/ +/* V2ApiService + Network Interface Detach + @param detachNetworkInterfaceRequest detachNetworkInterfaceRequest + @return *DetachNetworkInterfaceResponse*/ func (a *V2ApiService) DetachNetworkInterface(detachNetworkInterfaceRequest *DetachNetworkInterfaceRequest) (*DetachNetworkInterfaceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DetachNetworkInterfaceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DetachNetworkInterfaceResponse ) // create path and map variables @@ -1894,8 +1973,9 @@ func (a *V2ApiService) DetachNetworkInterface(detachNetworkInterfaceRequest *Det localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1904,7 +1984,8 @@ func (a *V2ApiService) DetachNetworkInterface(detachNetworkInterfaceRequest *Det } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1942,20 +2023,21 @@ func (a *V2ApiService) DetachNetworkInterface(detachNetworkInterfaceRequest *Det } } + return &successPayload, err } -/* V2ApiService -공인IP를서버인스턴스에할당해제 -@param disassociatePublicIpFromServerInstanceRequest disassociatePublicIpFromServerInstanceRequest -@return *DisassociatePublicIpFromServerInstanceResponse*/ +/* V2ApiService + 공인IP를서버인스턴스에할당해제 + @param disassociatePublicIpFromServerInstanceRequest disassociatePublicIpFromServerInstanceRequest + @return *DisassociatePublicIpFromServerInstanceResponse*/ func (a *V2ApiService) DisassociatePublicIpFromServerInstance(disassociatePublicIpFromServerInstanceRequest *DisassociatePublicIpFromServerInstanceRequest) (*DisassociatePublicIpFromServerInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload DisassociatePublicIpFromServerInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload DisassociatePublicIpFromServerInstanceResponse ) // create path and map variables @@ -1965,8 +2047,9 @@ func (a *V2ApiService) DisassociatePublicIpFromServerInstance(disassociatePublic localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -1975,7 +2058,8 @@ func (a *V2ApiService) DisassociatePublicIpFromServerInstance(disassociatePublic } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2013,20 +2097,21 @@ func (a *V2ApiService) DisassociatePublicIpFromServerInstance(disassociatePublic } } + return &successPayload, err } -/* V2ApiService -접근제어그룹리스트조회 -@param getAccessControlGroupListRequest getAccessControlGroupListRequest -@return *GetAccessControlGroupListResponse*/ +/* V2ApiService + 접근제어그룹리스트조회 + @param getAccessControlGroupListRequest getAccessControlGroupListRequest + @return *GetAccessControlGroupListResponse*/ func (a *V2ApiService) GetAccessControlGroupList(getAccessControlGroupListRequest *GetAccessControlGroupListRequest) (*GetAccessControlGroupListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetAccessControlGroupListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetAccessControlGroupListResponse ) // create path and map variables @@ -2036,8 +2121,9 @@ func (a *V2ApiService) GetAccessControlGroupList(getAccessControlGroupListReques localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2046,7 +2132,8 @@ func (a *V2ApiService) GetAccessControlGroupList(getAccessControlGroupListReques } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2084,20 +2171,21 @@ func (a *V2ApiService) GetAccessControlGroupList(getAccessControlGroupListReques } } + return &successPayload, err } -/* V2ApiService -접근제어그룹적용된서버인스턴스리스트조회 -@param getAccessControlGroupServerInstanceListRequest getAccessControlGroupServerInstanceListRequest -@return *GetAccessControlGroupServerInstanceListResponse*/ +/* V2ApiService + 접근제어그룹적용된서버인스턴스리스트조회 + @param getAccessControlGroupServerInstanceListRequest getAccessControlGroupServerInstanceListRequest + @return *GetAccessControlGroupServerInstanceListResponse*/ func (a *V2ApiService) GetAccessControlGroupServerInstanceList(getAccessControlGroupServerInstanceListRequest *GetAccessControlGroupServerInstanceListRequest) (*GetAccessControlGroupServerInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetAccessControlGroupServerInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetAccessControlGroupServerInstanceListResponse ) // create path and map variables @@ -2107,8 +2195,9 @@ func (a *V2ApiService) GetAccessControlGroupServerInstanceList(getAccessControlG localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2117,7 +2206,8 @@ func (a *V2ApiService) GetAccessControlGroupServerInstanceList(getAccessControlG } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2155,20 +2245,21 @@ func (a *V2ApiService) GetAccessControlGroupServerInstanceList(getAccessControlG } } + return &successPayload, err } -/* V2ApiService -접근제어규칙리스트조회 -@param getAccessControlRuleListRequest getAccessControlRuleListRequest -@return *GetAccessControlRuleListResponse*/ +/* V2ApiService + 접근제어규칙리스트조회 + @param getAccessControlRuleListRequest getAccessControlRuleListRequest + @return *GetAccessControlRuleListResponse*/ func (a *V2ApiService) GetAccessControlRuleList(getAccessControlRuleListRequest *GetAccessControlRuleListRequest) (*GetAccessControlRuleListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetAccessControlRuleListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetAccessControlRuleListResponse ) // create path and map variables @@ -2178,8 +2269,9 @@ func (a *V2ApiService) GetAccessControlRuleList(getAccessControlRuleListRequest localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2188,7 +2280,8 @@ func (a *V2ApiService) GetAccessControlRuleList(getAccessControlRuleListRequest } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2226,20 +2319,21 @@ func (a *V2ApiService) GetAccessControlRuleList(getAccessControlRuleListRequest } } + return &successPayload, err } -/* V2ApiService -블록스토리지인스턴스리스트조회 -@param getBlockStorageInstanceListRequest getBlockStorageInstanceListRequest -@return *GetBlockStorageInstanceListResponse*/ +/* V2ApiService + 블록스토리지인스턴스리스트조회 + @param getBlockStorageInstanceListRequest getBlockStorageInstanceListRequest + @return *GetBlockStorageInstanceListResponse*/ func (a *V2ApiService) GetBlockStorageInstanceList(getBlockStorageInstanceListRequest *GetBlockStorageInstanceListRequest) (*GetBlockStorageInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetBlockStorageInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetBlockStorageInstanceListResponse ) // create path and map variables @@ -2249,8 +2343,9 @@ func (a *V2ApiService) GetBlockStorageInstanceList(getBlockStorageInstanceListRe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2259,7 +2354,8 @@ func (a *V2ApiService) GetBlockStorageInstanceList(getBlockStorageInstanceListRe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2297,20 +2393,21 @@ func (a *V2ApiService) GetBlockStorageInstanceList(getBlockStorageInstanceListRe } } + return &successPayload, err } -/* V2ApiService -블록스토리지스냅샷인스턴스리스트조회 -@param getBlockStorageSnapshotInstanceListRequest getBlockStorageSnapshotInstanceListRequest -@return *GetBlockStorageSnapshotInstanceListResponse*/ +/* V2ApiService + 블록스토리지스냅샷인스턴스리스트조회 + @param getBlockStorageSnapshotInstanceListRequest getBlockStorageSnapshotInstanceListRequest + @return *GetBlockStorageSnapshotInstanceListResponse*/ func (a *V2ApiService) GetBlockStorageSnapshotInstanceList(getBlockStorageSnapshotInstanceListRequest *GetBlockStorageSnapshotInstanceListRequest) (*GetBlockStorageSnapshotInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetBlockStorageSnapshotInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetBlockStorageSnapshotInstanceListResponse ) // create path and map variables @@ -2320,8 +2417,9 @@ func (a *V2ApiService) GetBlockStorageSnapshotInstanceList(getBlockStorageSnapsh localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2330,7 +2428,8 @@ func (a *V2ApiService) GetBlockStorageSnapshotInstanceList(getBlockStorageSnapsh } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2368,20 +2467,21 @@ func (a *V2ApiService) GetBlockStorageSnapshotInstanceList(getBlockStorageSnapsh } } + return &successPayload, err } -/* V2ApiService -인스턴스태그리스트조회 -@param getInstanceTagListRequest getInstanceTagListRequest -@return *GetInstanceTagListResponse*/ +/* V2ApiService + 인스턴스태그리스트조회 + @param getInstanceTagListRequest getInstanceTagListRequest + @return *GetInstanceTagListResponse*/ func (a *V2ApiService) GetInstanceTagList(getInstanceTagListRequest *GetInstanceTagListRequest) (*GetInstanceTagListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetInstanceTagListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetInstanceTagListResponse ) // create path and map variables @@ -2391,8 +2491,9 @@ func (a *V2ApiService) GetInstanceTagList(getInstanceTagListRequest *GetInstance localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2401,7 +2502,8 @@ func (a *V2ApiService) GetInstanceTagList(getInstanceTagListRequest *GetInstance } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2439,20 +2541,21 @@ func (a *V2ApiService) GetInstanceTagList(getInstanceTagListRequest *GetInstance } } + return &successPayload, err } -/* V2ApiService -로그인키리스트조회 -@param getLoginKeyListRequest getLoginKeyListRequest -@return *GetLoginKeyListResponse*/ +/* V2ApiService + 로그인키리스트조회 + @param getLoginKeyListRequest getLoginKeyListRequest + @return *GetLoginKeyListResponse*/ func (a *V2ApiService) GetLoginKeyList(getLoginKeyListRequest *GetLoginKeyListRequest) (*GetLoginKeyListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetLoginKeyListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetLoginKeyListResponse ) // create path and map variables @@ -2462,8 +2565,9 @@ func (a *V2ApiService) GetLoginKeyList(getLoginKeyListRequest *GetLoginKeyListRe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2472,7 +2576,8 @@ func (a *V2ApiService) GetLoginKeyList(getLoginKeyListRequest *GetLoginKeyListRe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2510,20 +2615,21 @@ func (a *V2ApiService) GetLoginKeyList(getLoginKeyListRequest *GetLoginKeyListRe } } + return &successPayload, err } -/* V2ApiService -회원서버이미지리스트조회 -@param getMemberServerImageListRequest getMemberServerImageListRequest -@return *GetMemberServerImageListResponse*/ +/* V2ApiService + 회원서버이미지리스트조회 + @param getMemberServerImageListRequest getMemberServerImageListRequest + @return *GetMemberServerImageListResponse*/ func (a *V2ApiService) GetMemberServerImageList(getMemberServerImageListRequest *GetMemberServerImageListRequest) (*GetMemberServerImageListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetMemberServerImageListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetMemberServerImageListResponse ) // create path and map variables @@ -2533,8 +2639,9 @@ func (a *V2ApiService) GetMemberServerImageList(getMemberServerImageListRequest localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2543,7 +2650,8 @@ func (a *V2ApiService) GetMemberServerImageList(getMemberServerImageListRequest } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2581,20 +2689,21 @@ func (a *V2ApiService) GetMemberServerImageList(getMemberServerImageListRequest } } + return &successPayload, err } -/* V2ApiService -NAS볼륨인스턴스리스트조회 -@param getNasVolumeInstanceListRequest getNasVolumeInstanceListRequest -@return *GetNasVolumeInstanceListResponse*/ +/* V2ApiService + NAS볼륨인스턴스리스트조회 + @param getNasVolumeInstanceListRequest getNasVolumeInstanceListRequest + @return *GetNasVolumeInstanceListResponse*/ func (a *V2ApiService) GetNasVolumeInstanceList(getNasVolumeInstanceListRequest *GetNasVolumeInstanceListRequest) (*GetNasVolumeInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetNasVolumeInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetNasVolumeInstanceListResponse ) // create path and map variables @@ -2604,8 +2713,9 @@ func (a *V2ApiService) GetNasVolumeInstanceList(getNasVolumeInstanceListRequest localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2614,7 +2724,8 @@ func (a *V2ApiService) GetNasVolumeInstanceList(getNasVolumeInstanceListRequest } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2652,20 +2763,21 @@ func (a *V2ApiService) GetNasVolumeInstanceList(getNasVolumeInstanceListRequest } } + return &successPayload, err } -/* V2ApiService -NAS볼륨인스턴스측정리스트조회 -@param getNasVolumeInstanceRatingListRequest getNasVolumeInstanceRatingListRequest -@return *GetNasVolumeInstanceRatingListResponse*/ +/* V2ApiService + NAS볼륨인스턴스측정리스트조회 + @param getNasVolumeInstanceRatingListRequest getNasVolumeInstanceRatingListRequest + @return *GetNasVolumeInstanceRatingListResponse*/ func (a *V2ApiService) GetNasVolumeInstanceRatingList(getNasVolumeInstanceRatingListRequest *GetNasVolumeInstanceRatingListRequest) (*GetNasVolumeInstanceRatingListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetNasVolumeInstanceRatingListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetNasVolumeInstanceRatingListResponse ) // create path and map variables @@ -2675,8 +2787,9 @@ func (a *V2ApiService) GetNasVolumeInstanceRatingList(getNasVolumeInstanceRating localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2685,7 +2798,8 @@ func (a *V2ApiService) GetNasVolumeInstanceRatingList(getNasVolumeInstanceRating } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2723,20 +2837,21 @@ func (a *V2ApiService) GetNasVolumeInstanceRatingList(getNasVolumeInstanceRating } } + return &successPayload, err } -/* V2ApiService -Network Interface 리스트조회 -@param getNetworkInterfaceListRequest getNetworkInterfaceListRequest -@return *GetNetworkInterfaceListResponse*/ +/* V2ApiService + Network Interface 리스트조회 + @param getNetworkInterfaceListRequest getNetworkInterfaceListRequest + @return *GetNetworkInterfaceListResponse*/ func (a *V2ApiService) GetNetworkInterfaceList(getNetworkInterfaceListRequest *GetNetworkInterfaceListRequest) (*GetNetworkInterfaceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetNetworkInterfaceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetNetworkInterfaceListResponse ) // create path and map variables @@ -2746,8 +2861,9 @@ func (a *V2ApiService) GetNetworkInterfaceList(getNetworkInterfaceListRequest *G localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2756,7 +2872,8 @@ func (a *V2ApiService) GetNetworkInterfaceList(getNetworkInterfaceListRequest *G } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2794,20 +2911,21 @@ func (a *V2ApiService) GetNetworkInterfaceList(getNetworkInterfaceListRequest *G } } + return &successPayload, err } -/* V2ApiService -포트포워딩Rule리스트조회 -@param getPortForwardingRuleListRequest getPortForwardingRuleListRequest -@return *GetPortForwardingRuleListResponse*/ +/* V2ApiService + 포트포워딩Rule리스트조회 + @param getPortForwardingRuleListRequest getPortForwardingRuleListRequest + @return *GetPortForwardingRuleListResponse*/ func (a *V2ApiService) GetPortForwardingRuleList(getPortForwardingRuleListRequest *GetPortForwardingRuleListRequest) (*GetPortForwardingRuleListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetPortForwardingRuleListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetPortForwardingRuleListResponse ) // create path and map variables @@ -2817,8 +2935,9 @@ func (a *V2ApiService) GetPortForwardingRuleList(getPortForwardingRuleListReques localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2827,7 +2946,8 @@ func (a *V2ApiService) GetPortForwardingRuleList(getPortForwardingRuleListReques } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2865,20 +2985,21 @@ func (a *V2ApiService) GetPortForwardingRuleList(getPortForwardingRuleListReques } } + return &successPayload, err } -/* V2ApiService -Private Subnet 인스턴스리스트조회 -@param getPrivateSubnetInstanceListRequest getPrivateSubnetInstanceListRequest -@return *GetPrivateSubnetInstanceListResponse*/ +/* V2ApiService + Private Subnet 인스턴스리스트조회 + @param getPrivateSubnetInstanceListRequest getPrivateSubnetInstanceListRequest + @return *GetPrivateSubnetInstanceListResponse*/ func (a *V2ApiService) GetPrivateSubnetInstanceList(getPrivateSubnetInstanceListRequest *GetPrivateSubnetInstanceListRequest) (*GetPrivateSubnetInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetPrivateSubnetInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetPrivateSubnetInstanceListResponse ) // create path and map variables @@ -2888,8 +3009,9 @@ func (a *V2ApiService) GetPrivateSubnetInstanceList(getPrivateSubnetInstanceList localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2898,7 +3020,8 @@ func (a *V2ApiService) GetPrivateSubnetInstanceList(getPrivateSubnetInstanceList } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2936,20 +3059,21 @@ func (a *V2ApiService) GetPrivateSubnetInstanceList(getPrivateSubnetInstanceList } } + return &successPayload, err } -/* V2ApiService -공인IP인스턴스리스트조회 -@param getPublicIpInstanceListRequest getPublicIpInstanceListRequest -@return *GetPublicIpInstanceListResponse*/ +/* V2ApiService + 공인IP인스턴스리스트조회 + @param getPublicIpInstanceListRequest getPublicIpInstanceListRequest + @return *GetPublicIpInstanceListResponse*/ func (a *V2ApiService) GetPublicIpInstanceList(getPublicIpInstanceListRequest *GetPublicIpInstanceListRequest) (*GetPublicIpInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetPublicIpInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetPublicIpInstanceListResponse ) // create path and map variables @@ -2959,8 +3083,9 @@ func (a *V2ApiService) GetPublicIpInstanceList(getPublicIpInstanceListRequest *G localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -2969,7 +3094,8 @@ func (a *V2ApiService) GetPublicIpInstanceList(getPublicIpInstanceListRequest *G } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3007,20 +3133,21 @@ func (a *V2ApiService) GetPublicIpInstanceList(getPublicIpInstanceListRequest *G } } + return &successPayload, err } -/* V2ApiService -공인IP할당(가능)서버인스턴스리스트조회 -@param getPublicIpTargetServerInstanceListRequest getPublicIpTargetServerInstanceListRequest -@return *GetPublicIpTargetServerInstanceListResponse*/ +/* V2ApiService + 공인IP할당(가능)서버인스턴스리스트조회 + @param getPublicIpTargetServerInstanceListRequest getPublicIpTargetServerInstanceListRequest + @return *GetPublicIpTargetServerInstanceListResponse*/ func (a *V2ApiService) GetPublicIpTargetServerInstanceList(getPublicIpTargetServerInstanceListRequest *GetPublicIpTargetServerInstanceListRequest) (*GetPublicIpTargetServerInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetPublicIpTargetServerInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetPublicIpTargetServerInstanceListResponse ) // create path and map variables @@ -3030,8 +3157,9 @@ func (a *V2ApiService) GetPublicIpTargetServerInstanceList(getPublicIpTargetServ localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3040,7 +3168,8 @@ func (a *V2ApiService) GetPublicIpTargetServerInstanceList(getPublicIpTargetServ } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3078,20 +3207,21 @@ func (a *V2ApiService) GetPublicIpTargetServerInstanceList(getPublicIpTargetServ } } + return &successPayload, err } -/* V2ApiService -RAID리스트조회 -@param getRaidListRequest getRaidListRequest -@return *GetRaidListResponse*/ +/* V2ApiService + RAID리스트조회 + @param getRaidListRequest getRaidListRequest + @return *GetRaidListResponse*/ func (a *V2ApiService) GetRaidList(getRaidListRequest *GetRaidListRequest) (*GetRaidListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetRaidListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetRaidListResponse ) // create path and map variables @@ -3101,8 +3231,9 @@ func (a *V2ApiService) GetRaidList(getRaidListRequest *GetRaidListRequest) (*Get localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3111,7 +3242,8 @@ func (a *V2ApiService) GetRaidList(getRaidListRequest *GetRaidListRequest) (*Get } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3149,20 +3281,21 @@ func (a *V2ApiService) GetRaidList(getRaidListRequest *GetRaidListRequest) (*Get } } + return &successPayload, err } -/* V2ApiService -REGION리스트조회 -@param getRegionListRequest getRegionListRequest -@return *GetRegionListResponse*/ +/* V2ApiService + REGION리스트조회 + @param getRegionListRequest getRegionListRequest + @return *GetRegionListResponse*/ func (a *V2ApiService) GetRegionList(getRegionListRequest *GetRegionListRequest) (*GetRegionListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetRegionListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetRegionListResponse ) // create path and map variables @@ -3172,8 +3305,9 @@ func (a *V2ApiService) GetRegionList(getRegionListRequest *GetRegionListRequest) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3182,7 +3316,8 @@ func (a *V2ApiService) GetRegionList(getRegionListRequest *GetRegionListRequest) } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3220,20 +3355,21 @@ func (a *V2ApiService) GetRegionList(getRegionListRequest *GetRegionListRequest) } } + return &successPayload, err } -/* V2ApiService -루트패스워드조회 -@param getRootPasswordRequest getRootPasswordRequest -@return *GetRootPasswordResponse*/ +/* V2ApiService + 루트패스워드조회 + @param getRootPasswordRequest getRootPasswordRequest + @return *GetRootPasswordResponse*/ func (a *V2ApiService) GetRootPassword(getRootPasswordRequest *GetRootPasswordRequest) (*GetRootPasswordResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetRootPasswordResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetRootPasswordResponse ) // create path and map variables @@ -3243,8 +3379,9 @@ func (a *V2ApiService) GetRootPassword(getRootPasswordRequest *GetRootPasswordRe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3253,7 +3390,8 @@ func (a *V2ApiService) GetRootPassword(getRootPasswordRequest *GetRootPasswordRe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3291,20 +3429,21 @@ func (a *V2ApiService) GetRootPassword(getRootPasswordRequest *GetRootPasswordRe } } + return &successPayload, err } -/* V2ApiService -서버이미지상품리스트조회 -@param getServerImageProductListRequest getServerImageProductListRequest -@return *GetServerImageProductListResponse*/ +/* V2ApiService + 서버이미지상품리스트조회 + @param getServerImageProductListRequest getServerImageProductListRequest + @return *GetServerImageProductListResponse*/ func (a *V2ApiService) GetServerImageProductList(getServerImageProductListRequest *GetServerImageProductListRequest) (*GetServerImageProductListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetServerImageProductListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetServerImageProductListResponse ) // create path and map variables @@ -3314,8 +3453,9 @@ func (a *V2ApiService) GetServerImageProductList(getServerImageProductListReques localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3324,7 +3464,8 @@ func (a *V2ApiService) GetServerImageProductList(getServerImageProductListReques } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3362,20 +3503,21 @@ func (a *V2ApiService) GetServerImageProductList(getServerImageProductListReques } } + return &successPayload, err } -/* V2ApiService -서버인스턴스리스트조회 -@param getServerInstanceListRequest getServerInstanceListRequest -@return *GetServerInstanceListResponse*/ +/* V2ApiService + 서버인스턴스리스트조회 + @param getServerInstanceListRequest getServerInstanceListRequest + @return *GetServerInstanceListResponse*/ func (a *V2ApiService) GetServerInstanceList(getServerInstanceListRequest *GetServerInstanceListRequest) (*GetServerInstanceListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetServerInstanceListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetServerInstanceListResponse ) // create path and map variables @@ -3385,8 +3527,9 @@ func (a *V2ApiService) GetServerInstanceList(getServerInstanceListRequest *GetSe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3395,7 +3538,8 @@ func (a *V2ApiService) GetServerInstanceList(getServerInstanceListRequest *GetSe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3433,20 +3577,21 @@ func (a *V2ApiService) GetServerInstanceList(getServerInstanceListRequest *GetSe } } + return &successPayload, err } -/* V2ApiService -서버상품리스트조회 -@param getServerProductListRequest getServerProductListRequest -@return *GetServerProductListResponse*/ +/* V2ApiService + 서버상품리스트조회 + @param getServerProductListRequest getServerProductListRequest + @return *GetServerProductListResponse*/ func (a *V2ApiService) GetServerProductList(getServerProductListRequest *GetServerProductListRequest) (*GetServerProductListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetServerProductListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetServerProductListResponse ) // create path and map variables @@ -3456,8 +3601,9 @@ func (a *V2ApiService) GetServerProductList(getServerProductListRequest *GetServ localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3466,7 +3612,8 @@ func (a *V2ApiService) GetServerProductList(getServerProductListRequest *GetServ } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3504,20 +3651,21 @@ func (a *V2ApiService) GetServerProductList(getServerProductListRequest *GetServ } } + return &successPayload, err } -/* V2ApiService -ZONE리스트조회 -@param getZoneListRequest getZoneListRequest -@return *GetZoneListResponse*/ +/* V2ApiService + ZONE리스트조회 + @param getZoneListRequest getZoneListRequest + @return *GetZoneListResponse*/ func (a *V2ApiService) GetZoneList(getZoneListRequest *GetZoneListRequest) (*GetZoneListResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload GetZoneListResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload GetZoneListResponse ) // create path and map variables @@ -3527,8 +3675,9 @@ func (a *V2ApiService) GetZoneList(getZoneListRequest *GetZoneListRequest) (*Get localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3537,7 +3686,8 @@ func (a *V2ApiService) GetZoneList(getZoneListRequest *GetZoneListRequest) (*Get } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3575,20 +3725,21 @@ func (a *V2ApiService) GetZoneList(getZoneListRequest *GetZoneListRequest) (*Get } } + return &successPayload, err } -/* V2ApiService -로그인키IMPORT -@param importLoginKeyRequest importLoginKeyRequest -@return *ImportLoginKeyResponse*/ +/* V2ApiService + 로그인키IMPORT + @param importLoginKeyRequest importLoginKeyRequest + @return *ImportLoginKeyResponse*/ func (a *V2ApiService) ImportLoginKey(importLoginKeyRequest *ImportLoginKeyRequest) (*ImportLoginKeyResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload ImportLoginKeyResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload ImportLoginKeyResponse ) // create path and map variables @@ -3598,8 +3749,9 @@ func (a *V2ApiService) ImportLoginKey(importLoginKeyRequest *ImportLoginKeyReque localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3608,7 +3760,8 @@ func (a *V2ApiService) ImportLoginKey(importLoginKeyRequest *ImportLoginKeyReque } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3646,20 +3799,21 @@ func (a *V2ApiService) ImportLoginKey(importLoginKeyRequest *ImportLoginKeyReque } } + return &successPayload, err } -/* V2ApiService -서버인스턴스재시작 -@param rebootServerInstancesRequest rebootServerInstancesRequest -@return *RebootServerInstancesResponse*/ +/* V2ApiService + 서버인스턴스재시작 + @param rebootServerInstancesRequest rebootServerInstancesRequest + @return *RebootServerInstancesResponse*/ func (a *V2ApiService) RebootServerInstances(rebootServerInstancesRequest *RebootServerInstancesRequest) (*RebootServerInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload RebootServerInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload RebootServerInstancesResponse ) // create path and map variables @@ -3669,8 +3823,9 @@ func (a *V2ApiService) RebootServerInstances(rebootServerInstancesRequest *Reboo localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3679,7 +3834,8 @@ func (a *V2ApiService) RebootServerInstances(rebootServerInstancesRequest *Reboo } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3717,20 +3873,21 @@ func (a *V2ApiService) RebootServerInstances(rebootServerInstancesRequest *Reboo } } + return &successPayload, err } -/* V2ApiService -서버인스턴스재생성 -@param recreateServerInstanceRequest recreateServerInstanceRequest -@return *RecreateServerInstanceResponse*/ +/* V2ApiService + 서버인스턴스재생성 + @param recreateServerInstanceRequest recreateServerInstanceRequest + @return *RecreateServerInstanceResponse*/ func (a *V2ApiService) RecreateServerInstance(recreateServerInstanceRequest *RecreateServerInstanceRequest) (*RecreateServerInstanceResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload RecreateServerInstanceResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload RecreateServerInstanceResponse ) // create path and map variables @@ -3740,8 +3897,9 @@ func (a *V2ApiService) RecreateServerInstance(recreateServerInstanceRequest *Rec localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3750,7 +3908,8 @@ func (a *V2ApiService) RecreateServerInstance(recreateServerInstanceRequest *Rec } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3788,20 +3947,21 @@ func (a *V2ApiService) RecreateServerInstance(recreateServerInstanceRequest *Rec } } + return &successPayload, err } -/* V2ApiService -NAS볼륨인스턴스접근제어제거 -@param removeNasVolumeAccessControlRequest removeNasVolumeAccessControlRequest -@return *RemoveNasVolumeAccessControlResponse*/ +/* V2ApiService + NAS볼륨인스턴스접근제어제거 + @param removeNasVolumeAccessControlRequest removeNasVolumeAccessControlRequest + @return *RemoveNasVolumeAccessControlResponse*/ func (a *V2ApiService) RemoveNasVolumeAccessControl(removeNasVolumeAccessControlRequest *RemoveNasVolumeAccessControlRequest) (*RemoveNasVolumeAccessControlResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload RemoveNasVolumeAccessControlResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload RemoveNasVolumeAccessControlResponse ) // create path and map variables @@ -3811,8 +3971,9 @@ func (a *V2ApiService) RemoveNasVolumeAccessControl(removeNasVolumeAccessControl localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3821,7 +3982,8 @@ func (a *V2ApiService) RemoveNasVolumeAccessControl(removeNasVolumeAccessControl } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3859,20 +4021,21 @@ func (a *V2ApiService) RemoveNasVolumeAccessControl(removeNasVolumeAccessControl } } + return &successPayload, err } -/* V2ApiService -NAS볼륨인스턴스접근제어설정 -@param setNasVolumeAccessControlRequest setNasVolumeAccessControlRequest -@return *SetNasVolumeAccessControlResponse*/ +/* V2ApiService + NAS볼륨인스턴스접근제어설정 + @param setNasVolumeAccessControlRequest setNasVolumeAccessControlRequest + @return *SetNasVolumeAccessControlResponse*/ func (a *V2ApiService) SetNasVolumeAccessControl(setNasVolumeAccessControlRequest *SetNasVolumeAccessControlRequest) (*SetNasVolumeAccessControlResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload SetNasVolumeAccessControlResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload SetNasVolumeAccessControlResponse ) // create path and map variables @@ -3882,8 +4045,9 @@ func (a *V2ApiService) SetNasVolumeAccessControl(setNasVolumeAccessControlReques localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3892,7 +4056,8 @@ func (a *V2ApiService) SetNasVolumeAccessControl(setNasVolumeAccessControlReques } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3930,20 +4095,21 @@ func (a *V2ApiService) SetNasVolumeAccessControl(setNasVolumeAccessControlReques } } + return &successPayload, err } -/* V2ApiService -서버인스턴스시작 -@param startServerInstancesRequest startServerInstancesRequest -@return *StartServerInstancesResponse*/ +/* V2ApiService + 서버인스턴스시작 + @param startServerInstancesRequest startServerInstancesRequest + @return *StartServerInstancesResponse*/ func (a *V2ApiService) StartServerInstances(startServerInstancesRequest *StartServerInstancesRequest) (*StartServerInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload StartServerInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload StartServerInstancesResponse ) // create path and map variables @@ -3953,8 +4119,9 @@ func (a *V2ApiService) StartServerInstances(startServerInstancesRequest *StartSe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -3963,7 +4130,8 @@ func (a *V2ApiService) StartServerInstances(startServerInstancesRequest *StartSe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4001,20 +4169,21 @@ func (a *V2ApiService) StartServerInstances(startServerInstancesRequest *StartSe } } + return &successPayload, err } -/* V2ApiService -서버인스턴스종료 -@param stopServerInstancesRequest stopServerInstancesRequest -@return *StopServerInstancesResponse*/ +/* V2ApiService + 서버인스턴스종료 + @param stopServerInstancesRequest stopServerInstancesRequest + @return *StopServerInstancesResponse*/ func (a *V2ApiService) StopServerInstances(stopServerInstancesRequest *StopServerInstancesRequest) (*StopServerInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload StopServerInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload StopServerInstancesResponse ) // create path and map variables @@ -4024,8 +4193,9 @@ func (a *V2ApiService) StopServerInstances(stopServerInstancesRequest *StopServe localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -4034,7 +4204,8 @@ func (a *V2ApiService) StopServerInstances(stopServerInstancesRequest *StopServe } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4072,20 +4243,21 @@ func (a *V2ApiService) StopServerInstances(stopServerInstancesRequest *StopServe } } + return &successPayload, err } -/* V2ApiService -서버인스턴스반납 -@param terminateServerInstancesRequest terminateServerInstancesRequest -@return *TerminateServerInstancesResponse*/ +/* V2ApiService + 서버인스턴스반납 + @param terminateServerInstancesRequest terminateServerInstancesRequest + @return *TerminateServerInstancesResponse*/ func (a *V2ApiService) TerminateServerInstances(terminateServerInstancesRequest *TerminateServerInstancesRequest) (*TerminateServerInstancesResponse, error) { var ( localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - successPayload TerminateServerInstancesResponse + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + successPayload TerminateServerInstancesResponse ) // create path and map variables @@ -4095,8 +4267,9 @@ func (a *V2ApiService) TerminateServerInstances(terminateServerInstancesRequest localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + // to determine the Content-Type header - localVarHttpContentTypes := []string{"application/x-www-form-urlencoded"} + localVarHttpContentTypes := []string{ "application/x-www-form-urlencoded", } // set Content-Type header localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) @@ -4105,7 +4278,8 @@ func (a *V2ApiService) TerminateServerInstances(terminateServerInstancesRequest } // to determine the Accept header - localVarHttpHeaderAccepts := []string{} + localVarHttpHeaderAccepts := []string{ + } // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4143,5 +4317,7 @@ func (a *V2ApiService) TerminateServerInstances(terminateServerInstancesRequest } } + return &successPayload, err } + diff --git a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/zone.go b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/zone.go index c264bc159..c954015aa 100644 --- a/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/zone.go +++ b/vendor/github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server/zone.go @@ -12,17 +12,17 @@ package server type Zone struct { // 존(Zone)번호 - ZoneNo *string `json:"zoneNo,omitempty"` +ZoneNo *string `json:"zoneNo,omitempty"` // 존(Zone)명 - ZoneName *string `json:"zoneName,omitempty"` +ZoneName *string `json:"zoneName,omitempty"` // 존(Zone) 코드 - ZoneCode *string `json:"zoneCode,omitempty"` +ZoneCode *string `json:"zoneCode,omitempty"` // 존(Zone)설명 - ZoneDescription *string `json:"zoneDescription,omitempty"` +ZoneDescription *string `json:"zoneDescription,omitempty"` // 리전번호 - RegionNo *string `json:"regionNo,omitempty"` +RegionNo *string `json:"regionNo,omitempty"` } diff --git a/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/endpoints/endpoints_config.go b/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/endpoints/endpoints_config.go index 06b491fa8..60adf7d45 100644 --- a/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/endpoints/endpoints_config.go +++ b/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/endpoints/endpoints_config.go @@ -1,3 +1,4 @@ + package endpoints import ( @@ -6,7 +7,7 @@ import ( "sync" ) -const endpointsJson = `{ +const endpointsJson =`{ "products": [ { "code": "ecs", @@ -1655,7 +1656,6 @@ const endpointsJson = `{ } ] }` - var initOnce sync.Once var data interface{} diff --git a/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses/response.go b/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses/response.go index 1da9cb262..dd6ae5b4c 100644 --- a/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses/response.go +++ b/vendor/github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses/response.go @@ -41,7 +41,6 @@ var debug utils.Debug func init() { debug = utils.Init("sdk") } - // Unmarshal object from http response body to target Response func Unmarshal(response AcsResponse, httpResponse *http.Response, format string) (err error) { err = response.parseFromHttpResponse(httpResponse) diff --git a/vendor/github.com/aliyun/aliyun-oss-go-sdk/oss/type.go b/vendor/github.com/aliyun/aliyun-oss-go-sdk/oss/type.go index 489836513..b60564538 100644 --- a/vendor/github.com/aliyun/aliyun-oss-go-sdk/oss/type.go +++ b/vendor/github.com/aliyun/aliyun-oss-go-sdk/oss/type.go @@ -190,8 +190,8 @@ type GetBucketCORSResult CORSXML // GetBucketInfoResult GetBucketInfo请求返回结果 type GetBucketInfoResult struct { - XMLName xml.Name `xml:"BucketInfo"` - BucketInfo BucketInfo `xml:"Bucket"` + XMLName xml.Name `xml:"BucketInfo"` + BucketInfo BucketInfo `xml:"Bucket"` } // BucketInfo Bucket信息 @@ -200,7 +200,7 @@ type BucketInfo struct { Name string `xml:"Name"` // Bucket名称 Location string `xml:"Location"` // Bucket所在的数据中心 CreationDate time.Time `xml:"CreationDate"` // Bucket创建时间 - ExtranetEndpoint string `xml:"ExtranetEndpoint"` // Bucket访问的外网域名 + ExtranetEndpoint string `xml:"ExtranetEndpoint"` // Bucket访问的外网域名 IntranetEndpoint string `xml:"IntranetEndpoint"` // Bucket访问的内网域名 ACL string `xml:"AccessControlList>Grant"` // Bucket权限 Owner Owner `xml:"Owner"` // Bucket拥有者信息 diff --git a/vendor/github.com/chzyer/readline/runebuf.go b/vendor/github.com/chzyer/readline/runebuf.go index d95df1e36..81d2da50c 100644 --- a/vendor/github.com/chzyer/readline/runebuf.go +++ b/vendor/github.com/chzyer/readline/runebuf.go @@ -35,7 +35,7 @@ type RuneBuffer struct { sync.Mutex } -func (r *RuneBuffer) pushKill(text []rune) { +func (r* RuneBuffer) pushKill(text []rune) { r.lastKill = append([]rune{}, text...) } @@ -221,7 +221,7 @@ func (r *RuneBuffer) DeleteWord() { } for i := init + 1; i < len(r.buf); i++ { if !IsWordBreak(r.buf[i]) && IsWordBreak(r.buf[i-1]) { - r.pushKill(r.buf[r.idx : i-1]) + r.pushKill(r.buf[r.idx:i-1]) r.Refresh(func() { r.buf = append(r.buf[:r.idx], r.buf[i-1:]...) }) @@ -350,7 +350,7 @@ func (r *RuneBuffer) Yank() { return } r.Refresh(func() { - buf := make([]rune, 0, len(r.buf)+len(r.lastKill)) + buf := make([]rune, 0, len(r.buf) + len(r.lastKill)) buf = append(buf, r.buf[:r.idx]...) buf = append(buf, r.lastKill...) buf = append(buf, r.buf[r.idx:]...) diff --git a/vendor/github.com/digitalocean/go-libvirt/internal/constants/constants.gen.go b/vendor/github.com/digitalocean/go-libvirt/internal/constants/constants.gen.go index 002aa1280..7224cdc1c 100644 --- a/vendor/github.com/digitalocean/go-libvirt/internal/constants/constants.gen.go +++ b/vendor/github.com/digitalocean/go-libvirt/internal/constants/constants.gen.go @@ -867,6 +867,7 @@ const ( // ProcDomainSetIothreadParams is libvirt's REMOTE_PROC_DOMAIN_SET_IOTHREAD_PARAMS ProcDomainSetIothreadParams = 402 + // From consts: // StringMax is libvirt's REMOTE_STRING_MAX StringMax = 4194304 diff --git a/vendor/github.com/digitalocean/go-libvirt/libvirt.gen.go b/vendor/github.com/digitalocean/go-libvirt/libvirt.gen.go index 85e8d9928..eb51f2817 100644 --- a/vendor/github.com/digitalocean/go-libvirt/libvirt.gen.go +++ b/vendor/github.com/digitalocean/go-libvirt/libvirt.gen.go @@ -34,7 +34,7 @@ const ( VirUUIDBuflen = 16 ) -type typedParamDecoder struct{} +type typedParamDecoder struct {} // Decode decodes a TypedParam. These are part of the libvirt spec, and not xdr // proper. TypedParams contain a name, which is called Field for some reason, @@ -111,31 +111,22 @@ func (typedParamDecoder) decodeTypedParamValue(d *xdr.Decoder) (*TypedParamValue // // OptString is libvirt's remote_string type OptString []string - // UUID is libvirt's remote_uuid type UUID [VirUUIDBuflen]byte - // OptDomain is libvirt's remote_domain type OptDomain []Domain - // OptNetwork is libvirt's remote_network type OptNetwork []Network - // OptNwfilter is libvirt's remote_nwfilter type OptNwfilter []Nwfilter - // OptNwfilterBinding is libvirt's remote_nwfilter_binding type OptNwfilterBinding []NwfilterBinding - // OptStoragePool is libvirt's remote_storage_pool type OptStoragePool []StoragePool - // OptStorageVol is libvirt's remote_storage_vol type OptStorageVol []StorageVol - // OptNodeDevice is libvirt's remote_node_device type OptNodeDevice []NodeDevice - // OptSecret is libvirt's remote_secret type OptSecret []Secret @@ -144,7 +135,6 @@ type OptSecret []Secret // // AuthType is libvirt's remote_auth_type type AuthType int32 - // Procedure is libvirt's remote_procedure type Procedure int32 @@ -155,7 +145,7 @@ type Procedure int32 type Domain struct { Name string UUID UUID - ID int32 + ID int32 } // Network is libvirt's remote_nonnull_network @@ -172,14 +162,14 @@ type Nwfilter struct { // NwfilterBinding is libvirt's remote_nonnull_nwfilter_binding type NwfilterBinding struct { - Portdev string + Portdev string Filtername string } // Interface is libvirt's remote_nonnull_interface type Interface struct { Name string - Mac string + Mac string } // StoragePool is libvirt's remote_nonnull_storage_pool @@ -192,7 +182,7 @@ type StoragePool struct { type StorageVol struct { Pool string Name string - Key string + Key string } // NodeDevice is libvirt's remote_nonnull_node_device @@ -202,38 +192,38 @@ type NodeDevice struct { // Secret is libvirt's remote_nonnull_secret type Secret struct { - UUID UUID + UUID UUID UsageType int32 - UsageID string + UsageID string } // DomainSnapshot is libvirt's remote_nonnull_domain_snapshot type DomainSnapshot struct { Name string - Dom Domain + Dom Domain } // Error is libvirt's remote_error type Error struct { - Code int32 + Code int32 OptDomain int32 - Message OptString - Level int32 - Dom OptDomain - Str1 OptString - Str2 OptString - Str3 OptString - Int1 int32 - Int2 int32 - Net OptNetwork + Message OptString + Level int32 + Dom OptDomain + Str1 OptString + Str2 OptString + Str3 OptString + Int1 int32 + Int2 int32 + Net OptNetwork } // VcpuInfo is libvirt's remote_vcpu_info type VcpuInfo struct { - Number uint32 - State int32 + Number uint32 + State int32 CPUTime uint64 - CPU int32 + CPU int32 } // TypedParam is libvirt's remote_typed_param @@ -256,13 +246,13 @@ type NodeGetMemoryStats struct { // DomainDiskError is libvirt's remote_domain_disk_error type DomainDiskError struct { - Disk string + Disk string Error int32 } // ConnectOpenArgs is libvirt's remote_connect_open_args type ConnectOpenArgs struct { - Name OptString + Name OptString Flags ConnectFlags } @@ -323,13 +313,13 @@ type ConnectGetMaxVcpusRet struct { // NodeGetInfoRet is libvirt's remote_node_get_info_ret type NodeGetInfoRet struct { - Model [32]int8 - Memory uint64 - Cpus int32 - Mhz int32 - Nodes int32 + Model [32]int8 + Memory uint64 + Cpus int32 + Mhz int32 + Nodes int32 Sockets int32 - Cores int32 + Cores int32 Threads int32 } @@ -341,10 +331,10 @@ type ConnectGetCapabilitiesRet struct { // ConnectGetDomainCapabilitiesArgs is libvirt's remote_connect_get_domain_capabilities_args type ConnectGetDomainCapabilitiesArgs struct { Emulatorbin OptString - Arch OptString - Machine OptString - Virttype OptString - Flags uint32 + Arch OptString + Machine OptString + Virttype OptString + Flags uint32 } // ConnectGetDomainCapabilitiesRet is libvirt's remote_connect_get_domain_capabilities_ret @@ -354,14 +344,14 @@ type ConnectGetDomainCapabilitiesRet struct { // NodeGetCPUStatsArgs is libvirt's remote_node_get_cpu_stats_args type NodeGetCPUStatsArgs struct { - CPUNum int32 + CPUNum int32 Nparams int32 - Flags uint32 + Flags uint32 } // NodeGetCPUStatsRet is libvirt's remote_node_get_cpu_stats_ret type NodeGetCPUStatsRet struct { - Params []NodeGetCPUStats + Params []NodeGetCPUStats Nparams int32 } @@ -369,19 +359,19 @@ type NodeGetCPUStatsRet struct { type NodeGetMemoryStatsArgs struct { Nparams int32 CellNum int32 - Flags uint32 + Flags uint32 } // NodeGetMemoryStatsRet is libvirt's remote_node_get_memory_stats_ret type NodeGetMemoryStatsRet struct { - Params []NodeGetMemoryStats + Params []NodeGetMemoryStats Nparams int32 } // NodeGetCellsFreeMemoryArgs is libvirt's remote_node_get_cells_free_memory_args type NodeGetCellsFreeMemoryArgs struct { StartCell int32 - Maxcells int32 + Maxcells int32 } // NodeGetCellsFreeMemoryRet is libvirt's remote_node_get_cells_free_memory_ret @@ -401,13 +391,13 @@ type DomainGetSchedulerTypeArgs struct { // DomainGetSchedulerTypeRet is libvirt's remote_domain_get_scheduler_type_ret type DomainGetSchedulerTypeRet struct { - Type string + Type string Nparams int32 } // DomainGetSchedulerParametersArgs is libvirt's remote_domain_get_scheduler_parameters_args type DomainGetSchedulerParametersArgs struct { - Dom Domain + Dom Domain Nparams int32 } @@ -418,9 +408,9 @@ type DomainGetSchedulerParametersRet struct { // DomainGetSchedulerParametersFlagsArgs is libvirt's remote_domain_get_scheduler_parameters_flags_args type DomainGetSchedulerParametersFlagsArgs struct { - Dom Domain + Dom Domain Nparams int32 - Flags uint32 + Flags uint32 } // DomainGetSchedulerParametersFlagsRet is libvirt's remote_domain_get_scheduler_parameters_flags_ret @@ -430,95 +420,95 @@ type DomainGetSchedulerParametersFlagsRet struct { // DomainSetSchedulerParametersArgs is libvirt's remote_domain_set_scheduler_parameters_args type DomainSetSchedulerParametersArgs struct { - Dom Domain + Dom Domain Params []TypedParam } // DomainSetSchedulerParametersFlagsArgs is libvirt's remote_domain_set_scheduler_parameters_flags_args type DomainSetSchedulerParametersFlagsArgs struct { - Dom Domain + Dom Domain Params []TypedParam - Flags uint32 + Flags uint32 } // DomainSetBlkioParametersArgs is libvirt's remote_domain_set_blkio_parameters_args type DomainSetBlkioParametersArgs struct { - Dom Domain + Dom Domain Params []TypedParam - Flags uint32 + Flags uint32 } // DomainGetBlkioParametersArgs is libvirt's remote_domain_get_blkio_parameters_args type DomainGetBlkioParametersArgs struct { - Dom Domain + Dom Domain Nparams int32 - Flags uint32 + Flags uint32 } // DomainGetBlkioParametersRet is libvirt's remote_domain_get_blkio_parameters_ret type DomainGetBlkioParametersRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainSetMemoryParametersArgs is libvirt's remote_domain_set_memory_parameters_args type DomainSetMemoryParametersArgs struct { - Dom Domain + Dom Domain Params []TypedParam - Flags uint32 + Flags uint32 } // DomainGetMemoryParametersArgs is libvirt's remote_domain_get_memory_parameters_args type DomainGetMemoryParametersArgs struct { - Dom Domain + Dom Domain Nparams int32 - Flags uint32 + Flags uint32 } // DomainGetMemoryParametersRet is libvirt's remote_domain_get_memory_parameters_ret type DomainGetMemoryParametersRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainBlockResizeArgs is libvirt's remote_domain_block_resize_args type DomainBlockResizeArgs struct { - Dom Domain - Disk string - Size uint64 + Dom Domain + Disk string + Size uint64 Flags DomainBlockResizeFlags } // DomainSetNumaParametersArgs is libvirt's remote_domain_set_numa_parameters_args type DomainSetNumaParametersArgs struct { - Dom Domain + Dom Domain Params []TypedParam - Flags uint32 + Flags uint32 } // DomainGetNumaParametersArgs is libvirt's remote_domain_get_numa_parameters_args type DomainGetNumaParametersArgs struct { - Dom Domain + Dom Domain Nparams int32 - Flags uint32 + Flags uint32 } // DomainGetNumaParametersRet is libvirt's remote_domain_get_numa_parameters_ret type DomainGetNumaParametersRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainSetPerfEventsArgs is libvirt's remote_domain_set_perf_events_args type DomainSetPerfEventsArgs struct { - Dom Domain + Dom Domain Params []TypedParam - Flags DomainModificationImpact + Flags DomainModificationImpact } // DomainGetPerfEventsArgs is libvirt's remote_domain_get_perf_events_args type DomainGetPerfEventsArgs struct { - Dom Domain + Dom Domain Flags DomainModificationImpact } @@ -529,78 +519,78 @@ type DomainGetPerfEventsRet struct { // DomainBlockStatsArgs is libvirt's remote_domain_block_stats_args type DomainBlockStatsArgs struct { - Dom Domain + Dom Domain Path string } // DomainBlockStatsRet is libvirt's remote_domain_block_stats_ret type DomainBlockStatsRet struct { - RdReq int64 + RdReq int64 RdBytes int64 - WrReq int64 + WrReq int64 WrBytes int64 - Errs int64 + Errs int64 } // DomainBlockStatsFlagsArgs is libvirt's remote_domain_block_stats_flags_args type DomainBlockStatsFlagsArgs struct { - Dom Domain - Path string + Dom Domain + Path string Nparams int32 - Flags uint32 + Flags uint32 } // DomainBlockStatsFlagsRet is libvirt's remote_domain_block_stats_flags_ret type DomainBlockStatsFlagsRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainInterfaceStatsArgs is libvirt's remote_domain_interface_stats_args type DomainInterfaceStatsArgs struct { - Dom Domain + Dom Domain Device string } // DomainInterfaceStatsRet is libvirt's remote_domain_interface_stats_ret type DomainInterfaceStatsRet struct { - RxBytes int64 + RxBytes int64 RxPackets int64 - RxErrs int64 - RxDrop int64 - TxBytes int64 + RxErrs int64 + RxDrop int64 + TxBytes int64 TxPackets int64 - TxErrs int64 - TxDrop int64 + TxErrs int64 + TxDrop int64 } // DomainSetInterfaceParametersArgs is libvirt's remote_domain_set_interface_parameters_args type DomainSetInterfaceParametersArgs struct { - Dom Domain + Dom Domain Device string Params []TypedParam - Flags uint32 + Flags uint32 } // DomainGetInterfaceParametersArgs is libvirt's remote_domain_get_interface_parameters_args type DomainGetInterfaceParametersArgs struct { - Dom Domain - Device string + Dom Domain + Device string Nparams int32 - Flags DomainModificationImpact + Flags DomainModificationImpact } // DomainGetInterfaceParametersRet is libvirt's remote_domain_get_interface_parameters_ret type DomainGetInterfaceParametersRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainMemoryStatsArgs is libvirt's remote_domain_memory_stats_args type DomainMemoryStatsArgs struct { - Dom Domain + Dom Domain MaxStats uint32 - Flags uint32 + Flags uint32 } // DomainMemoryStat is libvirt's remote_domain_memory_stat @@ -616,11 +606,11 @@ type DomainMemoryStatsRet struct { // DomainBlockPeekArgs is libvirt's remote_domain_block_peek_args type DomainBlockPeekArgs struct { - Dom Domain - Path string + Dom Domain + Path string Offset uint64 - Size uint32 - Flags uint32 + Size uint32 + Flags uint32 } // DomainBlockPeekRet is libvirt's remote_domain_block_peek_ret @@ -630,10 +620,10 @@ type DomainBlockPeekRet struct { // DomainMemoryPeekArgs is libvirt's remote_domain_memory_peek_args type DomainMemoryPeekArgs struct { - Dom Domain + Dom Domain Offset uint64 - Size uint32 - Flags DomainMemoryFlags + Size uint32 + Flags DomainMemoryFlags } // DomainMemoryPeekRet is libvirt's remote_domain_memory_peek_ret @@ -643,16 +633,16 @@ type DomainMemoryPeekRet struct { // DomainGetBlockInfoArgs is libvirt's remote_domain_get_block_info_args type DomainGetBlockInfoArgs struct { - Dom Domain - Path string + Dom Domain + Path string Flags uint32 } // DomainGetBlockInfoRet is libvirt's remote_domain_get_block_info_ret type DomainGetBlockInfoRet struct { Allocation uint64 - Capacity uint64 - Physical uint64 + Capacity uint64 + Physical uint64 } // ConnectListDomainsArgs is libvirt's remote_connect_list_domains_args @@ -673,7 +663,7 @@ type ConnectNumOfDomainsRet struct { // DomainCreateXMLArgs is libvirt's remote_domain_create_xml_args type DomainCreateXMLArgs struct { XMLDesc string - Flags DomainCreateFlags + Flags DomainCreateFlags } // DomainCreateXMLRet is libvirt's remote_domain_create_xml_ret @@ -684,7 +674,7 @@ type DomainCreateXMLRet struct { // DomainCreateXMLWithFilesArgs is libvirt's remote_domain_create_xml_with_files_args type DomainCreateXMLWithFilesArgs struct { XMLDesc string - Flags DomainCreateFlags + Flags DomainCreateFlags } // DomainCreateXMLWithFilesRet is libvirt's remote_domain_create_xml_with_files_ret @@ -734,15 +724,15 @@ type DomainResumeArgs struct { // DomainPmSuspendForDurationArgs is libvirt's remote_domain_pm_suspend_for_duration_args type DomainPmSuspendForDurationArgs struct { - Dom Domain - Target uint32 + Dom Domain + Target uint32 Duration uint64 - Flags uint32 + Flags uint32 } // DomainPmWakeupArgs is libvirt's remote_domain_pm_wakeup_args type DomainPmWakeupArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -753,13 +743,13 @@ type DomainShutdownArgs struct { // DomainRebootArgs is libvirt's remote_domain_reboot_args type DomainRebootArgs struct { - Dom Domain + Dom Domain Flags DomainRebootFlagValues } // DomainResetArgs is libvirt's remote_domain_reset_args type DomainResetArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -770,7 +760,7 @@ type DomainDestroyArgs struct { // DomainDestroyFlagsArgs is libvirt's remote_domain_destroy_flags_args type DomainDestroyFlagsArgs struct { - Dom Domain + Dom Domain Flags DomainDestroyFlagsValues } @@ -796,28 +786,28 @@ type DomainGetMaxMemoryRet struct { // DomainSetMaxMemoryArgs is libvirt's remote_domain_set_max_memory_args type DomainSetMaxMemoryArgs struct { - Dom Domain + Dom Domain Memory uint64 } // DomainSetMemoryArgs is libvirt's remote_domain_set_memory_args type DomainSetMemoryArgs struct { - Dom Domain + Dom Domain Memory uint64 } // DomainSetMemoryFlagsArgs is libvirt's remote_domain_set_memory_flags_args type DomainSetMemoryFlagsArgs struct { - Dom Domain + Dom Domain Memory uint64 - Flags uint32 + Flags uint32 } // DomainSetMemoryStatsPeriodArgs is libvirt's remote_domain_set_memory_stats_period_args type DomainSetMemoryStatsPeriodArgs struct { - Dom Domain + Dom Domain Period int32 - Flags DomainMemoryModFlags + Flags DomainMemoryModFlags } // DomainGetInfoArgs is libvirt's remote_domain_get_info_args @@ -827,24 +817,24 @@ type DomainGetInfoArgs struct { // DomainGetInfoRet is libvirt's remote_domain_get_info_ret type DomainGetInfoRet struct { - State uint8 - MaxMem uint64 - Memory uint64 + State uint8 + MaxMem uint64 + Memory uint64 NrVirtCPU uint16 - CPUTime uint64 + CPUTime uint64 } // DomainSaveArgs is libvirt's remote_domain_save_args type DomainSaveArgs struct { Dom Domain - To string + To string } // DomainSaveFlagsArgs is libvirt's remote_domain_save_flags_args type DomainSaveFlagsArgs struct { - Dom Domain - To string - Dxml OptString + Dom Domain + To string + Dxml OptString Flags uint32 } @@ -855,14 +845,14 @@ type DomainRestoreArgs struct { // DomainRestoreFlagsArgs is libvirt's remote_domain_restore_flags_args type DomainRestoreFlagsArgs struct { - From string - Dxml OptString + From string + Dxml OptString Flags uint32 } // DomainSaveImageGetXMLDescArgs is libvirt's remote_domain_save_image_get_xml_desc_args type DomainSaveImageGetXMLDescArgs struct { - File string + File string Flags uint32 } @@ -873,31 +863,31 @@ type DomainSaveImageGetXMLDescRet struct { // DomainSaveImageDefineXMLArgs is libvirt's remote_domain_save_image_define_xml_args type DomainSaveImageDefineXMLArgs struct { - File string - Dxml string + File string + Dxml string Flags uint32 } // DomainCoreDumpArgs is libvirt's remote_domain_core_dump_args type DomainCoreDumpArgs struct { - Dom Domain - To string + Dom Domain + To string Flags DomainCoreDumpFlags } // DomainCoreDumpWithFormatArgs is libvirt's remote_domain_core_dump_with_format_args type DomainCoreDumpWithFormatArgs struct { - Dom Domain - To string + Dom Domain + To string Dumpformat uint32 - Flags DomainCoreDumpFlags + Flags DomainCoreDumpFlags } // DomainScreenshotArgs is libvirt's remote_domain_screenshot_args type DomainScreenshotArgs struct { - Dom Domain + Dom Domain Screen uint32 - Flags uint32 + Flags uint32 } // DomainScreenshotRet is libvirt's remote_domain_screenshot_ret @@ -907,7 +897,7 @@ type DomainScreenshotRet struct { // DomainGetXMLDescArgs is libvirt's remote_domain_get_xml_desc_args type DomainGetXMLDescArgs struct { - Dom Domain + Dom Domain Flags DomainXMLFlags } @@ -918,9 +908,9 @@ type DomainGetXMLDescRet struct { // DomainMigratePrepareArgs is libvirt's remote_domain_migrate_prepare_args type DomainMigratePrepareArgs struct { - UriIn OptString - Flags uint64 - Dname OptString + UriIn OptString + Flags uint64 + Dname OptString Resource uint64 } @@ -932,20 +922,20 @@ type DomainMigratePrepareRet struct { // DomainMigratePerformArgs is libvirt's remote_domain_migrate_perform_args type DomainMigratePerformArgs struct { - Dom Domain - Cookie []byte - Uri string - Flags uint64 - Dname OptString + Dom Domain + Cookie []byte + Uri string + Flags uint64 + Dname OptString Resource uint64 } // DomainMigrateFinishArgs is libvirt's remote_domain_migrate_finish_args type DomainMigrateFinishArgs struct { - Dname string + Dname string Cookie []byte - Uri string - Flags uint64 + Uri string + Flags uint64 } // DomainMigrateFinishRet is libvirt's remote_domain_migrate_finish_ret @@ -955,11 +945,11 @@ type DomainMigrateFinishRet struct { // DomainMigratePrepare2Args is libvirt's remote_domain_migrate_prepare2_args type DomainMigratePrepare2Args struct { - UriIn OptString - Flags uint64 - Dname OptString + UriIn OptString + Flags uint64 + Dname OptString Resource uint64 - DomXML string + DomXML string } // DomainMigratePrepare2Ret is libvirt's remote_domain_migrate_prepare2_ret @@ -970,10 +960,10 @@ type DomainMigratePrepare2Ret struct { // DomainMigrateFinish2Args is libvirt's remote_domain_migrate_finish2_args type DomainMigrateFinish2Args struct { - Dname string - Cookie []byte - Uri string - Flags uint64 + Dname string + Cookie []byte + Uri string + Flags uint64 Retcode int32 } @@ -1004,7 +994,7 @@ type DomainCreateArgs struct { // DomainCreateWithFlagsArgs is libvirt's remote_domain_create_with_flags_args type DomainCreateWithFlagsArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -1015,7 +1005,7 @@ type DomainCreateWithFlagsRet struct { // DomainCreateWithFilesArgs is libvirt's remote_domain_create_with_files_args type DomainCreateWithFilesArgs struct { - Dom Domain + Dom Domain Flags DomainCreateFlags } @@ -1036,7 +1026,7 @@ type DomainDefineXMLRet struct { // DomainDefineXMLFlagsArgs is libvirt's remote_domain_define_xml_flags_args type DomainDefineXMLFlagsArgs struct { - XML string + XML string Flags DomainDefineFlags } @@ -1052,49 +1042,49 @@ type DomainUndefineArgs struct { // DomainUndefineFlagsArgs is libvirt's remote_domain_undefine_flags_args type DomainUndefineFlagsArgs struct { - Dom Domain + Dom Domain Flags DomainUndefineFlagsValues } // DomainInjectNmiArgs is libvirt's remote_domain_inject_nmi_args type DomainInjectNmiArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainSendKeyArgs is libvirt's remote_domain_send_key_args type DomainSendKeyArgs struct { - Dom Domain - Codeset uint32 + Dom Domain + Codeset uint32 Holdtime uint32 Keycodes []uint32 - Flags uint32 + Flags uint32 } // DomainSendProcessSignalArgs is libvirt's remote_domain_send_process_signal_args type DomainSendProcessSignalArgs struct { - Dom Domain + Dom Domain PidValue int64 - Signum uint32 - Flags uint32 + Signum uint32 + Flags uint32 } // DomainSetVcpusArgs is libvirt's remote_domain_set_vcpus_args type DomainSetVcpusArgs struct { - Dom Domain + Dom Domain Nvcpus uint32 } // DomainSetVcpusFlagsArgs is libvirt's remote_domain_set_vcpus_flags_args type DomainSetVcpusFlagsArgs struct { - Dom Domain + Dom Domain Nvcpus uint32 - Flags uint32 + Flags uint32 } // DomainGetVcpusFlagsArgs is libvirt's remote_domain_get_vcpus_flags_args type DomainGetVcpusFlagsArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -1105,63 +1095,63 @@ type DomainGetVcpusFlagsRet struct { // DomainPinVcpuArgs is libvirt's remote_domain_pin_vcpu_args type DomainPinVcpuArgs struct { - Dom Domain - Vcpu uint32 + Dom Domain + Vcpu uint32 Cpumap []byte } // DomainPinVcpuFlagsArgs is libvirt's remote_domain_pin_vcpu_flags_args type DomainPinVcpuFlagsArgs struct { - Dom Domain - Vcpu uint32 + Dom Domain + Vcpu uint32 Cpumap []byte - Flags uint32 + Flags uint32 } // DomainGetVcpuPinInfoArgs is libvirt's remote_domain_get_vcpu_pin_info_args type DomainGetVcpuPinInfoArgs struct { - Dom Domain + Dom Domain Ncpumaps int32 - Maplen int32 - Flags uint32 + Maplen int32 + Flags uint32 } // DomainGetVcpuPinInfoRet is libvirt's remote_domain_get_vcpu_pin_info_ret type DomainGetVcpuPinInfoRet struct { Cpumaps []byte - Num int32 + Num int32 } // DomainPinEmulatorArgs is libvirt's remote_domain_pin_emulator_args type DomainPinEmulatorArgs struct { - Dom Domain + Dom Domain Cpumap []byte - Flags DomainModificationImpact + Flags DomainModificationImpact } // DomainGetEmulatorPinInfoArgs is libvirt's remote_domain_get_emulator_pin_info_args type DomainGetEmulatorPinInfoArgs struct { - Dom Domain + Dom Domain Maplen int32 - Flags DomainModificationImpact + Flags DomainModificationImpact } // DomainGetEmulatorPinInfoRet is libvirt's remote_domain_get_emulator_pin_info_ret type DomainGetEmulatorPinInfoRet struct { Cpumaps []byte - Ret int32 + Ret int32 } // DomainGetVcpusArgs is libvirt's remote_domain_get_vcpus_args type DomainGetVcpusArgs struct { - Dom Domain + Dom Domain Maxinfo int32 - Maplen int32 + Maplen int32 } // DomainGetVcpusRet is libvirt's remote_domain_get_vcpus_ret type DomainGetVcpusRet struct { - Info []VcpuInfo + Info []VcpuInfo Cpumaps []byte } @@ -1178,49 +1168,49 @@ type DomainGetMaxVcpusRet struct { // DomainIothreadInfo is libvirt's remote_domain_iothread_info type DomainIothreadInfo struct { IothreadID uint32 - Cpumap []byte + Cpumap []byte } // DomainGetIothreadInfoArgs is libvirt's remote_domain_get_iothread_info_args type DomainGetIothreadInfoArgs struct { - Dom Domain + Dom Domain Flags DomainModificationImpact } // DomainGetIothreadInfoRet is libvirt's remote_domain_get_iothread_info_ret type DomainGetIothreadInfoRet struct { Info []DomainIothreadInfo - Ret uint32 + Ret uint32 } // DomainPinIothreadArgs is libvirt's remote_domain_pin_iothread_args type DomainPinIothreadArgs struct { - Dom Domain + Dom Domain IothreadsID uint32 - Cpumap []byte - Flags DomainModificationImpact + Cpumap []byte + Flags DomainModificationImpact } // DomainAddIothreadArgs is libvirt's remote_domain_add_iothread_args type DomainAddIothreadArgs struct { - Dom Domain + Dom Domain IothreadID uint32 - Flags DomainModificationImpact + Flags DomainModificationImpact } // DomainDelIothreadArgs is libvirt's remote_domain_del_iothread_args type DomainDelIothreadArgs struct { - Dom Domain + Dom Domain IothreadID uint32 - Flags DomainModificationImpact + Flags DomainModificationImpact } // DomainSetIothreadParamsArgs is libvirt's remote_domain_set_iothread_params_args type DomainSetIothreadParamsArgs struct { - Dom Domain + Dom Domain IothreadID uint32 - Params []TypedParam - Flags uint32 + Params []TypedParam + Flags uint32 } // DomainGetSecurityLabelArgs is libvirt's remote_domain_get_security_label_args @@ -1230,7 +1220,7 @@ type DomainGetSecurityLabelArgs struct { // DomainGetSecurityLabelRet is libvirt's remote_domain_get_security_label_ret type DomainGetSecurityLabelRet struct { - Label []int8 + Label []int8 Enforcing int32 } @@ -1242,13 +1232,13 @@ type DomainGetSecurityLabelListArgs struct { // DomainGetSecurityLabelListRet is libvirt's remote_domain_get_security_label_list_ret type DomainGetSecurityLabelListRet struct { Labels []DomainGetSecurityLabelRet - Ret int32 + Ret int32 } // NodeGetSecurityModelRet is libvirt's remote_node_get_security_model_ret type NodeGetSecurityModelRet struct { Model []int8 - Doi []int8 + Doi []int8 } // DomainAttachDeviceArgs is libvirt's remote_domain_attach_device_args @@ -1259,8 +1249,8 @@ type DomainAttachDeviceArgs struct { // DomainAttachDeviceFlagsArgs is libvirt's remote_domain_attach_device_flags_args type DomainAttachDeviceFlagsArgs struct { - Dom Domain - XML string + Dom Domain + XML string Flags uint32 } @@ -1272,21 +1262,21 @@ type DomainDetachDeviceArgs struct { // DomainDetachDeviceFlagsArgs is libvirt's remote_domain_detach_device_flags_args type DomainDetachDeviceFlagsArgs struct { - Dom Domain - XML string + Dom Domain + XML string Flags uint32 } // DomainUpdateDeviceFlagsArgs is libvirt's remote_domain_update_device_flags_args type DomainUpdateDeviceFlagsArgs struct { - Dom Domain - XML string + Dom Domain + XML string Flags DomainDeviceModifyFlags } // DomainDetachDeviceAliasArgs is libvirt's remote_domain_detach_device_alias_args type DomainDetachDeviceAliasArgs struct { - Dom Domain + Dom Domain Alias string Flags uint32 } @@ -1303,25 +1293,25 @@ type DomainGetAutostartRet struct { // DomainSetAutostartArgs is libvirt's remote_domain_set_autostart_args type DomainSetAutostartArgs struct { - Dom Domain + Dom Domain Autostart int32 } // DomainSetMetadataArgs is libvirt's remote_domain_set_metadata_args type DomainSetMetadataArgs struct { - Dom Domain - Type int32 + Dom Domain + Type int32 Metadata OptString - Key OptString - Uri OptString - Flags DomainModificationImpact + Key OptString + Uri OptString + Flags DomainModificationImpact } // DomainGetMetadataArgs is libvirt's remote_domain_get_metadata_args type DomainGetMetadataArgs struct { - Dom Domain - Type int32 - Uri OptString + Dom Domain + Type int32 + Uri OptString Flags DomainModificationImpact } @@ -1332,111 +1322,111 @@ type DomainGetMetadataRet struct { // DomainBlockJobAbortArgs is libvirt's remote_domain_block_job_abort_args type DomainBlockJobAbortArgs struct { - Dom Domain - Path string + Dom Domain + Path string Flags DomainBlockJobAbortFlags } // DomainGetBlockJobInfoArgs is libvirt's remote_domain_get_block_job_info_args type DomainGetBlockJobInfoArgs struct { - Dom Domain - Path string + Dom Domain + Path string Flags uint32 } // DomainGetBlockJobInfoRet is libvirt's remote_domain_get_block_job_info_ret type DomainGetBlockJobInfoRet struct { - Found int32 - Type int32 + Found int32 + Type int32 Bandwidth uint64 - Cur uint64 - End uint64 + Cur uint64 + End uint64 } // DomainBlockJobSetSpeedArgs is libvirt's remote_domain_block_job_set_speed_args type DomainBlockJobSetSpeedArgs struct { - Dom Domain - Path string + Dom Domain + Path string Bandwidth uint64 - Flags DomainBlockJobSetSpeedFlags + Flags DomainBlockJobSetSpeedFlags } // DomainBlockPullArgs is libvirt's remote_domain_block_pull_args type DomainBlockPullArgs struct { - Dom Domain - Path string + Dom Domain + Path string Bandwidth uint64 - Flags DomainBlockPullFlags + Flags DomainBlockPullFlags } // DomainBlockRebaseArgs is libvirt's remote_domain_block_rebase_args type DomainBlockRebaseArgs struct { - Dom Domain - Path string - Base OptString + Dom Domain + Path string + Base OptString Bandwidth uint64 - Flags DomainBlockRebaseFlags + Flags DomainBlockRebaseFlags } // DomainBlockCopyArgs is libvirt's remote_domain_block_copy_args type DomainBlockCopyArgs struct { - Dom Domain - Path string + Dom Domain + Path string Destxml string - Params []TypedParam - Flags DomainBlockCopyFlags + Params []TypedParam + Flags DomainBlockCopyFlags } // DomainBlockCommitArgs is libvirt's remote_domain_block_commit_args type DomainBlockCommitArgs struct { - Dom Domain - Disk string - Base OptString - Top OptString + Dom Domain + Disk string + Base OptString + Top OptString Bandwidth uint64 - Flags DomainBlockCommitFlags + Flags DomainBlockCommitFlags } // DomainSetBlockIOTuneArgs is libvirt's remote_domain_set_block_io_tune_args type DomainSetBlockIOTuneArgs struct { - Dom Domain - Disk string + Dom Domain + Disk string Params []TypedParam - Flags uint32 + Flags uint32 } // DomainGetBlockIOTuneArgs is libvirt's remote_domain_get_block_io_tune_args type DomainGetBlockIOTuneArgs struct { - Dom Domain - Disk OptString + Dom Domain + Disk OptString Nparams int32 - Flags uint32 + Flags uint32 } // DomainGetBlockIOTuneRet is libvirt's remote_domain_get_block_io_tune_ret type DomainGetBlockIOTuneRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainGetCPUStatsArgs is libvirt's remote_domain_get_cpu_stats_args type DomainGetCPUStatsArgs struct { - Dom Domain - Nparams uint32 + Dom Domain + Nparams uint32 StartCPU int32 - Ncpus uint32 - Flags TypedParameterFlags + Ncpus uint32 + Flags TypedParameterFlags } // DomainGetCPUStatsRet is libvirt's remote_domain_get_cpu_stats_ret type DomainGetCPUStatsRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainGetHostnameArgs is libvirt's remote_domain_get_hostname_args type DomainGetHostnameArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -1522,12 +1512,12 @@ type NetworkUndefineArgs struct { // NetworkUpdateArgs is libvirt's remote_network_update_args type NetworkUpdateArgs struct { - Net Network - Command uint32 - Section uint32 + Net Network + Command uint32 + Section uint32 ParentIndex int32 - XML string - Flags NetworkUpdateFlags + XML string + Flags NetworkUpdateFlags } // NetworkCreateArgs is libvirt's remote_network_create_args @@ -1542,7 +1532,7 @@ type NetworkDestroyArgs struct { // NetworkGetXMLDescArgs is libvirt's remote_network_get_xml_desc_args type NetworkGetXMLDescArgs struct { - Net Network + Net Network Flags uint32 } @@ -1573,7 +1563,7 @@ type NetworkGetAutostartRet struct { // NetworkSetAutostartArgs is libvirt's remote_network_set_autostart_args type NetworkSetAutostartArgs struct { - Net Network + Net Network Autostart int32 } @@ -1630,7 +1620,7 @@ type NwfilterUndefineArgs struct { // NwfilterGetXMLDescArgs is libvirt's remote_nwfilter_get_xml_desc_args type NwfilterGetXMLDescArgs struct { OptNwfilter Nwfilter - Flags uint32 + Flags uint32 } // NwfilterGetXMLDescRet is libvirt's remote_nwfilter_get_xml_desc_ret @@ -1701,7 +1691,7 @@ type InterfaceGetXMLDescRet struct { // InterfaceDefineXMLArgs is libvirt's remote_interface_define_xml_args type InterfaceDefineXMLArgs struct { - XML string + XML string Flags uint32 } @@ -1755,28 +1745,28 @@ type AuthSaslInitRet struct { // AuthSaslStartArgs is libvirt's remote_auth_sasl_start_args type AuthSaslStartArgs struct { Mech string - Nil int32 + Nil int32 Data []int8 } // AuthSaslStartRet is libvirt's remote_auth_sasl_start_ret type AuthSaslStartRet struct { Complete int32 - Nil int32 - Data []int8 + Nil int32 + Data []int8 } // AuthSaslStepArgs is libvirt's remote_auth_sasl_step_args type AuthSaslStepArgs struct { - Nil int32 + Nil int32 Data []int8 } // AuthSaslStepRet is libvirt's remote_auth_sasl_step_ret type AuthSaslStepRet struct { Complete int32 - Nil int32 - Data []int8 + Nil int32 + Data []int8 } // AuthPolkitRet is libvirt's remote_auth_polkit_ret @@ -1816,9 +1806,9 @@ type ConnectListDefinedStoragePoolsRet struct { // ConnectFindStoragePoolSourcesArgs is libvirt's remote_connect_find_storage_pool_sources_args type ConnectFindStoragePoolSourcesArgs struct { - Type string + Type string SrcSpec OptString - Flags uint32 + Flags uint32 } // ConnectFindStoragePoolSourcesRet is libvirt's remote_connect_find_storage_pool_sources_ret @@ -1868,7 +1858,7 @@ type StoragePoolLookupByTargetPathRet struct { // StoragePoolCreateXMLArgs is libvirt's remote_storage_pool_create_xml_args type StoragePoolCreateXMLArgs struct { - XML string + XML string Flags StoragePoolCreateFlags } @@ -1879,7 +1869,7 @@ type StoragePoolCreateXMLRet struct { // StoragePoolDefineXMLArgs is libvirt's remote_storage_pool_define_xml_args type StoragePoolDefineXMLArgs struct { - XML string + XML string Flags uint32 } @@ -1890,7 +1880,7 @@ type StoragePoolDefineXMLRet struct { // StoragePoolBuildArgs is libvirt's remote_storage_pool_build_args type StoragePoolBuildArgs struct { - Pool StoragePool + Pool StoragePool Flags StoragePoolBuildFlags } @@ -1901,7 +1891,7 @@ type StoragePoolUndefineArgs struct { // StoragePoolCreateArgs is libvirt's remote_storage_pool_create_args type StoragePoolCreateArgs struct { - Pool StoragePool + Pool StoragePool Flags StoragePoolCreateFlags } @@ -1912,19 +1902,19 @@ type StoragePoolDestroyArgs struct { // StoragePoolDeleteArgs is libvirt's remote_storage_pool_delete_args type StoragePoolDeleteArgs struct { - Pool StoragePool + Pool StoragePool Flags StoragePoolDeleteFlags } // StoragePoolRefreshArgs is libvirt's remote_storage_pool_refresh_args type StoragePoolRefreshArgs struct { - Pool StoragePool + Pool StoragePool Flags uint32 } // StoragePoolGetXMLDescArgs is libvirt's remote_storage_pool_get_xml_desc_args type StoragePoolGetXMLDescArgs struct { - Pool StoragePool + Pool StoragePool Flags StorageXMLFlags } @@ -1940,10 +1930,10 @@ type StoragePoolGetInfoArgs struct { // StoragePoolGetInfoRet is libvirt's remote_storage_pool_get_info_ret type StoragePoolGetInfoRet struct { - State uint8 - Capacity uint64 + State uint8 + Capacity uint64 Allocation uint64 - Available uint64 + Available uint64 } // StoragePoolGetAutostartArgs is libvirt's remote_storage_pool_get_autostart_args @@ -1958,7 +1948,7 @@ type StoragePoolGetAutostartRet struct { // StoragePoolSetAutostartArgs is libvirt's remote_storage_pool_set_autostart_args type StoragePoolSetAutostartArgs struct { - Pool StoragePool + Pool StoragePool Autostart int32 } @@ -1974,7 +1964,7 @@ type StoragePoolNumOfVolumesRet struct { // StoragePoolListVolumesArgs is libvirt's remote_storage_pool_list_volumes_args type StoragePoolListVolumesArgs struct { - Pool StoragePool + Pool StoragePool Maxnames int32 } @@ -2016,8 +2006,8 @@ type StorageVolLookupByPathRet struct { // StorageVolCreateXMLArgs is libvirt's remote_storage_vol_create_xml_args type StorageVolCreateXMLArgs struct { - Pool StoragePool - XML string + Pool StoragePool + XML string Flags StorageVolCreateFlags } @@ -2028,10 +2018,10 @@ type StorageVolCreateXMLRet struct { // StorageVolCreateXMLFromArgs is libvirt's remote_storage_vol_create_xml_from_args type StorageVolCreateXMLFromArgs struct { - Pool StoragePool - XML string + Pool StoragePool + XML string Clonevol StorageVol - Flags StorageVolCreateFlags + Flags StorageVolCreateFlags } // StorageVolCreateXMLFromRet is libvirt's remote_storage_vol_create_xml_from_ret @@ -2041,26 +2031,26 @@ type StorageVolCreateXMLFromRet struct { // StorageVolDeleteArgs is libvirt's remote_storage_vol_delete_args type StorageVolDeleteArgs struct { - Vol StorageVol + Vol StorageVol Flags StorageVolDeleteFlags } // StorageVolWipeArgs is libvirt's remote_storage_vol_wipe_args type StorageVolWipeArgs struct { - Vol StorageVol + Vol StorageVol Flags uint32 } // StorageVolWipePatternArgs is libvirt's remote_storage_vol_wipe_pattern_args type StorageVolWipePatternArgs struct { - Vol StorageVol + Vol StorageVol Algorithm uint32 - Flags uint32 + Flags uint32 } // StorageVolGetXMLDescArgs is libvirt's remote_storage_vol_get_xml_desc_args type StorageVolGetXMLDescArgs struct { - Vol StorageVol + Vol StorageVol Flags uint32 } @@ -2076,21 +2066,21 @@ type StorageVolGetInfoArgs struct { // StorageVolGetInfoRet is libvirt's remote_storage_vol_get_info_ret type StorageVolGetInfoRet struct { - Type int8 - Capacity uint64 + Type int8 + Capacity uint64 Allocation uint64 } // StorageVolGetInfoFlagsArgs is libvirt's remote_storage_vol_get_info_flags_args type StorageVolGetInfoFlagsArgs struct { - Vol StorageVol + Vol StorageVol Flags uint32 } // StorageVolGetInfoFlagsRet is libvirt's remote_storage_vol_get_info_flags_ret type StorageVolGetInfoFlagsRet struct { - Type int8 - Capacity uint64 + Type int8 + Capacity uint64 Allocation uint64 } @@ -2106,14 +2096,14 @@ type StorageVolGetPathRet struct { // StorageVolResizeArgs is libvirt's remote_storage_vol_resize_args type StorageVolResizeArgs struct { - Vol StorageVol + Vol StorageVol Capacity uint64 - Flags StorageVolResizeFlags + Flags StorageVolResizeFlags } // NodeNumOfDevicesArgs is libvirt's remote_node_num_of_devices_args type NodeNumOfDevicesArgs struct { - Cap OptString + Cap OptString Flags uint32 } @@ -2124,9 +2114,9 @@ type NodeNumOfDevicesRet struct { // NodeListDevicesArgs is libvirt's remote_node_list_devices_args type NodeListDevicesArgs struct { - Cap OptString + Cap OptString Maxnames int32 - Flags uint32 + Flags uint32 } // NodeListDevicesRet is libvirt's remote_node_list_devices_ret @@ -2146,8 +2136,8 @@ type NodeDeviceLookupByNameRet struct { // NodeDeviceLookupScsiHostByWwnArgs is libvirt's remote_node_device_lookup_scsi_host_by_wwn_args type NodeDeviceLookupScsiHostByWwnArgs struct { - Wwnn string - Wwpn string + Wwnn string + Wwpn string Flags uint32 } @@ -2158,7 +2148,7 @@ type NodeDeviceLookupScsiHostByWwnRet struct { // NodeDeviceGetXMLDescArgs is libvirt's remote_node_device_get_xml_desc_args type NodeDeviceGetXMLDescArgs struct { - Name string + Name string Flags uint32 } @@ -2189,7 +2179,7 @@ type NodeDeviceNumOfCapsRet struct { // NodeDeviceListCapsArgs is libvirt's remote_node_device_list_caps_args type NodeDeviceListCapsArgs struct { - Name string + Name string Maxnames int32 } @@ -2205,9 +2195,9 @@ type NodeDeviceDettachArgs struct { // NodeDeviceDetachFlagsArgs is libvirt's remote_node_device_detach_flags_args type NodeDeviceDetachFlagsArgs struct { - Name string + Name string DriverName OptString - Flags uint32 + Flags uint32 } // NodeDeviceReAttachArgs is libvirt's remote_node_device_re_attach_args @@ -2223,7 +2213,7 @@ type NodeDeviceResetArgs struct { // NodeDeviceCreateXMLArgs is libvirt's remote_node_device_create_xml_args type NodeDeviceCreateXMLArgs struct { XMLDesc string - Flags uint32 + Flags uint32 } // NodeDeviceCreateXMLRet is libvirt's remote_node_device_create_xml_ret @@ -2248,22 +2238,22 @@ type ConnectDomainEventDeregisterRet struct { // DomainEventLifecycleMsg is libvirt's remote_domain_event_lifecycle_msg type DomainEventLifecycleMsg struct { - Dom Domain - Event int32 + Dom Domain + Event int32 Detail int32 } // DomainEventCallbackLifecycleMsg is libvirt's remote_domain_event_callback_lifecycle_msg type DomainEventCallbackLifecycleMsg struct { CallbackID int32 - Msg DomainEventLifecycleMsg + Msg DomainEventLifecycleMsg } // ConnectDomainXMLFromNativeArgs is libvirt's remote_connect_domain_xml_from_native_args type ConnectDomainXMLFromNativeArgs struct { NativeFormat string NativeConfig string - Flags uint32 + Flags uint32 } // ConnectDomainXMLFromNativeRet is libvirt's remote_connect_domain_xml_from_native_ret @@ -2274,8 +2264,8 @@ type ConnectDomainXMLFromNativeRet struct { // ConnectDomainXMLToNativeArgs is libvirt's remote_connect_domain_xml_to_native_args type ConnectDomainXMLToNativeArgs struct { NativeFormat string - DomainXML string - Flags uint32 + DomainXML string + Flags uint32 } // ConnectDomainXMLToNativeRet is libvirt's remote_connect_domain_xml_to_native_ret @@ -2310,7 +2300,7 @@ type SecretLookupByUUIDRet struct { // SecretDefineXMLArgs is libvirt's remote_secret_define_xml_args type SecretDefineXMLArgs struct { - XML string + XML string Flags uint32 } @@ -2322,7 +2312,7 @@ type SecretDefineXMLRet struct { // SecretGetXMLDescArgs is libvirt's remote_secret_get_xml_desc_args type SecretGetXMLDescArgs struct { OptSecret Secret - Flags uint32 + Flags uint32 } // SecretGetXMLDescRet is libvirt's remote_secret_get_xml_desc_ret @@ -2333,14 +2323,14 @@ type SecretGetXMLDescRet struct { // SecretSetValueArgs is libvirt's remote_secret_set_value_args type SecretSetValueArgs struct { OptSecret Secret - Value []byte - Flags uint32 + Value []byte + Flags uint32 } // SecretGetValueArgs is libvirt's remote_secret_get_value_args type SecretGetValueArgs struct { OptSecret Secret - Flags uint32 + Flags uint32 } // SecretGetValueRet is libvirt's remote_secret_get_value_ret @@ -2356,7 +2346,7 @@ type SecretUndefineArgs struct { // SecretLookupByUsageArgs is libvirt's remote_secret_lookup_by_usage_args type SecretLookupByUsageArgs struct { UsageType int32 - UsageID string + UsageID string } // SecretLookupByUsageRet is libvirt's remote_secret_lookup_by_usage_ret @@ -2366,10 +2356,10 @@ type SecretLookupByUsageRet struct { // DomainMigratePrepareTunnelArgs is libvirt's remote_domain_migrate_prepare_tunnel_args type DomainMigratePrepareTunnelArgs struct { - Flags uint64 - Dname OptString + Flags uint64 + Dname OptString Resource uint64 - DomXML string + DomXML string } // ConnectIsSecureRet is libvirt's remote_connect_is_secure_ret @@ -2459,7 +2449,7 @@ type InterfaceIsActiveRet struct { // ConnectCompareCPUArgs is libvirt's remote_connect_compare_cpu_args type ConnectCompareCPUArgs struct { - XML string + XML string Flags ConnectCompareCPUFlags } @@ -2471,7 +2461,7 @@ type ConnectCompareCPURet struct { // ConnectBaselineCPUArgs is libvirt's remote_connect_baseline_cpu_args type ConnectBaselineCPUArgs struct { XMLCPUs []string - Flags ConnectBaselineCPUFlags + Flags ConnectBaselineCPUFlags } // ConnectBaselineCPURet is libvirt's remote_connect_baseline_cpu_ret @@ -2486,29 +2476,29 @@ type DomainGetJobInfoArgs struct { // DomainGetJobInfoRet is libvirt's remote_domain_get_job_info_ret type DomainGetJobInfoRet struct { - Type int32 - TimeElapsed uint64 + Type int32 + TimeElapsed uint64 TimeRemaining uint64 - DataTotal uint64 + DataTotal uint64 DataProcessed uint64 DataRemaining uint64 - MemTotal uint64 - MemProcessed uint64 - MemRemaining uint64 - FileTotal uint64 + MemTotal uint64 + MemProcessed uint64 + MemRemaining uint64 + FileTotal uint64 FileProcessed uint64 FileRemaining uint64 } // DomainGetJobStatsArgs is libvirt's remote_domain_get_job_stats_args type DomainGetJobStatsArgs struct { - Dom Domain + Dom Domain Flags DomainGetJobStatsFlags } // DomainGetJobStatsRet is libvirt's remote_domain_get_job_stats_ret type DomainGetJobStatsRet struct { - Type int32 + Type int32 Params []TypedParam } @@ -2519,7 +2509,7 @@ type DomainAbortJobArgs struct { // DomainMigrateGetMaxDowntimeArgs is libvirt's remote_domain_migrate_get_max_downtime_args type DomainMigrateGetMaxDowntimeArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2530,14 +2520,14 @@ type DomainMigrateGetMaxDowntimeRet struct { // DomainMigrateSetMaxDowntimeArgs is libvirt's remote_domain_migrate_set_max_downtime_args type DomainMigrateSetMaxDowntimeArgs struct { - Dom Domain + Dom Domain Downtime uint64 - Flags uint32 + Flags uint32 } // DomainMigrateGetCompressionCacheArgs is libvirt's remote_domain_migrate_get_compression_cache_args type DomainMigrateGetCompressionCacheArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2548,21 +2538,21 @@ type DomainMigrateGetCompressionCacheRet struct { // DomainMigrateSetCompressionCacheArgs is libvirt's remote_domain_migrate_set_compression_cache_args type DomainMigrateSetCompressionCacheArgs struct { - Dom Domain + Dom Domain CacheSize uint64 - Flags uint32 + Flags uint32 } // DomainMigrateSetMaxSpeedArgs is libvirt's remote_domain_migrate_set_max_speed_args type DomainMigrateSetMaxSpeedArgs struct { - Dom Domain + Dom Domain Bandwidth uint64 - Flags uint32 + Flags uint32 } // DomainMigrateGetMaxSpeedArgs is libvirt's remote_domain_migrate_get_max_speed_args type DomainMigrateGetMaxSpeedArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2584,7 +2574,7 @@ type ConnectDomainEventDeregisterAnyArgs struct { // ConnectDomainEventCallbackRegisterAnyArgs is libvirt's remote_connect_domain_event_callback_register_any_args type ConnectDomainEventCallbackRegisterAnyArgs struct { EventID int32 - Dom OptDomain + Dom OptDomain } // ConnectDomainEventCallbackRegisterAnyRet is libvirt's remote_connect_domain_event_callback_register_any_ret @@ -2605,66 +2595,66 @@ type DomainEventRebootMsg struct { // DomainEventCallbackRebootMsg is libvirt's remote_domain_event_callback_reboot_msg type DomainEventCallbackRebootMsg struct { CallbackID int32 - Msg DomainEventRebootMsg + Msg DomainEventRebootMsg } // DomainEventRtcChangeMsg is libvirt's remote_domain_event_rtc_change_msg type DomainEventRtcChangeMsg struct { - Dom Domain + Dom Domain Offset int64 } // DomainEventCallbackRtcChangeMsg is libvirt's remote_domain_event_callback_rtc_change_msg type DomainEventCallbackRtcChangeMsg struct { CallbackID int32 - Msg DomainEventRtcChangeMsg + Msg DomainEventRtcChangeMsg } // DomainEventWatchdogMsg is libvirt's remote_domain_event_watchdog_msg type DomainEventWatchdogMsg struct { - Dom Domain + Dom Domain Action int32 } // DomainEventCallbackWatchdogMsg is libvirt's remote_domain_event_callback_watchdog_msg type DomainEventCallbackWatchdogMsg struct { CallbackID int32 - Msg DomainEventWatchdogMsg + Msg DomainEventWatchdogMsg } // DomainEventIOErrorMsg is libvirt's remote_domain_event_io_error_msg type DomainEventIOErrorMsg struct { - Dom Domain - SrcPath string + Dom Domain + SrcPath string DevAlias string - Action int32 + Action int32 } // DomainEventCallbackIOErrorMsg is libvirt's remote_domain_event_callback_io_error_msg type DomainEventCallbackIOErrorMsg struct { CallbackID int32 - Msg DomainEventIOErrorMsg + Msg DomainEventIOErrorMsg } // DomainEventIOErrorReasonMsg is libvirt's remote_domain_event_io_error_reason_msg type DomainEventIOErrorReasonMsg struct { - Dom Domain - SrcPath string + Dom Domain + SrcPath string DevAlias string - Action int32 - Reason string + Action int32 + Reason string } // DomainEventCallbackIOErrorReasonMsg is libvirt's remote_domain_event_callback_io_error_reason_msg type DomainEventCallbackIOErrorReasonMsg struct { CallbackID int32 - Msg DomainEventIOErrorReasonMsg + Msg DomainEventIOErrorReasonMsg } // DomainEventGraphicsAddress is libvirt's remote_domain_event_graphics_address type DomainEventGraphicsAddress struct { - Family int32 - Node string + Family int32 + Node string Service string } @@ -2676,60 +2666,60 @@ type DomainEventGraphicsIdentity struct { // DomainEventGraphicsMsg is libvirt's remote_domain_event_graphics_msg type DomainEventGraphicsMsg struct { - Dom Domain - Phase int32 - Local DomainEventGraphicsAddress - Remote DomainEventGraphicsAddress + Dom Domain + Phase int32 + Local DomainEventGraphicsAddress + Remote DomainEventGraphicsAddress AuthScheme string - Subject []DomainEventGraphicsIdentity + Subject []DomainEventGraphicsIdentity } // DomainEventCallbackGraphicsMsg is libvirt's remote_domain_event_callback_graphics_msg type DomainEventCallbackGraphicsMsg struct { CallbackID int32 - Msg DomainEventGraphicsMsg + Msg DomainEventGraphicsMsg } // DomainEventBlockJobMsg is libvirt's remote_domain_event_block_job_msg type DomainEventBlockJobMsg struct { - Dom Domain - Path string - Type int32 + Dom Domain + Path string + Type int32 Status int32 } // DomainEventCallbackBlockJobMsg is libvirt's remote_domain_event_callback_block_job_msg type DomainEventCallbackBlockJobMsg struct { CallbackID int32 - Msg DomainEventBlockJobMsg + Msg DomainEventBlockJobMsg } // DomainEventDiskChangeMsg is libvirt's remote_domain_event_disk_change_msg type DomainEventDiskChangeMsg struct { - Dom Domain + Dom Domain OldSrcPath OptString NewSrcPath OptString - DevAlias string - Reason int32 + DevAlias string + Reason int32 } // DomainEventCallbackDiskChangeMsg is libvirt's remote_domain_event_callback_disk_change_msg type DomainEventCallbackDiskChangeMsg struct { CallbackID int32 - Msg DomainEventDiskChangeMsg + Msg DomainEventDiskChangeMsg } // DomainEventTrayChangeMsg is libvirt's remote_domain_event_tray_change_msg type DomainEventTrayChangeMsg struct { - Dom Domain + Dom Domain DevAlias string - Reason int32 + Reason int32 } // DomainEventCallbackTrayChangeMsg is libvirt's remote_domain_event_callback_tray_change_msg type DomainEventCallbackTrayChangeMsg struct { CallbackID int32 - Msg DomainEventTrayChangeMsg + Msg DomainEventTrayChangeMsg } // DomainEventPmwakeupMsg is libvirt's remote_domain_event_pmwakeup_msg @@ -2740,8 +2730,8 @@ type DomainEventPmwakeupMsg struct { // DomainEventCallbackPmwakeupMsg is libvirt's remote_domain_event_callback_pmwakeup_msg type DomainEventCallbackPmwakeupMsg struct { CallbackID int32 - Reason int32 - Msg DomainEventPmwakeupMsg + Reason int32 + Msg DomainEventPmwakeupMsg } // DomainEventPmsuspendMsg is libvirt's remote_domain_event_pmsuspend_msg @@ -2752,20 +2742,20 @@ type DomainEventPmsuspendMsg struct { // DomainEventCallbackPmsuspendMsg is libvirt's remote_domain_event_callback_pmsuspend_msg type DomainEventCallbackPmsuspendMsg struct { CallbackID int32 - Reason int32 - Msg DomainEventPmsuspendMsg + Reason int32 + Msg DomainEventPmsuspendMsg } // DomainEventBalloonChangeMsg is libvirt's remote_domain_event_balloon_change_msg type DomainEventBalloonChangeMsg struct { - Dom Domain + Dom Domain Actual uint64 } // DomainEventCallbackBalloonChangeMsg is libvirt's remote_domain_event_callback_balloon_change_msg type DomainEventCallbackBalloonChangeMsg struct { CallbackID int32 - Msg DomainEventBalloonChangeMsg + Msg DomainEventBalloonChangeMsg } // DomainEventPmsuspendDiskMsg is libvirt's remote_domain_event_pmsuspend_disk_msg @@ -2776,19 +2766,19 @@ type DomainEventPmsuspendDiskMsg struct { // DomainEventCallbackPmsuspendDiskMsg is libvirt's remote_domain_event_callback_pmsuspend_disk_msg type DomainEventCallbackPmsuspendDiskMsg struct { CallbackID int32 - Reason int32 - Msg DomainEventPmsuspendDiskMsg + Reason int32 + Msg DomainEventPmsuspendDiskMsg } // DomainManagedSaveArgs is libvirt's remote_domain_managed_save_args type DomainManagedSaveArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainHasManagedSaveImageArgs is libvirt's remote_domain_has_managed_save_image_args type DomainHasManagedSaveImageArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2799,13 +2789,13 @@ type DomainHasManagedSaveImageRet struct { // DomainManagedSaveRemoveArgs is libvirt's remote_domain_managed_save_remove_args type DomainManagedSaveRemoveArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainManagedSaveGetXMLDescArgs is libvirt's remote_domain_managed_save_get_xml_desc_args type DomainManagedSaveGetXMLDescArgs struct { - Dom Domain + Dom Domain Flags DomainXMLFlags } @@ -2816,16 +2806,16 @@ type DomainManagedSaveGetXMLDescRet struct { // DomainManagedSaveDefineXMLArgs is libvirt's remote_domain_managed_save_define_xml_args type DomainManagedSaveDefineXMLArgs struct { - Dom Domain - Dxml OptString + Dom Domain + Dxml OptString Flags DomainSaveRestoreFlags } // DomainSnapshotCreateXMLArgs is libvirt's remote_domain_snapshot_create_xml_args type DomainSnapshotCreateXMLArgs struct { - Dom Domain + Dom Domain XMLDesc string - Flags uint32 + Flags uint32 } // DomainSnapshotCreateXMLRet is libvirt's remote_domain_snapshot_create_xml_ret @@ -2835,7 +2825,7 @@ type DomainSnapshotCreateXMLRet struct { // DomainSnapshotGetXMLDescArgs is libvirt's remote_domain_snapshot_get_xml_desc_args type DomainSnapshotGetXMLDescArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags uint32 } @@ -2846,7 +2836,7 @@ type DomainSnapshotGetXMLDescRet struct { // DomainSnapshotNumArgs is libvirt's remote_domain_snapshot_num_args type DomainSnapshotNumArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2857,9 +2847,9 @@ type DomainSnapshotNumRet struct { // DomainSnapshotListNamesArgs is libvirt's remote_domain_snapshot_list_names_args type DomainSnapshotListNamesArgs struct { - Dom Domain + Dom Domain Maxnames int32 - Flags uint32 + Flags uint32 } // DomainSnapshotListNamesRet is libvirt's remote_domain_snapshot_list_names_ret @@ -2869,20 +2859,20 @@ type DomainSnapshotListNamesRet struct { // DomainListAllSnapshotsArgs is libvirt's remote_domain_list_all_snapshots_args type DomainListAllSnapshotsArgs struct { - Dom Domain + Dom Domain NeedResults int32 - Flags uint32 + Flags uint32 } // DomainListAllSnapshotsRet is libvirt's remote_domain_list_all_snapshots_ret type DomainListAllSnapshotsRet struct { Snapshots []DomainSnapshot - Ret int32 + Ret int32 } // DomainSnapshotNumChildrenArgs is libvirt's remote_domain_snapshot_num_children_args type DomainSnapshotNumChildrenArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags uint32 } @@ -2893,9 +2883,9 @@ type DomainSnapshotNumChildrenRet struct { // DomainSnapshotListChildrenNamesArgs is libvirt's remote_domain_snapshot_list_children_names_args type DomainSnapshotListChildrenNamesArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Maxnames int32 - Flags uint32 + Flags uint32 } // DomainSnapshotListChildrenNamesRet is libvirt's remote_domain_snapshot_list_children_names_ret @@ -2905,21 +2895,21 @@ type DomainSnapshotListChildrenNamesRet struct { // DomainSnapshotListAllChildrenArgs is libvirt's remote_domain_snapshot_list_all_children_args type DomainSnapshotListAllChildrenArgs struct { - Snapshot DomainSnapshot + Snapshot DomainSnapshot NeedResults int32 - Flags uint32 + Flags uint32 } // DomainSnapshotListAllChildrenRet is libvirt's remote_domain_snapshot_list_all_children_ret type DomainSnapshotListAllChildrenRet struct { Snapshots []DomainSnapshot - Ret int32 + Ret int32 } // DomainSnapshotLookupByNameArgs is libvirt's remote_domain_snapshot_lookup_by_name_args type DomainSnapshotLookupByNameArgs struct { - Dom Domain - Name string + Dom Domain + Name string Flags uint32 } @@ -2930,7 +2920,7 @@ type DomainSnapshotLookupByNameRet struct { // DomainHasCurrentSnapshotArgs is libvirt's remote_domain_has_current_snapshot_args type DomainHasCurrentSnapshotArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2941,7 +2931,7 @@ type DomainHasCurrentSnapshotRet struct { // DomainSnapshotGetParentArgs is libvirt's remote_domain_snapshot_get_parent_args type DomainSnapshotGetParentArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags uint32 } @@ -2952,7 +2942,7 @@ type DomainSnapshotGetParentRet struct { // DomainSnapshotCurrentArgs is libvirt's remote_domain_snapshot_current_args type DomainSnapshotCurrentArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -2963,7 +2953,7 @@ type DomainSnapshotCurrentRet struct { // DomainSnapshotIsCurrentArgs is libvirt's remote_domain_snapshot_is_current_args type DomainSnapshotIsCurrentArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags uint32 } @@ -2974,7 +2964,7 @@ type DomainSnapshotIsCurrentRet struct { // DomainSnapshotHasMetadataArgs is libvirt's remote_domain_snapshot_has_metadata_args type DomainSnapshotHasMetadataArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags uint32 } @@ -2985,96 +2975,96 @@ type DomainSnapshotHasMetadataRet struct { // DomainRevertToSnapshotArgs is libvirt's remote_domain_revert_to_snapshot_args type DomainRevertToSnapshotArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags uint32 } // DomainSnapshotDeleteArgs is libvirt's remote_domain_snapshot_delete_args type DomainSnapshotDeleteArgs struct { - Snap DomainSnapshot + Snap DomainSnapshot Flags DomainSnapshotDeleteFlags } // DomainOpenConsoleArgs is libvirt's remote_domain_open_console_args type DomainOpenConsoleArgs struct { - Dom Domain + Dom Domain DevName OptString - Flags uint32 + Flags uint32 } // DomainOpenChannelArgs is libvirt's remote_domain_open_channel_args type DomainOpenChannelArgs struct { - Dom Domain - Name OptString + Dom Domain + Name OptString Flags DomainChannelFlags } // StorageVolUploadArgs is libvirt's remote_storage_vol_upload_args type StorageVolUploadArgs struct { - Vol StorageVol + Vol StorageVol Offset uint64 Length uint64 - Flags StorageVolUploadFlags + Flags StorageVolUploadFlags } // StorageVolDownloadArgs is libvirt's remote_storage_vol_download_args type StorageVolDownloadArgs struct { - Vol StorageVol + Vol StorageVol Offset uint64 Length uint64 - Flags StorageVolDownloadFlags + Flags StorageVolDownloadFlags } // DomainGetStateArgs is libvirt's remote_domain_get_state_args type DomainGetStateArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainGetStateRet is libvirt's remote_domain_get_state_ret type DomainGetStateRet struct { - State int32 + State int32 Reason int32 } // DomainMigrateBegin3Args is libvirt's remote_domain_migrate_begin3_args type DomainMigrateBegin3Args struct { - Dom Domain - Xmlin OptString - Flags uint64 - Dname OptString + Dom Domain + Xmlin OptString + Flags uint64 + Dname OptString Resource uint64 } // DomainMigrateBegin3Ret is libvirt's remote_domain_migrate_begin3_ret type DomainMigrateBegin3Ret struct { CookieOut []byte - XML string + XML string } // DomainMigratePrepare3Args is libvirt's remote_domain_migrate_prepare3_args type DomainMigratePrepare3Args struct { CookieIn []byte - UriIn OptString - Flags uint64 - Dname OptString + UriIn OptString + Flags uint64 + Dname OptString Resource uint64 - DomXML string + DomXML string } // DomainMigratePrepare3Ret is libvirt's remote_domain_migrate_prepare3_ret type DomainMigratePrepare3Ret struct { CookieOut []byte - UriOut OptString + UriOut OptString } // DomainMigratePrepareTunnel3Args is libvirt's remote_domain_migrate_prepare_tunnel3_args type DomainMigratePrepareTunnel3Args struct { CookieIn []byte - Flags uint64 - Dname OptString + Flags uint64 + Dname OptString Resource uint64 - DomXML string + DomXML string } // DomainMigratePrepareTunnel3Ret is libvirt's remote_domain_migrate_prepare_tunnel3_ret @@ -3084,13 +3074,13 @@ type DomainMigratePrepareTunnel3Ret struct { // DomainMigratePerform3Args is libvirt's remote_domain_migrate_perform3_args type DomainMigratePerform3Args struct { - Dom Domain - Xmlin OptString + Dom Domain + Xmlin OptString CookieIn []byte Dconnuri OptString - Uri OptString - Flags uint64 - Dname OptString + Uri OptString + Flags uint64 + Dname OptString Resource uint64 } @@ -3101,25 +3091,25 @@ type DomainMigratePerform3Ret struct { // DomainMigrateFinish3Args is libvirt's remote_domain_migrate_finish3_args type DomainMigrateFinish3Args struct { - Dname string - CookieIn []byte - Dconnuri OptString - Uri OptString - Flags uint64 + Dname string + CookieIn []byte + Dconnuri OptString + Uri OptString + Flags uint64 Cancelled int32 } // DomainMigrateFinish3Ret is libvirt's remote_domain_migrate_finish3_ret type DomainMigrateFinish3Ret struct { - Dom Domain + Dom Domain CookieOut []byte } // DomainMigrateConfirm3Args is libvirt's remote_domain_migrate_confirm3_args type DomainMigrateConfirm3Args struct { - Dom Domain - CookieIn []byte - Flags uint64 + Dom Domain + CookieIn []byte + Flags uint64 Cancelled int32 } @@ -3131,250 +3121,250 @@ type DomainEventControlErrorMsg struct { // DomainEventCallbackControlErrorMsg is libvirt's remote_domain_event_callback_control_error_msg type DomainEventCallbackControlErrorMsg struct { CallbackID int32 - Msg DomainEventControlErrorMsg + Msg DomainEventControlErrorMsg } // DomainGetControlInfoArgs is libvirt's remote_domain_get_control_info_args type DomainGetControlInfoArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainGetControlInfoRet is libvirt's remote_domain_get_control_info_ret type DomainGetControlInfoRet struct { - State uint32 - Details uint32 + State uint32 + Details uint32 StateTime uint64 } // DomainOpenGraphicsArgs is libvirt's remote_domain_open_graphics_args type DomainOpenGraphicsArgs struct { - Dom Domain - Idx uint32 + Dom Domain + Idx uint32 Flags DomainOpenGraphicsFlags } // DomainOpenGraphicsFdArgs is libvirt's remote_domain_open_graphics_fd_args type DomainOpenGraphicsFdArgs struct { - Dom Domain - Idx uint32 + Dom Domain + Idx uint32 Flags DomainOpenGraphicsFlags } // NodeSuspendForDurationArgs is libvirt's remote_node_suspend_for_duration_args type NodeSuspendForDurationArgs struct { - Target uint32 + Target uint32 Duration uint64 - Flags uint32 + Flags uint32 } // DomainShutdownFlagsArgs is libvirt's remote_domain_shutdown_flags_args type DomainShutdownFlagsArgs struct { - Dom Domain + Dom Domain Flags DomainShutdownFlagValues } // DomainGetDiskErrorsArgs is libvirt's remote_domain_get_disk_errors_args type DomainGetDiskErrorsArgs struct { - Dom Domain + Dom Domain Maxerrors uint32 - Flags uint32 + Flags uint32 } // DomainGetDiskErrorsRet is libvirt's remote_domain_get_disk_errors_ret type DomainGetDiskErrorsRet struct { - Errors []DomainDiskError + Errors []DomainDiskError Nerrors int32 } // ConnectListAllDomainsArgs is libvirt's remote_connect_list_all_domains_args type ConnectListAllDomainsArgs struct { NeedResults int32 - Flags ConnectListAllDomainsFlags + Flags ConnectListAllDomainsFlags } // ConnectListAllDomainsRet is libvirt's remote_connect_list_all_domains_ret type ConnectListAllDomainsRet struct { Domains []Domain - Ret uint32 + Ret uint32 } // ConnectListAllStoragePoolsArgs is libvirt's remote_connect_list_all_storage_pools_args type ConnectListAllStoragePoolsArgs struct { NeedResults int32 - Flags ConnectListAllStoragePoolsFlags + Flags ConnectListAllStoragePoolsFlags } // ConnectListAllStoragePoolsRet is libvirt's remote_connect_list_all_storage_pools_ret type ConnectListAllStoragePoolsRet struct { Pools []StoragePool - Ret uint32 + Ret uint32 } // StoragePoolListAllVolumesArgs is libvirt's remote_storage_pool_list_all_volumes_args type StoragePoolListAllVolumesArgs struct { - Pool StoragePool + Pool StoragePool NeedResults int32 - Flags uint32 + Flags uint32 } // StoragePoolListAllVolumesRet is libvirt's remote_storage_pool_list_all_volumes_ret type StoragePoolListAllVolumesRet struct { Vols []StorageVol - Ret uint32 + Ret uint32 } // ConnectListAllNetworksArgs is libvirt's remote_connect_list_all_networks_args type ConnectListAllNetworksArgs struct { NeedResults int32 - Flags ConnectListAllNetworksFlags + Flags ConnectListAllNetworksFlags } // ConnectListAllNetworksRet is libvirt's remote_connect_list_all_networks_ret type ConnectListAllNetworksRet struct { Nets []Network - Ret uint32 + Ret uint32 } // ConnectListAllInterfacesArgs is libvirt's remote_connect_list_all_interfaces_args type ConnectListAllInterfacesArgs struct { NeedResults int32 - Flags ConnectListAllInterfacesFlags + Flags ConnectListAllInterfacesFlags } // ConnectListAllInterfacesRet is libvirt's remote_connect_list_all_interfaces_ret type ConnectListAllInterfacesRet struct { Ifaces []Interface - Ret uint32 + Ret uint32 } // ConnectListAllNodeDevicesArgs is libvirt's remote_connect_list_all_node_devices_args type ConnectListAllNodeDevicesArgs struct { NeedResults int32 - Flags uint32 + Flags uint32 } // ConnectListAllNodeDevicesRet is libvirt's remote_connect_list_all_node_devices_ret type ConnectListAllNodeDevicesRet struct { Devices []NodeDevice - Ret uint32 + Ret uint32 } // ConnectListAllNwfiltersArgs is libvirt's remote_connect_list_all_nwfilters_args type ConnectListAllNwfiltersArgs struct { NeedResults int32 - Flags uint32 + Flags uint32 } // ConnectListAllNwfiltersRet is libvirt's remote_connect_list_all_nwfilters_ret type ConnectListAllNwfiltersRet struct { Filters []Nwfilter - Ret uint32 + Ret uint32 } // ConnectListAllSecretsArgs is libvirt's remote_connect_list_all_secrets_args type ConnectListAllSecretsArgs struct { NeedResults int32 - Flags ConnectListAllSecretsFlags + Flags ConnectListAllSecretsFlags } // ConnectListAllSecretsRet is libvirt's remote_connect_list_all_secrets_ret type ConnectListAllSecretsRet struct { Secrets []Secret - Ret uint32 + Ret uint32 } // NodeSetMemoryParametersArgs is libvirt's remote_node_set_memory_parameters_args type NodeSetMemoryParametersArgs struct { Params []TypedParam - Flags uint32 + Flags uint32 } // NodeGetMemoryParametersArgs is libvirt's remote_node_get_memory_parameters_args type NodeGetMemoryParametersArgs struct { Nparams int32 - Flags uint32 + Flags uint32 } // NodeGetMemoryParametersRet is libvirt's remote_node_get_memory_parameters_ret type NodeGetMemoryParametersRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // NodeGetCPUMapArgs is libvirt's remote_node_get_cpu_map_args type NodeGetCPUMapArgs struct { - NeedMap int32 + NeedMap int32 NeedOnline int32 - Flags uint32 + Flags uint32 } // NodeGetCPUMapRet is libvirt's remote_node_get_cpu_map_ret type NodeGetCPUMapRet struct { Cpumap []byte Online uint32 - Ret int32 + Ret int32 } // DomainFstrimArgs is libvirt's remote_domain_fstrim_args type DomainFstrimArgs struct { - Dom Domain + Dom Domain MountPoint OptString - Minimum uint64 - Flags uint32 + Minimum uint64 + Flags uint32 } // DomainGetTimeArgs is libvirt's remote_domain_get_time_args type DomainGetTimeArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainGetTimeRet is libvirt's remote_domain_get_time_ret type DomainGetTimeRet struct { - Seconds int64 + Seconds int64 Nseconds uint32 } // DomainSetTimeArgs is libvirt's remote_domain_set_time_args type DomainSetTimeArgs struct { - Dom Domain - Seconds int64 + Dom Domain + Seconds int64 Nseconds uint32 - Flags DomainSetTimeFlags + Flags DomainSetTimeFlags } // DomainMigrateBegin3ParamsArgs is libvirt's remote_domain_migrate_begin3_params_args type DomainMigrateBegin3ParamsArgs struct { - Dom Domain + Dom Domain Params []TypedParam - Flags uint32 + Flags uint32 } // DomainMigrateBegin3ParamsRet is libvirt's remote_domain_migrate_begin3_params_ret type DomainMigrateBegin3ParamsRet struct { CookieOut []byte - XML string + XML string } // DomainMigratePrepare3ParamsArgs is libvirt's remote_domain_migrate_prepare3_params_args type DomainMigratePrepare3ParamsArgs struct { - Params []TypedParam + Params []TypedParam CookieIn []byte - Flags uint32 + Flags uint32 } // DomainMigratePrepare3ParamsRet is libvirt's remote_domain_migrate_prepare3_params_ret type DomainMigratePrepare3ParamsRet struct { CookieOut []byte - UriOut OptString + UriOut OptString } // DomainMigratePrepareTunnel3ParamsArgs is libvirt's remote_domain_migrate_prepare_tunnel3_params_args type DomainMigratePrepareTunnel3ParamsArgs struct { - Params []TypedParam + Params []TypedParam CookieIn []byte - Flags uint32 + Flags uint32 } // DomainMigratePrepareTunnel3ParamsRet is libvirt's remote_domain_migrate_prepare_tunnel3_params_ret @@ -3384,11 +3374,11 @@ type DomainMigratePrepareTunnel3ParamsRet struct { // DomainMigratePerform3ParamsArgs is libvirt's remote_domain_migrate_perform3_params_args type DomainMigratePerform3ParamsArgs struct { - Dom Domain + Dom Domain Dconnuri OptString - Params []TypedParam + Params []TypedParam CookieIn []byte - Flags DomainMigrateFlags + Flags DomainMigrateFlags } // DomainMigratePerform3ParamsRet is libvirt's remote_domain_migrate_perform3_params_ret @@ -3398,70 +3388,70 @@ type DomainMigratePerform3ParamsRet struct { // DomainMigrateFinish3ParamsArgs is libvirt's remote_domain_migrate_finish3_params_args type DomainMigrateFinish3ParamsArgs struct { - Params []TypedParam - CookieIn []byte - Flags uint32 + Params []TypedParam + CookieIn []byte + Flags uint32 Cancelled int32 } // DomainMigrateFinish3ParamsRet is libvirt's remote_domain_migrate_finish3_params_ret type DomainMigrateFinish3ParamsRet struct { - Dom Domain + Dom Domain CookieOut []byte } // DomainMigrateConfirm3ParamsArgs is libvirt's remote_domain_migrate_confirm3_params_args type DomainMigrateConfirm3ParamsArgs struct { - Dom Domain - Params []TypedParam - CookieIn []byte - Flags uint32 + Dom Domain + Params []TypedParam + CookieIn []byte + Flags uint32 Cancelled int32 } // DomainEventDeviceRemovedMsg is libvirt's remote_domain_event_device_removed_msg type DomainEventDeviceRemovedMsg struct { - Dom Domain + Dom Domain DevAlias string } // DomainEventCallbackDeviceRemovedMsg is libvirt's remote_domain_event_callback_device_removed_msg type DomainEventCallbackDeviceRemovedMsg struct { CallbackID int32 - Msg DomainEventDeviceRemovedMsg + Msg DomainEventDeviceRemovedMsg } // DomainEventBlockJob2Msg is libvirt's remote_domain_event_block_job_2_msg type DomainEventBlockJob2Msg struct { CallbackID int32 - Dom Domain - Dst string - Type int32 - Status int32 + Dom Domain + Dst string + Type int32 + Status int32 } // DomainEventBlockThresholdMsg is libvirt's remote_domain_event_block_threshold_msg type DomainEventBlockThresholdMsg struct { CallbackID int32 - Dom Domain - Dev string - Path OptString - Threshold uint64 - Excess uint64 + Dom Domain + Dev string + Path OptString + Threshold uint64 + Excess uint64 } // DomainEventCallbackTunableMsg is libvirt's remote_domain_event_callback_tunable_msg type DomainEventCallbackTunableMsg struct { CallbackID int32 - Dom Domain - Params []TypedParam + Dom Domain + Params []TypedParam } // DomainEventCallbackDeviceAddedMsg is libvirt's remote_domain_event_callback_device_added_msg type DomainEventCallbackDeviceAddedMsg struct { CallbackID int32 - Dom Domain - DevAlias string + Dom Domain + DevAlias string } // ConnectEventConnectionClosedMsg is libvirt's remote_connect_event_connection_closed_msg @@ -3471,21 +3461,21 @@ type ConnectEventConnectionClosedMsg struct { // ConnectGetCPUModelNamesArgs is libvirt's remote_connect_get_cpu_model_names_args type ConnectGetCPUModelNamesArgs struct { - Arch string + Arch string NeedResults int32 - Flags uint32 + Flags uint32 } // ConnectGetCPUModelNamesRet is libvirt's remote_connect_get_cpu_model_names_ret type ConnectGetCPUModelNamesRet struct { Models []string - Ret int32 + Ret int32 } // ConnectNetworkEventRegisterAnyArgs is libvirt's remote_connect_network_event_register_any_args type ConnectNetworkEventRegisterAnyArgs struct { EventID int32 - Net OptNetwork + Net OptNetwork } // ConnectNetworkEventRegisterAnyRet is libvirt's remote_connect_network_event_register_any_ret @@ -3501,15 +3491,15 @@ type ConnectNetworkEventDeregisterAnyArgs struct { // NetworkEventLifecycleMsg is libvirt's remote_network_event_lifecycle_msg type NetworkEventLifecycleMsg struct { CallbackID int32 - Net Network - Event int32 - Detail int32 + Net Network + Event int32 + Detail int32 } // ConnectStoragePoolEventRegisterAnyArgs is libvirt's remote_connect_storage_pool_event_register_any_args type ConnectStoragePoolEventRegisterAnyArgs struct { EventID int32 - Pool OptStoragePool + Pool OptStoragePool } // ConnectStoragePoolEventRegisterAnyRet is libvirt's remote_connect_storage_pool_event_register_any_ret @@ -3525,21 +3515,21 @@ type ConnectStoragePoolEventDeregisterAnyArgs struct { // StoragePoolEventLifecycleMsg is libvirt's remote_storage_pool_event_lifecycle_msg type StoragePoolEventLifecycleMsg struct { CallbackID int32 - Pool StoragePool - Event int32 - Detail int32 + Pool StoragePool + Event int32 + Detail int32 } // StoragePoolEventRefreshMsg is libvirt's remote_storage_pool_event_refresh_msg type StoragePoolEventRefreshMsg struct { CallbackID int32 - Pool StoragePool + Pool StoragePool } // ConnectNodeDeviceEventRegisterAnyArgs is libvirt's remote_connect_node_device_event_register_any_args type ConnectNodeDeviceEventRegisterAnyArgs struct { EventID int32 - Dev OptNodeDevice + Dev OptNodeDevice } // ConnectNodeDeviceEventRegisterAnyRet is libvirt's remote_connect_node_device_event_register_any_ret @@ -3555,22 +3545,22 @@ type ConnectNodeDeviceEventDeregisterAnyArgs struct { // NodeDeviceEventLifecycleMsg is libvirt's remote_node_device_event_lifecycle_msg type NodeDeviceEventLifecycleMsg struct { CallbackID int32 - Dev NodeDevice - Event int32 - Detail int32 + Dev NodeDevice + Event int32 + Detail int32 } // NodeDeviceEventUpdateMsg is libvirt's remote_node_device_event_update_msg type NodeDeviceEventUpdateMsg struct { CallbackID int32 - Dev NodeDevice + Dev NodeDevice } // DomainFsfreezeArgs is libvirt's remote_domain_fsfreeze_args type DomainFsfreezeArgs struct { - Dom Domain + Dom Domain Mountpoints []string - Flags uint32 + Flags uint32 } // DomainFsfreezeRet is libvirt's remote_domain_fsfreeze_ret @@ -3580,9 +3570,9 @@ type DomainFsfreezeRet struct { // DomainFsthawArgs is libvirt's remote_domain_fsthaw_args type DomainFsthawArgs struct { - Dom Domain + Dom Domain Mountpoints []string - Flags uint32 + Flags uint32 } // DomainFsthawRet is libvirt's remote_domain_fsthaw_ret @@ -3592,10 +3582,10 @@ type DomainFsthawRet struct { // NodeGetFreePagesArgs is libvirt's remote_node_get_free_pages_args type NodeGetFreePagesArgs struct { - Pages []uint32 + Pages []uint32 StartCell int32 CellCount uint32 - Flags uint32 + Flags uint32 } // NodeGetFreePagesRet is libvirt's remote_node_get_free_pages_ret @@ -3605,11 +3595,11 @@ type NodeGetFreePagesRet struct { // NodeAllocPagesArgs is libvirt's remote_node_alloc_pages_args type NodeAllocPagesArgs struct { - PageSizes []uint32 + PageSizes []uint32 PageCounts []uint64 - StartCell int32 - CellCount uint32 - Flags NodeAllocPagesFlags + StartCell int32 + CellCount uint32 + Flags NodeAllocPagesFlags } // NodeAllocPagesRet is libvirt's remote_node_alloc_pages_ret @@ -3619,40 +3609,40 @@ type NodeAllocPagesRet struct { // NetworkDhcpLease is libvirt's remote_network_dhcp_lease type NetworkDhcpLease struct { - Iface string + Iface string Expirytime int64 - Type int32 - Mac OptString - Iaid OptString - Ipaddr string - Prefix uint32 - Hostname OptString - Clientid OptString + Type int32 + Mac OptString + Iaid OptString + Ipaddr string + Prefix uint32 + Hostname OptString + Clientid OptString } // NetworkGetDhcpLeasesArgs is libvirt's remote_network_get_dhcp_leases_args type NetworkGetDhcpLeasesArgs struct { - Net Network - Mac OptString + Net Network + Mac OptString NeedResults int32 - Flags uint32 + Flags uint32 } // NetworkGetDhcpLeasesRet is libvirt's remote_network_get_dhcp_leases_ret type NetworkGetDhcpLeasesRet struct { Leases []NetworkDhcpLease - Ret uint32 + Ret uint32 } // DomainStatsRecord is libvirt's remote_domain_stats_record type DomainStatsRecord struct { - Dom Domain + Dom Domain Params []TypedParam } // ConnectGetAllDomainStatsArgs is libvirt's remote_connect_get_all_domain_stats_args type ConnectGetAllDomainStatsArgs struct { - Doms []Domain + Doms []Domain Stats uint32 Flags ConnectGetAllDomainStatsFlags } @@ -3660,9 +3650,9 @@ type ConnectGetAllDomainStatsArgs struct { // DomainEventCallbackAgentLifecycleMsg is libvirt's remote_domain_event_callback_agent_lifecycle_msg type DomainEventCallbackAgentLifecycleMsg struct { CallbackID int32 - Dom Domain - State int32 - Reason int32 + Dom Domain + State int32 + Reason int32 } // ConnectGetAllDomainStatsRet is libvirt's remote_connect_get_all_domain_stats_ret @@ -3673,42 +3663,42 @@ type ConnectGetAllDomainStatsRet struct { // DomainFsinfo is libvirt's remote_domain_fsinfo type DomainFsinfo struct { Mountpoint string - Name string - Fstype string + Name string + Fstype string DevAliases []string } // DomainGetFsinfoArgs is libvirt's remote_domain_get_fsinfo_args type DomainGetFsinfoArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainGetFsinfoRet is libvirt's remote_domain_get_fsinfo_ret type DomainGetFsinfoRet struct { Info []DomainFsinfo - Ret uint32 + Ret uint32 } // DomainIPAddr is libvirt's remote_domain_ip_addr type DomainIPAddr struct { - Type int32 - Addr string + Type int32 + Addr string Prefix uint32 } // DomainInterface is libvirt's remote_domain_interface type DomainInterface struct { - Name string + Name string Hwaddr OptString - Addrs []DomainIPAddr + Addrs []DomainIPAddr } // DomainInterfaceAddressesArgs is libvirt's remote_domain_interface_addresses_args type DomainInterfaceAddressesArgs struct { - Dom Domain + Dom Domain Source uint32 - Flags uint32 + Flags uint32 } // DomainInterfaceAddressesRet is libvirt's remote_domain_interface_addresses_ret @@ -3718,17 +3708,17 @@ type DomainInterfaceAddressesRet struct { // DomainSetUserPasswordArgs is libvirt's remote_domain_set_user_password_args type DomainSetUserPasswordArgs struct { - Dom Domain - User OptString + Dom Domain + User OptString Password OptString - Flags DomainSetUserPasswordFlags + Flags DomainSetUserPasswordFlags } // DomainRenameArgs is libvirt's remote_domain_rename_args type DomainRenameArgs struct { - Dom Domain + Dom Domain NewName OptString - Flags uint32 + Flags uint32 } // DomainRenameRet is libvirt's remote_domain_rename_ret @@ -3739,33 +3729,33 @@ type DomainRenameRet struct { // DomainEventCallbackMigrationIterationMsg is libvirt's remote_domain_event_callback_migration_iteration_msg type DomainEventCallbackMigrationIterationMsg struct { CallbackID int32 - Dom Domain - Iteration int32 + Dom Domain + Iteration int32 } // DomainEventCallbackJobCompletedMsg is libvirt's remote_domain_event_callback_job_completed_msg type DomainEventCallbackJobCompletedMsg struct { CallbackID int32 - Dom Domain - Params []TypedParam + Dom Domain + Params []TypedParam } // DomainMigrateStartPostCopyArgs is libvirt's remote_domain_migrate_start_post_copy_args type DomainMigrateStartPostCopyArgs struct { - Dom Domain + Dom Domain Flags uint32 } // DomainEventCallbackDeviceRemovalFailedMsg is libvirt's remote_domain_event_callback_device_removal_failed_msg type DomainEventCallbackDeviceRemovalFailedMsg struct { CallbackID int32 - Dom Domain - DevAlias string + Dom Domain + DevAlias string } // DomainGetGuestVcpusArgs is libvirt's remote_domain_get_guest_vcpus_args type DomainGetGuestVcpusArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -3776,31 +3766,31 @@ type DomainGetGuestVcpusRet struct { // DomainSetGuestVcpusArgs is libvirt's remote_domain_set_guest_vcpus_args type DomainSetGuestVcpusArgs struct { - Dom Domain + Dom Domain Cpumap string - State int32 - Flags uint32 + State int32 + Flags uint32 } // DomainSetVcpuArgs is libvirt's remote_domain_set_vcpu_args type DomainSetVcpuArgs struct { - Dom Domain + Dom Domain Cpumap string - State int32 - Flags DomainModificationImpact + State int32 + Flags DomainModificationImpact } // DomainEventCallbackMetadataChangeMsg is libvirt's remote_domain_event_callback_metadata_change_msg type DomainEventCallbackMetadataChangeMsg struct { CallbackID int32 - Dom Domain - Type int32 - Nsuri OptString + Dom Domain + Type int32 + Nsuri OptString } // ConnectSecretEventRegisterAnyArgs is libvirt's remote_connect_secret_event_register_any_args type ConnectSecretEventRegisterAnyArgs struct { - EventID int32 + EventID int32 OptSecret OptSecret } @@ -3817,41 +3807,41 @@ type ConnectSecretEventDeregisterAnyArgs struct { // SecretEventLifecycleMsg is libvirt's remote_secret_event_lifecycle_msg type SecretEventLifecycleMsg struct { CallbackID int32 - OptSecret Secret - Event int32 - Detail int32 + OptSecret Secret + Event int32 + Detail int32 } // SecretEventValueChangedMsg is libvirt's remote_secret_event_value_changed_msg type SecretEventValueChangedMsg struct { CallbackID int32 - OptSecret Secret + OptSecret Secret } // DomainSetBlockThresholdArgs is libvirt's remote_domain_set_block_threshold_args type DomainSetBlockThresholdArgs struct { - Dom Domain - Dev string + Dom Domain + Dev string Threshold uint64 - Flags uint32 + Flags uint32 } // DomainSetLifecycleActionArgs is libvirt's remote_domain_set_lifecycle_action_args type DomainSetLifecycleActionArgs struct { - Dom Domain - Type uint32 + Dom Domain + Type uint32 Action uint32 - Flags DomainModificationImpact + Flags DomainModificationImpact } // ConnectCompareHypervisorCPUArgs is libvirt's remote_connect_compare_hypervisor_cpu_args type ConnectCompareHypervisorCPUArgs struct { Emulator OptString - Arch OptString - Machine OptString + Arch OptString + Machine OptString Virttype OptString - XMLCPU string - Flags uint32 + XMLCPU string + Flags uint32 } // ConnectCompareHypervisorCPURet is libvirt's remote_connect_compare_hypervisor_cpu_ret @@ -3862,11 +3852,11 @@ type ConnectCompareHypervisorCPURet struct { // ConnectBaselineHypervisorCPUArgs is libvirt's remote_connect_baseline_hypervisor_cpu_args type ConnectBaselineHypervisorCPUArgs struct { Emulator OptString - Arch OptString - Machine OptString + Arch OptString + Machine OptString Virttype OptString - XMLCPUs []string - Flags uint32 + XMLCPUs []string + Flags uint32 } // ConnectBaselineHypervisorCPURet is libvirt's remote_connect_baseline_hypervisor_cpu_ret @@ -3877,18 +3867,18 @@ type ConnectBaselineHypervisorCPURet struct { // NodeGetSevInfoArgs is libvirt's remote_node_get_sev_info_args type NodeGetSevInfoArgs struct { Nparams int32 - Flags uint32 + Flags uint32 } // NodeGetSevInfoRet is libvirt's remote_node_get_sev_info_ret type NodeGetSevInfoRet struct { - Params []TypedParam + Params []TypedParam Nparams int32 } // DomainGetLaunchSecurityInfoArgs is libvirt's remote_domain_get_launch_security_info_args type DomainGetLaunchSecurityInfoArgs struct { - Dom Domain + Dom Domain Flags uint32 } @@ -3909,7 +3899,7 @@ type NwfilterBindingLookupByPortDevRet struct { // NwfilterBindingCreateXMLArgs is libvirt's remote_nwfilter_binding_create_xml_args type NwfilterBindingCreateXMLArgs struct { - XML string + XML string Flags uint32 } @@ -3926,7 +3916,7 @@ type NwfilterBindingDeleteArgs struct { // NwfilterBindingGetXMLDescArgs is libvirt's remote_nwfilter_binding_get_xml_desc_args type NwfilterBindingGetXMLDescArgs struct { OptNwfilter NwfilterBinding - Flags uint32 + Flags uint32 } // NwfilterBindingGetXMLDescRet is libvirt's remote_nwfilter_binding_get_xml_desc_ret @@ -3937,15 +3927,17 @@ type NwfilterBindingGetXMLDescRet struct { // ConnectListAllNwfilterBindingsArgs is libvirt's remote_connect_list_all_nwfilter_bindings_args type ConnectListAllNwfilterBindingsArgs struct { NeedResults int32 - Flags uint32 + Flags uint32 } // ConnectListAllNwfilterBindingsRet is libvirt's remote_connect_list_all_nwfilter_bindings_ret type ConnectListAllNwfilterBindingsRet struct { Bindings []NwfilterBinding - Ret uint32 + Ret uint32 } + + // TypedParamValue is a discriminated union. type TypedParamValue struct { D uint32 @@ -3994,12 +3986,13 @@ func NewTypedParamValueString(v string) *TypedParamValue { return &TypedParamValue{D: 7, I: v} } + // ConnectOpen is the go wrapper for REMOTE_PROC_CONNECT_OPEN. func (l *Libvirt) ConnectOpen(Name OptString, Flags ConnectFlags) (err error) { var buf []byte - args := ConnectOpenArgs{ - Name: Name, + args := ConnectOpenArgs { + Name: Name, Flags: Flags, } @@ -4008,6 +4001,7 @@ func (l *Libvirt) ConnectOpen(Name OptString, Flags ConnectFlags) (err error) { return } + _, err = l.requestStream(1, constants.Program, buf, nil, nil) if err != nil { return @@ -4020,6 +4014,7 @@ func (l *Libvirt) ConnectOpen(Name OptString, Flags ConnectFlags) (err error) { func (l *Libvirt) ConnectClose() (err error) { var buf []byte + _, err = l.requestStream(2, constants.Program, buf, nil, nil) if err != nil { return @@ -4080,7 +4075,7 @@ func (l *Libvirt) ConnectGetVersion() (rHvVer uint64, err error) { func (l *Libvirt) ConnectGetMaxVcpus(Type OptString) (rMaxVcpus int32, err error) { var buf []byte - args := ConnectGetMaxVcpusArgs{ + args := ConnectGetMaxVcpusArgs { Type: Type, } @@ -4196,7 +4191,7 @@ func (l *Libvirt) ConnectGetCapabilities() (rCapabilities string, err error) { func (l *Libvirt) DomainAttachDevice(Dom Domain, XML string) (err error) { var buf []byte - args := DomainAttachDeviceArgs{ + args := DomainAttachDeviceArgs { Dom: Dom, XML: XML, } @@ -4206,6 +4201,7 @@ func (l *Libvirt) DomainAttachDevice(Dom Domain, XML string) (err error) { return } + _, err = l.requestStream(8, constants.Program, buf, nil, nil) if err != nil { return @@ -4218,7 +4214,7 @@ func (l *Libvirt) DomainAttachDevice(Dom Domain, XML string) (err error) { func (l *Libvirt) DomainCreate(Dom Domain) (err error) { var buf []byte - args := DomainCreateArgs{ + args := DomainCreateArgs { Dom: Dom, } @@ -4227,6 +4223,7 @@ func (l *Libvirt) DomainCreate(Dom Domain) (err error) { return } + _, err = l.requestStream(9, constants.Program, buf, nil, nil) if err != nil { return @@ -4239,9 +4236,9 @@ func (l *Libvirt) DomainCreate(Dom Domain) (err error) { func (l *Libvirt) DomainCreateXML(XMLDesc string, Flags DomainCreateFlags) (rDom Domain, err error) { var buf []byte - args := DomainCreateXMLArgs{ + args := DomainCreateXMLArgs { XMLDesc: XMLDesc, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -4273,7 +4270,7 @@ func (l *Libvirt) DomainCreateXML(XMLDesc string, Flags DomainCreateFlags) (rDom func (l *Libvirt) DomainDefineXML(XML string) (rDom Domain, err error) { var buf []byte - args := DomainDefineXMLArgs{ + args := DomainDefineXMLArgs { XML: XML, } @@ -4306,7 +4303,7 @@ func (l *Libvirt) DomainDefineXML(XML string) (rDom Domain, err error) { func (l *Libvirt) DomainDestroy(Dom Domain) (err error) { var buf []byte - args := DomainDestroyArgs{ + args := DomainDestroyArgs { Dom: Dom, } @@ -4315,6 +4312,7 @@ func (l *Libvirt) DomainDestroy(Dom Domain) (err error) { return } + _, err = l.requestStream(12, constants.Program, buf, nil, nil) if err != nil { return @@ -4327,7 +4325,7 @@ func (l *Libvirt) DomainDestroy(Dom Domain) (err error) { func (l *Libvirt) DomainDetachDevice(Dom Domain, XML string) (err error) { var buf []byte - args := DomainDetachDeviceArgs{ + args := DomainDetachDeviceArgs { Dom: Dom, XML: XML, } @@ -4337,6 +4335,7 @@ func (l *Libvirt) DomainDetachDevice(Dom Domain, XML string) (err error) { return } + _, err = l.requestStream(13, constants.Program, buf, nil, nil) if err != nil { return @@ -4349,8 +4348,8 @@ func (l *Libvirt) DomainDetachDevice(Dom Domain, XML string) (err error) { func (l *Libvirt) DomainGetXMLDesc(Dom Domain, Flags DomainXMLFlags) (rXML string, err error) { var buf []byte - args := DomainGetXMLDescArgs{ - Dom: Dom, + args := DomainGetXMLDescArgs { + Dom: Dom, Flags: Flags, } @@ -4383,7 +4382,7 @@ func (l *Libvirt) DomainGetXMLDesc(Dom Domain, Flags DomainXMLFlags) (rXML strin func (l *Libvirt) DomainGetAutostart(Dom Domain) (rAutostart int32, err error) { var buf []byte - args := DomainGetAutostartArgs{ + args := DomainGetAutostartArgs { Dom: Dom, } @@ -4416,7 +4415,7 @@ func (l *Libvirt) DomainGetAutostart(Dom Domain) (rAutostart int32, err error) { func (l *Libvirt) DomainGetInfo(Dom Domain) (rState uint8, rMaxMem uint64, rMemory uint64, rNrVirtCPU uint16, rCPUTime uint64, err error) { var buf []byte - args := DomainGetInfoArgs{ + args := DomainGetInfoArgs { Dom: Dom, } @@ -4469,7 +4468,7 @@ func (l *Libvirt) DomainGetInfo(Dom Domain) (rState uint8, rMaxMem uint64, rMemo func (l *Libvirt) DomainGetMaxMemory(Dom Domain) (rMemory uint64, err error) { var buf []byte - args := DomainGetMaxMemoryArgs{ + args := DomainGetMaxMemoryArgs { Dom: Dom, } @@ -4502,7 +4501,7 @@ func (l *Libvirt) DomainGetMaxMemory(Dom Domain) (rMemory uint64, err error) { func (l *Libvirt) DomainGetMaxVcpus(Dom Domain) (rNum int32, err error) { var buf []byte - args := DomainGetMaxVcpusArgs{ + args := DomainGetMaxVcpusArgs { Dom: Dom, } @@ -4535,7 +4534,7 @@ func (l *Libvirt) DomainGetMaxVcpus(Dom Domain) (rNum int32, err error) { func (l *Libvirt) DomainGetOsType(Dom Domain) (rType string, err error) { var buf []byte - args := DomainGetOsTypeArgs{ + args := DomainGetOsTypeArgs { Dom: Dom, } @@ -4568,10 +4567,10 @@ func (l *Libvirt) DomainGetOsType(Dom Domain) (rType string, err error) { func (l *Libvirt) DomainGetVcpus(Dom Domain, Maxinfo int32, Maplen int32) (rInfo []VcpuInfo, rCpumaps []byte, err error) { var buf []byte - args := DomainGetVcpusArgs{ - Dom: Dom, + args := DomainGetVcpusArgs { + Dom: Dom, Maxinfo: Maxinfo, - Maplen: Maplen, + Maplen: Maplen, } buf, err = encode(&args) @@ -4608,7 +4607,7 @@ func (l *Libvirt) DomainGetVcpus(Dom Domain, Maxinfo int32, Maplen int32) (rInfo func (l *Libvirt) ConnectListDefinedDomains(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListDefinedDomainsArgs{ + args := ConnectListDefinedDomainsArgs { Maxnames: Maxnames, } @@ -4641,7 +4640,7 @@ func (l *Libvirt) ConnectListDefinedDomains(Maxnames int32) (rNames []string, er func (l *Libvirt) DomainLookupByID(ID int32) (rDom Domain, err error) { var buf []byte - args := DomainLookupByIDArgs{ + args := DomainLookupByIDArgs { ID: ID, } @@ -4674,7 +4673,7 @@ func (l *Libvirt) DomainLookupByID(ID int32) (rDom Domain, err error) { func (l *Libvirt) DomainLookupByName(Name string) (rDom Domain, err error) { var buf []byte - args := DomainLookupByNameArgs{ + args := DomainLookupByNameArgs { Name: Name, } @@ -4707,7 +4706,7 @@ func (l *Libvirt) DomainLookupByName(Name string) (rDom Domain, err error) { func (l *Libvirt) DomainLookupByUUID(UUID UUID) (rDom Domain, err error) { var buf []byte - args := DomainLookupByUUIDArgs{ + args := DomainLookupByUUIDArgs { UUID: UUID, } @@ -4764,9 +4763,9 @@ func (l *Libvirt) ConnectNumOfDefinedDomains() (rNum int32, err error) { func (l *Libvirt) DomainPinVcpu(Dom Domain, Vcpu uint32, Cpumap []byte) (err error) { var buf []byte - args := DomainPinVcpuArgs{ - Dom: Dom, - Vcpu: Vcpu, + args := DomainPinVcpuArgs { + Dom: Dom, + Vcpu: Vcpu, Cpumap: Cpumap, } @@ -4775,6 +4774,7 @@ func (l *Libvirt) DomainPinVcpu(Dom Domain, Vcpu uint32, Cpumap []byte) (err err return } + _, err = l.requestStream(26, constants.Program, buf, nil, nil) if err != nil { return @@ -4787,8 +4787,8 @@ func (l *Libvirt) DomainPinVcpu(Dom Domain, Vcpu uint32, Cpumap []byte) (err err func (l *Libvirt) DomainReboot(Dom Domain, Flags DomainRebootFlagValues) (err error) { var buf []byte - args := DomainRebootArgs{ - Dom: Dom, + args := DomainRebootArgs { + Dom: Dom, Flags: Flags, } @@ -4797,6 +4797,7 @@ func (l *Libvirt) DomainReboot(Dom Domain, Flags DomainRebootFlagValues) (err er return } + _, err = l.requestStream(27, constants.Program, buf, nil, nil) if err != nil { return @@ -4809,7 +4810,7 @@ func (l *Libvirt) DomainReboot(Dom Domain, Flags DomainRebootFlagValues) (err er func (l *Libvirt) DomainResume(Dom Domain) (err error) { var buf []byte - args := DomainResumeArgs{ + args := DomainResumeArgs { Dom: Dom, } @@ -4818,6 +4819,7 @@ func (l *Libvirt) DomainResume(Dom Domain) (err error) { return } + _, err = l.requestStream(28, constants.Program, buf, nil, nil) if err != nil { return @@ -4830,8 +4832,8 @@ func (l *Libvirt) DomainResume(Dom Domain) (err error) { func (l *Libvirt) DomainSetAutostart(Dom Domain, Autostart int32) (err error) { var buf []byte - args := DomainSetAutostartArgs{ - Dom: Dom, + args := DomainSetAutostartArgs { + Dom: Dom, Autostart: Autostart, } @@ -4840,6 +4842,7 @@ func (l *Libvirt) DomainSetAutostart(Dom Domain, Autostart int32) (err error) { return } + _, err = l.requestStream(29, constants.Program, buf, nil, nil) if err != nil { return @@ -4852,8 +4855,8 @@ func (l *Libvirt) DomainSetAutostart(Dom Domain, Autostart int32) (err error) { func (l *Libvirt) DomainSetMaxMemory(Dom Domain, Memory uint64) (err error) { var buf []byte - args := DomainSetMaxMemoryArgs{ - Dom: Dom, + args := DomainSetMaxMemoryArgs { + Dom: Dom, Memory: Memory, } @@ -4862,6 +4865,7 @@ func (l *Libvirt) DomainSetMaxMemory(Dom Domain, Memory uint64) (err error) { return } + _, err = l.requestStream(30, constants.Program, buf, nil, nil) if err != nil { return @@ -4874,8 +4878,8 @@ func (l *Libvirt) DomainSetMaxMemory(Dom Domain, Memory uint64) (err error) { func (l *Libvirt) DomainSetMemory(Dom Domain, Memory uint64) (err error) { var buf []byte - args := DomainSetMemoryArgs{ - Dom: Dom, + args := DomainSetMemoryArgs { + Dom: Dom, Memory: Memory, } @@ -4884,6 +4888,7 @@ func (l *Libvirt) DomainSetMemory(Dom Domain, Memory uint64) (err error) { return } + _, err = l.requestStream(31, constants.Program, buf, nil, nil) if err != nil { return @@ -4896,8 +4901,8 @@ func (l *Libvirt) DomainSetMemory(Dom Domain, Memory uint64) (err error) { func (l *Libvirt) DomainSetVcpus(Dom Domain, Nvcpus uint32) (err error) { var buf []byte - args := DomainSetVcpusArgs{ - Dom: Dom, + args := DomainSetVcpusArgs { + Dom: Dom, Nvcpus: Nvcpus, } @@ -4906,6 +4911,7 @@ func (l *Libvirt) DomainSetVcpus(Dom Domain, Nvcpus uint32) (err error) { return } + _, err = l.requestStream(32, constants.Program, buf, nil, nil) if err != nil { return @@ -4918,7 +4924,7 @@ func (l *Libvirt) DomainSetVcpus(Dom Domain, Nvcpus uint32) (err error) { func (l *Libvirt) DomainShutdown(Dom Domain) (err error) { var buf []byte - args := DomainShutdownArgs{ + args := DomainShutdownArgs { Dom: Dom, } @@ -4927,6 +4933,7 @@ func (l *Libvirt) DomainShutdown(Dom Domain) (err error) { return } + _, err = l.requestStream(33, constants.Program, buf, nil, nil) if err != nil { return @@ -4939,7 +4946,7 @@ func (l *Libvirt) DomainShutdown(Dom Domain) (err error) { func (l *Libvirt) DomainSuspend(Dom Domain) (err error) { var buf []byte - args := DomainSuspendArgs{ + args := DomainSuspendArgs { Dom: Dom, } @@ -4948,6 +4955,7 @@ func (l *Libvirt) DomainSuspend(Dom Domain) (err error) { return } + _, err = l.requestStream(34, constants.Program, buf, nil, nil) if err != nil { return @@ -4960,7 +4968,7 @@ func (l *Libvirt) DomainSuspend(Dom Domain) (err error) { func (l *Libvirt) DomainUndefine(Dom Domain) (err error) { var buf []byte - args := DomainUndefineArgs{ + args := DomainUndefineArgs { Dom: Dom, } @@ -4969,6 +4977,7 @@ func (l *Libvirt) DomainUndefine(Dom Domain) (err error) { return } + _, err = l.requestStream(35, constants.Program, buf, nil, nil) if err != nil { return @@ -4981,7 +4990,7 @@ func (l *Libvirt) DomainUndefine(Dom Domain) (err error) { func (l *Libvirt) ConnectListDefinedNetworks(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListDefinedNetworksArgs{ + args := ConnectListDefinedNetworksArgs { Maxnames: Maxnames, } @@ -5014,7 +5023,7 @@ func (l *Libvirt) ConnectListDefinedNetworks(Maxnames int32) (rNames []string, e func (l *Libvirt) ConnectListDomains(Maxids int32) (rIds []int32, err error) { var buf []byte - args := ConnectListDomainsArgs{ + args := ConnectListDomainsArgs { Maxids: Maxids, } @@ -5047,7 +5056,7 @@ func (l *Libvirt) ConnectListDomains(Maxids int32) (rIds []int32, err error) { func (l *Libvirt) ConnectListNetworks(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListNetworksArgs{ + args := ConnectListNetworksArgs { Maxnames: Maxnames, } @@ -5080,7 +5089,7 @@ func (l *Libvirt) ConnectListNetworks(Maxnames int32) (rNames []string, err erro func (l *Libvirt) NetworkCreate(Net Network) (err error) { var buf []byte - args := NetworkCreateArgs{ + args := NetworkCreateArgs { Net: Net, } @@ -5089,6 +5098,7 @@ func (l *Libvirt) NetworkCreate(Net Network) (err error) { return } + _, err = l.requestStream(39, constants.Program, buf, nil, nil) if err != nil { return @@ -5101,7 +5111,7 @@ func (l *Libvirt) NetworkCreate(Net Network) (err error) { func (l *Libvirt) NetworkCreateXML(XML string) (rNet Network, err error) { var buf []byte - args := NetworkCreateXMLArgs{ + args := NetworkCreateXMLArgs { XML: XML, } @@ -5134,7 +5144,7 @@ func (l *Libvirt) NetworkCreateXML(XML string) (rNet Network, err error) { func (l *Libvirt) NetworkDefineXML(XML string) (rNet Network, err error) { var buf []byte - args := NetworkDefineXMLArgs{ + args := NetworkDefineXMLArgs { XML: XML, } @@ -5167,7 +5177,7 @@ func (l *Libvirt) NetworkDefineXML(XML string) (rNet Network, err error) { func (l *Libvirt) NetworkDestroy(Net Network) (err error) { var buf []byte - args := NetworkDestroyArgs{ + args := NetworkDestroyArgs { Net: Net, } @@ -5176,6 +5186,7 @@ func (l *Libvirt) NetworkDestroy(Net Network) (err error) { return } + _, err = l.requestStream(42, constants.Program, buf, nil, nil) if err != nil { return @@ -5188,8 +5199,8 @@ func (l *Libvirt) NetworkDestroy(Net Network) (err error) { func (l *Libvirt) NetworkGetXMLDesc(Net Network, Flags uint32) (rXML string, err error) { var buf []byte - args := NetworkGetXMLDescArgs{ - Net: Net, + args := NetworkGetXMLDescArgs { + Net: Net, Flags: Flags, } @@ -5222,7 +5233,7 @@ func (l *Libvirt) NetworkGetXMLDesc(Net Network, Flags uint32) (rXML string, err func (l *Libvirt) NetworkGetAutostart(Net Network) (rAutostart int32, err error) { var buf []byte - args := NetworkGetAutostartArgs{ + args := NetworkGetAutostartArgs { Net: Net, } @@ -5255,7 +5266,7 @@ func (l *Libvirt) NetworkGetAutostart(Net Network) (rAutostart int32, err error) func (l *Libvirt) NetworkGetBridgeName(Net Network) (rName string, err error) { var buf []byte - args := NetworkGetBridgeNameArgs{ + args := NetworkGetBridgeNameArgs { Net: Net, } @@ -5288,7 +5299,7 @@ func (l *Libvirt) NetworkGetBridgeName(Net Network) (rName string, err error) { func (l *Libvirt) NetworkLookupByName(Name string) (rNet Network, err error) { var buf []byte - args := NetworkLookupByNameArgs{ + args := NetworkLookupByNameArgs { Name: Name, } @@ -5321,7 +5332,7 @@ func (l *Libvirt) NetworkLookupByName(Name string) (rNet Network, err error) { func (l *Libvirt) NetworkLookupByUUID(UUID UUID) (rNet Network, err error) { var buf []byte - args := NetworkLookupByUUIDArgs{ + args := NetworkLookupByUUIDArgs { UUID: UUID, } @@ -5354,8 +5365,8 @@ func (l *Libvirt) NetworkLookupByUUID(UUID UUID) (rNet Network, err error) { func (l *Libvirt) NetworkSetAutostart(Net Network, Autostart int32) (err error) { var buf []byte - args := NetworkSetAutostartArgs{ - Net: Net, + args := NetworkSetAutostartArgs { + Net: Net, Autostart: Autostart, } @@ -5364,6 +5375,7 @@ func (l *Libvirt) NetworkSetAutostart(Net Network, Autostart int32) (err error) return } + _, err = l.requestStream(48, constants.Program, buf, nil, nil) if err != nil { return @@ -5376,7 +5388,7 @@ func (l *Libvirt) NetworkSetAutostart(Net Network, Autostart int32) (err error) func (l *Libvirt) NetworkUndefine(Net Network) (err error) { var buf []byte - args := NetworkUndefineArgs{ + args := NetworkUndefineArgs { Net: Net, } @@ -5385,6 +5397,7 @@ func (l *Libvirt) NetworkUndefine(Net Network) (err error) { return } + _, err = l.requestStream(49, constants.Program, buf, nil, nil) if err != nil { return @@ -5469,9 +5482,9 @@ func (l *Libvirt) ConnectNumOfNetworks() (rNum int32, err error) { func (l *Libvirt) DomainCoreDump(Dom Domain, To string, Flags DomainCoreDumpFlags) (err error) { var buf []byte - args := DomainCoreDumpArgs{ - Dom: Dom, - To: To, + args := DomainCoreDumpArgs { + Dom: Dom, + To: To, Flags: Flags, } @@ -5480,6 +5493,7 @@ func (l *Libvirt) DomainCoreDump(Dom Domain, To string, Flags DomainCoreDumpFlag return } + _, err = l.requestStream(53, constants.Program, buf, nil, nil) if err != nil { return @@ -5492,7 +5506,7 @@ func (l *Libvirt) DomainCoreDump(Dom Domain, To string, Flags DomainCoreDumpFlag func (l *Libvirt) DomainRestore(From string) (err error) { var buf []byte - args := DomainRestoreArgs{ + args := DomainRestoreArgs { From: From, } @@ -5501,6 +5515,7 @@ func (l *Libvirt) DomainRestore(From string) (err error) { return } + _, err = l.requestStream(54, constants.Program, buf, nil, nil) if err != nil { return @@ -5513,9 +5528,9 @@ func (l *Libvirt) DomainRestore(From string) (err error) { func (l *Libvirt) DomainSave(Dom Domain, To string) (err error) { var buf []byte - args := DomainSaveArgs{ + args := DomainSaveArgs { Dom: Dom, - To: To, + To: To, } buf, err = encode(&args) @@ -5523,6 +5538,7 @@ func (l *Libvirt) DomainSave(Dom Domain, To string) (err error) { return } + _, err = l.requestStream(55, constants.Program, buf, nil, nil) if err != nil { return @@ -5535,7 +5551,7 @@ func (l *Libvirt) DomainSave(Dom Domain, To string) (err error) { func (l *Libvirt) DomainGetSchedulerType(Dom Domain) (rType string, rNparams int32, err error) { var buf []byte - args := DomainGetSchedulerTypeArgs{ + args := DomainGetSchedulerTypeArgs { Dom: Dom, } @@ -5573,8 +5589,8 @@ func (l *Libvirt) DomainGetSchedulerType(Dom Domain) (rType string, rNparams int func (l *Libvirt) DomainGetSchedulerParameters(Dom Domain, Nparams int32) (rParams []TypedParam, err error) { var buf []byte - args := DomainGetSchedulerParametersArgs{ - Dom: Dom, + args := DomainGetSchedulerParametersArgs { + Dom: Dom, Nparams: Nparams, } @@ -5607,8 +5623,8 @@ func (l *Libvirt) DomainGetSchedulerParameters(Dom Domain, Nparams int32) (rPara func (l *Libvirt) DomainSetSchedulerParameters(Dom Domain, Params []TypedParam) (err error) { var buf []byte - args := DomainSetSchedulerParametersArgs{ - Dom: Dom, + args := DomainSetSchedulerParametersArgs { + Dom: Dom, Params: Params, } @@ -5617,6 +5633,7 @@ func (l *Libvirt) DomainSetSchedulerParameters(Dom Domain, Params []TypedParam) return } + _, err = l.requestStream(58, constants.Program, buf, nil, nil) if err != nil { return @@ -5653,7 +5670,7 @@ func (l *Libvirt) ConnectGetHostname() (rHostname string, err error) { func (l *Libvirt) ConnectSupportsFeature(Feature int32) (rSupported int32, err error) { var buf []byte - args := ConnectSupportsFeatureArgs{ + args := ConnectSupportsFeatureArgs { Feature: Feature, } @@ -5686,10 +5703,10 @@ func (l *Libvirt) ConnectSupportsFeature(Feature int32) (rSupported int32, err e func (l *Libvirt) DomainMigratePrepare(UriIn OptString, Flags uint64, Dname OptString, Resource uint64) (rCookie []byte, rUriOut OptString, err error) { var buf []byte - args := DomainMigratePrepareArgs{ - UriIn: UriIn, - Flags: Flags, - Dname: Dname, + args := DomainMigratePrepareArgs { + UriIn: UriIn, + Flags: Flags, + Dname: Dname, Resource: Resource, } @@ -5727,12 +5744,12 @@ func (l *Libvirt) DomainMigratePrepare(UriIn OptString, Flags uint64, Dname OptS func (l *Libvirt) DomainMigratePerform(Dom Domain, Cookie []byte, Uri string, Flags uint64, Dname OptString, Resource uint64) (err error) { var buf []byte - args := DomainMigratePerformArgs{ - Dom: Dom, - Cookie: Cookie, - Uri: Uri, - Flags: Flags, - Dname: Dname, + args := DomainMigratePerformArgs { + Dom: Dom, + Cookie: Cookie, + Uri: Uri, + Flags: Flags, + Dname: Dname, Resource: Resource, } @@ -5741,6 +5758,7 @@ func (l *Libvirt) DomainMigratePerform(Dom Domain, Cookie []byte, Uri string, Fl return } + _, err = l.requestStream(62, constants.Program, buf, nil, nil) if err != nil { return @@ -5753,11 +5771,11 @@ func (l *Libvirt) DomainMigratePerform(Dom Domain, Cookie []byte, Uri string, Fl func (l *Libvirt) DomainMigrateFinish(Dname string, Cookie []byte, Uri string, Flags uint64) (rDdom Domain, err error) { var buf []byte - args := DomainMigrateFinishArgs{ - Dname: Dname, + args := DomainMigrateFinishArgs { + Dname: Dname, Cookie: Cookie, - Uri: Uri, - Flags: Flags, + Uri: Uri, + Flags: Flags, } buf, err = encode(&args) @@ -5789,8 +5807,8 @@ func (l *Libvirt) DomainMigrateFinish(Dname string, Cookie []byte, Uri string, F func (l *Libvirt) DomainBlockStats(Dom Domain, Path string) (rRdReq int64, rRdBytes int64, rWrReq int64, rWrBytes int64, rErrs int64, err error) { var buf []byte - args := DomainBlockStatsArgs{ - Dom: Dom, + args := DomainBlockStatsArgs { + Dom: Dom, Path: Path, } @@ -5843,8 +5861,8 @@ func (l *Libvirt) DomainBlockStats(Dom Domain, Path string) (rRdReq int64, rRdBy func (l *Libvirt) DomainInterfaceStats(Dom Domain, Device string) (rRxBytes int64, rRxPackets int64, rRxErrs int64, rRxDrop int64, rTxBytes int64, rTxPackets int64, rTxErrs int64, rTxDrop int64, err error) { var buf []byte - args := DomainInterfaceStatsArgs{ - Dom: Dom, + args := DomainInterfaceStatsArgs { + Dom: Dom, Device: Device, } @@ -5960,9 +5978,9 @@ func (l *Libvirt) AuthSaslInit() (rMechlist string, err error) { func (l *Libvirt) AuthSaslStart(Mech string, Nil int32, Data []int8) (rComplete int32, rNil int32, rData []int8, err error) { var buf []byte - args := AuthSaslStartArgs{ + args := AuthSaslStartArgs { Mech: Mech, - Nil: Nil, + Nil: Nil, Data: Data, } @@ -6005,8 +6023,8 @@ func (l *Libvirt) AuthSaslStart(Mech string, Nil int32, Data []int8) (rComplete func (l *Libvirt) AuthSaslStep(Nil int32, Data []int8) (rComplete int32, rNil int32, rData []int8, err error) { var buf []byte - args := AuthSaslStepArgs{ - Nil: Nil, + args := AuthSaslStepArgs { + Nil: Nil, Data: Data, } @@ -6097,7 +6115,7 @@ func (l *Libvirt) ConnectNumOfStoragePools() (rNum int32, err error) { func (l *Libvirt) ConnectListStoragePools(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListStoragePoolsArgs{ + args := ConnectListStoragePoolsArgs { Maxnames: Maxnames, } @@ -6154,7 +6172,7 @@ func (l *Libvirt) ConnectNumOfDefinedStoragePools() (rNum int32, err error) { func (l *Libvirt) ConnectListDefinedStoragePools(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListDefinedStoragePoolsArgs{ + args := ConnectListDefinedStoragePoolsArgs { Maxnames: Maxnames, } @@ -6187,10 +6205,10 @@ func (l *Libvirt) ConnectListDefinedStoragePools(Maxnames int32) (rNames []strin func (l *Libvirt) ConnectFindStoragePoolSources(Type string, SrcSpec OptString, Flags uint32) (rXML string, err error) { var buf []byte - args := ConnectFindStoragePoolSourcesArgs{ - Type: Type, + args := ConnectFindStoragePoolSourcesArgs { + Type: Type, SrcSpec: SrcSpec, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -6222,8 +6240,8 @@ func (l *Libvirt) ConnectFindStoragePoolSources(Type string, SrcSpec OptString, func (l *Libvirt) StoragePoolCreateXML(XML string, Flags StoragePoolCreateFlags) (rPool StoragePool, err error) { var buf []byte - args := StoragePoolCreateXMLArgs{ - XML: XML, + args := StoragePoolCreateXMLArgs { + XML: XML, Flags: Flags, } @@ -6256,8 +6274,8 @@ func (l *Libvirt) StoragePoolCreateXML(XML string, Flags StoragePoolCreateFlags) func (l *Libvirt) StoragePoolDefineXML(XML string, Flags uint32) (rPool StoragePool, err error) { var buf []byte - args := StoragePoolDefineXMLArgs{ - XML: XML, + args := StoragePoolDefineXMLArgs { + XML: XML, Flags: Flags, } @@ -6290,8 +6308,8 @@ func (l *Libvirt) StoragePoolDefineXML(XML string, Flags uint32) (rPool StorageP func (l *Libvirt) StoragePoolCreate(Pool StoragePool, Flags StoragePoolCreateFlags) (err error) { var buf []byte - args := StoragePoolCreateArgs{ - Pool: Pool, + args := StoragePoolCreateArgs { + Pool: Pool, Flags: Flags, } @@ -6300,6 +6318,7 @@ func (l *Libvirt) StoragePoolCreate(Pool StoragePool, Flags StoragePoolCreateFla return } + _, err = l.requestStream(78, constants.Program, buf, nil, nil) if err != nil { return @@ -6312,8 +6331,8 @@ func (l *Libvirt) StoragePoolCreate(Pool StoragePool, Flags StoragePoolCreateFla func (l *Libvirt) StoragePoolBuild(Pool StoragePool, Flags StoragePoolBuildFlags) (err error) { var buf []byte - args := StoragePoolBuildArgs{ - Pool: Pool, + args := StoragePoolBuildArgs { + Pool: Pool, Flags: Flags, } @@ -6322,6 +6341,7 @@ func (l *Libvirt) StoragePoolBuild(Pool StoragePool, Flags StoragePoolBuildFlags return } + _, err = l.requestStream(79, constants.Program, buf, nil, nil) if err != nil { return @@ -6334,7 +6354,7 @@ func (l *Libvirt) StoragePoolBuild(Pool StoragePool, Flags StoragePoolBuildFlags func (l *Libvirt) StoragePoolDestroy(Pool StoragePool) (err error) { var buf []byte - args := StoragePoolDestroyArgs{ + args := StoragePoolDestroyArgs { Pool: Pool, } @@ -6343,6 +6363,7 @@ func (l *Libvirt) StoragePoolDestroy(Pool StoragePool) (err error) { return } + _, err = l.requestStream(80, constants.Program, buf, nil, nil) if err != nil { return @@ -6355,8 +6376,8 @@ func (l *Libvirt) StoragePoolDestroy(Pool StoragePool) (err error) { func (l *Libvirt) StoragePoolDelete(Pool StoragePool, Flags StoragePoolDeleteFlags) (err error) { var buf []byte - args := StoragePoolDeleteArgs{ - Pool: Pool, + args := StoragePoolDeleteArgs { + Pool: Pool, Flags: Flags, } @@ -6365,6 +6386,7 @@ func (l *Libvirt) StoragePoolDelete(Pool StoragePool, Flags StoragePoolDeleteFla return } + _, err = l.requestStream(81, constants.Program, buf, nil, nil) if err != nil { return @@ -6377,7 +6399,7 @@ func (l *Libvirt) StoragePoolDelete(Pool StoragePool, Flags StoragePoolDeleteFla func (l *Libvirt) StoragePoolUndefine(Pool StoragePool) (err error) { var buf []byte - args := StoragePoolUndefineArgs{ + args := StoragePoolUndefineArgs { Pool: Pool, } @@ -6386,6 +6408,7 @@ func (l *Libvirt) StoragePoolUndefine(Pool StoragePool) (err error) { return } + _, err = l.requestStream(82, constants.Program, buf, nil, nil) if err != nil { return @@ -6398,8 +6421,8 @@ func (l *Libvirt) StoragePoolUndefine(Pool StoragePool) (err error) { func (l *Libvirt) StoragePoolRefresh(Pool StoragePool, Flags uint32) (err error) { var buf []byte - args := StoragePoolRefreshArgs{ - Pool: Pool, + args := StoragePoolRefreshArgs { + Pool: Pool, Flags: Flags, } @@ -6408,6 +6431,7 @@ func (l *Libvirt) StoragePoolRefresh(Pool StoragePool, Flags uint32) (err error) return } + _, err = l.requestStream(83, constants.Program, buf, nil, nil) if err != nil { return @@ -6420,7 +6444,7 @@ func (l *Libvirt) StoragePoolRefresh(Pool StoragePool, Flags uint32) (err error) func (l *Libvirt) StoragePoolLookupByName(Name string) (rPool StoragePool, err error) { var buf []byte - args := StoragePoolLookupByNameArgs{ + args := StoragePoolLookupByNameArgs { Name: Name, } @@ -6453,7 +6477,7 @@ func (l *Libvirt) StoragePoolLookupByName(Name string) (rPool StoragePool, err e func (l *Libvirt) StoragePoolLookupByUUID(UUID UUID) (rPool StoragePool, err error) { var buf []byte - args := StoragePoolLookupByUUIDArgs{ + args := StoragePoolLookupByUUIDArgs { UUID: UUID, } @@ -6486,7 +6510,7 @@ func (l *Libvirt) StoragePoolLookupByUUID(UUID UUID) (rPool StoragePool, err err func (l *Libvirt) StoragePoolLookupByVolume(Vol StorageVol) (rPool StoragePool, err error) { var buf []byte - args := StoragePoolLookupByVolumeArgs{ + args := StoragePoolLookupByVolumeArgs { Vol: Vol, } @@ -6519,7 +6543,7 @@ func (l *Libvirt) StoragePoolLookupByVolume(Vol StorageVol) (rPool StoragePool, func (l *Libvirt) StoragePoolGetInfo(Pool StoragePool) (rState uint8, rCapacity uint64, rAllocation uint64, rAvailable uint64, err error) { var buf []byte - args := StoragePoolGetInfoArgs{ + args := StoragePoolGetInfoArgs { Pool: Pool, } @@ -6567,8 +6591,8 @@ func (l *Libvirt) StoragePoolGetInfo(Pool StoragePool) (rState uint8, rCapacity func (l *Libvirt) StoragePoolGetXMLDesc(Pool StoragePool, Flags StorageXMLFlags) (rXML string, err error) { var buf []byte - args := StoragePoolGetXMLDescArgs{ - Pool: Pool, + args := StoragePoolGetXMLDescArgs { + Pool: Pool, Flags: Flags, } @@ -6601,7 +6625,7 @@ func (l *Libvirt) StoragePoolGetXMLDesc(Pool StoragePool, Flags StorageXMLFlags) func (l *Libvirt) StoragePoolGetAutostart(Pool StoragePool) (rAutostart int32, err error) { var buf []byte - args := StoragePoolGetAutostartArgs{ + args := StoragePoolGetAutostartArgs { Pool: Pool, } @@ -6634,8 +6658,8 @@ func (l *Libvirt) StoragePoolGetAutostart(Pool StoragePool) (rAutostart int32, e func (l *Libvirt) StoragePoolSetAutostart(Pool StoragePool, Autostart int32) (err error) { var buf []byte - args := StoragePoolSetAutostartArgs{ - Pool: Pool, + args := StoragePoolSetAutostartArgs { + Pool: Pool, Autostart: Autostart, } @@ -6644,6 +6668,7 @@ func (l *Libvirt) StoragePoolSetAutostart(Pool StoragePool, Autostart int32) (er return } + _, err = l.requestStream(90, constants.Program, buf, nil, nil) if err != nil { return @@ -6656,7 +6681,7 @@ func (l *Libvirt) StoragePoolSetAutostart(Pool StoragePool, Autostart int32) (er func (l *Libvirt) StoragePoolNumOfVolumes(Pool StoragePool) (rNum int32, err error) { var buf []byte - args := StoragePoolNumOfVolumesArgs{ + args := StoragePoolNumOfVolumesArgs { Pool: Pool, } @@ -6689,8 +6714,8 @@ func (l *Libvirt) StoragePoolNumOfVolumes(Pool StoragePool) (rNum int32, err err func (l *Libvirt) StoragePoolListVolumes(Pool StoragePool, Maxnames int32) (rNames []string, err error) { var buf []byte - args := StoragePoolListVolumesArgs{ - Pool: Pool, + args := StoragePoolListVolumesArgs { + Pool: Pool, Maxnames: Maxnames, } @@ -6723,9 +6748,9 @@ func (l *Libvirt) StoragePoolListVolumes(Pool StoragePool, Maxnames int32) (rNam func (l *Libvirt) StorageVolCreateXML(Pool StoragePool, XML string, Flags StorageVolCreateFlags) (rVol StorageVol, err error) { var buf []byte - args := StorageVolCreateXMLArgs{ - Pool: Pool, - XML: XML, + args := StorageVolCreateXMLArgs { + Pool: Pool, + XML: XML, Flags: Flags, } @@ -6758,8 +6783,8 @@ func (l *Libvirt) StorageVolCreateXML(Pool StoragePool, XML string, Flags Storag func (l *Libvirt) StorageVolDelete(Vol StorageVol, Flags StorageVolDeleteFlags) (err error) { var buf []byte - args := StorageVolDeleteArgs{ - Vol: Vol, + args := StorageVolDeleteArgs { + Vol: Vol, Flags: Flags, } @@ -6768,6 +6793,7 @@ func (l *Libvirt) StorageVolDelete(Vol StorageVol, Flags StorageVolDeleteFlags) return } + _, err = l.requestStream(94, constants.Program, buf, nil, nil) if err != nil { return @@ -6780,7 +6806,7 @@ func (l *Libvirt) StorageVolDelete(Vol StorageVol, Flags StorageVolDeleteFlags) func (l *Libvirt) StorageVolLookupByName(Pool StoragePool, Name string) (rVol StorageVol, err error) { var buf []byte - args := StorageVolLookupByNameArgs{ + args := StorageVolLookupByNameArgs { Pool: Pool, Name: Name, } @@ -6814,7 +6840,7 @@ func (l *Libvirt) StorageVolLookupByName(Pool StoragePool, Name string) (rVol St func (l *Libvirt) StorageVolLookupByKey(Key string) (rVol StorageVol, err error) { var buf []byte - args := StorageVolLookupByKeyArgs{ + args := StorageVolLookupByKeyArgs { Key: Key, } @@ -6847,7 +6873,7 @@ func (l *Libvirt) StorageVolLookupByKey(Key string) (rVol StorageVol, err error) func (l *Libvirt) StorageVolLookupByPath(Path string) (rVol StorageVol, err error) { var buf []byte - args := StorageVolLookupByPathArgs{ + args := StorageVolLookupByPathArgs { Path: Path, } @@ -6880,7 +6906,7 @@ func (l *Libvirt) StorageVolLookupByPath(Path string) (rVol StorageVol, err erro func (l *Libvirt) StorageVolGetInfo(Vol StorageVol) (rType int8, rCapacity uint64, rAllocation uint64, err error) { var buf []byte - args := StorageVolGetInfoArgs{ + args := StorageVolGetInfoArgs { Vol: Vol, } @@ -6923,8 +6949,8 @@ func (l *Libvirt) StorageVolGetInfo(Vol StorageVol) (rType int8, rCapacity uint6 func (l *Libvirt) StorageVolGetXMLDesc(Vol StorageVol, Flags uint32) (rXML string, err error) { var buf []byte - args := StorageVolGetXMLDescArgs{ - Vol: Vol, + args := StorageVolGetXMLDescArgs { + Vol: Vol, Flags: Flags, } @@ -6957,7 +6983,7 @@ func (l *Libvirt) StorageVolGetXMLDesc(Vol StorageVol, Flags uint32) (rXML strin func (l *Libvirt) StorageVolGetPath(Vol StorageVol) (rName string, err error) { var buf []byte - args := StorageVolGetPathArgs{ + args := StorageVolGetPathArgs { Vol: Vol, } @@ -6990,9 +7016,9 @@ func (l *Libvirt) StorageVolGetPath(Vol StorageVol) (rName string, err error) { func (l *Libvirt) NodeGetCellsFreeMemory(StartCell int32, Maxcells int32) (rCells []uint64, err error) { var buf []byte - args := NodeGetCellsFreeMemoryArgs{ + args := NodeGetCellsFreeMemoryArgs { StartCell: StartCell, - Maxcells: Maxcells, + Maxcells: Maxcells, } buf, err = encode(&args) @@ -7048,12 +7074,12 @@ func (l *Libvirt) NodeGetFreeMemory() (rFreeMem uint64, err error) { func (l *Libvirt) DomainBlockPeek(Dom Domain, Path string, Offset uint64, Size uint32, Flags uint32) (rBuffer []byte, err error) { var buf []byte - args := DomainBlockPeekArgs{ - Dom: Dom, - Path: Path, + args := DomainBlockPeekArgs { + Dom: Dom, + Path: Path, Offset: Offset, - Size: Size, - Flags: Flags, + Size: Size, + Flags: Flags, } buf, err = encode(&args) @@ -7085,11 +7111,11 @@ func (l *Libvirt) DomainBlockPeek(Dom Domain, Path string, Offset uint64, Size u func (l *Libvirt) DomainMemoryPeek(Dom Domain, Offset uint64, Size uint32, Flags DomainMemoryFlags) (rBuffer []byte, err error) { var buf []byte - args := DomainMemoryPeekArgs{ - Dom: Dom, + args := DomainMemoryPeekArgs { + Dom: Dom, Offset: Offset, - Size: Size, - Flags: Flags, + Size: Size, + Flags: Flags, } buf, err = encode(&args) @@ -7169,6 +7195,7 @@ func (l *Libvirt) ConnectDomainEventDeregister() (rCbRegistered int32, err error func (l *Libvirt) DomainEventLifecycle() (err error) { var buf []byte + _, err = l.requestStream(107, constants.Program, buf, nil, nil) if err != nil { return @@ -7181,12 +7208,12 @@ func (l *Libvirt) DomainEventLifecycle() (err error) { func (l *Libvirt) DomainMigratePrepare2(UriIn OptString, Flags uint64, Dname OptString, Resource uint64, DomXML string) (rCookie []byte, rUriOut OptString, err error) { var buf []byte - args := DomainMigratePrepare2Args{ - UriIn: UriIn, - Flags: Flags, - Dname: Dname, + args := DomainMigratePrepare2Args { + UriIn: UriIn, + Flags: Flags, + Dname: Dname, Resource: Resource, - DomXML: DomXML, + DomXML: DomXML, } buf, err = encode(&args) @@ -7223,11 +7250,11 @@ func (l *Libvirt) DomainMigratePrepare2(UriIn OptString, Flags uint64, Dname Opt func (l *Libvirt) DomainMigrateFinish2(Dname string, Cookie []byte, Uri string, Flags uint64, Retcode int32) (rDdom Domain, err error) { var buf []byte - args := DomainMigrateFinish2Args{ - Dname: Dname, - Cookie: Cookie, - Uri: Uri, - Flags: Flags, + args := DomainMigrateFinish2Args { + Dname: Dname, + Cookie: Cookie, + Uri: Uri, + Flags: Flags, Retcode: Retcode, } @@ -7284,8 +7311,8 @@ func (l *Libvirt) ConnectGetUri() (rUri string, err error) { func (l *Libvirt) NodeNumOfDevices(Cap OptString, Flags uint32) (rNum int32, err error) { var buf []byte - args := NodeNumOfDevicesArgs{ - Cap: Cap, + args := NodeNumOfDevicesArgs { + Cap: Cap, Flags: Flags, } @@ -7318,10 +7345,10 @@ func (l *Libvirt) NodeNumOfDevices(Cap OptString, Flags uint32) (rNum int32, err func (l *Libvirt) NodeListDevices(Cap OptString, Maxnames int32, Flags uint32) (rNames []string, err error) { var buf []byte - args := NodeListDevicesArgs{ - Cap: Cap, + args := NodeListDevicesArgs { + Cap: Cap, Maxnames: Maxnames, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -7353,7 +7380,7 @@ func (l *Libvirt) NodeListDevices(Cap OptString, Maxnames int32, Flags uint32) ( func (l *Libvirt) NodeDeviceLookupByName(Name string) (rDev NodeDevice, err error) { var buf []byte - args := NodeDeviceLookupByNameArgs{ + args := NodeDeviceLookupByNameArgs { Name: Name, } @@ -7386,8 +7413,8 @@ func (l *Libvirt) NodeDeviceLookupByName(Name string) (rDev NodeDevice, err erro func (l *Libvirt) NodeDeviceGetXMLDesc(Name string, Flags uint32) (rXML string, err error) { var buf []byte - args := NodeDeviceGetXMLDescArgs{ - Name: Name, + args := NodeDeviceGetXMLDescArgs { + Name: Name, Flags: Flags, } @@ -7420,7 +7447,7 @@ func (l *Libvirt) NodeDeviceGetXMLDesc(Name string, Flags uint32) (rXML string, func (l *Libvirt) NodeDeviceGetParent(Name string) (rParentName OptString, err error) { var buf []byte - args := NodeDeviceGetParentArgs{ + args := NodeDeviceGetParentArgs { Name: Name, } @@ -7453,7 +7480,7 @@ func (l *Libvirt) NodeDeviceGetParent(Name string) (rParentName OptString, err e func (l *Libvirt) NodeDeviceNumOfCaps(Name string) (rNum int32, err error) { var buf []byte - args := NodeDeviceNumOfCapsArgs{ + args := NodeDeviceNumOfCapsArgs { Name: Name, } @@ -7486,8 +7513,8 @@ func (l *Libvirt) NodeDeviceNumOfCaps(Name string) (rNum int32, err error) { func (l *Libvirt) NodeDeviceListCaps(Name string, Maxnames int32) (rNames []string, err error) { var buf []byte - args := NodeDeviceListCapsArgs{ - Name: Name, + args := NodeDeviceListCapsArgs { + Name: Name, Maxnames: Maxnames, } @@ -7520,7 +7547,7 @@ func (l *Libvirt) NodeDeviceListCaps(Name string, Maxnames int32) (rNames []stri func (l *Libvirt) NodeDeviceDettach(Name string) (err error) { var buf []byte - args := NodeDeviceDettachArgs{ + args := NodeDeviceDettachArgs { Name: Name, } @@ -7529,6 +7556,7 @@ func (l *Libvirt) NodeDeviceDettach(Name string) (err error) { return } + _, err = l.requestStream(118, constants.Program, buf, nil, nil) if err != nil { return @@ -7541,7 +7569,7 @@ func (l *Libvirt) NodeDeviceDettach(Name string) (err error) { func (l *Libvirt) NodeDeviceReAttach(Name string) (err error) { var buf []byte - args := NodeDeviceReAttachArgs{ + args := NodeDeviceReAttachArgs { Name: Name, } @@ -7550,6 +7578,7 @@ func (l *Libvirt) NodeDeviceReAttach(Name string) (err error) { return } + _, err = l.requestStream(119, constants.Program, buf, nil, nil) if err != nil { return @@ -7562,7 +7591,7 @@ func (l *Libvirt) NodeDeviceReAttach(Name string) (err error) { func (l *Libvirt) NodeDeviceReset(Name string) (err error) { var buf []byte - args := NodeDeviceResetArgs{ + args := NodeDeviceResetArgs { Name: Name, } @@ -7571,6 +7600,7 @@ func (l *Libvirt) NodeDeviceReset(Name string) (err error) { return } + _, err = l.requestStream(120, constants.Program, buf, nil, nil) if err != nil { return @@ -7583,7 +7613,7 @@ func (l *Libvirt) NodeDeviceReset(Name string) (err error) { func (l *Libvirt) DomainGetSecurityLabel(Dom Domain) (rLabel []int8, rEnforcing int32, err error) { var buf []byte - args := DomainGetSecurityLabelArgs{ + args := DomainGetSecurityLabelArgs { Dom: Dom, } @@ -7650,9 +7680,9 @@ func (l *Libvirt) NodeGetSecurityModel() (rModel []int8, rDoi []int8, err error) func (l *Libvirt) NodeDeviceCreateXML(XMLDesc string, Flags uint32) (rDev NodeDevice, err error) { var buf []byte - args := NodeDeviceCreateXMLArgs{ + args := NodeDeviceCreateXMLArgs { XMLDesc: XMLDesc, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -7684,7 +7714,7 @@ func (l *Libvirt) NodeDeviceCreateXML(XMLDesc string, Flags uint32) (rDev NodeDe func (l *Libvirt) NodeDeviceDestroy(Name string) (err error) { var buf []byte - args := NodeDeviceDestroyArgs{ + args := NodeDeviceDestroyArgs { Name: Name, } @@ -7693,6 +7723,7 @@ func (l *Libvirt) NodeDeviceDestroy(Name string) (err error) { return } + _, err = l.requestStream(124, constants.Program, buf, nil, nil) if err != nil { return @@ -7705,11 +7736,11 @@ func (l *Libvirt) NodeDeviceDestroy(Name string) (err error) { func (l *Libvirt) StorageVolCreateXMLFrom(Pool StoragePool, XML string, Clonevol StorageVol, Flags StorageVolCreateFlags) (rVol StorageVol, err error) { var buf []byte - args := StorageVolCreateXMLFromArgs{ - Pool: Pool, - XML: XML, + args := StorageVolCreateXMLFromArgs { + Pool: Pool, + XML: XML, Clonevol: Clonevol, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -7765,7 +7796,7 @@ func (l *Libvirt) ConnectNumOfInterfaces() (rNum int32, err error) { func (l *Libvirt) ConnectListInterfaces(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListInterfacesArgs{ + args := ConnectListInterfacesArgs { Maxnames: Maxnames, } @@ -7798,7 +7829,7 @@ func (l *Libvirt) ConnectListInterfaces(Maxnames int32) (rNames []string, err er func (l *Libvirt) InterfaceLookupByName(Name string) (rIface Interface, err error) { var buf []byte - args := InterfaceLookupByNameArgs{ + args := InterfaceLookupByNameArgs { Name: Name, } @@ -7831,7 +7862,7 @@ func (l *Libvirt) InterfaceLookupByName(Name string) (rIface Interface, err erro func (l *Libvirt) InterfaceLookupByMacString(Mac string) (rIface Interface, err error) { var buf []byte - args := InterfaceLookupByMacStringArgs{ + args := InterfaceLookupByMacStringArgs { Mac: Mac, } @@ -7864,7 +7895,7 @@ func (l *Libvirt) InterfaceLookupByMacString(Mac string) (rIface Interface, err func (l *Libvirt) InterfaceGetXMLDesc(Iface Interface, Flags uint32) (rXML string, err error) { var buf []byte - args := InterfaceGetXMLDescArgs{ + args := InterfaceGetXMLDescArgs { Iface: Iface, Flags: Flags, } @@ -7898,8 +7929,8 @@ func (l *Libvirt) InterfaceGetXMLDesc(Iface Interface, Flags uint32) (rXML strin func (l *Libvirt) InterfaceDefineXML(XML string, Flags uint32) (rIface Interface, err error) { var buf []byte - args := InterfaceDefineXMLArgs{ - XML: XML, + args := InterfaceDefineXMLArgs { + XML: XML, Flags: Flags, } @@ -7932,7 +7963,7 @@ func (l *Libvirt) InterfaceDefineXML(XML string, Flags uint32) (rIface Interface func (l *Libvirt) InterfaceUndefine(Iface Interface) (err error) { var buf []byte - args := InterfaceUndefineArgs{ + args := InterfaceUndefineArgs { Iface: Iface, } @@ -7941,6 +7972,7 @@ func (l *Libvirt) InterfaceUndefine(Iface Interface) (err error) { return } + _, err = l.requestStream(132, constants.Program, buf, nil, nil) if err != nil { return @@ -7953,7 +7985,7 @@ func (l *Libvirt) InterfaceUndefine(Iface Interface) (err error) { func (l *Libvirt) InterfaceCreate(Iface Interface, Flags uint32) (err error) { var buf []byte - args := InterfaceCreateArgs{ + args := InterfaceCreateArgs { Iface: Iface, Flags: Flags, } @@ -7963,6 +7995,7 @@ func (l *Libvirt) InterfaceCreate(Iface Interface, Flags uint32) (err error) { return } + _, err = l.requestStream(133, constants.Program, buf, nil, nil) if err != nil { return @@ -7975,7 +8008,7 @@ func (l *Libvirt) InterfaceCreate(Iface Interface, Flags uint32) (err error) { func (l *Libvirt) InterfaceDestroy(Iface Interface, Flags uint32) (err error) { var buf []byte - args := InterfaceDestroyArgs{ + args := InterfaceDestroyArgs { Iface: Iface, Flags: Flags, } @@ -7985,6 +8018,7 @@ func (l *Libvirt) InterfaceDestroy(Iface Interface, Flags uint32) (err error) { return } + _, err = l.requestStream(134, constants.Program, buf, nil, nil) if err != nil { return @@ -7997,10 +8031,10 @@ func (l *Libvirt) InterfaceDestroy(Iface Interface, Flags uint32) (err error) { func (l *Libvirt) ConnectDomainXMLFromNative(NativeFormat string, NativeConfig string, Flags uint32) (rDomainXML string, err error) { var buf []byte - args := ConnectDomainXMLFromNativeArgs{ + args := ConnectDomainXMLFromNativeArgs { NativeFormat: NativeFormat, NativeConfig: NativeConfig, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -8032,10 +8066,10 @@ func (l *Libvirt) ConnectDomainXMLFromNative(NativeFormat string, NativeConfig s func (l *Libvirt) ConnectDomainXMLToNative(NativeFormat string, DomainXML string, Flags uint32) (rNativeConfig string, err error) { var buf []byte - args := ConnectDomainXMLToNativeArgs{ + args := ConnectDomainXMLToNativeArgs { NativeFormat: NativeFormat, - DomainXML: DomainXML, - Flags: Flags, + DomainXML: DomainXML, + Flags: Flags, } buf, err = encode(&args) @@ -8091,7 +8125,7 @@ func (l *Libvirt) ConnectNumOfDefinedInterfaces() (rNum int32, err error) { func (l *Libvirt) ConnectListDefinedInterfaces(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListDefinedInterfacesArgs{ + args := ConnectListDefinedInterfacesArgs { Maxnames: Maxnames, } @@ -8148,7 +8182,7 @@ func (l *Libvirt) ConnectNumOfSecrets() (rNum int32, err error) { func (l *Libvirt) ConnectListSecrets(Maxuuids int32) (rUuids []string, err error) { var buf []byte - args := ConnectListSecretsArgs{ + args := ConnectListSecretsArgs { Maxuuids: Maxuuids, } @@ -8181,7 +8215,7 @@ func (l *Libvirt) ConnectListSecrets(Maxuuids int32) (rUuids []string, err error func (l *Libvirt) SecretLookupByUUID(UUID UUID) (rOptSecret Secret, err error) { var buf []byte - args := SecretLookupByUUIDArgs{ + args := SecretLookupByUUIDArgs { UUID: UUID, } @@ -8214,8 +8248,8 @@ func (l *Libvirt) SecretLookupByUUID(UUID UUID) (rOptSecret Secret, err error) { func (l *Libvirt) SecretDefineXML(XML string, Flags uint32) (rOptSecret Secret, err error) { var buf []byte - args := SecretDefineXMLArgs{ - XML: XML, + args := SecretDefineXMLArgs { + XML: XML, Flags: Flags, } @@ -8248,9 +8282,9 @@ func (l *Libvirt) SecretDefineXML(XML string, Flags uint32) (rOptSecret Secret, func (l *Libvirt) SecretGetXMLDesc(OptSecret Secret, Flags uint32) (rXML string, err error) { var buf []byte - args := SecretGetXMLDescArgs{ + args := SecretGetXMLDescArgs { OptSecret: OptSecret, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -8282,10 +8316,10 @@ func (l *Libvirt) SecretGetXMLDesc(OptSecret Secret, Flags uint32) (rXML string, func (l *Libvirt) SecretSetValue(OptSecret Secret, Value []byte, Flags uint32) (err error) { var buf []byte - args := SecretSetValueArgs{ + args := SecretSetValueArgs { OptSecret: OptSecret, - Value: Value, - Flags: Flags, + Value: Value, + Flags: Flags, } buf, err = encode(&args) @@ -8293,6 +8327,7 @@ func (l *Libvirt) SecretSetValue(OptSecret Secret, Value []byte, Flags uint32) ( return } + _, err = l.requestStream(144, constants.Program, buf, nil, nil) if err != nil { return @@ -8305,9 +8340,9 @@ func (l *Libvirt) SecretSetValue(OptSecret Secret, Value []byte, Flags uint32) ( func (l *Libvirt) SecretGetValue(OptSecret Secret, Flags uint32) (rValue []byte, err error) { var buf []byte - args := SecretGetValueArgs{ + args := SecretGetValueArgs { OptSecret: OptSecret, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -8339,7 +8374,7 @@ func (l *Libvirt) SecretGetValue(OptSecret Secret, Flags uint32) (rValue []byte, func (l *Libvirt) SecretUndefine(OptSecret Secret) (err error) { var buf []byte - args := SecretUndefineArgs{ + args := SecretUndefineArgs { OptSecret: OptSecret, } @@ -8348,6 +8383,7 @@ func (l *Libvirt) SecretUndefine(OptSecret Secret) (err error) { return } + _, err = l.requestStream(146, constants.Program, buf, nil, nil) if err != nil { return @@ -8360,9 +8396,9 @@ func (l *Libvirt) SecretUndefine(OptSecret Secret) (err error) { func (l *Libvirt) SecretLookupByUsage(UsageType int32, UsageID string) (rOptSecret Secret, err error) { var buf []byte - args := SecretLookupByUsageArgs{ + args := SecretLookupByUsageArgs { UsageType: UsageType, - UsageID: UsageID, + UsageID: UsageID, } buf, err = encode(&args) @@ -8394,11 +8430,11 @@ func (l *Libvirt) SecretLookupByUsage(UsageType int32, UsageID string) (rOptSecr func (l *Libvirt) DomainMigratePrepareTunnel(Flags uint64, outStream io.Reader, Dname OptString, Resource uint64, DomXML string) (err error) { var buf []byte - args := DomainMigratePrepareTunnelArgs{ - Flags: Flags, - Dname: Dname, + args := DomainMigratePrepareTunnelArgs { + Flags: Flags, + Dname: Dname, Resource: Resource, - DomXML: DomXML, + DomXML: DomXML, } buf, err = encode(&args) @@ -8406,6 +8442,7 @@ func (l *Libvirt) DomainMigratePrepareTunnel(Flags uint64, outStream io.Reader, return } + _, err = l.requestStream(148, constants.Program, buf, outStream, nil) if err != nil { return @@ -8442,7 +8479,7 @@ func (l *Libvirt) ConnectIsSecure() (rSecure int32, err error) { func (l *Libvirt) DomainIsActive(Dom Domain) (rActive int32, err error) { var buf []byte - args := DomainIsActiveArgs{ + args := DomainIsActiveArgs { Dom: Dom, } @@ -8475,7 +8512,7 @@ func (l *Libvirt) DomainIsActive(Dom Domain) (rActive int32, err error) { func (l *Libvirt) DomainIsPersistent(Dom Domain) (rPersistent int32, err error) { var buf []byte - args := DomainIsPersistentArgs{ + args := DomainIsPersistentArgs { Dom: Dom, } @@ -8508,7 +8545,7 @@ func (l *Libvirt) DomainIsPersistent(Dom Domain) (rPersistent int32, err error) func (l *Libvirt) NetworkIsActive(Net Network) (rActive int32, err error) { var buf []byte - args := NetworkIsActiveArgs{ + args := NetworkIsActiveArgs { Net: Net, } @@ -8541,7 +8578,7 @@ func (l *Libvirt) NetworkIsActive(Net Network) (rActive int32, err error) { func (l *Libvirt) NetworkIsPersistent(Net Network) (rPersistent int32, err error) { var buf []byte - args := NetworkIsPersistentArgs{ + args := NetworkIsPersistentArgs { Net: Net, } @@ -8574,7 +8611,7 @@ func (l *Libvirt) NetworkIsPersistent(Net Network) (rPersistent int32, err error func (l *Libvirt) StoragePoolIsActive(Pool StoragePool) (rActive int32, err error) { var buf []byte - args := StoragePoolIsActiveArgs{ + args := StoragePoolIsActiveArgs { Pool: Pool, } @@ -8607,7 +8644,7 @@ func (l *Libvirt) StoragePoolIsActive(Pool StoragePool) (rActive int32, err erro func (l *Libvirt) StoragePoolIsPersistent(Pool StoragePool) (rPersistent int32, err error) { var buf []byte - args := StoragePoolIsPersistentArgs{ + args := StoragePoolIsPersistentArgs { Pool: Pool, } @@ -8640,7 +8677,7 @@ func (l *Libvirt) StoragePoolIsPersistent(Pool StoragePool) (rPersistent int32, func (l *Libvirt) InterfaceIsActive(Iface Interface) (rActive int32, err error) { var buf []byte - args := InterfaceIsActiveArgs{ + args := InterfaceIsActiveArgs { Iface: Iface, } @@ -8697,8 +8734,8 @@ func (l *Libvirt) ConnectGetLibVersion() (rLibVer uint64, err error) { func (l *Libvirt) ConnectCompareCPU(XML string, Flags ConnectCompareCPUFlags) (rResult int32, err error) { var buf []byte - args := ConnectCompareCPUArgs{ - XML: XML, + args := ConnectCompareCPUArgs { + XML: XML, Flags: Flags, } @@ -8731,10 +8768,10 @@ func (l *Libvirt) ConnectCompareCPU(XML string, Flags ConnectCompareCPUFlags) (r func (l *Libvirt) DomainMemoryStats(Dom Domain, MaxStats uint32, Flags uint32) (rStats []DomainMemoryStat, err error) { var buf []byte - args := DomainMemoryStatsArgs{ - Dom: Dom, + args := DomainMemoryStatsArgs { + Dom: Dom, MaxStats: MaxStats, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -8766,9 +8803,9 @@ func (l *Libvirt) DomainMemoryStats(Dom Domain, MaxStats uint32, Flags uint32) ( func (l *Libvirt) DomainAttachDeviceFlags(Dom Domain, XML string, Flags uint32) (err error) { var buf []byte - args := DomainAttachDeviceFlagsArgs{ - Dom: Dom, - XML: XML, + args := DomainAttachDeviceFlagsArgs { + Dom: Dom, + XML: XML, Flags: Flags, } @@ -8777,6 +8814,7 @@ func (l *Libvirt) DomainAttachDeviceFlags(Dom Domain, XML string, Flags uint32) return } + _, err = l.requestStream(160, constants.Program, buf, nil, nil) if err != nil { return @@ -8789,9 +8827,9 @@ func (l *Libvirt) DomainAttachDeviceFlags(Dom Domain, XML string, Flags uint32) func (l *Libvirt) DomainDetachDeviceFlags(Dom Domain, XML string, Flags uint32) (err error) { var buf []byte - args := DomainDetachDeviceFlagsArgs{ - Dom: Dom, - XML: XML, + args := DomainDetachDeviceFlagsArgs { + Dom: Dom, + XML: XML, Flags: Flags, } @@ -8800,6 +8838,7 @@ func (l *Libvirt) DomainDetachDeviceFlags(Dom Domain, XML string, Flags uint32) return } + _, err = l.requestStream(161, constants.Program, buf, nil, nil) if err != nil { return @@ -8812,9 +8851,9 @@ func (l *Libvirt) DomainDetachDeviceFlags(Dom Domain, XML string, Flags uint32) func (l *Libvirt) ConnectBaselineCPU(XMLCPUs []string, Flags ConnectBaselineCPUFlags) (rCPU string, err error) { var buf []byte - args := ConnectBaselineCPUArgs{ + args := ConnectBaselineCPUArgs { XMLCPUs: XMLCPUs, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -8846,7 +8885,7 @@ func (l *Libvirt) ConnectBaselineCPU(XMLCPUs []string, Flags ConnectBaselineCPUF func (l *Libvirt) DomainGetJobInfo(Dom Domain) (rType int32, rTimeElapsed uint64, rTimeRemaining uint64, rDataTotal uint64, rDataProcessed uint64, rDataRemaining uint64, rMemTotal uint64, rMemProcessed uint64, rMemRemaining uint64, rFileTotal uint64, rFileProcessed uint64, rFileRemaining uint64, err error) { var buf []byte - args := DomainGetJobInfoArgs{ + args := DomainGetJobInfoArgs { Dom: Dom, } @@ -8934,7 +8973,7 @@ func (l *Libvirt) DomainGetJobInfo(Dom Domain) (rType int32, rTimeElapsed uint64 func (l *Libvirt) DomainAbortJob(Dom Domain) (err error) { var buf []byte - args := DomainAbortJobArgs{ + args := DomainAbortJobArgs { Dom: Dom, } @@ -8943,6 +8982,7 @@ func (l *Libvirt) DomainAbortJob(Dom Domain) (err error) { return } + _, err = l.requestStream(164, constants.Program, buf, nil, nil) if err != nil { return @@ -8955,8 +8995,8 @@ func (l *Libvirt) DomainAbortJob(Dom Domain) (err error) { func (l *Libvirt) StorageVolWipe(Vol StorageVol, Flags uint32) (err error) { var buf []byte - args := StorageVolWipeArgs{ - Vol: Vol, + args := StorageVolWipeArgs { + Vol: Vol, Flags: Flags, } @@ -8965,6 +9005,7 @@ func (l *Libvirt) StorageVolWipe(Vol StorageVol, Flags uint32) (err error) { return } + _, err = l.requestStream(165, constants.Program, buf, nil, nil) if err != nil { return @@ -8977,10 +9018,10 @@ func (l *Libvirt) StorageVolWipe(Vol StorageVol, Flags uint32) (err error) { func (l *Libvirt) DomainMigrateSetMaxDowntime(Dom Domain, Downtime uint64, Flags uint32) (err error) { var buf []byte - args := DomainMigrateSetMaxDowntimeArgs{ - Dom: Dom, + args := DomainMigrateSetMaxDowntimeArgs { + Dom: Dom, Downtime: Downtime, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -8988,6 +9029,7 @@ func (l *Libvirt) DomainMigrateSetMaxDowntime(Dom Domain, Downtime uint64, Flags return } + _, err = l.requestStream(166, constants.Program, buf, nil, nil) if err != nil { return @@ -9000,7 +9042,7 @@ func (l *Libvirt) DomainMigrateSetMaxDowntime(Dom Domain, Downtime uint64, Flags func (l *Libvirt) ConnectDomainEventRegisterAny(EventID int32) (err error) { var buf []byte - args := ConnectDomainEventRegisterAnyArgs{ + args := ConnectDomainEventRegisterAnyArgs { EventID: EventID, } @@ -9009,6 +9051,7 @@ func (l *Libvirt) ConnectDomainEventRegisterAny(EventID int32) (err error) { return } + _, err = l.requestStream(167, constants.Program, buf, nil, nil) if err != nil { return @@ -9021,7 +9064,7 @@ func (l *Libvirt) ConnectDomainEventRegisterAny(EventID int32) (err error) { func (l *Libvirt) ConnectDomainEventDeregisterAny(EventID int32) (err error) { var buf []byte - args := ConnectDomainEventDeregisterAnyArgs{ + args := ConnectDomainEventDeregisterAnyArgs { EventID: EventID, } @@ -9030,6 +9073,7 @@ func (l *Libvirt) ConnectDomainEventDeregisterAny(EventID int32) (err error) { return } + _, err = l.requestStream(168, constants.Program, buf, nil, nil) if err != nil { return @@ -9042,6 +9086,7 @@ func (l *Libvirt) ConnectDomainEventDeregisterAny(EventID int32) (err error) { func (l *Libvirt) DomainEventReboot() (err error) { var buf []byte + _, err = l.requestStream(169, constants.Program, buf, nil, nil) if err != nil { return @@ -9054,6 +9099,7 @@ func (l *Libvirt) DomainEventReboot() (err error) { func (l *Libvirt) DomainEventRtcChange() (err error) { var buf []byte + _, err = l.requestStream(170, constants.Program, buf, nil, nil) if err != nil { return @@ -9066,6 +9112,7 @@ func (l *Libvirt) DomainEventRtcChange() (err error) { func (l *Libvirt) DomainEventWatchdog() (err error) { var buf []byte + _, err = l.requestStream(171, constants.Program, buf, nil, nil) if err != nil { return @@ -9078,6 +9125,7 @@ func (l *Libvirt) DomainEventWatchdog() (err error) { func (l *Libvirt) DomainEventIOError() (err error) { var buf []byte + _, err = l.requestStream(172, constants.Program, buf, nil, nil) if err != nil { return @@ -9090,6 +9138,7 @@ func (l *Libvirt) DomainEventIOError() (err error) { func (l *Libvirt) DomainEventGraphics() (err error) { var buf []byte + _, err = l.requestStream(173, constants.Program, buf, nil, nil) if err != nil { return @@ -9102,9 +9151,9 @@ func (l *Libvirt) DomainEventGraphics() (err error) { func (l *Libvirt) DomainUpdateDeviceFlags(Dom Domain, XML string, Flags DomainDeviceModifyFlags) (err error) { var buf []byte - args := DomainUpdateDeviceFlagsArgs{ - Dom: Dom, - XML: XML, + args := DomainUpdateDeviceFlagsArgs { + Dom: Dom, + XML: XML, Flags: Flags, } @@ -9113,6 +9162,7 @@ func (l *Libvirt) DomainUpdateDeviceFlags(Dom Domain, XML string, Flags DomainDe return } + _, err = l.requestStream(174, constants.Program, buf, nil, nil) if err != nil { return @@ -9125,7 +9175,7 @@ func (l *Libvirt) DomainUpdateDeviceFlags(Dom Domain, XML string, Flags DomainDe func (l *Libvirt) NwfilterLookupByName(Name string) (rOptNwfilter Nwfilter, err error) { var buf []byte - args := NwfilterLookupByNameArgs{ + args := NwfilterLookupByNameArgs { Name: Name, } @@ -9158,7 +9208,7 @@ func (l *Libvirt) NwfilterLookupByName(Name string) (rOptNwfilter Nwfilter, err func (l *Libvirt) NwfilterLookupByUUID(UUID UUID) (rOptNwfilter Nwfilter, err error) { var buf []byte - args := NwfilterLookupByUUIDArgs{ + args := NwfilterLookupByUUIDArgs { UUID: UUID, } @@ -9191,9 +9241,9 @@ func (l *Libvirt) NwfilterLookupByUUID(UUID UUID) (rOptNwfilter Nwfilter, err er func (l *Libvirt) NwfilterGetXMLDesc(OptNwfilter Nwfilter, Flags uint32) (rXML string, err error) { var buf []byte - args := NwfilterGetXMLDescArgs{ + args := NwfilterGetXMLDescArgs { OptNwfilter: OptNwfilter, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9249,7 +9299,7 @@ func (l *Libvirt) ConnectNumOfNwfilters() (rNum int32, err error) { func (l *Libvirt) ConnectListNwfilters(Maxnames int32) (rNames []string, err error) { var buf []byte - args := ConnectListNwfiltersArgs{ + args := ConnectListNwfiltersArgs { Maxnames: Maxnames, } @@ -9282,7 +9332,7 @@ func (l *Libvirt) ConnectListNwfilters(Maxnames int32) (rNames []string, err err func (l *Libvirt) NwfilterDefineXML(XML string) (rOptNwfilter Nwfilter, err error) { var buf []byte - args := NwfilterDefineXMLArgs{ + args := NwfilterDefineXMLArgs { XML: XML, } @@ -9315,7 +9365,7 @@ func (l *Libvirt) NwfilterDefineXML(XML string) (rOptNwfilter Nwfilter, err erro func (l *Libvirt) NwfilterUndefine(OptNwfilter Nwfilter) (err error) { var buf []byte - args := NwfilterUndefineArgs{ + args := NwfilterUndefineArgs { OptNwfilter: OptNwfilter, } @@ -9324,6 +9374,7 @@ func (l *Libvirt) NwfilterUndefine(OptNwfilter Nwfilter) (err error) { return } + _, err = l.requestStream(181, constants.Program, buf, nil, nil) if err != nil { return @@ -9336,8 +9387,8 @@ func (l *Libvirt) NwfilterUndefine(OptNwfilter Nwfilter) (err error) { func (l *Libvirt) DomainManagedSave(Dom Domain, Flags uint32) (err error) { var buf []byte - args := DomainManagedSaveArgs{ - Dom: Dom, + args := DomainManagedSaveArgs { + Dom: Dom, Flags: Flags, } @@ -9346,6 +9397,7 @@ func (l *Libvirt) DomainManagedSave(Dom Domain, Flags uint32) (err error) { return } + _, err = l.requestStream(182, constants.Program, buf, nil, nil) if err != nil { return @@ -9358,8 +9410,8 @@ func (l *Libvirt) DomainManagedSave(Dom Domain, Flags uint32) (err error) { func (l *Libvirt) DomainHasManagedSaveImage(Dom Domain, Flags uint32) (rResult int32, err error) { var buf []byte - args := DomainHasManagedSaveImageArgs{ - Dom: Dom, + args := DomainHasManagedSaveImageArgs { + Dom: Dom, Flags: Flags, } @@ -9392,8 +9444,8 @@ func (l *Libvirt) DomainHasManagedSaveImage(Dom Domain, Flags uint32) (rResult i func (l *Libvirt) DomainManagedSaveRemove(Dom Domain, Flags uint32) (err error) { var buf []byte - args := DomainManagedSaveRemoveArgs{ - Dom: Dom, + args := DomainManagedSaveRemoveArgs { + Dom: Dom, Flags: Flags, } @@ -9402,6 +9454,7 @@ func (l *Libvirt) DomainManagedSaveRemove(Dom Domain, Flags uint32) (err error) return } + _, err = l.requestStream(184, constants.Program, buf, nil, nil) if err != nil { return @@ -9414,10 +9467,10 @@ func (l *Libvirt) DomainManagedSaveRemove(Dom Domain, Flags uint32) (err error) func (l *Libvirt) DomainSnapshotCreateXML(Dom Domain, XMLDesc string, Flags uint32) (rSnap DomainSnapshot, err error) { var buf []byte - args := DomainSnapshotCreateXMLArgs{ - Dom: Dom, + args := DomainSnapshotCreateXMLArgs { + Dom: Dom, XMLDesc: XMLDesc, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9449,8 +9502,8 @@ func (l *Libvirt) DomainSnapshotCreateXML(Dom Domain, XMLDesc string, Flags uint func (l *Libvirt) DomainSnapshotGetXMLDesc(Snap DomainSnapshot, Flags uint32) (rXML string, err error) { var buf []byte - args := DomainSnapshotGetXMLDescArgs{ - Snap: Snap, + args := DomainSnapshotGetXMLDescArgs { + Snap: Snap, Flags: Flags, } @@ -9483,8 +9536,8 @@ func (l *Libvirt) DomainSnapshotGetXMLDesc(Snap DomainSnapshot, Flags uint32) (r func (l *Libvirt) DomainSnapshotNum(Dom Domain, Flags uint32) (rNum int32, err error) { var buf []byte - args := DomainSnapshotNumArgs{ - Dom: Dom, + args := DomainSnapshotNumArgs { + Dom: Dom, Flags: Flags, } @@ -9517,10 +9570,10 @@ func (l *Libvirt) DomainSnapshotNum(Dom Domain, Flags uint32) (rNum int32, err e func (l *Libvirt) DomainSnapshotListNames(Dom Domain, Maxnames int32, Flags uint32) (rNames []string, err error) { var buf []byte - args := DomainSnapshotListNamesArgs{ - Dom: Dom, + args := DomainSnapshotListNamesArgs { + Dom: Dom, Maxnames: Maxnames, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9552,9 +9605,9 @@ func (l *Libvirt) DomainSnapshotListNames(Dom Domain, Maxnames int32, Flags uint func (l *Libvirt) DomainSnapshotLookupByName(Dom Domain, Name string, Flags uint32) (rSnap DomainSnapshot, err error) { var buf []byte - args := DomainSnapshotLookupByNameArgs{ - Dom: Dom, - Name: Name, + args := DomainSnapshotLookupByNameArgs { + Dom: Dom, + Name: Name, Flags: Flags, } @@ -9587,8 +9640,8 @@ func (l *Libvirt) DomainSnapshotLookupByName(Dom Domain, Name string, Flags uint func (l *Libvirt) DomainHasCurrentSnapshot(Dom Domain, Flags uint32) (rResult int32, err error) { var buf []byte - args := DomainHasCurrentSnapshotArgs{ - Dom: Dom, + args := DomainHasCurrentSnapshotArgs { + Dom: Dom, Flags: Flags, } @@ -9621,8 +9674,8 @@ func (l *Libvirt) DomainHasCurrentSnapshot(Dom Domain, Flags uint32) (rResult in func (l *Libvirt) DomainSnapshotCurrent(Dom Domain, Flags uint32) (rSnap DomainSnapshot, err error) { var buf []byte - args := DomainSnapshotCurrentArgs{ - Dom: Dom, + args := DomainSnapshotCurrentArgs { + Dom: Dom, Flags: Flags, } @@ -9655,8 +9708,8 @@ func (l *Libvirt) DomainSnapshotCurrent(Dom Domain, Flags uint32) (rSnap DomainS func (l *Libvirt) DomainRevertToSnapshot(Snap DomainSnapshot, Flags uint32) (err error) { var buf []byte - args := DomainRevertToSnapshotArgs{ - Snap: Snap, + args := DomainRevertToSnapshotArgs { + Snap: Snap, Flags: Flags, } @@ -9665,6 +9718,7 @@ func (l *Libvirt) DomainRevertToSnapshot(Snap DomainSnapshot, Flags uint32) (err return } + _, err = l.requestStream(192, constants.Program, buf, nil, nil) if err != nil { return @@ -9677,8 +9731,8 @@ func (l *Libvirt) DomainRevertToSnapshot(Snap DomainSnapshot, Flags uint32) (err func (l *Libvirt) DomainSnapshotDelete(Snap DomainSnapshot, Flags DomainSnapshotDeleteFlags) (err error) { var buf []byte - args := DomainSnapshotDeleteArgs{ - Snap: Snap, + args := DomainSnapshotDeleteArgs { + Snap: Snap, Flags: Flags, } @@ -9687,6 +9741,7 @@ func (l *Libvirt) DomainSnapshotDelete(Snap DomainSnapshot, Flags DomainSnapshot return } + _, err = l.requestStream(193, constants.Program, buf, nil, nil) if err != nil { return @@ -9699,9 +9754,9 @@ func (l *Libvirt) DomainSnapshotDelete(Snap DomainSnapshot, Flags DomainSnapshot func (l *Libvirt) DomainGetBlockInfo(Dom Domain, Path string, Flags uint32) (rAllocation uint64, rCapacity uint64, rPhysical uint64, err error) { var buf []byte - args := DomainGetBlockInfoArgs{ - Dom: Dom, - Path: Path, + args := DomainGetBlockInfoArgs { + Dom: Dom, + Path: Path, Flags: Flags, } @@ -9744,6 +9799,7 @@ func (l *Libvirt) DomainGetBlockInfo(Dom Domain, Path string, Flags uint32) (rAl func (l *Libvirt) DomainEventIOErrorReason() (err error) { var buf []byte + _, err = l.requestStream(195, constants.Program, buf, nil, nil) if err != nil { return @@ -9756,8 +9812,8 @@ func (l *Libvirt) DomainEventIOErrorReason() (err error) { func (l *Libvirt) DomainCreateWithFlags(Dom Domain, Flags uint32) (rDom Domain, err error) { var buf []byte - args := DomainCreateWithFlagsArgs{ - Dom: Dom, + args := DomainCreateWithFlagsArgs { + Dom: Dom, Flags: Flags, } @@ -9790,10 +9846,10 @@ func (l *Libvirt) DomainCreateWithFlags(Dom Domain, Flags uint32) (rDom Domain, func (l *Libvirt) DomainSetMemoryParameters(Dom Domain, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetMemoryParametersArgs{ - Dom: Dom, + args := DomainSetMemoryParametersArgs { + Dom: Dom, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9801,6 +9857,7 @@ func (l *Libvirt) DomainSetMemoryParameters(Dom Domain, Params []TypedParam, Fla return } + _, err = l.requestStream(197, constants.Program, buf, nil, nil) if err != nil { return @@ -9813,10 +9870,10 @@ func (l *Libvirt) DomainSetMemoryParameters(Dom Domain, Params []TypedParam, Fla func (l *Libvirt) DomainGetMemoryParameters(Dom Domain, Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainGetMemoryParametersArgs{ - Dom: Dom, + args := DomainGetMemoryParametersArgs { + Dom: Dom, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9853,10 +9910,10 @@ func (l *Libvirt) DomainGetMemoryParameters(Dom Domain, Nparams int32, Flags uin func (l *Libvirt) DomainSetVcpusFlags(Dom Domain, Nvcpus uint32, Flags uint32) (err error) { var buf []byte - args := DomainSetVcpusFlagsArgs{ - Dom: Dom, + args := DomainSetVcpusFlagsArgs { + Dom: Dom, Nvcpus: Nvcpus, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9864,6 +9921,7 @@ func (l *Libvirt) DomainSetVcpusFlags(Dom Domain, Nvcpus uint32, Flags uint32) ( return } + _, err = l.requestStream(199, constants.Program, buf, nil, nil) if err != nil { return @@ -9876,8 +9934,8 @@ func (l *Libvirt) DomainSetVcpusFlags(Dom Domain, Nvcpus uint32, Flags uint32) ( func (l *Libvirt) DomainGetVcpusFlags(Dom Domain, Flags uint32) (rNum int32, err error) { var buf []byte - args := DomainGetVcpusFlagsArgs{ - Dom: Dom, + args := DomainGetVcpusFlagsArgs { + Dom: Dom, Flags: Flags, } @@ -9910,10 +9968,10 @@ func (l *Libvirt) DomainGetVcpusFlags(Dom Domain, Flags uint32) (rNum int32, err func (l *Libvirt) DomainOpenConsole(Dom Domain, DevName OptString, inStream io.Writer, Flags uint32) (err error) { var buf []byte - args := DomainOpenConsoleArgs{ - Dom: Dom, + args := DomainOpenConsoleArgs { + Dom: Dom, DevName: DevName, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -9921,6 +9979,7 @@ func (l *Libvirt) DomainOpenConsole(Dom Domain, DevName OptString, inStream io.W return } + _, err = l.requestStream(201, constants.Program, buf, nil, inStream) if err != nil { return @@ -9933,7 +9992,7 @@ func (l *Libvirt) DomainOpenConsole(Dom Domain, DevName OptString, inStream io.W func (l *Libvirt) DomainIsUpdated(Dom Domain) (rUpdated int32, err error) { var buf []byte - args := DomainIsUpdatedArgs{ + args := DomainIsUpdatedArgs { Dom: Dom, } @@ -9966,7 +10025,7 @@ func (l *Libvirt) DomainIsUpdated(Dom Domain) (rUpdated int32, err error) { func (l *Libvirt) ConnectGetSysinfo(Flags uint32) (rSysinfo string, err error) { var buf []byte - args := ConnectGetSysinfoArgs{ + args := ConnectGetSysinfoArgs { Flags: Flags, } @@ -9999,10 +10058,10 @@ func (l *Libvirt) ConnectGetSysinfo(Flags uint32) (rSysinfo string, err error) { func (l *Libvirt) DomainSetMemoryFlags(Dom Domain, Memory uint64, Flags uint32) (err error) { var buf []byte - args := DomainSetMemoryFlagsArgs{ - Dom: Dom, + args := DomainSetMemoryFlagsArgs { + Dom: Dom, Memory: Memory, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10010,6 +10069,7 @@ func (l *Libvirt) DomainSetMemoryFlags(Dom Domain, Memory uint64, Flags uint32) return } + _, err = l.requestStream(204, constants.Program, buf, nil, nil) if err != nil { return @@ -10022,10 +10082,10 @@ func (l *Libvirt) DomainSetMemoryFlags(Dom Domain, Memory uint64, Flags uint32) func (l *Libvirt) DomainSetBlkioParameters(Dom Domain, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetBlkioParametersArgs{ - Dom: Dom, + args := DomainSetBlkioParametersArgs { + Dom: Dom, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10033,6 +10093,7 @@ func (l *Libvirt) DomainSetBlkioParameters(Dom Domain, Params []TypedParam, Flag return } + _, err = l.requestStream(205, constants.Program, buf, nil, nil) if err != nil { return @@ -10045,10 +10106,10 @@ func (l *Libvirt) DomainSetBlkioParameters(Dom Domain, Params []TypedParam, Flag func (l *Libvirt) DomainGetBlkioParameters(Dom Domain, Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainGetBlkioParametersArgs{ - Dom: Dom, + args := DomainGetBlkioParametersArgs { + Dom: Dom, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10085,10 +10146,10 @@ func (l *Libvirt) DomainGetBlkioParameters(Dom Domain, Nparams int32, Flags uint func (l *Libvirt) DomainMigrateSetMaxSpeed(Dom Domain, Bandwidth uint64, Flags uint32) (err error) { var buf []byte - args := DomainMigrateSetMaxSpeedArgs{ - Dom: Dom, + args := DomainMigrateSetMaxSpeedArgs { + Dom: Dom, Bandwidth: Bandwidth, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10096,6 +10157,7 @@ func (l *Libvirt) DomainMigrateSetMaxSpeed(Dom Domain, Bandwidth uint64, Flags u return } + _, err = l.requestStream(207, constants.Program, buf, nil, nil) if err != nil { return @@ -10108,11 +10170,11 @@ func (l *Libvirt) DomainMigrateSetMaxSpeed(Dom Domain, Bandwidth uint64, Flags u func (l *Libvirt) StorageVolUpload(Vol StorageVol, outStream io.Reader, Offset uint64, Length uint64, Flags StorageVolUploadFlags) (err error) { var buf []byte - args := StorageVolUploadArgs{ - Vol: Vol, + args := StorageVolUploadArgs { + Vol: Vol, Offset: Offset, Length: Length, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10120,6 +10182,7 @@ func (l *Libvirt) StorageVolUpload(Vol StorageVol, outStream io.Reader, Offset u return } + _, err = l.requestStream(208, constants.Program, buf, outStream, nil) if err != nil { return @@ -10132,11 +10195,11 @@ func (l *Libvirt) StorageVolUpload(Vol StorageVol, outStream io.Reader, Offset u func (l *Libvirt) StorageVolDownload(Vol StorageVol, inStream io.Writer, Offset uint64, Length uint64, Flags StorageVolDownloadFlags) (err error) { var buf []byte - args := StorageVolDownloadArgs{ - Vol: Vol, + args := StorageVolDownloadArgs { + Vol: Vol, Offset: Offset, Length: Length, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10144,6 +10207,7 @@ func (l *Libvirt) StorageVolDownload(Vol StorageVol, inStream io.Writer, Offset return } + _, err = l.requestStream(209, constants.Program, buf, nil, inStream) if err != nil { return @@ -10156,8 +10220,8 @@ func (l *Libvirt) StorageVolDownload(Vol StorageVol, inStream io.Writer, Offset func (l *Libvirt) DomainInjectNmi(Dom Domain, Flags uint32) (err error) { var buf []byte - args := DomainInjectNmiArgs{ - Dom: Dom, + args := DomainInjectNmiArgs { + Dom: Dom, Flags: Flags, } @@ -10166,6 +10230,7 @@ func (l *Libvirt) DomainInjectNmi(Dom Domain, Flags uint32) (err error) { return } + _, err = l.requestStream(210, constants.Program, buf, nil, nil) if err != nil { return @@ -10178,10 +10243,10 @@ func (l *Libvirt) DomainInjectNmi(Dom Domain, Flags uint32) (err error) { func (l *Libvirt) DomainScreenshot(Dom Domain, inStream io.Writer, Screen uint32, Flags uint32) (rMime OptString, err error) { var buf []byte - args := DomainScreenshotArgs{ - Dom: Dom, + args := DomainScreenshotArgs { + Dom: Dom, Screen: Screen, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10213,8 +10278,8 @@ func (l *Libvirt) DomainScreenshot(Dom Domain, inStream io.Writer, Screen uint32 func (l *Libvirt) DomainGetState(Dom Domain, Flags uint32) (rState int32, rReason int32, err error) { var buf []byte - args := DomainGetStateArgs{ - Dom: Dom, + args := DomainGetStateArgs { + Dom: Dom, Flags: Flags, } @@ -10252,11 +10317,11 @@ func (l *Libvirt) DomainGetState(Dom Domain, Flags uint32) (rState int32, rReaso func (l *Libvirt) DomainMigrateBegin3(Dom Domain, Xmlin OptString, Flags uint64, Dname OptString, Resource uint64) (rCookieOut []byte, rXML string, err error) { var buf []byte - args := DomainMigrateBegin3Args{ - Dom: Dom, - Xmlin: Xmlin, - Flags: Flags, - Dname: Dname, + args := DomainMigrateBegin3Args { + Dom: Dom, + Xmlin: Xmlin, + Flags: Flags, + Dname: Dname, Resource: Resource, } @@ -10294,13 +10359,13 @@ func (l *Libvirt) DomainMigrateBegin3(Dom Domain, Xmlin OptString, Flags uint64, func (l *Libvirt) DomainMigratePrepare3(CookieIn []byte, UriIn OptString, Flags uint64, Dname OptString, Resource uint64, DomXML string) (rCookieOut []byte, rUriOut OptString, err error) { var buf []byte - args := DomainMigratePrepare3Args{ + args := DomainMigratePrepare3Args { CookieIn: CookieIn, - UriIn: UriIn, - Flags: Flags, - Dname: Dname, + UriIn: UriIn, + Flags: Flags, + Dname: Dname, Resource: Resource, - DomXML: DomXML, + DomXML: DomXML, } buf, err = encode(&args) @@ -10337,12 +10402,12 @@ func (l *Libvirt) DomainMigratePrepare3(CookieIn []byte, UriIn OptString, Flags func (l *Libvirt) DomainMigratePrepareTunnel3(CookieIn []byte, outStream io.Reader, Flags uint64, Dname OptString, Resource uint64, DomXML string) (rCookieOut []byte, err error) { var buf []byte - args := DomainMigratePrepareTunnel3Args{ + args := DomainMigratePrepareTunnel3Args { CookieIn: CookieIn, - Flags: Flags, - Dname: Dname, + Flags: Flags, + Dname: Dname, Resource: Resource, - DomXML: DomXML, + DomXML: DomXML, } buf, err = encode(&args) @@ -10374,14 +10439,14 @@ func (l *Libvirt) DomainMigratePrepareTunnel3(CookieIn []byte, outStream io.Read func (l *Libvirt) DomainMigratePerform3(Dom Domain, Xmlin OptString, CookieIn []byte, Dconnuri OptString, Uri OptString, Flags uint64, Dname OptString, Resource uint64) (rCookieOut []byte, err error) { var buf []byte - args := DomainMigratePerform3Args{ - Dom: Dom, - Xmlin: Xmlin, + args := DomainMigratePerform3Args { + Dom: Dom, + Xmlin: Xmlin, CookieIn: CookieIn, Dconnuri: Dconnuri, - Uri: Uri, - Flags: Flags, - Dname: Dname, + Uri: Uri, + Flags: Flags, + Dname: Dname, Resource: Resource, } @@ -10414,12 +10479,12 @@ func (l *Libvirt) DomainMigratePerform3(Dom Domain, Xmlin OptString, CookieIn [] func (l *Libvirt) DomainMigrateFinish3(Dname string, CookieIn []byte, Dconnuri OptString, Uri OptString, Flags uint64, Cancelled int32) (rDom Domain, rCookieOut []byte, err error) { var buf []byte - args := DomainMigrateFinish3Args{ - Dname: Dname, - CookieIn: CookieIn, - Dconnuri: Dconnuri, - Uri: Uri, - Flags: Flags, + args := DomainMigrateFinish3Args { + Dname: Dname, + CookieIn: CookieIn, + Dconnuri: Dconnuri, + Uri: Uri, + Flags: Flags, Cancelled: Cancelled, } @@ -10457,10 +10522,10 @@ func (l *Libvirt) DomainMigrateFinish3(Dname string, CookieIn []byte, Dconnuri O func (l *Libvirt) DomainMigrateConfirm3(Dom Domain, CookieIn []byte, Flags uint64, Cancelled int32) (err error) { var buf []byte - args := DomainMigrateConfirm3Args{ - Dom: Dom, - CookieIn: CookieIn, - Flags: Flags, + args := DomainMigrateConfirm3Args { + Dom: Dom, + CookieIn: CookieIn, + Flags: Flags, Cancelled: Cancelled, } @@ -10469,6 +10534,7 @@ func (l *Libvirt) DomainMigrateConfirm3(Dom Domain, CookieIn []byte, Flags uint6 return } + _, err = l.requestStream(218, constants.Program, buf, nil, nil) if err != nil { return @@ -10481,10 +10547,10 @@ func (l *Libvirt) DomainMigrateConfirm3(Dom Domain, CookieIn []byte, Flags uint6 func (l *Libvirt) DomainSetSchedulerParametersFlags(Dom Domain, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetSchedulerParametersFlagsArgs{ - Dom: Dom, + args := DomainSetSchedulerParametersFlagsArgs { + Dom: Dom, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10492,6 +10558,7 @@ func (l *Libvirt) DomainSetSchedulerParametersFlags(Dom Domain, Params []TypedPa return } + _, err = l.requestStream(219, constants.Program, buf, nil, nil) if err != nil { return @@ -10504,7 +10571,7 @@ func (l *Libvirt) DomainSetSchedulerParametersFlags(Dom Domain, Params []TypedPa func (l *Libvirt) InterfaceChangeBegin(Flags uint32) (err error) { var buf []byte - args := InterfaceChangeBeginArgs{ + args := InterfaceChangeBeginArgs { Flags: Flags, } @@ -10513,6 +10580,7 @@ func (l *Libvirt) InterfaceChangeBegin(Flags uint32) (err error) { return } + _, err = l.requestStream(220, constants.Program, buf, nil, nil) if err != nil { return @@ -10525,7 +10593,7 @@ func (l *Libvirt) InterfaceChangeBegin(Flags uint32) (err error) { func (l *Libvirt) InterfaceChangeCommit(Flags uint32) (err error) { var buf []byte - args := InterfaceChangeCommitArgs{ + args := InterfaceChangeCommitArgs { Flags: Flags, } @@ -10534,6 +10602,7 @@ func (l *Libvirt) InterfaceChangeCommit(Flags uint32) (err error) { return } + _, err = l.requestStream(221, constants.Program, buf, nil, nil) if err != nil { return @@ -10546,7 +10615,7 @@ func (l *Libvirt) InterfaceChangeCommit(Flags uint32) (err error) { func (l *Libvirt) InterfaceChangeRollback(Flags uint32) (err error) { var buf []byte - args := InterfaceChangeRollbackArgs{ + args := InterfaceChangeRollbackArgs { Flags: Flags, } @@ -10555,6 +10624,7 @@ func (l *Libvirt) InterfaceChangeRollback(Flags uint32) (err error) { return } + _, err = l.requestStream(222, constants.Program, buf, nil, nil) if err != nil { return @@ -10567,10 +10637,10 @@ func (l *Libvirt) InterfaceChangeRollback(Flags uint32) (err error) { func (l *Libvirt) DomainGetSchedulerParametersFlags(Dom Domain, Nparams int32, Flags uint32) (rParams []TypedParam, err error) { var buf []byte - args := DomainGetSchedulerParametersFlagsArgs{ - Dom: Dom, + args := DomainGetSchedulerParametersFlagsArgs { + Dom: Dom, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10602,6 +10672,7 @@ func (l *Libvirt) DomainGetSchedulerParametersFlags(Dom Domain, Nparams int32, F func (l *Libvirt) DomainEventControlError() (err error) { var buf []byte + _, err = l.requestStream(224, constants.Program, buf, nil, nil) if err != nil { return @@ -10614,11 +10685,11 @@ func (l *Libvirt) DomainEventControlError() (err error) { func (l *Libvirt) DomainPinVcpuFlags(Dom Domain, Vcpu uint32, Cpumap []byte, Flags uint32) (err error) { var buf []byte - args := DomainPinVcpuFlagsArgs{ - Dom: Dom, - Vcpu: Vcpu, + args := DomainPinVcpuFlagsArgs { + Dom: Dom, + Vcpu: Vcpu, Cpumap: Cpumap, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10626,6 +10697,7 @@ func (l *Libvirt) DomainPinVcpuFlags(Dom Domain, Vcpu uint32, Cpumap []byte, Fla return } + _, err = l.requestStream(225, constants.Program, buf, nil, nil) if err != nil { return @@ -10638,12 +10710,12 @@ func (l *Libvirt) DomainPinVcpuFlags(Dom Domain, Vcpu uint32, Cpumap []byte, Fla func (l *Libvirt) DomainSendKey(Dom Domain, Codeset uint32, Holdtime uint32, Keycodes []uint32, Flags uint32) (err error) { var buf []byte - args := DomainSendKeyArgs{ - Dom: Dom, - Codeset: Codeset, + args := DomainSendKeyArgs { + Dom: Dom, + Codeset: Codeset, Holdtime: Holdtime, Keycodes: Keycodes, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10651,6 +10723,7 @@ func (l *Libvirt) DomainSendKey(Dom Domain, Codeset uint32, Holdtime uint32, Key return } + _, err = l.requestStream(226, constants.Program, buf, nil, nil) if err != nil { return @@ -10663,10 +10736,10 @@ func (l *Libvirt) DomainSendKey(Dom Domain, Codeset uint32, Holdtime uint32, Key func (l *Libvirt) NodeGetCPUStats(CPUNum int32, Nparams int32, Flags uint32) (rParams []NodeGetCPUStats, rNparams int32, err error) { var buf []byte - args := NodeGetCPUStatsArgs{ - CPUNum: CPUNum, + args := NodeGetCPUStatsArgs { + CPUNum: CPUNum, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10703,10 +10776,10 @@ func (l *Libvirt) NodeGetCPUStats(CPUNum int32, Nparams int32, Flags uint32) (rP func (l *Libvirt) NodeGetMemoryStats(Nparams int32, CellNum int32, Flags uint32) (rParams []NodeGetMemoryStats, rNparams int32, err error) { var buf []byte - args := NodeGetMemoryStatsArgs{ + args := NodeGetMemoryStatsArgs { Nparams: Nparams, CellNum: CellNum, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -10743,8 +10816,8 @@ func (l *Libvirt) NodeGetMemoryStats(Nparams int32, CellNum int32, Flags uint32) func (l *Libvirt) DomainGetControlInfo(Dom Domain, Flags uint32) (rState uint32, rDetails uint32, rStateTime uint64, err error) { var buf []byte - args := DomainGetControlInfoArgs{ - Dom: Dom, + args := DomainGetControlInfoArgs { + Dom: Dom, Flags: Flags, } @@ -10787,11 +10860,11 @@ func (l *Libvirt) DomainGetControlInfo(Dom Domain, Flags uint32) (rState uint32, func (l *Libvirt) DomainGetVcpuPinInfo(Dom Domain, Ncpumaps int32, Maplen int32, Flags uint32) (rCpumaps []byte, rNum int32, err error) { var buf []byte - args := DomainGetVcpuPinInfoArgs{ - Dom: Dom, + args := DomainGetVcpuPinInfoArgs { + Dom: Dom, Ncpumaps: Ncpumaps, - Maplen: Maplen, - Flags: Flags, + Maplen: Maplen, + Flags: Flags, } buf, err = encode(&args) @@ -10828,8 +10901,8 @@ func (l *Libvirt) DomainGetVcpuPinInfo(Dom Domain, Ncpumaps int32, Maplen int32, func (l *Libvirt) DomainUndefineFlags(Dom Domain, Flags DomainUndefineFlagsValues) (err error) { var buf []byte - args := DomainUndefineFlagsArgs{ - Dom: Dom, + args := DomainUndefineFlagsArgs { + Dom: Dom, Flags: Flags, } @@ -10838,6 +10911,7 @@ func (l *Libvirt) DomainUndefineFlags(Dom Domain, Flags DomainUndefineFlagsValue return } + _, err = l.requestStream(231, constants.Program, buf, nil, nil) if err != nil { return @@ -10850,10 +10924,10 @@ func (l *Libvirt) DomainUndefineFlags(Dom Domain, Flags DomainUndefineFlagsValue func (l *Libvirt) DomainSaveFlags(Dom Domain, To string, Dxml OptString, Flags uint32) (err error) { var buf []byte - args := DomainSaveFlagsArgs{ - Dom: Dom, - To: To, - Dxml: Dxml, + args := DomainSaveFlagsArgs { + Dom: Dom, + To: To, + Dxml: Dxml, Flags: Flags, } @@ -10862,6 +10936,7 @@ func (l *Libvirt) DomainSaveFlags(Dom Domain, To string, Dxml OptString, Flags u return } + _, err = l.requestStream(232, constants.Program, buf, nil, nil) if err != nil { return @@ -10874,9 +10949,9 @@ func (l *Libvirt) DomainSaveFlags(Dom Domain, To string, Dxml OptString, Flags u func (l *Libvirt) DomainRestoreFlags(From string, Dxml OptString, Flags uint32) (err error) { var buf []byte - args := DomainRestoreFlagsArgs{ - From: From, - Dxml: Dxml, + args := DomainRestoreFlagsArgs { + From: From, + Dxml: Dxml, Flags: Flags, } @@ -10885,6 +10960,7 @@ func (l *Libvirt) DomainRestoreFlags(From string, Dxml OptString, Flags uint32) return } + _, err = l.requestStream(233, constants.Program, buf, nil, nil) if err != nil { return @@ -10897,8 +10973,8 @@ func (l *Libvirt) DomainRestoreFlags(From string, Dxml OptString, Flags uint32) func (l *Libvirt) DomainDestroyFlags(Dom Domain, Flags DomainDestroyFlagsValues) (err error) { var buf []byte - args := DomainDestroyFlagsArgs{ - Dom: Dom, + args := DomainDestroyFlagsArgs { + Dom: Dom, Flags: Flags, } @@ -10907,6 +10983,7 @@ func (l *Libvirt) DomainDestroyFlags(Dom Domain, Flags DomainDestroyFlagsValues) return } + _, err = l.requestStream(234, constants.Program, buf, nil, nil) if err != nil { return @@ -10919,8 +10996,8 @@ func (l *Libvirt) DomainDestroyFlags(Dom Domain, Flags DomainDestroyFlagsValues) func (l *Libvirt) DomainSaveImageGetXMLDesc(File string, Flags uint32) (rXML string, err error) { var buf []byte - args := DomainSaveImageGetXMLDescArgs{ - File: File, + args := DomainSaveImageGetXMLDescArgs { + File: File, Flags: Flags, } @@ -10953,9 +11030,9 @@ func (l *Libvirt) DomainSaveImageGetXMLDesc(File string, Flags uint32) (rXML str func (l *Libvirt) DomainSaveImageDefineXML(File string, Dxml string, Flags uint32) (err error) { var buf []byte - args := DomainSaveImageDefineXMLArgs{ - File: File, - Dxml: Dxml, + args := DomainSaveImageDefineXMLArgs { + File: File, + Dxml: Dxml, Flags: Flags, } @@ -10964,6 +11041,7 @@ func (l *Libvirt) DomainSaveImageDefineXML(File string, Dxml string, Flags uint3 return } + _, err = l.requestStream(236, constants.Program, buf, nil, nil) if err != nil { return @@ -10976,9 +11054,9 @@ func (l *Libvirt) DomainSaveImageDefineXML(File string, Dxml string, Flags uint3 func (l *Libvirt) DomainBlockJobAbort(Dom Domain, Path string, Flags DomainBlockJobAbortFlags) (err error) { var buf []byte - args := DomainBlockJobAbortArgs{ - Dom: Dom, - Path: Path, + args := DomainBlockJobAbortArgs { + Dom: Dom, + Path: Path, Flags: Flags, } @@ -10987,6 +11065,7 @@ func (l *Libvirt) DomainBlockJobAbort(Dom Domain, Path string, Flags DomainBlock return } + _, err = l.requestStream(237, constants.Program, buf, nil, nil) if err != nil { return @@ -10999,9 +11078,9 @@ func (l *Libvirt) DomainBlockJobAbort(Dom Domain, Path string, Flags DomainBlock func (l *Libvirt) DomainGetBlockJobInfo(Dom Domain, Path string, Flags uint32) (rFound int32, rType int32, rBandwidth uint64, rCur uint64, rEnd uint64, err error) { var buf []byte - args := DomainGetBlockJobInfoArgs{ - Dom: Dom, - Path: Path, + args := DomainGetBlockJobInfoArgs { + Dom: Dom, + Path: Path, Flags: Flags, } @@ -11054,11 +11133,11 @@ func (l *Libvirt) DomainGetBlockJobInfo(Dom Domain, Path string, Flags uint32) ( func (l *Libvirt) DomainBlockJobSetSpeed(Dom Domain, Path string, Bandwidth uint64, Flags DomainBlockJobSetSpeedFlags) (err error) { var buf []byte - args := DomainBlockJobSetSpeedArgs{ - Dom: Dom, - Path: Path, + args := DomainBlockJobSetSpeedArgs { + Dom: Dom, + Path: Path, Bandwidth: Bandwidth, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11066,6 +11145,7 @@ func (l *Libvirt) DomainBlockJobSetSpeed(Dom Domain, Path string, Bandwidth uint return } + _, err = l.requestStream(239, constants.Program, buf, nil, nil) if err != nil { return @@ -11078,11 +11158,11 @@ func (l *Libvirt) DomainBlockJobSetSpeed(Dom Domain, Path string, Bandwidth uint func (l *Libvirt) DomainBlockPull(Dom Domain, Path string, Bandwidth uint64, Flags DomainBlockPullFlags) (err error) { var buf []byte - args := DomainBlockPullArgs{ - Dom: Dom, - Path: Path, + args := DomainBlockPullArgs { + Dom: Dom, + Path: Path, Bandwidth: Bandwidth, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11090,6 +11170,7 @@ func (l *Libvirt) DomainBlockPull(Dom Domain, Path string, Bandwidth uint64, Fla return } + _, err = l.requestStream(240, constants.Program, buf, nil, nil) if err != nil { return @@ -11102,6 +11183,7 @@ func (l *Libvirt) DomainBlockPull(Dom Domain, Path string, Bandwidth uint64, Fla func (l *Libvirt) DomainEventBlockJob() (err error) { var buf []byte + _, err = l.requestStream(241, constants.Program, buf, nil, nil) if err != nil { return @@ -11114,8 +11196,8 @@ func (l *Libvirt) DomainEventBlockJob() (err error) { func (l *Libvirt) DomainMigrateGetMaxSpeed(Dom Domain, Flags uint32) (rBandwidth uint64, err error) { var buf []byte - args := DomainMigrateGetMaxSpeedArgs{ - Dom: Dom, + args := DomainMigrateGetMaxSpeedArgs { + Dom: Dom, Flags: Flags, } @@ -11148,11 +11230,11 @@ func (l *Libvirt) DomainMigrateGetMaxSpeed(Dom Domain, Flags uint32) (rBandwidth func (l *Libvirt) DomainBlockStatsFlags(Dom Domain, Path string, Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainBlockStatsFlagsArgs{ - Dom: Dom, - Path: Path, + args := DomainBlockStatsFlagsArgs { + Dom: Dom, + Path: Path, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11189,8 +11271,8 @@ func (l *Libvirt) DomainBlockStatsFlags(Dom Domain, Path string, Nparams int32, func (l *Libvirt) DomainSnapshotGetParent(Snap DomainSnapshot, Flags uint32) (rSnap DomainSnapshot, err error) { var buf []byte - args := DomainSnapshotGetParentArgs{ - Snap: Snap, + args := DomainSnapshotGetParentArgs { + Snap: Snap, Flags: Flags, } @@ -11223,8 +11305,8 @@ func (l *Libvirt) DomainSnapshotGetParent(Snap DomainSnapshot, Flags uint32) (rS func (l *Libvirt) DomainReset(Dom Domain, Flags uint32) (err error) { var buf []byte - args := DomainResetArgs{ - Dom: Dom, + args := DomainResetArgs { + Dom: Dom, Flags: Flags, } @@ -11233,6 +11315,7 @@ func (l *Libvirt) DomainReset(Dom Domain, Flags uint32) (err error) { return } + _, err = l.requestStream(245, constants.Program, buf, nil, nil) if err != nil { return @@ -11245,8 +11328,8 @@ func (l *Libvirt) DomainReset(Dom Domain, Flags uint32) (err error) { func (l *Libvirt) DomainSnapshotNumChildren(Snap DomainSnapshot, Flags uint32) (rNum int32, err error) { var buf []byte - args := DomainSnapshotNumChildrenArgs{ - Snap: Snap, + args := DomainSnapshotNumChildrenArgs { + Snap: Snap, Flags: Flags, } @@ -11279,10 +11362,10 @@ func (l *Libvirt) DomainSnapshotNumChildren(Snap DomainSnapshot, Flags uint32) ( func (l *Libvirt) DomainSnapshotListChildrenNames(Snap DomainSnapshot, Maxnames int32, Flags uint32) (rNames []string, err error) { var buf []byte - args := DomainSnapshotListChildrenNamesArgs{ - Snap: Snap, + args := DomainSnapshotListChildrenNamesArgs { + Snap: Snap, Maxnames: Maxnames, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11314,6 +11397,7 @@ func (l *Libvirt) DomainSnapshotListChildrenNames(Snap DomainSnapshot, Maxnames func (l *Libvirt) DomainEventDiskChange() (err error) { var buf []byte + _, err = l.requestStream(248, constants.Program, buf, nil, nil) if err != nil { return @@ -11326,9 +11410,9 @@ func (l *Libvirt) DomainEventDiskChange() (err error) { func (l *Libvirt) DomainOpenGraphics(Dom Domain, Idx uint32, Flags DomainOpenGraphicsFlags) (err error) { var buf []byte - args := DomainOpenGraphicsArgs{ - Dom: Dom, - Idx: Idx, + args := DomainOpenGraphicsArgs { + Dom: Dom, + Idx: Idx, Flags: Flags, } @@ -11337,6 +11421,7 @@ func (l *Libvirt) DomainOpenGraphics(Dom Domain, Idx uint32, Flags DomainOpenGra return } + _, err = l.requestStream(249, constants.Program, buf, nil, nil) if err != nil { return @@ -11349,10 +11434,10 @@ func (l *Libvirt) DomainOpenGraphics(Dom Domain, Idx uint32, Flags DomainOpenGra func (l *Libvirt) NodeSuspendForDuration(Target uint32, Duration uint64, Flags uint32) (err error) { var buf []byte - args := NodeSuspendForDurationArgs{ - Target: Target, + args := NodeSuspendForDurationArgs { + Target: Target, Duration: Duration, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11360,6 +11445,7 @@ func (l *Libvirt) NodeSuspendForDuration(Target uint32, Duration uint64, Flags u return } + _, err = l.requestStream(250, constants.Program, buf, nil, nil) if err != nil { return @@ -11372,10 +11458,10 @@ func (l *Libvirt) NodeSuspendForDuration(Target uint32, Duration uint64, Flags u func (l *Libvirt) DomainBlockResize(Dom Domain, Disk string, Size uint64, Flags DomainBlockResizeFlags) (err error) { var buf []byte - args := DomainBlockResizeArgs{ - Dom: Dom, - Disk: Disk, - Size: Size, + args := DomainBlockResizeArgs { + Dom: Dom, + Disk: Disk, + Size: Size, Flags: Flags, } @@ -11384,6 +11470,7 @@ func (l *Libvirt) DomainBlockResize(Dom Domain, Disk string, Size uint64, Flags return } + _, err = l.requestStream(251, constants.Program, buf, nil, nil) if err != nil { return @@ -11396,11 +11483,11 @@ func (l *Libvirt) DomainBlockResize(Dom Domain, Disk string, Size uint64, Flags func (l *Libvirt) DomainSetBlockIOTune(Dom Domain, Disk string, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetBlockIOTuneArgs{ - Dom: Dom, - Disk: Disk, + args := DomainSetBlockIOTuneArgs { + Dom: Dom, + Disk: Disk, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11408,6 +11495,7 @@ func (l *Libvirt) DomainSetBlockIOTune(Dom Domain, Disk string, Params []TypedPa return } + _, err = l.requestStream(252, constants.Program, buf, nil, nil) if err != nil { return @@ -11420,11 +11508,11 @@ func (l *Libvirt) DomainSetBlockIOTune(Dom Domain, Disk string, Params []TypedPa func (l *Libvirt) DomainGetBlockIOTune(Dom Domain, Disk OptString, Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainGetBlockIOTuneArgs{ - Dom: Dom, - Disk: Disk, + args := DomainGetBlockIOTuneArgs { + Dom: Dom, + Disk: Disk, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11461,10 +11549,10 @@ func (l *Libvirt) DomainGetBlockIOTune(Dom Domain, Disk OptString, Nparams int32 func (l *Libvirt) DomainSetNumaParameters(Dom Domain, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetNumaParametersArgs{ - Dom: Dom, + args := DomainSetNumaParametersArgs { + Dom: Dom, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11472,6 +11560,7 @@ func (l *Libvirt) DomainSetNumaParameters(Dom Domain, Params []TypedParam, Flags return } + _, err = l.requestStream(254, constants.Program, buf, nil, nil) if err != nil { return @@ -11484,10 +11573,10 @@ func (l *Libvirt) DomainSetNumaParameters(Dom Domain, Params []TypedParam, Flags func (l *Libvirt) DomainGetNumaParameters(Dom Domain, Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainGetNumaParametersArgs{ - Dom: Dom, + args := DomainGetNumaParametersArgs { + Dom: Dom, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11524,11 +11613,11 @@ func (l *Libvirt) DomainGetNumaParameters(Dom Domain, Nparams int32, Flags uint3 func (l *Libvirt) DomainSetInterfaceParameters(Dom Domain, Device string, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetInterfaceParametersArgs{ - Dom: Dom, + args := DomainSetInterfaceParametersArgs { + Dom: Dom, Device: Device, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11536,6 +11625,7 @@ func (l *Libvirt) DomainSetInterfaceParameters(Dom Domain, Device string, Params return } + _, err = l.requestStream(256, constants.Program, buf, nil, nil) if err != nil { return @@ -11548,11 +11638,11 @@ func (l *Libvirt) DomainSetInterfaceParameters(Dom Domain, Device string, Params func (l *Libvirt) DomainGetInterfaceParameters(Dom Domain, Device string, Nparams int32, Flags DomainModificationImpact) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainGetInterfaceParametersArgs{ - Dom: Dom, - Device: Device, + args := DomainGetInterfaceParametersArgs { + Dom: Dom, + Device: Device, Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11589,8 +11679,8 @@ func (l *Libvirt) DomainGetInterfaceParameters(Dom Domain, Device string, Nparam func (l *Libvirt) DomainShutdownFlags(Dom Domain, Flags DomainShutdownFlagValues) (err error) { var buf []byte - args := DomainShutdownFlagsArgs{ - Dom: Dom, + args := DomainShutdownFlagsArgs { + Dom: Dom, Flags: Flags, } @@ -11599,6 +11689,7 @@ func (l *Libvirt) DomainShutdownFlags(Dom Domain, Flags DomainShutdownFlagValues return } + _, err = l.requestStream(258, constants.Program, buf, nil, nil) if err != nil { return @@ -11611,10 +11702,10 @@ func (l *Libvirt) DomainShutdownFlags(Dom Domain, Flags DomainShutdownFlagValues func (l *Libvirt) StorageVolWipePattern(Vol StorageVol, Algorithm uint32, Flags uint32) (err error) { var buf []byte - args := StorageVolWipePatternArgs{ - Vol: Vol, + args := StorageVolWipePatternArgs { + Vol: Vol, Algorithm: Algorithm, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11622,6 +11713,7 @@ func (l *Libvirt) StorageVolWipePattern(Vol StorageVol, Algorithm uint32, Flags return } + _, err = l.requestStream(259, constants.Program, buf, nil, nil) if err != nil { return @@ -11634,10 +11726,10 @@ func (l *Libvirt) StorageVolWipePattern(Vol StorageVol, Algorithm uint32, Flags func (l *Libvirt) StorageVolResize(Vol StorageVol, Capacity uint64, Flags StorageVolResizeFlags) (err error) { var buf []byte - args := StorageVolResizeArgs{ - Vol: Vol, + args := StorageVolResizeArgs { + Vol: Vol, Capacity: Capacity, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11645,6 +11737,7 @@ func (l *Libvirt) StorageVolResize(Vol StorageVol, Capacity uint64, Flags Storag return } + _, err = l.requestStream(260, constants.Program, buf, nil, nil) if err != nil { return @@ -11657,11 +11750,11 @@ func (l *Libvirt) StorageVolResize(Vol StorageVol, Capacity uint64, Flags Storag func (l *Libvirt) DomainPmSuspendForDuration(Dom Domain, Target uint32, Duration uint64, Flags uint32) (err error) { var buf []byte - args := DomainPmSuspendForDurationArgs{ - Dom: Dom, - Target: Target, + args := DomainPmSuspendForDurationArgs { + Dom: Dom, + Target: Target, Duration: Duration, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11669,6 +11762,7 @@ func (l *Libvirt) DomainPmSuspendForDuration(Dom Domain, Target uint32, Duration return } + _, err = l.requestStream(261, constants.Program, buf, nil, nil) if err != nil { return @@ -11681,12 +11775,12 @@ func (l *Libvirt) DomainPmSuspendForDuration(Dom Domain, Target uint32, Duration func (l *Libvirt) DomainGetCPUStats(Dom Domain, Nparams uint32, StartCPU int32, Ncpus uint32, Flags TypedParameterFlags) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := DomainGetCPUStatsArgs{ - Dom: Dom, - Nparams: Nparams, + args := DomainGetCPUStatsArgs { + Dom: Dom, + Nparams: Nparams, StartCPU: StartCPU, - Ncpus: Ncpus, - Flags: Flags, + Ncpus: Ncpus, + Flags: Flags, } buf, err = encode(&args) @@ -11723,10 +11817,10 @@ func (l *Libvirt) DomainGetCPUStats(Dom Domain, Nparams uint32, StartCPU int32, func (l *Libvirt) DomainGetDiskErrors(Dom Domain, Maxerrors uint32, Flags uint32) (rErrors []DomainDiskError, rNerrors int32, err error) { var buf []byte - args := DomainGetDiskErrorsArgs{ - Dom: Dom, + args := DomainGetDiskErrorsArgs { + Dom: Dom, Maxerrors: Maxerrors, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11763,13 +11857,13 @@ func (l *Libvirt) DomainGetDiskErrors(Dom Domain, Maxerrors uint32, Flags uint32 func (l *Libvirt) DomainSetMetadata(Dom Domain, Type int32, Metadata OptString, Key OptString, Uri OptString, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainSetMetadataArgs{ - Dom: Dom, - Type: Type, + args := DomainSetMetadataArgs { + Dom: Dom, + Type: Type, Metadata: Metadata, - Key: Key, - Uri: Uri, - Flags: Flags, + Key: Key, + Uri: Uri, + Flags: Flags, } buf, err = encode(&args) @@ -11777,6 +11871,7 @@ func (l *Libvirt) DomainSetMetadata(Dom Domain, Type int32, Metadata OptString, return } + _, err = l.requestStream(264, constants.Program, buf, nil, nil) if err != nil { return @@ -11789,10 +11884,10 @@ func (l *Libvirt) DomainSetMetadata(Dom Domain, Type int32, Metadata OptString, func (l *Libvirt) DomainGetMetadata(Dom Domain, Type int32, Uri OptString, Flags DomainModificationImpact) (rMetadata string, err error) { var buf []byte - args := DomainGetMetadataArgs{ - Dom: Dom, - Type: Type, - Uri: Uri, + args := DomainGetMetadataArgs { + Dom: Dom, + Type: Type, + Uri: Uri, Flags: Flags, } @@ -11825,12 +11920,12 @@ func (l *Libvirt) DomainGetMetadata(Dom Domain, Type int32, Uri OptString, Flags func (l *Libvirt) DomainBlockRebase(Dom Domain, Path string, Base OptString, Bandwidth uint64, Flags DomainBlockRebaseFlags) (err error) { var buf []byte - args := DomainBlockRebaseArgs{ - Dom: Dom, - Path: Path, - Base: Base, + args := DomainBlockRebaseArgs { + Dom: Dom, + Path: Path, + Base: Base, Bandwidth: Bandwidth, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -11838,6 +11933,7 @@ func (l *Libvirt) DomainBlockRebase(Dom Domain, Path string, Base OptString, Ban return } + _, err = l.requestStream(266, constants.Program, buf, nil, nil) if err != nil { return @@ -11850,8 +11946,8 @@ func (l *Libvirt) DomainBlockRebase(Dom Domain, Path string, Base OptString, Ban func (l *Libvirt) DomainPmWakeup(Dom Domain, Flags uint32) (err error) { var buf []byte - args := DomainPmWakeupArgs{ - Dom: Dom, + args := DomainPmWakeupArgs { + Dom: Dom, Flags: Flags, } @@ -11860,6 +11956,7 @@ func (l *Libvirt) DomainPmWakeup(Dom Domain, Flags uint32) (err error) { return } + _, err = l.requestStream(267, constants.Program, buf, nil, nil) if err != nil { return @@ -11872,6 +11969,7 @@ func (l *Libvirt) DomainPmWakeup(Dom Domain, Flags uint32) (err error) { func (l *Libvirt) DomainEventTrayChange() (err error) { var buf []byte + _, err = l.requestStream(268, constants.Program, buf, nil, nil) if err != nil { return @@ -11884,6 +11982,7 @@ func (l *Libvirt) DomainEventTrayChange() (err error) { func (l *Libvirt) DomainEventPmwakeup() (err error) { var buf []byte + _, err = l.requestStream(269, constants.Program, buf, nil, nil) if err != nil { return @@ -11896,6 +11995,7 @@ func (l *Libvirt) DomainEventPmwakeup() (err error) { func (l *Libvirt) DomainEventPmsuspend() (err error) { var buf []byte + _, err = l.requestStream(270, constants.Program, buf, nil, nil) if err != nil { return @@ -11908,8 +12008,8 @@ func (l *Libvirt) DomainEventPmsuspend() (err error) { func (l *Libvirt) DomainSnapshotIsCurrent(Snap DomainSnapshot, Flags uint32) (rCurrent int32, err error) { var buf []byte - args := DomainSnapshotIsCurrentArgs{ - Snap: Snap, + args := DomainSnapshotIsCurrentArgs { + Snap: Snap, Flags: Flags, } @@ -11942,8 +12042,8 @@ func (l *Libvirt) DomainSnapshotIsCurrent(Snap DomainSnapshot, Flags uint32) (rC func (l *Libvirt) DomainSnapshotHasMetadata(Snap DomainSnapshot, Flags uint32) (rMetadata int32, err error) { var buf []byte - args := DomainSnapshotHasMetadataArgs{ - Snap: Snap, + args := DomainSnapshotHasMetadataArgs { + Snap: Snap, Flags: Flags, } @@ -11976,9 +12076,9 @@ func (l *Libvirt) DomainSnapshotHasMetadata(Snap DomainSnapshot, Flags uint32) ( func (l *Libvirt) ConnectListAllDomains(NeedResults int32, Flags ConnectListAllDomainsFlags) (rDomains []Domain, rRet uint32, err error) { var buf []byte - args := ConnectListAllDomainsArgs{ + args := ConnectListAllDomainsArgs { NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12015,10 +12115,10 @@ func (l *Libvirt) ConnectListAllDomains(NeedResults int32, Flags ConnectListAllD func (l *Libvirt) DomainListAllSnapshots(Dom Domain, NeedResults int32, Flags uint32) (rSnapshots []DomainSnapshot, rRet int32, err error) { var buf []byte - args := DomainListAllSnapshotsArgs{ - Dom: Dom, + args := DomainListAllSnapshotsArgs { + Dom: Dom, NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12055,10 +12155,10 @@ func (l *Libvirt) DomainListAllSnapshots(Dom Domain, NeedResults int32, Flags ui func (l *Libvirt) DomainSnapshotListAllChildren(Snapshot DomainSnapshot, NeedResults int32, Flags uint32) (rSnapshots []DomainSnapshot, rRet int32, err error) { var buf []byte - args := DomainSnapshotListAllChildrenArgs{ - Snapshot: Snapshot, + args := DomainSnapshotListAllChildrenArgs { + Snapshot: Snapshot, NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12095,6 +12195,7 @@ func (l *Libvirt) DomainSnapshotListAllChildren(Snapshot DomainSnapshot, NeedRes func (l *Libvirt) DomainEventBalloonChange() (err error) { var buf []byte + _, err = l.requestStream(276, constants.Program, buf, nil, nil) if err != nil { return @@ -12107,8 +12208,8 @@ func (l *Libvirt) DomainEventBalloonChange() (err error) { func (l *Libvirt) DomainGetHostname(Dom Domain, Flags uint32) (rHostname string, err error) { var buf []byte - args := DomainGetHostnameArgs{ - Dom: Dom, + args := DomainGetHostnameArgs { + Dom: Dom, Flags: Flags, } @@ -12141,7 +12242,7 @@ func (l *Libvirt) DomainGetHostname(Dom Domain, Flags uint32) (rHostname string, func (l *Libvirt) DomainGetSecurityLabelList(Dom Domain) (rLabels []DomainGetSecurityLabelRet, rRet int32, err error) { var buf []byte - args := DomainGetSecurityLabelListArgs{ + args := DomainGetSecurityLabelListArgs { Dom: Dom, } @@ -12179,10 +12280,10 @@ func (l *Libvirt) DomainGetSecurityLabelList(Dom Domain) (rLabels []DomainGetSec func (l *Libvirt) DomainPinEmulator(Dom Domain, Cpumap []byte, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainPinEmulatorArgs{ - Dom: Dom, + args := DomainPinEmulatorArgs { + Dom: Dom, Cpumap: Cpumap, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12190,6 +12291,7 @@ func (l *Libvirt) DomainPinEmulator(Dom Domain, Cpumap []byte, Flags DomainModif return } + _, err = l.requestStream(279, constants.Program, buf, nil, nil) if err != nil { return @@ -12202,10 +12304,10 @@ func (l *Libvirt) DomainPinEmulator(Dom Domain, Cpumap []byte, Flags DomainModif func (l *Libvirt) DomainGetEmulatorPinInfo(Dom Domain, Maplen int32, Flags DomainModificationImpact) (rCpumaps []byte, rRet int32, err error) { var buf []byte - args := DomainGetEmulatorPinInfoArgs{ - Dom: Dom, + args := DomainGetEmulatorPinInfoArgs { + Dom: Dom, Maplen: Maplen, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12242,9 +12344,9 @@ func (l *Libvirt) DomainGetEmulatorPinInfo(Dom Domain, Maplen int32, Flags Domai func (l *Libvirt) ConnectListAllStoragePools(NeedResults int32, Flags ConnectListAllStoragePoolsFlags) (rPools []StoragePool, rRet uint32, err error) { var buf []byte - args := ConnectListAllStoragePoolsArgs{ + args := ConnectListAllStoragePoolsArgs { NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12281,10 +12383,10 @@ func (l *Libvirt) ConnectListAllStoragePools(NeedResults int32, Flags ConnectLis func (l *Libvirt) StoragePoolListAllVolumes(Pool StoragePool, NeedResults int32, Flags uint32) (rVols []StorageVol, rRet uint32, err error) { var buf []byte - args := StoragePoolListAllVolumesArgs{ - Pool: Pool, + args := StoragePoolListAllVolumesArgs { + Pool: Pool, NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12321,9 +12423,9 @@ func (l *Libvirt) StoragePoolListAllVolumes(Pool StoragePool, NeedResults int32, func (l *Libvirt) ConnectListAllNetworks(NeedResults int32, Flags ConnectListAllNetworksFlags) (rNets []Network, rRet uint32, err error) { var buf []byte - args := ConnectListAllNetworksArgs{ + args := ConnectListAllNetworksArgs { NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12360,9 +12462,9 @@ func (l *Libvirt) ConnectListAllNetworks(NeedResults int32, Flags ConnectListAll func (l *Libvirt) ConnectListAllInterfaces(NeedResults int32, Flags ConnectListAllInterfacesFlags) (rIfaces []Interface, rRet uint32, err error) { var buf []byte - args := ConnectListAllInterfacesArgs{ + args := ConnectListAllInterfacesArgs { NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12399,9 +12501,9 @@ func (l *Libvirt) ConnectListAllInterfaces(NeedResults int32, Flags ConnectListA func (l *Libvirt) ConnectListAllNodeDevices(NeedResults int32, Flags uint32) (rDevices []NodeDevice, rRet uint32, err error) { var buf []byte - args := ConnectListAllNodeDevicesArgs{ + args := ConnectListAllNodeDevicesArgs { NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12438,9 +12540,9 @@ func (l *Libvirt) ConnectListAllNodeDevices(NeedResults int32, Flags uint32) (rD func (l *Libvirt) ConnectListAllNwfilters(NeedResults int32, Flags uint32) (rFilters []Nwfilter, rRet uint32, err error) { var buf []byte - args := ConnectListAllNwfiltersArgs{ + args := ConnectListAllNwfiltersArgs { NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12477,9 +12579,9 @@ func (l *Libvirt) ConnectListAllNwfilters(NeedResults int32, Flags uint32) (rFil func (l *Libvirt) ConnectListAllSecrets(NeedResults int32, Flags ConnectListAllSecretsFlags) (rSecrets []Secret, rRet uint32, err error) { var buf []byte - args := ConnectListAllSecretsArgs{ + args := ConnectListAllSecretsArgs { NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12516,9 +12618,9 @@ func (l *Libvirt) ConnectListAllSecrets(NeedResults int32, Flags ConnectListAllS func (l *Libvirt) NodeSetMemoryParameters(Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := NodeSetMemoryParametersArgs{ + args := NodeSetMemoryParametersArgs { Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12526,6 +12628,7 @@ func (l *Libvirt) NodeSetMemoryParameters(Params []TypedParam, Flags uint32) (er return } + _, err = l.requestStream(288, constants.Program, buf, nil, nil) if err != nil { return @@ -12538,9 +12641,9 @@ func (l *Libvirt) NodeSetMemoryParameters(Params []TypedParam, Flags uint32) (er func (l *Libvirt) NodeGetMemoryParameters(Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := NodeGetMemoryParametersArgs{ + args := NodeGetMemoryParametersArgs { Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12577,13 +12680,13 @@ func (l *Libvirt) NodeGetMemoryParameters(Nparams int32, Flags uint32) (rParams func (l *Libvirt) DomainBlockCommit(Dom Domain, Disk string, Base OptString, Top OptString, Bandwidth uint64, Flags DomainBlockCommitFlags) (err error) { var buf []byte - args := DomainBlockCommitArgs{ - Dom: Dom, - Disk: Disk, - Base: Base, - Top: Top, + args := DomainBlockCommitArgs { + Dom: Dom, + Disk: Disk, + Base: Base, + Top: Top, Bandwidth: Bandwidth, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12591,6 +12694,7 @@ func (l *Libvirt) DomainBlockCommit(Dom Domain, Disk string, Base OptString, Top return } + _, err = l.requestStream(290, constants.Program, buf, nil, nil) if err != nil { return @@ -12603,13 +12707,13 @@ func (l *Libvirt) DomainBlockCommit(Dom Domain, Disk string, Base OptString, Top func (l *Libvirt) NetworkUpdate(Net Network, Command uint32, Section uint32, ParentIndex int32, XML string, Flags NetworkUpdateFlags) (err error) { var buf []byte - args := NetworkUpdateArgs{ - Net: Net, - Command: Command, - Section: Section, + args := NetworkUpdateArgs { + Net: Net, + Command: Command, + Section: Section, ParentIndex: ParentIndex, - XML: XML, - Flags: Flags, + XML: XML, + Flags: Flags, } buf, err = encode(&args) @@ -12617,6 +12721,7 @@ func (l *Libvirt) NetworkUpdate(Net Network, Command uint32, Section uint32, Par return } + _, err = l.requestStream(291, constants.Program, buf, nil, nil) if err != nil { return @@ -12629,6 +12734,7 @@ func (l *Libvirt) NetworkUpdate(Net Network, Command uint32, Section uint32, Par func (l *Libvirt) DomainEventPmsuspendDisk() (err error) { var buf []byte + _, err = l.requestStream(292, constants.Program, buf, nil, nil) if err != nil { return @@ -12641,10 +12747,10 @@ func (l *Libvirt) DomainEventPmsuspendDisk() (err error) { func (l *Libvirt) NodeGetCPUMap(NeedMap int32, NeedOnline int32, Flags uint32) (rCpumap []byte, rOnline uint32, rRet int32, err error) { var buf []byte - args := NodeGetCPUMapArgs{ - NeedMap: NeedMap, + args := NodeGetCPUMapArgs { + NeedMap: NeedMap, NeedOnline: NeedOnline, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12686,11 +12792,11 @@ func (l *Libvirt) NodeGetCPUMap(NeedMap int32, NeedOnline int32, Flags uint32) ( func (l *Libvirt) DomainFstrim(Dom Domain, MountPoint OptString, Minimum uint64, Flags uint32) (err error) { var buf []byte - args := DomainFstrimArgs{ - Dom: Dom, + args := DomainFstrimArgs { + Dom: Dom, MountPoint: MountPoint, - Minimum: Minimum, - Flags: Flags, + Minimum: Minimum, + Flags: Flags, } buf, err = encode(&args) @@ -12698,6 +12804,7 @@ func (l *Libvirt) DomainFstrim(Dom Domain, MountPoint OptString, Minimum uint64, return } + _, err = l.requestStream(294, constants.Program, buf, nil, nil) if err != nil { return @@ -12710,11 +12817,11 @@ func (l *Libvirt) DomainFstrim(Dom Domain, MountPoint OptString, Minimum uint64, func (l *Libvirt) DomainSendProcessSignal(Dom Domain, PidValue int64, Signum uint32, Flags uint32) (err error) { var buf []byte - args := DomainSendProcessSignalArgs{ - Dom: Dom, + args := DomainSendProcessSignalArgs { + Dom: Dom, PidValue: PidValue, - Signum: Signum, - Flags: Flags, + Signum: Signum, + Flags: Flags, } buf, err = encode(&args) @@ -12722,6 +12829,7 @@ func (l *Libvirt) DomainSendProcessSignal(Dom Domain, PidValue int64, Signum uin return } + _, err = l.requestStream(295, constants.Program, buf, nil, nil) if err != nil { return @@ -12734,9 +12842,9 @@ func (l *Libvirt) DomainSendProcessSignal(Dom Domain, PidValue int64, Signum uin func (l *Libvirt) DomainOpenChannel(Dom Domain, Name OptString, inStream io.Writer, Flags DomainChannelFlags) (err error) { var buf []byte - args := DomainOpenChannelArgs{ - Dom: Dom, - Name: Name, + args := DomainOpenChannelArgs { + Dom: Dom, + Name: Name, Flags: Flags, } @@ -12745,6 +12853,7 @@ func (l *Libvirt) DomainOpenChannel(Dom Domain, Name OptString, inStream io.Writ return } + _, err = l.requestStream(296, constants.Program, buf, nil, inStream) if err != nil { return @@ -12757,9 +12866,9 @@ func (l *Libvirt) DomainOpenChannel(Dom Domain, Name OptString, inStream io.Writ func (l *Libvirt) NodeDeviceLookupScsiHostByWwn(Wwnn string, Wwpn string, Flags uint32) (rDev NodeDevice, err error) { var buf []byte - args := NodeDeviceLookupScsiHostByWwnArgs{ - Wwnn: Wwnn, - Wwpn: Wwpn, + args := NodeDeviceLookupScsiHostByWwnArgs { + Wwnn: Wwnn, + Wwpn: Wwpn, Flags: Flags, } @@ -12792,8 +12901,8 @@ func (l *Libvirt) NodeDeviceLookupScsiHostByWwn(Wwnn string, Wwpn string, Flags func (l *Libvirt) DomainGetJobStats(Dom Domain, Flags DomainGetJobStatsFlags) (rType int32, rParams []TypedParam, err error) { var buf []byte - args := DomainGetJobStatsArgs{ - Dom: Dom, + args := DomainGetJobStatsArgs { + Dom: Dom, Flags: Flags, } @@ -12831,8 +12940,8 @@ func (l *Libvirt) DomainGetJobStats(Dom Domain, Flags DomainGetJobStatsFlags) (r func (l *Libvirt) DomainMigrateGetCompressionCache(Dom Domain, Flags uint32) (rCacheSize uint64, err error) { var buf []byte - args := DomainMigrateGetCompressionCacheArgs{ - Dom: Dom, + args := DomainMigrateGetCompressionCacheArgs { + Dom: Dom, Flags: Flags, } @@ -12865,10 +12974,10 @@ func (l *Libvirt) DomainMigrateGetCompressionCache(Dom Domain, Flags uint32) (rC func (l *Libvirt) DomainMigrateSetCompressionCache(Dom Domain, CacheSize uint64, Flags uint32) (err error) { var buf []byte - args := DomainMigrateSetCompressionCacheArgs{ - Dom: Dom, + args := DomainMigrateSetCompressionCacheArgs { + Dom: Dom, CacheSize: CacheSize, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12876,6 +12985,7 @@ func (l *Libvirt) DomainMigrateSetCompressionCache(Dom Domain, CacheSize uint64, return } + _, err = l.requestStream(300, constants.Program, buf, nil, nil) if err != nil { return @@ -12888,10 +12998,10 @@ func (l *Libvirt) DomainMigrateSetCompressionCache(Dom Domain, CacheSize uint64, func (l *Libvirt) NodeDeviceDetachFlags(Name string, DriverName OptString, Flags uint32) (err error) { var buf []byte - args := NodeDeviceDetachFlagsArgs{ - Name: Name, + args := NodeDeviceDetachFlagsArgs { + Name: Name, DriverName: DriverName, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12899,6 +13009,7 @@ func (l *Libvirt) NodeDeviceDetachFlags(Name string, DriverName OptString, Flags return } + _, err = l.requestStream(301, constants.Program, buf, nil, nil) if err != nil { return @@ -12911,10 +13022,10 @@ func (l *Libvirt) NodeDeviceDetachFlags(Name string, DriverName OptString, Flags func (l *Libvirt) DomainMigrateBegin3Params(Dom Domain, Params []TypedParam, Flags uint32) (rCookieOut []byte, rXML string, err error) { var buf []byte - args := DomainMigrateBegin3ParamsArgs{ - Dom: Dom, + args := DomainMigrateBegin3ParamsArgs { + Dom: Dom, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12951,10 +13062,10 @@ func (l *Libvirt) DomainMigrateBegin3Params(Dom Domain, Params []TypedParam, Fla func (l *Libvirt) DomainMigratePrepare3Params(Params []TypedParam, CookieIn []byte, Flags uint32) (rCookieOut []byte, rUriOut OptString, err error) { var buf []byte - args := DomainMigratePrepare3ParamsArgs{ - Params: Params, + args := DomainMigratePrepare3ParamsArgs { + Params: Params, CookieIn: CookieIn, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -12991,10 +13102,10 @@ func (l *Libvirt) DomainMigratePrepare3Params(Params []TypedParam, CookieIn []by func (l *Libvirt) DomainMigratePrepareTunnel3Params(Params []TypedParam, CookieIn []byte, Flags uint32) (rCookieOut []byte, err error) { var buf []byte - args := DomainMigratePrepareTunnel3ParamsArgs{ - Params: Params, + args := DomainMigratePrepareTunnel3ParamsArgs { + Params: Params, CookieIn: CookieIn, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13026,12 +13137,12 @@ func (l *Libvirt) DomainMigratePrepareTunnel3Params(Params []TypedParam, CookieI func (l *Libvirt) DomainMigratePerform3Params(Dom Domain, Dconnuri OptString, Params []TypedParam, CookieIn []byte, Flags DomainMigrateFlags) (rCookieOut []byte, err error) { var buf []byte - args := DomainMigratePerform3ParamsArgs{ - Dom: Dom, + args := DomainMigratePerform3ParamsArgs { + Dom: Dom, Dconnuri: Dconnuri, - Params: Params, + Params: Params, CookieIn: CookieIn, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13063,10 +13174,10 @@ func (l *Libvirt) DomainMigratePerform3Params(Dom Domain, Dconnuri OptString, Pa func (l *Libvirt) DomainMigrateFinish3Params(Params []TypedParam, CookieIn []byte, Flags uint32, Cancelled int32) (rDom Domain, rCookieOut []byte, err error) { var buf []byte - args := DomainMigrateFinish3ParamsArgs{ - Params: Params, - CookieIn: CookieIn, - Flags: Flags, + args := DomainMigrateFinish3ParamsArgs { + Params: Params, + CookieIn: CookieIn, + Flags: Flags, Cancelled: Cancelled, } @@ -13104,11 +13215,11 @@ func (l *Libvirt) DomainMigrateFinish3Params(Params []TypedParam, CookieIn []byt func (l *Libvirt) DomainMigrateConfirm3Params(Dom Domain, Params []TypedParam, CookieIn []byte, Flags uint32, Cancelled int32) (err error) { var buf []byte - args := DomainMigrateConfirm3ParamsArgs{ - Dom: Dom, - Params: Params, - CookieIn: CookieIn, - Flags: Flags, + args := DomainMigrateConfirm3ParamsArgs { + Dom: Dom, + Params: Params, + CookieIn: CookieIn, + Flags: Flags, Cancelled: Cancelled, } @@ -13117,6 +13228,7 @@ func (l *Libvirt) DomainMigrateConfirm3Params(Dom Domain, Params []TypedParam, C return } + _, err = l.requestStream(307, constants.Program, buf, nil, nil) if err != nil { return @@ -13129,10 +13241,10 @@ func (l *Libvirt) DomainMigrateConfirm3Params(Dom Domain, Params []TypedParam, C func (l *Libvirt) DomainSetMemoryStatsPeriod(Dom Domain, Period int32, Flags DomainMemoryModFlags) (err error) { var buf []byte - args := DomainSetMemoryStatsPeriodArgs{ - Dom: Dom, + args := DomainSetMemoryStatsPeriodArgs { + Dom: Dom, Period: Period, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13140,6 +13252,7 @@ func (l *Libvirt) DomainSetMemoryStatsPeriod(Dom Domain, Period int32, Flags Dom return } + _, err = l.requestStream(308, constants.Program, buf, nil, nil) if err != nil { return @@ -13152,9 +13265,9 @@ func (l *Libvirt) DomainSetMemoryStatsPeriod(Dom Domain, Period int32, Flags Dom func (l *Libvirt) DomainCreateXMLWithFiles(XMLDesc string, Flags DomainCreateFlags) (rDom Domain, err error) { var buf []byte - args := DomainCreateXMLWithFilesArgs{ + args := DomainCreateXMLWithFilesArgs { XMLDesc: XMLDesc, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13186,8 +13299,8 @@ func (l *Libvirt) DomainCreateXMLWithFiles(XMLDesc string, Flags DomainCreateFla func (l *Libvirt) DomainCreateWithFiles(Dom Domain, Flags DomainCreateFlags) (rDom Domain, err error) { var buf []byte - args := DomainCreateWithFilesArgs{ - Dom: Dom, + args := DomainCreateWithFilesArgs { + Dom: Dom, Flags: Flags, } @@ -13220,6 +13333,7 @@ func (l *Libvirt) DomainCreateWithFiles(Dom Domain, Flags DomainCreateFlags) (rD func (l *Libvirt) DomainEventDeviceRemoved() (err error) { var buf []byte + _, err = l.requestStream(311, constants.Program, buf, nil, nil) if err != nil { return @@ -13232,10 +13346,10 @@ func (l *Libvirt) DomainEventDeviceRemoved() (err error) { func (l *Libvirt) ConnectGetCPUModelNames(Arch string, NeedResults int32, Flags uint32) (rModels []string, rRet int32, err error) { var buf []byte - args := ConnectGetCPUModelNamesArgs{ - Arch: Arch, + args := ConnectGetCPUModelNamesArgs { + Arch: Arch, NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13272,9 +13386,9 @@ func (l *Libvirt) ConnectGetCPUModelNames(Arch string, NeedResults int32, Flags func (l *Libvirt) ConnectNetworkEventRegisterAny(EventID int32, Net OptNetwork) (rCallbackID int32, err error) { var buf []byte - args := ConnectNetworkEventRegisterAnyArgs{ + args := ConnectNetworkEventRegisterAnyArgs { EventID: EventID, - Net: Net, + Net: Net, } buf, err = encode(&args) @@ -13306,7 +13420,7 @@ func (l *Libvirt) ConnectNetworkEventRegisterAny(EventID int32, Net OptNetwork) func (l *Libvirt) ConnectNetworkEventDeregisterAny(CallbackID int32) (err error) { var buf []byte - args := ConnectNetworkEventDeregisterAnyArgs{ + args := ConnectNetworkEventDeregisterAnyArgs { CallbackID: CallbackID, } @@ -13315,6 +13429,7 @@ func (l *Libvirt) ConnectNetworkEventDeregisterAny(CallbackID int32) (err error) return } + _, err = l.requestStream(314, constants.Program, buf, nil, nil) if err != nil { return @@ -13327,6 +13442,7 @@ func (l *Libvirt) ConnectNetworkEventDeregisterAny(CallbackID int32) (err error) func (l *Libvirt) NetworkEventLifecycle() (err error) { var buf []byte + _, err = l.requestStream(315, constants.Program, buf, nil, nil) if err != nil { return @@ -13339,9 +13455,9 @@ func (l *Libvirt) NetworkEventLifecycle() (err error) { func (l *Libvirt) ConnectDomainEventCallbackRegisterAny(EventID int32, Dom OptDomain) (rCallbackID int32, err error) { var buf []byte - args := ConnectDomainEventCallbackRegisterAnyArgs{ + args := ConnectDomainEventCallbackRegisterAnyArgs { EventID: EventID, - Dom: Dom, + Dom: Dom, } buf, err = encode(&args) @@ -13373,7 +13489,7 @@ func (l *Libvirt) ConnectDomainEventCallbackRegisterAny(EventID int32, Dom OptDo func (l *Libvirt) ConnectDomainEventCallbackDeregisterAny(CallbackID int32) (err error) { var buf []byte - args := ConnectDomainEventCallbackDeregisterAnyArgs{ + args := ConnectDomainEventCallbackDeregisterAnyArgs { CallbackID: CallbackID, } @@ -13382,6 +13498,7 @@ func (l *Libvirt) ConnectDomainEventCallbackDeregisterAny(CallbackID int32) (err return } + _, err = l.requestStream(317, constants.Program, buf, nil, nil) if err != nil { return @@ -13394,6 +13511,7 @@ func (l *Libvirt) ConnectDomainEventCallbackDeregisterAny(CallbackID int32) (err func (l *Libvirt) DomainEventCallbackLifecycle() (err error) { var buf []byte + _, err = l.requestStream(318, constants.Program, buf, nil, nil) if err != nil { return @@ -13406,6 +13524,7 @@ func (l *Libvirt) DomainEventCallbackLifecycle() (err error) { func (l *Libvirt) DomainEventCallbackReboot() (err error) { var buf []byte + _, err = l.requestStream(319, constants.Program, buf, nil, nil) if err != nil { return @@ -13418,6 +13537,7 @@ func (l *Libvirt) DomainEventCallbackReboot() (err error) { func (l *Libvirt) DomainEventCallbackRtcChange() (err error) { var buf []byte + _, err = l.requestStream(320, constants.Program, buf, nil, nil) if err != nil { return @@ -13430,6 +13550,7 @@ func (l *Libvirt) DomainEventCallbackRtcChange() (err error) { func (l *Libvirt) DomainEventCallbackWatchdog() (err error) { var buf []byte + _, err = l.requestStream(321, constants.Program, buf, nil, nil) if err != nil { return @@ -13442,6 +13563,7 @@ func (l *Libvirt) DomainEventCallbackWatchdog() (err error) { func (l *Libvirt) DomainEventCallbackIOError() (err error) { var buf []byte + _, err = l.requestStream(322, constants.Program, buf, nil, nil) if err != nil { return @@ -13454,6 +13576,7 @@ func (l *Libvirt) DomainEventCallbackIOError() (err error) { func (l *Libvirt) DomainEventCallbackGraphics() (err error) { var buf []byte + _, err = l.requestStream(323, constants.Program, buf, nil, nil) if err != nil { return @@ -13466,6 +13589,7 @@ func (l *Libvirt) DomainEventCallbackGraphics() (err error) { func (l *Libvirt) DomainEventCallbackIOErrorReason() (err error) { var buf []byte + _, err = l.requestStream(324, constants.Program, buf, nil, nil) if err != nil { return @@ -13478,6 +13602,7 @@ func (l *Libvirt) DomainEventCallbackIOErrorReason() (err error) { func (l *Libvirt) DomainEventCallbackControlError() (err error) { var buf []byte + _, err = l.requestStream(325, constants.Program, buf, nil, nil) if err != nil { return @@ -13490,6 +13615,7 @@ func (l *Libvirt) DomainEventCallbackControlError() (err error) { func (l *Libvirt) DomainEventCallbackBlockJob() (err error) { var buf []byte + _, err = l.requestStream(326, constants.Program, buf, nil, nil) if err != nil { return @@ -13502,6 +13628,7 @@ func (l *Libvirt) DomainEventCallbackBlockJob() (err error) { func (l *Libvirt) DomainEventCallbackDiskChange() (err error) { var buf []byte + _, err = l.requestStream(327, constants.Program, buf, nil, nil) if err != nil { return @@ -13514,6 +13641,7 @@ func (l *Libvirt) DomainEventCallbackDiskChange() (err error) { func (l *Libvirt) DomainEventCallbackTrayChange() (err error) { var buf []byte + _, err = l.requestStream(328, constants.Program, buf, nil, nil) if err != nil { return @@ -13526,6 +13654,7 @@ func (l *Libvirt) DomainEventCallbackTrayChange() (err error) { func (l *Libvirt) DomainEventCallbackPmwakeup() (err error) { var buf []byte + _, err = l.requestStream(329, constants.Program, buf, nil, nil) if err != nil { return @@ -13538,6 +13667,7 @@ func (l *Libvirt) DomainEventCallbackPmwakeup() (err error) { func (l *Libvirt) DomainEventCallbackPmsuspend() (err error) { var buf []byte + _, err = l.requestStream(330, constants.Program, buf, nil, nil) if err != nil { return @@ -13550,6 +13680,7 @@ func (l *Libvirt) DomainEventCallbackPmsuspend() (err error) { func (l *Libvirt) DomainEventCallbackBalloonChange() (err error) { var buf []byte + _, err = l.requestStream(331, constants.Program, buf, nil, nil) if err != nil { return @@ -13562,6 +13693,7 @@ func (l *Libvirt) DomainEventCallbackBalloonChange() (err error) { func (l *Libvirt) DomainEventCallbackPmsuspendDisk() (err error) { var buf []byte + _, err = l.requestStream(332, constants.Program, buf, nil, nil) if err != nil { return @@ -13574,6 +13706,7 @@ func (l *Libvirt) DomainEventCallbackPmsuspendDisk() (err error) { func (l *Libvirt) DomainEventCallbackDeviceRemoved() (err error) { var buf []byte + _, err = l.requestStream(333, constants.Program, buf, nil, nil) if err != nil { return @@ -13586,11 +13719,11 @@ func (l *Libvirt) DomainEventCallbackDeviceRemoved() (err error) { func (l *Libvirt) DomainCoreDumpWithFormat(Dom Domain, To string, Dumpformat uint32, Flags DomainCoreDumpFlags) (err error) { var buf []byte - args := DomainCoreDumpWithFormatArgs{ - Dom: Dom, - To: To, + args := DomainCoreDumpWithFormatArgs { + Dom: Dom, + To: To, Dumpformat: Dumpformat, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13598,6 +13731,7 @@ func (l *Libvirt) DomainCoreDumpWithFormat(Dom Domain, To string, Dumpformat uin return } + _, err = l.requestStream(334, constants.Program, buf, nil, nil) if err != nil { return @@ -13610,10 +13744,10 @@ func (l *Libvirt) DomainCoreDumpWithFormat(Dom Domain, To string, Dumpformat uin func (l *Libvirt) DomainFsfreeze(Dom Domain, Mountpoints []string, Flags uint32) (rFilesystems int32, err error) { var buf []byte - args := DomainFsfreezeArgs{ - Dom: Dom, + args := DomainFsfreezeArgs { + Dom: Dom, Mountpoints: Mountpoints, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13645,10 +13779,10 @@ func (l *Libvirt) DomainFsfreeze(Dom Domain, Mountpoints []string, Flags uint32) func (l *Libvirt) DomainFsthaw(Dom Domain, Mountpoints []string, Flags uint32) (rFilesystems int32, err error) { var buf []byte - args := DomainFsthawArgs{ - Dom: Dom, + args := DomainFsthawArgs { + Dom: Dom, Mountpoints: Mountpoints, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13680,8 +13814,8 @@ func (l *Libvirt) DomainFsthaw(Dom Domain, Mountpoints []string, Flags uint32) ( func (l *Libvirt) DomainGetTime(Dom Domain, Flags uint32) (rSeconds int64, rNseconds uint32, err error) { var buf []byte - args := DomainGetTimeArgs{ - Dom: Dom, + args := DomainGetTimeArgs { + Dom: Dom, Flags: Flags, } @@ -13719,11 +13853,11 @@ func (l *Libvirt) DomainGetTime(Dom Domain, Flags uint32) (rSeconds int64, rNsec func (l *Libvirt) DomainSetTime(Dom Domain, Seconds int64, Nseconds uint32, Flags DomainSetTimeFlags) (err error) { var buf []byte - args := DomainSetTimeArgs{ - Dom: Dom, - Seconds: Seconds, + args := DomainSetTimeArgs { + Dom: Dom, + Seconds: Seconds, Nseconds: Nseconds, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13731,6 +13865,7 @@ func (l *Libvirt) DomainSetTime(Dom Domain, Seconds int64, Nseconds uint32, Flag return } + _, err = l.requestStream(338, constants.Program, buf, nil, nil) if err != nil { return @@ -13743,6 +13878,7 @@ func (l *Libvirt) DomainSetTime(Dom Domain, Seconds int64, Nseconds uint32, Flag func (l *Libvirt) DomainEventBlockJob2() (err error) { var buf []byte + _, err = l.requestStream(339, constants.Program, buf, nil, nil) if err != nil { return @@ -13755,11 +13891,11 @@ func (l *Libvirt) DomainEventBlockJob2() (err error) { func (l *Libvirt) NodeGetFreePages(Pages []uint32, StartCell int32, CellCount uint32, Flags uint32) (rCounts []uint64, err error) { var buf []byte - args := NodeGetFreePagesArgs{ - Pages: Pages, + args := NodeGetFreePagesArgs { + Pages: Pages, StartCell: StartCell, CellCount: CellCount, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13791,11 +13927,11 @@ func (l *Libvirt) NodeGetFreePages(Pages []uint32, StartCell int32, CellCount ui func (l *Libvirt) NetworkGetDhcpLeases(Net Network, Mac OptString, NeedResults int32, Flags uint32) (rLeases []NetworkDhcpLease, rRet uint32, err error) { var buf []byte - args := NetworkGetDhcpLeasesArgs{ - Net: Net, - Mac: Mac, + args := NetworkGetDhcpLeasesArgs { + Net: Net, + Mac: Mac, NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -13832,12 +13968,12 @@ func (l *Libvirt) NetworkGetDhcpLeases(Net Network, Mac OptString, NeedResults i func (l *Libvirt) ConnectGetDomainCapabilities(Emulatorbin OptString, Arch OptString, Machine OptString, Virttype OptString, Flags uint32) (rCapabilities string, err error) { var buf []byte - args := ConnectGetDomainCapabilitiesArgs{ + args := ConnectGetDomainCapabilitiesArgs { Emulatorbin: Emulatorbin, - Arch: Arch, - Machine: Machine, - Virttype: Virttype, - Flags: Flags, + Arch: Arch, + Machine: Machine, + Virttype: Virttype, + Flags: Flags, } buf, err = encode(&args) @@ -13869,9 +14005,9 @@ func (l *Libvirt) ConnectGetDomainCapabilities(Emulatorbin OptString, Arch OptSt func (l *Libvirt) DomainOpenGraphicsFd(Dom Domain, Idx uint32, Flags DomainOpenGraphicsFlags) (err error) { var buf []byte - args := DomainOpenGraphicsFdArgs{ - Dom: Dom, - Idx: Idx, + args := DomainOpenGraphicsFdArgs { + Dom: Dom, + Idx: Idx, Flags: Flags, } @@ -13880,6 +14016,7 @@ func (l *Libvirt) DomainOpenGraphicsFd(Dom Domain, Idx uint32, Flags DomainOpenG return } + _, err = l.requestStream(343, constants.Program, buf, nil, nil) if err != nil { return @@ -13892,8 +14029,8 @@ func (l *Libvirt) DomainOpenGraphicsFd(Dom Domain, Idx uint32, Flags DomainOpenG func (l *Libvirt) ConnectGetAllDomainStats(Doms []Domain, Stats uint32, Flags ConnectGetAllDomainStatsFlags) (rRetStats []DomainStatsRecord, err error) { var buf []byte - args := ConnectGetAllDomainStatsArgs{ - Doms: Doms, + args := ConnectGetAllDomainStatsArgs { + Doms: Doms, Stats: Stats, Flags: Flags, } @@ -13927,12 +14064,12 @@ func (l *Libvirt) ConnectGetAllDomainStats(Doms []Domain, Stats uint32, Flags Co func (l *Libvirt) DomainBlockCopy(Dom Domain, Path string, Destxml string, Params []TypedParam, Flags DomainBlockCopyFlags) (err error) { var buf []byte - args := DomainBlockCopyArgs{ - Dom: Dom, - Path: Path, + args := DomainBlockCopyArgs { + Dom: Dom, + Path: Path, Destxml: Destxml, - Params: Params, - Flags: Flags, + Params: Params, + Flags: Flags, } buf, err = encode(&args) @@ -13940,6 +14077,7 @@ func (l *Libvirt) DomainBlockCopy(Dom Domain, Path string, Destxml string, Param return } + _, err = l.requestStream(345, constants.Program, buf, nil, nil) if err != nil { return @@ -13952,6 +14090,7 @@ func (l *Libvirt) DomainBlockCopy(Dom Domain, Path string, Destxml string, Param func (l *Libvirt) DomainEventCallbackTunable() (err error) { var buf []byte + _, err = l.requestStream(346, constants.Program, buf, nil, nil) if err != nil { return @@ -13964,12 +14103,12 @@ func (l *Libvirt) DomainEventCallbackTunable() (err error) { func (l *Libvirt) NodeAllocPages(PageSizes []uint32, PageCounts []uint64, StartCell int32, CellCount uint32, Flags NodeAllocPagesFlags) (rRet int32, err error) { var buf []byte - args := NodeAllocPagesArgs{ - PageSizes: PageSizes, + args := NodeAllocPagesArgs { + PageSizes: PageSizes, PageCounts: PageCounts, - StartCell: StartCell, - CellCount: CellCount, - Flags: Flags, + StartCell: StartCell, + CellCount: CellCount, + Flags: Flags, } buf, err = encode(&args) @@ -14001,6 +14140,7 @@ func (l *Libvirt) NodeAllocPages(PageSizes []uint32, PageCounts []uint64, StartC func (l *Libvirt) DomainEventCallbackAgentLifecycle() (err error) { var buf []byte + _, err = l.requestStream(348, constants.Program, buf, nil, nil) if err != nil { return @@ -14013,8 +14153,8 @@ func (l *Libvirt) DomainEventCallbackAgentLifecycle() (err error) { func (l *Libvirt) DomainGetFsinfo(Dom Domain, Flags uint32) (rInfo []DomainFsinfo, rRet uint32, err error) { var buf []byte - args := DomainGetFsinfoArgs{ - Dom: Dom, + args := DomainGetFsinfoArgs { + Dom: Dom, Flags: Flags, } @@ -14052,8 +14192,8 @@ func (l *Libvirt) DomainGetFsinfo(Dom Domain, Flags uint32) (rInfo []DomainFsinf func (l *Libvirt) DomainDefineXMLFlags(XML string, Flags DomainDefineFlags) (rDom Domain, err error) { var buf []byte - args := DomainDefineXMLFlagsArgs{ - XML: XML, + args := DomainDefineXMLFlagsArgs { + XML: XML, Flags: Flags, } @@ -14086,8 +14226,8 @@ func (l *Libvirt) DomainDefineXMLFlags(XML string, Flags DomainDefineFlags) (rDo func (l *Libvirt) DomainGetIothreadInfo(Dom Domain, Flags DomainModificationImpact) (rInfo []DomainIothreadInfo, rRet uint32, err error) { var buf []byte - args := DomainGetIothreadInfoArgs{ - Dom: Dom, + args := DomainGetIothreadInfoArgs { + Dom: Dom, Flags: Flags, } @@ -14125,11 +14265,11 @@ func (l *Libvirt) DomainGetIothreadInfo(Dom Domain, Flags DomainModificationImpa func (l *Libvirt) DomainPinIothread(Dom Domain, IothreadsID uint32, Cpumap []byte, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainPinIothreadArgs{ - Dom: Dom, + args := DomainPinIothreadArgs { + Dom: Dom, IothreadsID: IothreadsID, - Cpumap: Cpumap, - Flags: Flags, + Cpumap: Cpumap, + Flags: Flags, } buf, err = encode(&args) @@ -14137,6 +14277,7 @@ func (l *Libvirt) DomainPinIothread(Dom Domain, IothreadsID uint32, Cpumap []byt return } + _, err = l.requestStream(352, constants.Program, buf, nil, nil) if err != nil { return @@ -14149,10 +14290,10 @@ func (l *Libvirt) DomainPinIothread(Dom Domain, IothreadsID uint32, Cpumap []byt func (l *Libvirt) DomainInterfaceAddresses(Dom Domain, Source uint32, Flags uint32) (rIfaces []DomainInterface, err error) { var buf []byte - args := DomainInterfaceAddressesArgs{ - Dom: Dom, + args := DomainInterfaceAddressesArgs { + Dom: Dom, Source: Source, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14184,6 +14325,7 @@ func (l *Libvirt) DomainInterfaceAddresses(Dom Domain, Source uint32, Flags uint func (l *Libvirt) DomainEventCallbackDeviceAdded() (err error) { var buf []byte + _, err = l.requestStream(354, constants.Program, buf, nil, nil) if err != nil { return @@ -14196,10 +14338,10 @@ func (l *Libvirt) DomainEventCallbackDeviceAdded() (err error) { func (l *Libvirt) DomainAddIothread(Dom Domain, IothreadID uint32, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainAddIothreadArgs{ - Dom: Dom, + args := DomainAddIothreadArgs { + Dom: Dom, IothreadID: IothreadID, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14207,6 +14349,7 @@ func (l *Libvirt) DomainAddIothread(Dom Domain, IothreadID uint32, Flags DomainM return } + _, err = l.requestStream(355, constants.Program, buf, nil, nil) if err != nil { return @@ -14219,10 +14362,10 @@ func (l *Libvirt) DomainAddIothread(Dom Domain, IothreadID uint32, Flags DomainM func (l *Libvirt) DomainDelIothread(Dom Domain, IothreadID uint32, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainDelIothreadArgs{ - Dom: Dom, + args := DomainDelIothreadArgs { + Dom: Dom, IothreadID: IothreadID, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14230,6 +14373,7 @@ func (l *Libvirt) DomainDelIothread(Dom Domain, IothreadID uint32, Flags DomainM return } + _, err = l.requestStream(356, constants.Program, buf, nil, nil) if err != nil { return @@ -14242,11 +14386,11 @@ func (l *Libvirt) DomainDelIothread(Dom Domain, IothreadID uint32, Flags DomainM func (l *Libvirt) DomainSetUserPassword(Dom Domain, User OptString, Password OptString, Flags DomainSetUserPasswordFlags) (err error) { var buf []byte - args := DomainSetUserPasswordArgs{ - Dom: Dom, - User: User, + args := DomainSetUserPasswordArgs { + Dom: Dom, + User: User, Password: Password, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14254,6 +14398,7 @@ func (l *Libvirt) DomainSetUserPassword(Dom Domain, User OptString, Password Opt return } + _, err = l.requestStream(357, constants.Program, buf, nil, nil) if err != nil { return @@ -14266,10 +14411,10 @@ func (l *Libvirt) DomainSetUserPassword(Dom Domain, User OptString, Password Opt func (l *Libvirt) DomainRename(Dom Domain, NewName OptString, Flags uint32) (rRetcode int32, err error) { var buf []byte - args := DomainRenameArgs{ - Dom: Dom, + args := DomainRenameArgs { + Dom: Dom, NewName: NewName, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14301,6 +14446,7 @@ func (l *Libvirt) DomainRename(Dom Domain, NewName OptString, Flags uint32) (rRe func (l *Libvirt) DomainEventCallbackMigrationIteration() (err error) { var buf []byte + _, err = l.requestStream(359, constants.Program, buf, nil, nil) if err != nil { return @@ -14313,6 +14459,7 @@ func (l *Libvirt) DomainEventCallbackMigrationIteration() (err error) { func (l *Libvirt) ConnectRegisterCloseCallback() (err error) { var buf []byte + _, err = l.requestStream(360, constants.Program, buf, nil, nil) if err != nil { return @@ -14325,6 +14472,7 @@ func (l *Libvirt) ConnectRegisterCloseCallback() (err error) { func (l *Libvirt) ConnectUnregisterCloseCallback() (err error) { var buf []byte + _, err = l.requestStream(361, constants.Program, buf, nil, nil) if err != nil { return @@ -14337,6 +14485,7 @@ func (l *Libvirt) ConnectUnregisterCloseCallback() (err error) { func (l *Libvirt) ConnectEventConnectionClosed() (err error) { var buf []byte + _, err = l.requestStream(362, constants.Program, buf, nil, nil) if err != nil { return @@ -14349,6 +14498,7 @@ func (l *Libvirt) ConnectEventConnectionClosed() (err error) { func (l *Libvirt) DomainEventCallbackJobCompleted() (err error) { var buf []byte + _, err = l.requestStream(363, constants.Program, buf, nil, nil) if err != nil { return @@ -14361,8 +14511,8 @@ func (l *Libvirt) DomainEventCallbackJobCompleted() (err error) { func (l *Libvirt) DomainMigrateStartPostCopy(Dom Domain, Flags uint32) (err error) { var buf []byte - args := DomainMigrateStartPostCopyArgs{ - Dom: Dom, + args := DomainMigrateStartPostCopyArgs { + Dom: Dom, Flags: Flags, } @@ -14371,6 +14521,7 @@ func (l *Libvirt) DomainMigrateStartPostCopy(Dom Domain, Flags uint32) (err erro return } + _, err = l.requestStream(364, constants.Program, buf, nil, nil) if err != nil { return @@ -14383,8 +14534,8 @@ func (l *Libvirt) DomainMigrateStartPostCopy(Dom Domain, Flags uint32) (err erro func (l *Libvirt) DomainGetPerfEvents(Dom Domain, Flags DomainModificationImpact) (rParams []TypedParam, err error) { var buf []byte - args := DomainGetPerfEventsArgs{ - Dom: Dom, + args := DomainGetPerfEventsArgs { + Dom: Dom, Flags: Flags, } @@ -14417,10 +14568,10 @@ func (l *Libvirt) DomainGetPerfEvents(Dom Domain, Flags DomainModificationImpact func (l *Libvirt) DomainSetPerfEvents(Dom Domain, Params []TypedParam, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainSetPerfEventsArgs{ - Dom: Dom, + args := DomainSetPerfEventsArgs { + Dom: Dom, Params: Params, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14428,6 +14579,7 @@ func (l *Libvirt) DomainSetPerfEvents(Dom Domain, Params []TypedParam, Flags Dom return } + _, err = l.requestStream(366, constants.Program, buf, nil, nil) if err != nil { return @@ -14440,6 +14592,7 @@ func (l *Libvirt) DomainSetPerfEvents(Dom Domain, Params []TypedParam, Flags Dom func (l *Libvirt) DomainEventCallbackDeviceRemovalFailed() (err error) { var buf []byte + _, err = l.requestStream(367, constants.Program, buf, nil, nil) if err != nil { return @@ -14452,9 +14605,9 @@ func (l *Libvirt) DomainEventCallbackDeviceRemovalFailed() (err error) { func (l *Libvirt) ConnectStoragePoolEventRegisterAny(EventID int32, Pool OptStoragePool) (rCallbackID int32, err error) { var buf []byte - args := ConnectStoragePoolEventRegisterAnyArgs{ + args := ConnectStoragePoolEventRegisterAnyArgs { EventID: EventID, - Pool: Pool, + Pool: Pool, } buf, err = encode(&args) @@ -14486,7 +14639,7 @@ func (l *Libvirt) ConnectStoragePoolEventRegisterAny(EventID int32, Pool OptStor func (l *Libvirt) ConnectStoragePoolEventDeregisterAny(CallbackID int32) (err error) { var buf []byte - args := ConnectStoragePoolEventDeregisterAnyArgs{ + args := ConnectStoragePoolEventDeregisterAnyArgs { CallbackID: CallbackID, } @@ -14495,6 +14648,7 @@ func (l *Libvirt) ConnectStoragePoolEventDeregisterAny(CallbackID int32) (err er return } + _, err = l.requestStream(369, constants.Program, buf, nil, nil) if err != nil { return @@ -14507,6 +14661,7 @@ func (l *Libvirt) ConnectStoragePoolEventDeregisterAny(CallbackID int32) (err er func (l *Libvirt) StoragePoolEventLifecycle() (err error) { var buf []byte + _, err = l.requestStream(370, constants.Program, buf, nil, nil) if err != nil { return @@ -14519,8 +14674,8 @@ func (l *Libvirt) StoragePoolEventLifecycle() (err error) { func (l *Libvirt) DomainGetGuestVcpus(Dom Domain, Flags uint32) (rParams []TypedParam, err error) { var buf []byte - args := DomainGetGuestVcpusArgs{ - Dom: Dom, + args := DomainGetGuestVcpusArgs { + Dom: Dom, Flags: Flags, } @@ -14553,11 +14708,11 @@ func (l *Libvirt) DomainGetGuestVcpus(Dom Domain, Flags uint32) (rParams []Typed func (l *Libvirt) DomainSetGuestVcpus(Dom Domain, Cpumap string, State int32, Flags uint32) (err error) { var buf []byte - args := DomainSetGuestVcpusArgs{ - Dom: Dom, + args := DomainSetGuestVcpusArgs { + Dom: Dom, Cpumap: Cpumap, - State: State, - Flags: Flags, + State: State, + Flags: Flags, } buf, err = encode(&args) @@ -14565,6 +14720,7 @@ func (l *Libvirt) DomainSetGuestVcpus(Dom Domain, Cpumap string, State int32, Fl return } + _, err = l.requestStream(372, constants.Program, buf, nil, nil) if err != nil { return @@ -14577,6 +14733,7 @@ func (l *Libvirt) DomainSetGuestVcpus(Dom Domain, Cpumap string, State int32, Fl func (l *Libvirt) StoragePoolEventRefresh() (err error) { var buf []byte + _, err = l.requestStream(373, constants.Program, buf, nil, nil) if err != nil { return @@ -14589,9 +14746,9 @@ func (l *Libvirt) StoragePoolEventRefresh() (err error) { func (l *Libvirt) ConnectNodeDeviceEventRegisterAny(EventID int32, Dev OptNodeDevice) (rCallbackID int32, err error) { var buf []byte - args := ConnectNodeDeviceEventRegisterAnyArgs{ + args := ConnectNodeDeviceEventRegisterAnyArgs { EventID: EventID, - Dev: Dev, + Dev: Dev, } buf, err = encode(&args) @@ -14623,7 +14780,7 @@ func (l *Libvirt) ConnectNodeDeviceEventRegisterAny(EventID int32, Dev OptNodeDe func (l *Libvirt) ConnectNodeDeviceEventDeregisterAny(CallbackID int32) (err error) { var buf []byte - args := ConnectNodeDeviceEventDeregisterAnyArgs{ + args := ConnectNodeDeviceEventDeregisterAnyArgs { CallbackID: CallbackID, } @@ -14632,6 +14789,7 @@ func (l *Libvirt) ConnectNodeDeviceEventDeregisterAny(CallbackID int32) (err err return } + _, err = l.requestStream(375, constants.Program, buf, nil, nil) if err != nil { return @@ -14644,6 +14802,7 @@ func (l *Libvirt) ConnectNodeDeviceEventDeregisterAny(CallbackID int32) (err err func (l *Libvirt) NodeDeviceEventLifecycle() (err error) { var buf []byte + _, err = l.requestStream(376, constants.Program, buf, nil, nil) if err != nil { return @@ -14656,6 +14815,7 @@ func (l *Libvirt) NodeDeviceEventLifecycle() (err error) { func (l *Libvirt) NodeDeviceEventUpdate() (err error) { var buf []byte + _, err = l.requestStream(377, constants.Program, buf, nil, nil) if err != nil { return @@ -14668,8 +14828,8 @@ func (l *Libvirt) NodeDeviceEventUpdate() (err error) { func (l *Libvirt) StorageVolGetInfoFlags(Vol StorageVol, Flags uint32) (rType int8, rCapacity uint64, rAllocation uint64, err error) { var buf []byte - args := StorageVolGetInfoFlagsArgs{ - Vol: Vol, + args := StorageVolGetInfoFlagsArgs { + Vol: Vol, Flags: Flags, } @@ -14712,6 +14872,7 @@ func (l *Libvirt) StorageVolGetInfoFlags(Vol StorageVol, Flags uint32) (rType in func (l *Libvirt) DomainEventCallbackMetadataChange() (err error) { var buf []byte + _, err = l.requestStream(379, constants.Program, buf, nil, nil) if err != nil { return @@ -14724,8 +14885,8 @@ func (l *Libvirt) DomainEventCallbackMetadataChange() (err error) { func (l *Libvirt) ConnectSecretEventRegisterAny(EventID int32, OptSecret OptSecret) (rCallbackID int32, err error) { var buf []byte - args := ConnectSecretEventRegisterAnyArgs{ - EventID: EventID, + args := ConnectSecretEventRegisterAnyArgs { + EventID: EventID, OptSecret: OptSecret, } @@ -14758,7 +14919,7 @@ func (l *Libvirt) ConnectSecretEventRegisterAny(EventID int32, OptSecret OptSecr func (l *Libvirt) ConnectSecretEventDeregisterAny(CallbackID int32) (err error) { var buf []byte - args := ConnectSecretEventDeregisterAnyArgs{ + args := ConnectSecretEventDeregisterAnyArgs { CallbackID: CallbackID, } @@ -14767,6 +14928,7 @@ func (l *Libvirt) ConnectSecretEventDeregisterAny(CallbackID int32) (err error) return } + _, err = l.requestStream(381, constants.Program, buf, nil, nil) if err != nil { return @@ -14779,6 +14941,7 @@ func (l *Libvirt) ConnectSecretEventDeregisterAny(CallbackID int32) (err error) func (l *Libvirt) SecretEventLifecycle() (err error) { var buf []byte + _, err = l.requestStream(382, constants.Program, buf, nil, nil) if err != nil { return @@ -14791,6 +14954,7 @@ func (l *Libvirt) SecretEventLifecycle() (err error) { func (l *Libvirt) SecretEventValueChanged() (err error) { var buf []byte + _, err = l.requestStream(383, constants.Program, buf, nil, nil) if err != nil { return @@ -14803,11 +14967,11 @@ func (l *Libvirt) SecretEventValueChanged() (err error) { func (l *Libvirt) DomainSetVcpu(Dom Domain, Cpumap string, State int32, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainSetVcpuArgs{ - Dom: Dom, + args := DomainSetVcpuArgs { + Dom: Dom, Cpumap: Cpumap, - State: State, - Flags: Flags, + State: State, + Flags: Flags, } buf, err = encode(&args) @@ -14815,6 +14979,7 @@ func (l *Libvirt) DomainSetVcpu(Dom Domain, Cpumap string, State int32, Flags Do return } + _, err = l.requestStream(384, constants.Program, buf, nil, nil) if err != nil { return @@ -14827,6 +14992,7 @@ func (l *Libvirt) DomainSetVcpu(Dom Domain, Cpumap string, State int32, Flags Do func (l *Libvirt) DomainEventBlockThreshold() (err error) { var buf []byte + _, err = l.requestStream(385, constants.Program, buf, nil, nil) if err != nil { return @@ -14839,11 +15005,11 @@ func (l *Libvirt) DomainEventBlockThreshold() (err error) { func (l *Libvirt) DomainSetBlockThreshold(Dom Domain, Dev string, Threshold uint64, Flags uint32) (err error) { var buf []byte - args := DomainSetBlockThresholdArgs{ - Dom: Dom, - Dev: Dev, + args := DomainSetBlockThresholdArgs { + Dom: Dom, + Dev: Dev, Threshold: Threshold, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14851,6 +15017,7 @@ func (l *Libvirt) DomainSetBlockThreshold(Dom Domain, Dev string, Threshold uint return } + _, err = l.requestStream(386, constants.Program, buf, nil, nil) if err != nil { return @@ -14863,8 +15030,8 @@ func (l *Libvirt) DomainSetBlockThreshold(Dom Domain, Dev string, Threshold uint func (l *Libvirt) DomainMigrateGetMaxDowntime(Dom Domain, Flags uint32) (rDowntime uint64, err error) { var buf []byte - args := DomainMigrateGetMaxDowntimeArgs{ - Dom: Dom, + args := DomainMigrateGetMaxDowntimeArgs { + Dom: Dom, Flags: Flags, } @@ -14897,8 +15064,8 @@ func (l *Libvirt) DomainMigrateGetMaxDowntime(Dom Domain, Flags uint32) (rDownti func (l *Libvirt) DomainManagedSaveGetXMLDesc(Dom Domain, Flags DomainXMLFlags) (rXML string, err error) { var buf []byte - args := DomainManagedSaveGetXMLDescArgs{ - Dom: Dom, + args := DomainManagedSaveGetXMLDescArgs { + Dom: Dom, Flags: Flags, } @@ -14931,9 +15098,9 @@ func (l *Libvirt) DomainManagedSaveGetXMLDesc(Dom Domain, Flags DomainXMLFlags) func (l *Libvirt) DomainManagedSaveDefineXML(Dom Domain, Dxml OptString, Flags DomainSaveRestoreFlags) (err error) { var buf []byte - args := DomainManagedSaveDefineXMLArgs{ - Dom: Dom, - Dxml: Dxml, + args := DomainManagedSaveDefineXMLArgs { + Dom: Dom, + Dxml: Dxml, Flags: Flags, } @@ -14942,6 +15109,7 @@ func (l *Libvirt) DomainManagedSaveDefineXML(Dom Domain, Dxml OptString, Flags D return } + _, err = l.requestStream(389, constants.Program, buf, nil, nil) if err != nil { return @@ -14954,11 +15122,11 @@ func (l *Libvirt) DomainManagedSaveDefineXML(Dom Domain, Dxml OptString, Flags D func (l *Libvirt) DomainSetLifecycleAction(Dom Domain, Type uint32, Action uint32, Flags DomainModificationImpact) (err error) { var buf []byte - args := DomainSetLifecycleActionArgs{ - Dom: Dom, - Type: Type, + args := DomainSetLifecycleActionArgs { + Dom: Dom, + Type: Type, Action: Action, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -14966,6 +15134,7 @@ func (l *Libvirt) DomainSetLifecycleAction(Dom Domain, Type uint32, Action uint3 return } + _, err = l.requestStream(390, constants.Program, buf, nil, nil) if err != nil { return @@ -14978,7 +15147,7 @@ func (l *Libvirt) DomainSetLifecycleAction(Dom Domain, Type uint32, Action uint3 func (l *Libvirt) StoragePoolLookupByTargetPath(Path string) (rPool StoragePool, err error) { var buf []byte - args := StoragePoolLookupByTargetPathArgs{ + args := StoragePoolLookupByTargetPathArgs { Path: Path, } @@ -15011,8 +15180,8 @@ func (l *Libvirt) StoragePoolLookupByTargetPath(Path string) (rPool StoragePool, func (l *Libvirt) DomainDetachDeviceAlias(Dom Domain, Alias string, Flags uint32) (err error) { var buf []byte - args := DomainDetachDeviceAliasArgs{ - Dom: Dom, + args := DomainDetachDeviceAliasArgs { + Dom: Dom, Alias: Alias, Flags: Flags, } @@ -15022,6 +15191,7 @@ func (l *Libvirt) DomainDetachDeviceAlias(Dom Domain, Alias string, Flags uint32 return } + _, err = l.requestStream(392, constants.Program, buf, nil, nil) if err != nil { return @@ -15034,13 +15204,13 @@ func (l *Libvirt) DomainDetachDeviceAlias(Dom Domain, Alias string, Flags uint32 func (l *Libvirt) ConnectCompareHypervisorCPU(Emulator OptString, Arch OptString, Machine OptString, Virttype OptString, XMLCPU string, Flags uint32) (rResult int32, err error) { var buf []byte - args := ConnectCompareHypervisorCPUArgs{ + args := ConnectCompareHypervisorCPUArgs { Emulator: Emulator, - Arch: Arch, - Machine: Machine, + Arch: Arch, + Machine: Machine, Virttype: Virttype, - XMLCPU: XMLCPU, - Flags: Flags, + XMLCPU: XMLCPU, + Flags: Flags, } buf, err = encode(&args) @@ -15072,13 +15242,13 @@ func (l *Libvirt) ConnectCompareHypervisorCPU(Emulator OptString, Arch OptString func (l *Libvirt) ConnectBaselineHypervisorCPU(Emulator OptString, Arch OptString, Machine OptString, Virttype OptString, XMLCPUs []string, Flags uint32) (rCPU string, err error) { var buf []byte - args := ConnectBaselineHypervisorCPUArgs{ + args := ConnectBaselineHypervisorCPUArgs { Emulator: Emulator, - Arch: Arch, - Machine: Machine, + Arch: Arch, + Machine: Machine, Virttype: Virttype, - XMLCPUs: XMLCPUs, - Flags: Flags, + XMLCPUs: XMLCPUs, + Flags: Flags, } buf, err = encode(&args) @@ -15110,9 +15280,9 @@ func (l *Libvirt) ConnectBaselineHypervisorCPU(Emulator OptString, Arch OptStrin func (l *Libvirt) NodeGetSevInfo(Nparams int32, Flags uint32) (rParams []TypedParam, rNparams int32, err error) { var buf []byte - args := NodeGetSevInfoArgs{ + args := NodeGetSevInfoArgs { Nparams: Nparams, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -15149,8 +15319,8 @@ func (l *Libvirt) NodeGetSevInfo(Nparams int32, Flags uint32) (rParams []TypedPa func (l *Libvirt) DomainGetLaunchSecurityInfo(Dom Domain, Flags uint32) (rParams []TypedParam, err error) { var buf []byte - args := DomainGetLaunchSecurityInfoArgs{ - Dom: Dom, + args := DomainGetLaunchSecurityInfoArgs { + Dom: Dom, Flags: Flags, } @@ -15183,7 +15353,7 @@ func (l *Libvirt) DomainGetLaunchSecurityInfo(Dom Domain, Flags uint32) (rParams func (l *Libvirt) NwfilterBindingLookupByPortDev(Name string) (rOptNwfilter NwfilterBinding, err error) { var buf []byte - args := NwfilterBindingLookupByPortDevArgs{ + args := NwfilterBindingLookupByPortDevArgs { Name: Name, } @@ -15216,9 +15386,9 @@ func (l *Libvirt) NwfilterBindingLookupByPortDev(Name string) (rOptNwfilter Nwfi func (l *Libvirt) NwfilterBindingGetXMLDesc(OptNwfilter NwfilterBinding, Flags uint32) (rXML string, err error) { var buf []byte - args := NwfilterBindingGetXMLDescArgs{ + args := NwfilterBindingGetXMLDescArgs { OptNwfilter: OptNwfilter, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -15250,8 +15420,8 @@ func (l *Libvirt) NwfilterBindingGetXMLDesc(OptNwfilter NwfilterBinding, Flags u func (l *Libvirt) NwfilterBindingCreateXML(XML string, Flags uint32) (rOptNwfilter NwfilterBinding, err error) { var buf []byte - args := NwfilterBindingCreateXMLArgs{ - XML: XML, + args := NwfilterBindingCreateXMLArgs { + XML: XML, Flags: Flags, } @@ -15284,7 +15454,7 @@ func (l *Libvirt) NwfilterBindingCreateXML(XML string, Flags uint32) (rOptNwfilt func (l *Libvirt) NwfilterBindingDelete(OptNwfilter NwfilterBinding) (err error) { var buf []byte - args := NwfilterBindingDeleteArgs{ + args := NwfilterBindingDeleteArgs { OptNwfilter: OptNwfilter, } @@ -15293,6 +15463,7 @@ func (l *Libvirt) NwfilterBindingDelete(OptNwfilter NwfilterBinding) (err error) return } + _, err = l.requestStream(400, constants.Program, buf, nil, nil) if err != nil { return @@ -15305,9 +15476,9 @@ func (l *Libvirt) NwfilterBindingDelete(OptNwfilter NwfilterBinding) (err error) func (l *Libvirt) ConnectListAllNwfilterBindings(NeedResults int32, Flags uint32) (rBindings []NwfilterBinding, rRet uint32, err error) { var buf []byte - args := ConnectListAllNwfilterBindingsArgs{ + args := ConnectListAllNwfilterBindingsArgs { NeedResults: NeedResults, - Flags: Flags, + Flags: Flags, } buf, err = encode(&args) @@ -15344,11 +15515,11 @@ func (l *Libvirt) ConnectListAllNwfilterBindings(NeedResults int32, Flags uint32 func (l *Libvirt) DomainSetIothreadParams(Dom Domain, IothreadID uint32, Params []TypedParam, Flags uint32) (err error) { var buf []byte - args := DomainSetIothreadParamsArgs{ - Dom: Dom, + args := DomainSetIothreadParamsArgs { + Dom: Dom, IothreadID: IothreadID, - Params: Params, - Flags: Flags, + Params: Params, + Flags: Flags, } buf, err = encode(&args) @@ -15356,6 +15527,7 @@ func (l *Libvirt) DomainSetIothreadParams(Dom Domain, IothreadID uint32, Params return } + _, err = l.requestStream(402, constants.Program, buf, nil, nil) if err != nil { return @@ -15363,3 +15535,4 @@ func (l *Libvirt) DomainSetIothreadParams(Dom Domain, IothreadID uint32, Params return } + diff --git a/vendor/github.com/digitalocean/go-libvirt/units.go b/vendor/github.com/digitalocean/go-libvirt/units.go index 85f4d4f01..03686507f 100644 --- a/vendor/github.com/digitalocean/go-libvirt/units.go +++ b/vendor/github.com/digitalocean/go-libvirt/units.go @@ -18,10 +18,10 @@ package libvirt const ( - // B - byte - B = 1 - // KiB - kibibyte + // B - byte + B = 1 + // KiB - kibibyte KiB = 1024 * B - // MiB - mebibyte + // MiB - mebibyte MiB = 1024 * KiB ) diff --git a/vendor/github.com/golang-collections/collections/stack/stack.go b/vendor/github.com/golang-collections/collections/stack/stack.go index fc75f45a0..04063dfab 100644 --- a/vendor/github.com/golang-collections/collections/stack/stack.go +++ b/vendor/github.com/golang-collections/collections/stack/stack.go @@ -2,25 +2,22 @@ package stack type ( Stack struct { - top *node + top *node length int } node struct { value interface{} - prev *node - } + prev *node + } ) - // Create a new stack func New() *Stack { - return &Stack{nil, 0} + return &Stack{nil,0} } - // Return the number of items in the stack func (this *Stack) Len() int { return this.length } - // View the top item on the stack func (this *Stack) Peek() interface{} { if this.length == 0 { @@ -28,22 +25,20 @@ func (this *Stack) Peek() interface{} { } return this.top.value } - // Pop the top item of the stack and return it func (this *Stack) Pop() interface{} { if this.length == 0 { return nil } - + n := this.top this.top = n.prev this.length-- return n.value } - // Push a value onto the top of the stack func (this *Stack) Push(value interface{}) { - n := &node{value, this.top} + n := &node{value,this.top} this.top = n this.length++ -} +} \ No newline at end of file diff --git a/vendor/github.com/hashicorp/go-getter/gcs/v2/get_gcs.go b/vendor/github.com/hashicorp/go-getter/gcs/v2/get_gcs.go index 97ae6e318..dd9b6f256 100644 --- a/vendor/github.com/hashicorp/go-getter/gcs/v2/get_gcs.go +++ b/vendor/github.com/hashicorp/go-getter/gcs/v2/get_gcs.go @@ -15,7 +15,7 @@ import ( // Getter is a Getter implementation that will download a module from // a GCS bucket. -type Getter struct{} +type Getter struct {} func (g *Getter) Mode(ctx context.Context, u *url.URL) (getter.Mode, error) { diff --git a/vendor/github.com/hashicorp/go-sockaddr/ifaddrs.go b/vendor/github.com/hashicorp/go-sockaddr/ifaddrs.go index d58cb50af..80f61bef6 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/ifaddrs.go +++ b/vendor/github.com/hashicorp/go-sockaddr/ifaddrs.go @@ -1214,7 +1214,7 @@ func parseDefaultIfNameFromIPCmd(routeOut string) (string, error) { // Android. func parseDefaultIfNameFromIPCmdAndroid(routeOut string) (string, error) { parsedLines := parseIfNameFromIPCmd(routeOut) - if len(parsedLines) > 0 { + if (len(parsedLines) > 0) { ifName := strings.TrimSpace(parsedLines[0][4]) return ifName, nil } @@ -1222,6 +1222,7 @@ func parseDefaultIfNameFromIPCmdAndroid(routeOut string) (string, error) { return "", errors.New("No default interface found") } + // parseIfNameFromIPCmd parses interfaces from ip(8) for // Linux. func parseIfNameFromIPCmd(routeOut string) [][]string { diff --git a/vendor/github.com/hashicorp/go-sockaddr/route_info_android.go b/vendor/github.com/hashicorp/go-sockaddr/route_info_android.go index 6f484cc44..9885915a6 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/route_info_android.go +++ b/vendor/github.com/hashicorp/go-sockaddr/route_info_android.go @@ -25,6 +25,7 @@ func (ri routeInfo) GetDefaultInterfaceName() (string, error) { return "", err } + var ifName string if ifName, err = parseDefaultIfNameFromIPCmdAndroid(string(out)); err != nil { return "", errors.New("No default interface found") diff --git a/vendor/github.com/hashicorp/go-uuid/uuid.go b/vendor/github.com/hashicorp/go-uuid/uuid.go index 6424c8465..0c10c4e9f 100644 --- a/vendor/github.com/hashicorp/go-uuid/uuid.go +++ b/vendor/github.com/hashicorp/go-uuid/uuid.go @@ -24,6 +24,7 @@ func GenerateRandomBytesWithReader(size int, reader io.Reader) ([]byte, error) { return buf, nil } + const uuidLen = 16 // GenerateUUID is used to generate a random UUID @@ -57,7 +58,7 @@ func FormatUUID(buf []byte) (string, error) { } func ParseUUID(uuid string) ([]byte, error) { - if len(uuid) != 2*uuidLen+4 { + if len(uuid) != 2 * uuidLen + 4 { return nil, fmt.Errorf("uuid string is wrong length") } diff --git a/vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go b/vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go index a0b97e3f7..92d70934d 100644 --- a/vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go +++ b/vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go @@ -34,6 +34,6 @@ type LRUCache interface { // Clears all cache entries. Purge() - // Resizes cache, returning number evicted - Resize(int) int + // Resizes cache, returning number evicted + Resize(int) int } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Config.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Config.go index b93c4ffb0..993bb0319 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Config.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Config.go @@ -41,4 +41,4 @@ func (c *Config) SetEndpoint(endpoint string) { func (c *Config) SetTimeout(timeout time.Duration) { c.Timeout = timeout -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Const.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Const.go index 3ba92895d..bb8341d8e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Const.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Const.go @@ -29,3 +29,4 @@ const ( HeaderJdcloudPrefix = "x-jdcloud" HeaderJdcloudRequestId = "x-jdcloud-request-id" ) + diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/JdcloudClient.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/JdcloudClient.go index 125d3734f..82adae99e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/JdcloudClient.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/JdcloudClient.go @@ -15,12 +15,12 @@ package core import ( - "encoding/base64" - "encoding/json" - "fmt" "net/http" "strings" "time" + "fmt" + "encoding/json" + "encoding/base64" ) // JDCloudClient is the base struct of service clients diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Logger.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Logger.go index 7f057c9bb..deff03c9c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Logger.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Logger.go @@ -20,11 +20,11 @@ const ( LogFatal = iota LogError LogWarn - LogInfo + LogInfo ) type Logger interface { - Log(level int, message ...interface{}) + Log(level int, message... interface{}) } type DefaultLogger struct { @@ -35,8 +35,9 @@ func NewDefaultLogger(level int) *DefaultLogger { return &DefaultLogger{level} } -func (logger DefaultLogger) Log(level int, message ...interface{}) { +func (logger DefaultLogger) Log (level int, message... interface{}) { if level <= logger.Level { fmt.Println(message...) } } + diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ParameterBuilder.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ParameterBuilder.go index d90c53596..a48dcc5d1 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ParameterBuilder.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ParameterBuilder.go @@ -16,12 +16,12 @@ package core import ( "encoding/json" - "errors" "fmt" - urllib "net/url" - "reflect" "regexp" "strings" + "errors" + "reflect" + urllib "net/url" ) var baseRequestFields []string @@ -72,7 +72,7 @@ func (b WithBodyBuilder) BuildURL(url string, paramJson []byte) (string, error) return "", err } - b.Logger.Log(LogInfo, "URL="+encodedUrl) + b.Logger.Log(LogInfo, "URL=" + encodedUrl) return encodedUrl, nil } @@ -123,7 +123,7 @@ func (b WithoutBodyBuilder) BuildURL(url string, paramJson []byte) (string, erro } b.Logger.Log(LogInfo, string(paramJson)) - b.Logger.Log(LogInfo, "URL="+encodedUrl) + b.Logger.Log(LogInfo, "URL=" + encodedUrl) return encodedUrl, nil } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ResponseProcessor.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ResponseProcessor.go index 294559d5a..217b4b868 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ResponseProcessor.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/ResponseProcessor.go @@ -1,10 +1,10 @@ package core import ( + "net/http" + "io/ioutil" "errors" "fmt" - "io/ioutil" - "net/http" ) type ResponseProcessor interface { @@ -37,4 +37,4 @@ func (p WithoutBodyResponseProcessor) Process(response *http.Response) ([]byte, } return nil, errors.New("can not get requestId in HEAD response") -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Signer.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Signer.go index 337764b2c..670868597 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Signer.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Signer.go @@ -17,18 +17,18 @@ package core import ( - "bytes" "crypto/hmac" "crypto/sha256" "encoding/hex" "fmt" - "github.com/gofrs/uuid" "io" "net/http" "net/url" "sort" "strings" "time" + "bytes" + "github.com/gofrs/uuid" ) const ( @@ -40,7 +40,7 @@ const ( emptyStringSHA256 = `e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855` ) -var ignoredHeaders = []string{"Authorization", "User-Agent", "X-Jdcloud-Request-Id"} +var ignoredHeaders = []string {"Authorization", "User-Agent", "X-Jdcloud-Request-Id"} var noEscape [256]bool func init() { @@ -56,15 +56,16 @@ func init() { } } + type Signer struct { Credentials Credential - Logger Logger + Logger Logger } func NewSigner(credsProvider Credential, logger Logger) *Signer { return &Signer{ Credentials: credsProvider, - Logger: logger, + Logger: logger, } } @@ -101,13 +102,13 @@ func (v4 Signer) signWithBody(r *http.Request, body io.ReadSeeker, service, regi signTime time.Time) (http.Header, error) { ctx := &signingCtx{ - Request: r, - Body: body, - Query: r.URL.Query(), - Time: signTime, - ExpireTime: exp, - ServiceName: service, - Region: region, + Request: r, + Body: body, + Query: r.URL.Query(), + Time: signTime, + ExpireTime: exp, + ServiceName: service, + Region: region, } for key := range ctx.Query { @@ -140,7 +141,7 @@ func (v4 *Signer) logSigningInfo(ctx *signingCtx) { func (ctx *signingCtx) build() { ctx.buildTime() // no depends - ctx.buildNonce() // no depends + ctx.buildNonce() // no depends ctx.buildCredentialString() // no depends ctx.buildBodyDigest() diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Utils.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Utils.go index ce09b2e30..62e2edbf4 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Utils.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/core/Utils.go @@ -8,4 +8,4 @@ func includes(fields []string, field string) bool { } return false -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/Charge.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/Charge.go index caaa692be..c9669e0c5 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/Charge.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/Charge.go @@ -16,20 +16,21 @@ package models + type Charge struct { - /* 支付模式，取值为：prepaid_by_duration，postpaid_by_usage或postpaid_by_duration，prepaid_by_duration表示预付费，postpaid_by_usage表示按用量后付费，postpaid_by_duration表示按配置后付费，默认为postpaid_by_duration (Optional) */ - ChargeMode string `json:"chargeMode"` + /* 支付模式，取值为：prepaid_by_duration，postpaid_by_usage或postpaid_by_duration，prepaid_by_duration表示预付费，postpaid_by_usage表示按用量后付费，postpaid_by_duration表示按配置后付费，默认为postpaid_by_duration (Optional) */ + ChargeMode string `json:"chargeMode"` - /* 费用支付状态，取值为：normal、overdue、arrear，normal表示正常，overdue表示已到期，arrear表示欠费 (Optional) */ - ChargeStatus string `json:"chargeStatus"` + /* 费用支付状态，取值为：normal、overdue、arrear，normal表示正常，overdue表示已到期，arrear表示欠费 (Optional) */ + ChargeStatus string `json:"chargeStatus"` - /* 计费开始时间，遵循ISO8601标准，使用UTC时间，格式为：YYYY-MM-DDTHH:mm:ssZ (Optional) */ - ChargeStartTime string `json:"chargeStartTime"` + /* 计费开始时间，遵循ISO8601标准，使用UTC时间，格式为：YYYY-MM-DDTHH:mm:ssZ (Optional) */ + ChargeStartTime string `json:"chargeStartTime"` - /* 过期时间，预付费资源的到期时间，遵循ISO8601标准，使用UTC时间，格式为：YYYY-MM-DDTHH:mm:ssZ，后付费资源此字段内容为空 (Optional) */ - ChargeExpiredTime string `json:"chargeExpiredTime"` + /* 过期时间，预付费资源的到期时间，遵循ISO8601标准，使用UTC时间，格式为：YYYY-MM-DDTHH:mm:ssZ，后付费资源此字段内容为空 (Optional) */ + ChargeExpiredTime string `json:"chargeExpiredTime"` - /* 预期释放时间，资源的预期释放时间，预付费/后付费资源均有此值，遵循ISO8601标准，使用UTC时间，格式为：YYYY-MM-DDTHH:mm:ssZ (Optional) */ - ChargeRetireTime string `json:"chargeRetireTime"` + /* 预期释放时间，资源的预期释放时间，预付费/后付费资源均有此值，遵循ISO8601标准，使用UTC时间，格式为：YYYY-MM-DDTHH:mm:ssZ (Optional) */ + ChargeRetireTime string `json:"chargeRetireTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/ChargeSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/ChargeSpec.go index 1daedb863..32169444e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/ChargeSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models/ChargeSpec.go @@ -16,14 +16,15 @@ package models + type ChargeSpec struct { - /* 计费模式，取值为：prepaid_by_duration，postpaid_by_usage或postpaid_by_duration，prepaid_by_duration表示预付费，postpaid_by_usage表示按用量后付费，postpaid_by_duration表示按配置后付费，默认为postpaid_by_duration (Optional) */ - ChargeMode *string `json:"chargeMode"` + /* 计费模式，取值为：prepaid_by_duration，postpaid_by_usage或postpaid_by_duration，prepaid_by_duration表示预付费，postpaid_by_usage表示按用量后付费，postpaid_by_duration表示按配置后付费，默认为postpaid_by_duration (Optional) */ + ChargeMode *string `json:"chargeMode"` - /* 预付费计费单位，当chargeMode为prepaid_by_duration时有效，取值为：month、year，默认为month (Optional) */ - ChargeUnit *string `json:"chargeUnit"` + /* 预付费计费单位，当chargeMode为prepaid_by_duration时有效，取值为：month、year，默认为month (Optional) */ + ChargeUnit *string `json:"chargeUnit"` - /* 预付费计费时长，当chargeMode取值为prepaid_by_duration时有效。当chargeUnit为month时取值为：1~9，当chargeUnit为year时取值为：1、2、3 (Optional) */ - ChargeDuration *int `json:"chargeDuration"` + /* 预付费计费时长，当chargeMode取值为prepaid_by_duration时有效。当chargeUnit为month时取值为：1~9，当chargeUnit为year时取值为：1、2、3 (Optional) */ + ChargeDuration *int `json:"chargeDuration"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Filter.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Filter.go index 8e6630337..e89325aed 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Filter.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Filter.go @@ -16,14 +16,15 @@ package models + type Filter struct { - /* 过滤条件的名称 */ - Name string `json:"name"` + /* 过滤条件的名称 */ + Name string `json:"name"` - /* 过滤条件的操作符，默认eq (Optional) */ - Operator *string `json:"operator"` + /* 过滤条件的操作符，默认eq (Optional) */ + Operator *string `json:"operator"` - /* 过滤条件的值 */ - Values []string `json:"values"` + /* 过滤条件的值 */ + Values []string `json:"values"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Quota.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Quota.go index 15e4f43b2..a9553732c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Quota.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Quota.go @@ -16,14 +16,15 @@ package models + type Quota struct { - /* 配额项的名称 (Optional) */ - Name string `json:"name"` + /* 配额项的名称 (Optional) */ + Name string `json:"name"` - /* 配额 (Optional) */ - Max int `json:"max"` + /* 配额 (Optional) */ + Max int `json:"max"` - /* 已使用的数目 (Optional) */ - Used int `json:"used"` + /* 已使用的数目 (Optional) */ + Used int `json:"used"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/SimpleResponses.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/SimpleResponses.go index 03cfabb64..dcc6059fd 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/SimpleResponses.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/SimpleResponses.go @@ -16,8 +16,9 @@ package models + type SimpleResponses struct { - /* Request ID (Optional) */ - RequestId string `json:"requestId"` + /* Request ID (Optional) */ + RequestId string `json:"requestId"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Sort.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Sort.go index 07e0e0f1b..b99a1853a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Sort.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/Sort.go @@ -16,11 +16,12 @@ package models + type Sort struct { - /* 排序条件的名称 (Optional) */ - Name *string `json:"name"` + /* 排序条件的名称 (Optional) */ + Name *string `json:"name"` - /* 排序条件的方向 (Optional) */ - Direction *string `json:"direction"` + /* 排序条件的方向 (Optional) */ + Direction *string `json:"direction"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/TagFilter.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/TagFilter.go index 18ae84e7a..60e1f0774 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/TagFilter.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/common/models/TagFilter.go @@ -16,11 +16,12 @@ package models + type TagFilter struct { - /* Tag键 */ - Key string `json:"key"` + /* Tag键 */ + Key string `json:"key"` - /* Tag值 */ - Values []string `json:"values"` + /* Tag值 */ + Values []string `json:"values"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Disk.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Disk.go index 937518878..27a2f0a2a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Disk.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Disk.go @@ -20,54 +20,54 @@ import charge "github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models" type Disk struct { - /* 云硬盘ID (Optional) */ - DiskId string `json:"diskId"` + /* 云硬盘ID (Optional) */ + DiskId string `json:"diskId"` - /* 云硬盘所属AZ (Optional) */ - Az string `json:"az"` + /* 云硬盘所属AZ (Optional) */ + Az string `json:"az"` - /* 云硬盘名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - Name string `json:"name"` + /* 云硬盘名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + Name string `json:"name"` - /* 云硬盘描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* 云硬盘描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` - /* 云硬盘类型，取值为 ssd,premium-hdd,ssd.gp1,ssd.io1,hdd.std1 (Optional) */ - DiskType string `json:"diskType"` + /* 云硬盘类型，取值为 ssd,premium-hdd,ssd.gp1,ssd.io1,hdd.std1 (Optional) */ + DiskType string `json:"diskType"` - /* 云硬盘大小，单位为 GiB (Optional) */ - DiskSizeGB int `json:"diskSizeGB"` + /* 云硬盘大小，单位为 GiB (Optional) */ + DiskSizeGB int `json:"diskSizeGB"` - /* 该云硬盘实际应用的iops值 (Optional) */ - Iops int `json:"iops"` + /* 该云硬盘实际应用的iops值 (Optional) */ + Iops int `json:"iops"` - /* 该云硬盘实际应用的吞吐量的数值 (Optional) */ - Throughput int `json:"throughput"` + /* 该云硬盘实际应用的吞吐量的数值 (Optional) */ + Throughput int `json:"throughput"` - /* 云硬盘状态，取值为 creating、available、in-use、extending、restoring、deleting、deleted、error_create、error_delete、error_restore、error_extend 之一 (Optional) */ - Status string `json:"status"` + /* 云硬盘状态，取值为 creating、available、in-use、extending、restoring、deleting、deleted、error_create、error_delete、error_restore、error_extend 之一 (Optional) */ + Status string `json:"status"` - /* 挂载信息 (Optional) */ - Attachments []DiskAttachment `json:"attachments"` + /* 挂载信息 (Optional) */ + Attachments []DiskAttachment `json:"attachments"` - /* 创建该云硬盘的快照ID (Optional) */ - SnapshotId string `json:"snapshotId"` + /* 创建该云硬盘的快照ID (Optional) */ + SnapshotId string `json:"snapshotId"` - /* 云盘是否支持多挂载 (Optional) */ - MultiAttachable bool `json:"multiAttachable"` + /* 云盘是否支持多挂载 (Optional) */ + MultiAttachable bool `json:"multiAttachable"` - /* 云盘是否为加密盘 (Optional) */ - Encrypted bool `json:"encrypted"` + /* 云盘是否为加密盘 (Optional) */ + Encrypted bool `json:"encrypted"` - /* 云盘是否被暂停（IOPS限制为极低） (Optional) */ - Enable bool `json:"enable"` + /* 云盘是否被暂停（IOPS限制为极低） (Optional) */ + Enable bool `json:"enable"` - /* 创建云硬盘时间 (Optional) */ - CreateTime string `json:"createTime"` + /* 创建云硬盘时间 (Optional) */ + CreateTime string `json:"createTime"` - /* 云硬盘计费配置信息 (Optional) */ - Charge charge.Charge `json:"charge"` + /* 云硬盘计费配置信息 (Optional) */ + Charge charge.Charge `json:"charge"` - /* Tag信息 (Optional) */ - Tags []Tag `json:"tags"` + /* Tag信息 (Optional) */ + Tags []Tag `json:"tags"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskAttachment.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskAttachment.go index 17e068c63..220f3a51f 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskAttachment.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskAttachment.go @@ -16,23 +16,24 @@ package models + type DiskAttachment struct { - /* 挂载ID (Optional) */ - AttachmentId string `json:"attachmentId"` + /* 挂载ID (Optional) */ + AttachmentId string `json:"attachmentId"` - /* 云硬盘ID (Optional) */ - DiskId string `json:"diskId"` + /* 云硬盘ID (Optional) */ + DiskId string `json:"diskId"` - /* 挂载实例的类型，取值为 vm、nc (Optional) */ - InstanceType string `json:"instanceType"` + /* 挂载实例的类型，取值为 vm、nc (Optional) */ + InstanceType string `json:"instanceType"` - /* 挂载实例的ID (Optional) */ - InstanceId string `json:"instanceId"` + /* 挂载实例的ID (Optional) */ + InstanceId string `json:"instanceId"` - /* 挂载状态，取值为 "attaching", "attached", "detaching", "detached" (Optional) */ - Status string `json:"status"` + /* 挂载状态，取值为 "attaching", "attached", "detaching", "detached" (Optional) */ + Status string `json:"status"` - /* 挂载时间 (Optional) */ - AttachTime string `json:"attachTime"` + /* 挂载时间 (Optional) */ + AttachTime string `json:"attachTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpec.go index a9956c021..c694ebf82 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpec.go @@ -20,30 +20,30 @@ import charge "github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models" type DiskSpec struct { - /* 云硬盘所属的可用区 */ - Az string `json:"az"` + /* 云硬盘所属的可用区 */ + Az string `json:"az"` - /* 云硬盘名称 */ - Name string `json:"name"` + /* 云硬盘名称 */ + Name string `json:"name"` - /* 云硬盘描述 (Optional) */ - Description *string `json:"description"` + /* 云硬盘描述 (Optional) */ + Description *string `json:"description"` - /* 云硬盘类型，取值为ssd、premium-hdd、ssd.gp1、ssd.io1、hdd.std1之一 */ - DiskType string `json:"diskType"` + /* 云硬盘类型，取值为ssd、premium-hdd、ssd.gp1、ssd.io1、hdd.std1之一 */ + DiskType string `json:"diskType"` - /* 云硬盘大小，单位为 GiB，ssd 类型取值范围[20,1000]GB，步长为10G，premium-hdd 类型取值范围[20,3000]GB，步长为10G */ - DiskSizeGB int `json:"diskSizeGB"` + /* 云硬盘大小，单位为 GiB，ssd 类型取值范围[20,1000]GB，步长为10G，premium-hdd 类型取值范围[20,3000]GB，步长为10G */ + DiskSizeGB int `json:"diskSizeGB"` - /* 用于创建云硬盘的快照ID (Optional) */ - SnapshotId *string `json:"snapshotId"` + /* 用于创建云硬盘的快照ID (Optional) */ + SnapshotId *string `json:"snapshotId"` - /* 计费配置；如不指定，默认计费类型是后付费-按使用时常付费 (Optional) */ - Charge *charge.ChargeSpec `json:"charge"` + /* 计费配置；如不指定，默认计费类型是后付费-按使用时常付费 (Optional) */ + Charge *charge.ChargeSpec `json:"charge"` - /* 云硬盘是否支持一盘多主机挂载，默认为false（不支持） (Optional) */ - MultiAttachable *bool `json:"multiAttachable"` + /* 云硬盘是否支持一盘多主机挂载，默认为false（不支持） (Optional) */ + MultiAttachable *bool `json:"multiAttachable"` - /* 云硬盘是否加密，默认为false（不加密） (Optional) */ - Encrypt *bool `json:"encrypt"` + /* 云硬盘是否加密，默认为false（不加密） (Optional) */ + Encrypt *bool `json:"encrypt"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpecification.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpecification.go index a021a754c..8f439a49e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpecification.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/DiskSpecification.go @@ -16,38 +16,39 @@ package models + type DiskSpecification struct { - /* 云硬盘类型 (Optional) */ - DiskType string `json:"diskType"` + /* 云硬盘类型 (Optional) */ + DiskType string `json:"diskType"` - /* 支持的最小尺寸，单位为 GiB (Optional) */ - MinSizeGB int `json:"minSizeGB"` + /* 支持的最小尺寸，单位为 GiB (Optional) */ + MinSizeGB int `json:"minSizeGB"` - /* 支持的最大尺寸，单位为 GiB (Optional) */ - MaxSizeGB int `json:"maxSizeGB"` + /* 支持的最大尺寸，单位为 GiB (Optional) */ + MaxSizeGB int `json:"maxSizeGB"` - /* 步长尺寸，单位为 GiB (Optional) */ - StepSizeGB int `json:"stepSizeGB"` + /* 步长尺寸，单位为 GiB (Optional) */ + StepSizeGB int `json:"stepSizeGB"` - /* 描述信息 (Optional) */ - Description string `json:"description"` + /* 描述信息 (Optional) */ + Description string `json:"description"` - /* 默认的iops数量(基础iops数量) (Optional) */ - DefaultIOPS int `json:"defaultIOPS"` + /* 默认的iops数量(基础iops数量) (Optional) */ + DefaultIOPS int `json:"defaultIOPS"` - /* iops步长增量 (Optional) */ - StepIOPS float32 `json:"stepIOPS"` + /* iops步长增量 (Optional) */ + StepIOPS float32 `json:"stepIOPS"` - /* 最大iops数量 (Optional) */ - MaxIOPS int `json:"maxIOPS"` + /* 最大iops数量 (Optional) */ + MaxIOPS int `json:"maxIOPS"` - /* 默认的吞吐量 (Optional) */ - DefaultThroughput int `json:"defaultThroughput"` + /* 默认的吞吐量 (Optional) */ + DefaultThroughput int `json:"defaultThroughput"` - /* 吞吐量步长增量 (Optional) */ - StepThroughput float32 `json:"stepThroughput"` + /* 吞吐量步长增量 (Optional) */ + StepThroughput float32 `json:"stepThroughput"` - /* 最大吞吐量 (Optional) */ - MaxThroughput int `json:"maxThroughput"` + /* 最大吞吐量 (Optional) */ + MaxThroughput int `json:"maxThroughput"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Quota.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Quota.go index 372b997e3..4f318f4a0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Quota.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Quota.go @@ -16,11 +16,12 @@ package models + type Quota struct { - /* 配额 (Optional) */ - Limit int `json:"limit"` + /* 配额 (Optional) */ + Limit int `json:"limit"` - /* 已使用的数目 (Optional) */ - Used int `json:"used"` + /* 已使用的数目 (Optional) */ + Used int `json:"used"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/ShareInfo.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/ShareInfo.go index 4a0c63491..70f5df781 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/ShareInfo.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/ShareInfo.go @@ -16,11 +16,12 @@ package models + type ShareInfo struct { - /* 被共享快照的用户的pin (Optional) */ - ShareTo string `json:"shareTo"` + /* 被共享快照的用户的pin (Optional) */ + ShareTo string `json:"shareTo"` - /* 共享时间 (Optional) */ - ShareTime string `json:"shareTime"` + /* 共享时间 (Optional) */ + ShareTime string `json:"shareTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Snapshot.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Snapshot.go index afe5750d0..12a3bbf94 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Snapshot.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Snapshot.go @@ -16,38 +16,39 @@ package models + type Snapshot struct { - /* 云硬盘快照ID (Optional) */ - SnapshotId string `json:"snapshotId"` + /* 云硬盘快照ID (Optional) */ + SnapshotId string `json:"snapshotId"` - /* 快照来源 可以有self，others两种来源 (Optional) */ - SnapshotSource string `json:"snapshotSource"` + /* 快照来源 可以有self，others两种来源 (Optional) */ + SnapshotSource string `json:"snapshotSource"` - /* 创建快照的云硬盘ID(snapshotSource为others时不展示) (Optional) */ - DiskId string `json:"diskId"` + /* 创建快照的云硬盘ID(snapshotSource为others时不展示) (Optional) */ + DiskId string `json:"diskId"` - /* 快照大小，单位为GiB (Optional) */ - SnapshotSizeGB int `json:"snapshotSizeGB"` + /* 快照大小，单位为GiB (Optional) */ + SnapshotSizeGB int `json:"snapshotSizeGB"` - /* 快照关联的所有镜像ID(snapshotSource为others时不展示) (Optional) */ - Images []string `json:"images"` + /* 快照关联的所有镜像ID(snapshotSource为others时不展示) (Optional) */ + Images []string `json:"images"` - /* 快照名称 (Optional) */ - Name string `json:"name"` + /* 快照名称 (Optional) */ + Name string `json:"name"` - /* 快照描述 (Optional) */ - Description string `json:"description"` + /* 快照描述 (Optional) */ + Description string `json:"description"` - /* 快照状态，取值为 creating、available、in-use、deleting、error_create、error_delete 之一 (Optional) */ - Status string `json:"status"` + /* 快照状态，取值为 creating、available、in-use、deleting、error_create、error_delete 之一 (Optional) */ + Status string `json:"status"` - /* 创建时间 (Optional) */ - CreateTime string `json:"createTime"` + /* 创建时间 (Optional) */ + CreateTime string `json:"createTime"` - /* 共享信息 (Optional) */ - SharInfo []ShareInfo `json:"sharInfo"` + /* 共享信息 (Optional) */ + SharInfo []ShareInfo `json:"sharInfo"` - /* 快照是否为加密盘的快照 (Optional) */ - Encrypted bool `json:"encrypted"` + /* 快照是否为加密盘的快照 (Optional) */ + Encrypted bool `json:"encrypted"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/SnapshotSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/SnapshotSpec.go index 4f4420f80..0918fa64a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/SnapshotSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/SnapshotSpec.go @@ -16,14 +16,15 @@ package models + type SnapshotSpec struct { - /* 快照名称 */ - Name string `json:"name"` + /* 快照名称 */ + Name string `json:"name"` - /* 快照描述 (Optional) */ - Description *string `json:"description"` + /* 快照描述 (Optional) */ + Description *string `json:"description"` - /* 用于创建快照的云盘ID */ - DiskId string `json:"diskId"` + /* 用于创建快照的云盘ID */ + DiskId string `json:"diskId"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Soldout.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Soldout.go index 341f9d37e..587bbdf25 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Soldout.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Soldout.go @@ -16,14 +16,15 @@ package models + type Soldout struct { - /* 云硬盘所属的可用区 */ - AzName string `json:"azName"` + /* 云硬盘所属的可用区 */ + AzName string `json:"azName"` - /* 云硬盘类型，取值为ssd、premium-hdd、ssd.gp1、ssd.io1、hdd.std1之一 */ - MediaType string `json:"mediaType"` + /* 云硬盘类型，取值为ssd、premium-hdd、ssd.gp1、ssd.io1、hdd.std1之一 */ + MediaType string `json:"mediaType"` - /* 是否售罄 */ - IsSoldOut bool `json:"isSoldOut"` + /* 是否售罄 */ + IsSoldOut bool `json:"isSoldOut"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Tag.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Tag.go index 22f6316be..467465457 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Tag.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/Tag.go @@ -16,11 +16,12 @@ package models + type Tag struct { - /* Tag键 (Optional) */ - Key string `json:"key"` + /* Tag键 (Optional) */ + Key string `json:"key"` - /* Tag值 (Optional) */ - Value string `json:"value"` + /* Tag值 (Optional) */ + Value string `json:"value"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/TagFilter.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/TagFilter.go index 18ae84e7a..60e1f0774 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/TagFilter.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models/TagFilter.go @@ -16,11 +16,12 @@ package models + type TagFilter struct { - /* Tag键 */ - Key string `json:"key"` + /* Tag键 */ + Key string `json:"key"` - /* Tag值 */ - Values []string `json:"values"` + /* Tag值 */ + Values []string `json:"values"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AssociateElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AssociateElasticIp.go index f20e0af40..c562811b1 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AssociateElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AssociateElasticIp.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AssociateElasticIpRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 弹性公网IP的ID */ - ElasticIpId string `json:"elasticIpId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` + + /* 弹性公网IP的ID */ + ElasticIpId string `json:"elasticIpId"` } /* @@ -41,21 +42,21 @@ type AssociateElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAssociateElasticIpRequest( - regionId string, - instanceId string, - elasticIpId string, + regionId string, + instanceId string, + elasticIpId string, ) *AssociateElasticIpRequest { return &AssociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:associateElasticIp", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - ElasticIpId: elasticIpId, + RegionId: regionId, + InstanceId: instanceId, + ElasticIpId: elasticIpId, } } @@ -65,63 +66,63 @@ func NewAssociateElasticIpRequest( * param elasticIpId: 弹性公网IP的ID (Required) */ func NewAssociateElasticIpRequestWithAllParams( - regionId string, - instanceId string, - elasticIpId string, + regionId string, + instanceId string, + elasticIpId string, ) *AssociateElasticIpRequest { - return &AssociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:associateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - ElasticIpId: elasticIpId, - } + return &AssociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:associateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + ElasticIpId: elasticIpId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAssociateElasticIpRequestWithoutParam() *AssociateElasticIpRequest { - return &AssociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:associateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AssociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:associateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *AssociateElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *AssociateElasticIpRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param elasticIpId: 弹性公网IP的ID(Required) */ func (r *AssociateElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = elasticIpId + r.ElasticIpId = elasticIpId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AssociateElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AssociateElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AssociateElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AssociateElasticIpResult `json:"result"` } type AssociateElasticIpResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachDisk.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachDisk.go index da0a75268..e699d8ea5 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachDisk.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachDisk.go @@ -17,26 +17,27 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AttachDiskRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 云硬盘ID */ - DiskId string `json:"diskId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 数据盘的逻辑挂载点[vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi]，挂载系统盘时vda必传 (Optional) */ - DeviceName *string `json:"deviceName"` + /* 云硬盘ID */ + DiskId string `json:"diskId"` - /* 自动随主机删除此云硬盘，默认为False。仅按配置计费云硬盘支持修改此参数，包年包月云硬盘默认为False且不可修改。如果是共享型云硬盘，此参数无效。 (Optional) */ - AutoDelete *bool `json:"autoDelete"` + /* 数据盘的逻辑挂载点[vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi]，挂载系统盘时vda必传 (Optional) */ + DeviceName *string `json:"deviceName"` + + /* 自动随主机删除此云硬盘，默认为False。仅按配置计费云硬盘支持修改此参数，包年包月云硬盘默认为False且不可修改。如果是共享型云硬盘，此参数无效。 (Optional) */ + AutoDelete *bool `json:"autoDelete"` } /* @@ -47,21 +48,21 @@ type AttachDiskRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAttachDiskRequest( - regionId string, - instanceId string, - diskId string, + regionId string, + instanceId string, + diskId string, ) *AttachDiskRequest { return &AttachDiskRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:attachDisk", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - DiskId: diskId, + RegionId: regionId, + InstanceId: instanceId, + DiskId: diskId, } } @@ -73,77 +74,77 @@ func NewAttachDiskRequest( * param autoDelete: 自动随主机删除此云硬盘，默认为False。仅按配置计费云硬盘支持修改此参数，包年包月云硬盘默认为False且不可修改。如果是共享型云硬盘，此参数无效。 (Optional) */ func NewAttachDiskRequestWithAllParams( - regionId string, - instanceId string, - diskId string, - deviceName *string, - autoDelete *bool, + regionId string, + instanceId string, + diskId string, + deviceName *string, + autoDelete *bool, ) *AttachDiskRequest { - return &AttachDiskRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:attachDisk", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - DiskId: diskId, - DeviceName: deviceName, - AutoDelete: autoDelete, - } + return &AttachDiskRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:attachDisk", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + DiskId: diskId, + DeviceName: deviceName, + AutoDelete: autoDelete, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAttachDiskRequestWithoutParam() *AttachDiskRequest { - return &AttachDiskRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:attachDisk", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AttachDiskRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:attachDisk", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *AttachDiskRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *AttachDiskRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param diskId: 云硬盘ID(Required) */ func (r *AttachDiskRequest) SetDiskId(diskId string) { - r.DiskId = diskId + r.DiskId = diskId } /* param deviceName: 数据盘的逻辑挂载点[vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi]，挂载系统盘时vda必传(Optional) */ func (r *AttachDiskRequest) SetDeviceName(deviceName string) { - r.DeviceName = &deviceName + r.DeviceName = &deviceName } /* param autoDelete: 自动随主机删除此云硬盘，默认为False。仅按配置计费云硬盘支持修改此参数，包年包月云硬盘默认为False且不可修改。如果是共享型云硬盘，此参数无效。(Optional) */ func (r *AttachDiskRequest) SetAutoDelete(autoDelete bool) { - r.AutoDelete = &autoDelete + r.AutoDelete = &autoDelete } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AttachDiskRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AttachDiskResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AttachDiskResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AttachDiskResult `json:"result"` } type AttachDiskResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachNetworkInterface.go index 182f5c2f8..75c7720fd 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/AttachNetworkInterface.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AttachNetworkInterfaceRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 弹性网卡ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 随主机自动删除，默认为False (Optional) */ - AutoDelete *bool `json:"autoDelete"` + /* 弹性网卡ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` + + /* 随主机自动删除，默认为False (Optional) */ + AutoDelete *bool `json:"autoDelete"` } /* @@ -44,21 +45,21 @@ type AttachNetworkInterfaceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAttachNetworkInterfaceRequest( - regionId string, - instanceId string, - networkInterfaceId string, + regionId string, + instanceId string, + networkInterfaceId string, ) *AttachNetworkInterfaceRequest { return &AttachNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:attachNetworkInterface", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + InstanceId: instanceId, + NetworkInterfaceId: networkInterfaceId, } } @@ -69,70 +70,70 @@ func NewAttachNetworkInterfaceRequest( * param autoDelete: 随主机自动删除，默认为False (Optional) */ func NewAttachNetworkInterfaceRequestWithAllParams( - regionId string, - instanceId string, - networkInterfaceId string, - autoDelete *bool, + regionId string, + instanceId string, + networkInterfaceId string, + autoDelete *bool, ) *AttachNetworkInterfaceRequest { - return &AttachNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:attachNetworkInterface", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - NetworkInterfaceId: networkInterfaceId, - AutoDelete: autoDelete, - } + return &AttachNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:attachNetworkInterface", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + NetworkInterfaceId: networkInterfaceId, + AutoDelete: autoDelete, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAttachNetworkInterfaceRequestWithoutParam() *AttachNetworkInterfaceRequest { - return &AttachNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:attachNetworkInterface", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AttachNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:attachNetworkInterface", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *AttachNetworkInterfaceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *AttachNetworkInterfaceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param networkInterfaceId: 弹性网卡ID(Required) */ func (r *AttachNetworkInterfaceRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } /* param autoDelete: 随主机自动删除，默认为False(Optional) */ func (r *AttachNetworkInterfaceRequest) SetAutoDelete(autoDelete bool) { - r.AutoDelete = &autoDelete + r.AutoDelete = &autoDelete } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AttachNetworkInterfaceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AttachNetworkInterfaceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AttachNetworkInterfaceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AttachNetworkInterfaceResult `json:"result"` } type AttachNetworkInterfaceResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CopyImages.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CopyImages.go index 1bc6a26a9..a6c82e8e7 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CopyImages.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CopyImages.go @@ -17,21 +17,22 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type CopyImagesRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 源镜像ID */ - SourceImageIds []string `json:"sourceImageIds"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 目标区域 */ - DestinationRegion string `json:"destinationRegion"` + /* 源镜像ID */ + SourceImageIds []string `json:"sourceImageIds"` + + /* 目标区域 */ + DestinationRegion string `json:"destinationRegion"` } /* @@ -42,21 +43,21 @@ type CopyImagesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCopyImagesRequest( - regionId string, - sourceImageIds []string, - destinationRegion string, + regionId string, + sourceImageIds []string, + destinationRegion string, ) *CopyImagesRequest { return &CopyImagesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images:copyImages", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - SourceImageIds: sourceImageIds, - DestinationRegion: destinationRegion, + RegionId: regionId, + SourceImageIds: sourceImageIds, + DestinationRegion: destinationRegion, } } @@ -66,64 +67,64 @@ func NewCopyImagesRequest( * param destinationRegion: 目标区域 (Required) */ func NewCopyImagesRequestWithAllParams( - regionId string, - sourceImageIds []string, - destinationRegion string, + regionId string, + sourceImageIds []string, + destinationRegion string, ) *CopyImagesRequest { - return &CopyImagesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images:copyImages", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - SourceImageIds: sourceImageIds, - DestinationRegion: destinationRegion, - } + return &CopyImagesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images:copyImages", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + SourceImageIds: sourceImageIds, + DestinationRegion: destinationRegion, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCopyImagesRequestWithoutParam() *CopyImagesRequest { - return &CopyImagesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images:copyImages", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CopyImagesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images:copyImages", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *CopyImagesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param sourceImageIds: 源镜像ID(Required) */ func (r *CopyImagesRequest) SetSourceImageIds(sourceImageIds []string) { - r.SourceImageIds = sourceImageIds + r.SourceImageIds = sourceImageIds } /* param destinationRegion: 目标区域(Required) */ func (r *CopyImagesRequest) SetDestinationRegion(destinationRegion string) { - r.DestinationRegion = destinationRegion + r.DestinationRegion = destinationRegion } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CopyImagesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CopyImagesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CopyImagesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CopyImagesResult `json:"result"` } type CopyImagesResult struct { - CopyImages []vm.CopyImage `json:"copyImages"` -} + CopyImages []vm.CopyImage `json:"copyImages"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateImage.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateImage.go index ca11b2661..f9274a996 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateImage.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateImage.go @@ -17,27 +17,28 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type CreateImageRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 镜像名称，参考公共参数规范。 */ - Name string `json:"name"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 镜像描述，参考公共参数规范。 */ - Description string `json:"description"` + /* 镜像名称，参考公共参数规范。 */ + Name string `json:"name"` - /* 数据盘列表，可以在实例已挂载数据盘的基础上，额外增加新的快照、空盘、或排除云主机中的数据盘。 (Optional) */ - DataDisks []vm.InstanceDiskAttachmentSpec `json:"dataDisks"` + /* 镜像描述，参考公共参数规范。 */ + Description string `json:"description"` + + /* 数据盘列表，可以在实例已挂载数据盘的基础上，额外增加新的快照、空盘、或排除云主机中的数据盘。 (Optional) */ + DataDisks []vm.InstanceDiskAttachmentSpec `json:"dataDisks"` } /* @@ -49,23 +50,23 @@ type CreateImageRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateImageRequest( - regionId string, - instanceId string, - name string, - description string, + regionId string, + instanceId string, + name string, + description string, ) *CreateImageRequest { return &CreateImageRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:createImage", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - Name: name, - Description: description, + RegionId: regionId, + InstanceId: instanceId, + Name: name, + Description: description, } } @@ -77,78 +78,78 @@ func NewCreateImageRequest( * param dataDisks: 数据盘列表，可以在实例已挂载数据盘的基础上，额外增加新的快照、空盘、或排除云主机中的数据盘。 (Optional) */ func NewCreateImageRequestWithAllParams( - regionId string, - instanceId string, - name string, - description string, - dataDisks []vm.InstanceDiskAttachmentSpec, + regionId string, + instanceId string, + name string, + description string, + dataDisks []vm.InstanceDiskAttachmentSpec, ) *CreateImageRequest { - return &CreateImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:createImage", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - Name: name, - Description: description, - DataDisks: dataDisks, - } + return &CreateImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:createImage", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + Name: name, + Description: description, + DataDisks: dataDisks, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateImageRequestWithoutParam() *CreateImageRequest { - return &CreateImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:createImage", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:createImage", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *CreateImageRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *CreateImageRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param name: 镜像名称，参考公共参数规范。(Required) */ func (r *CreateImageRequest) SetName(name string) { - r.Name = name + r.Name = name } /* param description: 镜像描述，参考公共参数规范。(Required) */ func (r *CreateImageRequest) SetDescription(description string) { - r.Description = description + r.Description = description } /* param dataDisks: 数据盘列表，可以在实例已挂载数据盘的基础上，额外增加新的快照、空盘、或排除云主机中的数据盘。(Optional) */ func (r *CreateImageRequest) SetDataDisks(dataDisks []vm.InstanceDiskAttachmentSpec) { - r.DataDisks = dataDisks + r.DataDisks = dataDisks } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateImageRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateImageResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateImageResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateImageResult `json:"result"` } type CreateImageResult struct { - ImageId string `json:"imageId"` -} + ImageId string `json:"imageId"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateInstances.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateInstances.go index 259a4d6f5..f5d342dc0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateInstances.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateInstances.go @@ -17,27 +17,28 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type CreateInstancesRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 描述云主机配置 - */ - InstanceSpec *vm.InstanceSpec `json:"instanceSpec"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 购买云主机的数量；取值范围：[1,100]，默认为1。 - (Optional) */ - MaxCount *int `json:"maxCount"` + /* 描述云主机配置 + */ + InstanceSpec *vm.InstanceSpec `json:"instanceSpec"` - /* 用于保证请求的幂等性。由客户端生成，长度不能超过64个字符。 - (Optional) */ - ClientToken *string `json:"clientToken"` + /* 购买云主机的数量；取值范围：[1,100]，默认为1。 + (Optional) */ + MaxCount *int `json:"maxCount"` + + /* 用于保证请求的幂等性。由客户端生成，长度不能超过64个字符。 + (Optional) */ + ClientToken *string `json:"clientToken"` } /* @@ -46,21 +47,21 @@ type CreateInstancesRequest struct { (Required) * * @Deprecated, not compatible when mandatory parameters changed -*/ + */ func NewCreateInstancesRequest( - regionId string, - instanceSpec *vm.InstanceSpec, + regionId string, + instanceSpec *vm.InstanceSpec, ) *CreateInstancesRequest { return &CreateInstancesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceSpec: instanceSpec, + RegionId: regionId, + InstanceSpec: instanceSpec, } } @@ -72,76 +73,76 @@ func NewCreateInstancesRequest( (Optional) * param clientToken: 用于保证请求的幂等性。由客户端生成，长度不能超过64个字符。 (Optional) -*/ + */ func NewCreateInstancesRequestWithAllParams( - regionId string, - instanceSpec *vm.InstanceSpec, - maxCount *int, - clientToken *string, + regionId string, + instanceSpec *vm.InstanceSpec, + maxCount *int, + clientToken *string, ) *CreateInstancesRequest { - return &CreateInstancesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceSpec: instanceSpec, - MaxCount: maxCount, - ClientToken: clientToken, - } + return &CreateInstancesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceSpec: instanceSpec, + MaxCount: maxCount, + ClientToken: clientToken, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateInstancesRequestWithoutParam() *CreateInstancesRequest { - return &CreateInstancesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateInstancesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *CreateInstancesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceSpec: 描述云主机配置 (Required) */ func (r *CreateInstancesRequest) SetInstanceSpec(instanceSpec *vm.InstanceSpec) { - r.InstanceSpec = instanceSpec + r.InstanceSpec = instanceSpec } /* param maxCount: 购买云主机的数量；取值范围：[1,100]，默认为1。 (Optional) */ func (r *CreateInstancesRequest) SetMaxCount(maxCount int) { - r.MaxCount = &maxCount + r.MaxCount = &maxCount } /* param clientToken: 用于保证请求的幂等性。由客户端生成，长度不能超过64个字符。 (Optional) */ func (r *CreateInstancesRequest) SetClientToken(clientToken string) { - r.ClientToken = &clientToken + r.ClientToken = &clientToken } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateInstancesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateInstancesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateInstancesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateInstancesResult `json:"result"` } type CreateInstancesResult struct { - InstanceIds []string `json:"instanceIds"` -} + InstanceIds []string `json:"instanceIds"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateKeypair.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateKeypair.go index 75151d78a..6ffeee01c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateKeypair.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/CreateKeypair.go @@ -17,18 +17,19 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateKeypairRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 - */ - KeyName string `json:"keyName"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 + */ + KeyName string `json:"keyName"` } /* @@ -37,21 +38,21 @@ type CreateKeypairRequest struct { (Required) * * @Deprecated, not compatible when mandatory parameters changed -*/ + */ func NewCreateKeypairRequest( - regionId string, - keyName string, + regionId string, + keyName string, ) *CreateKeypairRequest { return &CreateKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/keypairs", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - KeyName: keyName, + RegionId: regionId, + KeyName: keyName, } } @@ -59,62 +60,62 @@ func NewCreateKeypairRequest( * param regionId: 地域ID (Required) * param keyName: 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 (Required) -*/ + */ func NewCreateKeypairRequestWithAllParams( - regionId string, - keyName string, + regionId string, + keyName string, ) *CreateKeypairRequest { - return &CreateKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - KeyName: keyName, - } + return &CreateKeypairRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + KeyName: keyName, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateKeypairRequestWithoutParam() *CreateKeypairRequest { - return &CreateKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateKeypairRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *CreateKeypairRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param keyName: 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 (Required) */ func (r *CreateKeypairRequest) SetKeyName(keyName string) { - r.KeyName = keyName + r.KeyName = keyName } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateKeypairRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateKeypairResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateKeypairResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateKeypairResult `json:"result"` } type CreateKeypairResult struct { - KeyName string `json:"keyName"` - PrivateKey string `json:"privateKey"` - KeyFingerprint string `json:"keyFingerprint"` -} + KeyName string `json:"keyName"` + PrivateKey string `json:"privateKey"` + KeyFingerprint string `json:"keyFingerprint"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteImage.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteImage.go index f72caf808..3496eace4 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteImage.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteImage.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteImageRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 镜像ID */ - ImageId string `json:"imageId"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* 镜像ID */ + ImageId string `json:"imageId"` } /* @@ -37,19 +38,19 @@ type DeleteImageRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteImageRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *DeleteImageRequest { return &DeleteImageRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -58,56 +59,56 @@ func NewDeleteImageRequest( * param imageId: 镜像ID (Required) */ func NewDeleteImageRequestWithAllParams( - regionId string, - imageId string, + regionId string, + imageId string, ) *DeleteImageRequest { - return &DeleteImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - } + return &DeleteImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteImageRequestWithoutParam() *DeleteImageRequest { - return &DeleteImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DeleteImageRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *DeleteImageRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteImageRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteImageResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteImageResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteImageResult `json:"result"` } type DeleteImageResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteInstance.go index c401f6b2b..6482ece51 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteInstance.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteInstanceRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* 云主机ID */ + InstanceId string `json:"instanceId"` } /* @@ -37,19 +38,19 @@ type DeleteInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteInstanceRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *DeleteInstanceRequest { return &DeleteInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -58,56 +59,56 @@ func NewDeleteInstanceRequest( * param instanceId: 云主机ID (Required) */ func NewDeleteInstanceRequestWithAllParams( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *DeleteInstanceRequest { - return &DeleteInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - } + return &DeleteInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteInstanceRequestWithoutParam() *DeleteInstanceRequest { - return &DeleteInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DeleteInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *DeleteInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteInstanceResult `json:"result"` } type DeleteInstanceResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteKeypair.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteKeypair.go index cb47a109e..ddac09b04 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteKeypair.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DeleteKeypair.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteKeypairRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 密钥名称 */ - KeyName string `json:"keyName"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* 密钥名称 */ + KeyName string `json:"keyName"` } /* @@ -37,19 +38,19 @@ type DeleteKeypairRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteKeypairRequest( - regionId string, - keyName string, + regionId string, + keyName string, ) *DeleteKeypairRequest { return &DeleteKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/keypairs/{keyName}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - KeyName: keyName, + RegionId: regionId, + KeyName: keyName, } } @@ -58,56 +59,56 @@ func NewDeleteKeypairRequest( * param keyName: 密钥名称 (Required) */ func NewDeleteKeypairRequestWithAllParams( - regionId string, - keyName string, + regionId string, + keyName string, ) *DeleteKeypairRequest { - return &DeleteKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs/{keyName}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - KeyName: keyName, - } + return &DeleteKeypairRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs/{keyName}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + KeyName: keyName, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteKeypairRequestWithoutParam() *DeleteKeypairRequest { - return &DeleteKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs/{keyName}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteKeypairRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs/{keyName}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DeleteKeypairRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param keyName: 密钥名称(Required) */ func (r *DeleteKeypairRequest) SetKeyName(keyName string) { - r.KeyName = keyName + r.KeyName = keyName } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteKeypairRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteKeypairResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteKeypairResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteKeypairResult `json:"result"` } type DeleteKeypairResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImage.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImage.go index c931329cc..14b9b1709 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImage.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImage.go @@ -17,18 +17,19 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeImageRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 镜像ID */ - ImageId string `json:"imageId"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* 镜像ID */ + ImageId string `json:"imageId"` } /* @@ -38,19 +39,19 @@ type DescribeImageRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeImageRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *DescribeImageRequest { return &DescribeImageRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -59,57 +60,57 @@ func NewDescribeImageRequest( * param imageId: 镜像ID (Required) */ func NewDescribeImageRequestWithAllParams( - regionId string, - imageId string, + regionId string, + imageId string, ) *DescribeImageRequest { - return &DescribeImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - } + return &DescribeImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeImageRequestWithoutParam() *DescribeImageRequest { - return &DescribeImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeImageRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *DescribeImageRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeImageRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeImageResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeImageResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeImageResult `json:"result"` } type DescribeImageResult struct { - Image vm.Image `json:"image"` -} + Image vm.Image `json:"image"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraints.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraints.go index 794e5e576..8011469e2 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraints.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraints.go @@ -17,18 +17,19 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeImageConstraintsRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 镜像ID */ - ImageId string `json:"imageId"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* 镜像ID */ + ImageId string `json:"imageId"` } /* @@ -38,19 +39,19 @@ type DescribeImageConstraintsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeImageConstraintsRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *DescribeImageConstraintsRequest { return &DescribeImageConstraintsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}/constraints", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -59,57 +60,57 @@ func NewDescribeImageConstraintsRequest( * param imageId: 镜像ID (Required) */ func NewDescribeImageConstraintsRequestWithAllParams( - regionId string, - imageId string, + regionId string, + imageId string, ) *DescribeImageConstraintsRequest { - return &DescribeImageConstraintsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}/constraints", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - } + return &DescribeImageConstraintsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}/constraints", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeImageConstraintsRequestWithoutParam() *DescribeImageConstraintsRequest { - return &DescribeImageConstraintsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}/constraints", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeImageConstraintsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}/constraints", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeImageConstraintsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *DescribeImageConstraintsRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeImageConstraintsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeImageConstraintsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeImageConstraintsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeImageConstraintsResult `json:"result"` } type DescribeImageConstraintsResult struct { - ImageConstraints vm.ImageConstraint `json:"imageConstraints"` -} + ImageConstraints vm.ImageConstraint `json:"imageConstraints"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraintsBatch.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraintsBatch.go index 4b33b11bc..f0a968cc1 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraintsBatch.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageConstraintsBatch.go @@ -17,18 +17,19 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeImageConstraintsBatchRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 镜像ID列表 (Optional) */ - Ids []string `json:"ids"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* 镜像ID列表 (Optional) */ + Ids []string `json:"ids"` } /* @@ -37,17 +38,17 @@ type DescribeImageConstraintsBatchRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeImageConstraintsBatchRequest( - regionId string, + regionId string, ) *DescribeImageConstraintsBatchRequest { return &DescribeImageConstraintsBatchRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/imageConstraints", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -56,57 +57,57 @@ func NewDescribeImageConstraintsBatchRequest( * param ids: 镜像ID列表 (Optional) */ func NewDescribeImageConstraintsBatchRequestWithAllParams( - regionId string, - ids []string, + regionId string, + ids []string, ) *DescribeImageConstraintsBatchRequest { - return &DescribeImageConstraintsBatchRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/imageConstraints", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - Ids: ids, - } + return &DescribeImageConstraintsBatchRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/imageConstraints", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + Ids: ids, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeImageConstraintsBatchRequestWithoutParam() *DescribeImageConstraintsBatchRequest { - return &DescribeImageConstraintsBatchRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/imageConstraints", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeImageConstraintsBatchRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/imageConstraints", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeImageConstraintsBatchRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param ids: 镜像ID列表(Optional) */ func (r *DescribeImageConstraintsBatchRequest) SetIds(ids []string) { - r.Ids = ids + r.Ids = ids } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeImageConstraintsBatchRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeImageConstraintsBatchResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeImageConstraintsBatchResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeImageConstraintsBatchResult `json:"result"` } type DescribeImageConstraintsBatchResult struct { - ImageConstraints []vm.ImageConstraint `json:"imageConstraints"` -} + ImageConstraints []vm.ImageConstraint `json:"imageConstraints"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageMembers.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageMembers.go index e92a3d4ba..b4374fad7 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageMembers.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImageMembers.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DescribeImageMembersRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 镜像ID */ - ImageId string `json:"imageId"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* 镜像ID */ + ImageId string `json:"imageId"` } /* @@ -37,19 +38,19 @@ type DescribeImageMembersRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeImageMembersRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *DescribeImageMembersRequest { return &DescribeImageMembersRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}/members", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -58,57 +59,57 @@ func NewDescribeImageMembersRequest( * param imageId: 镜像ID (Required) */ func NewDescribeImageMembersRequestWithAllParams( - regionId string, - imageId string, + regionId string, + imageId string, ) *DescribeImageMembersRequest { - return &DescribeImageMembersRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}/members", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - } + return &DescribeImageMembersRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}/members", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeImageMembersRequestWithoutParam() *DescribeImageMembersRequest { - return &DescribeImageMembersRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}/members", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeImageMembersRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}/members", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeImageMembersRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *DescribeImageMembersRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeImageMembersRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeImageMembersResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeImageMembersResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeImageMembersResult `json:"result"` } type DescribeImageMembersResult struct { - Pins []string `json:"pins"` -} + Pins []string `json:"pins"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImages.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImages.go index 05cea3038..01e89cf65 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImages.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeImages.go @@ -17,36 +17,37 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeImagesRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 镜像来源，如果没有指定ids参数，此参数必传；取值范围：public、shared、thirdparty、private (Optional) */ - ImageSource *string `json:"imageSource"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 操作系统平台，取值范围：Windows Server、CentOS、Ubuntu (Optional) */ - Platform *string `json:"platform"` + /* 镜像来源，如果没有指定ids参数，此参数必传；取值范围：public、shared、thirdparty、private (Optional) */ + ImageSource *string `json:"imageSource"` - /* 镜像ID列表，如果指定了此参数，其它参数可为空 (Optional) */ - Ids []string `json:"ids"` + /* 操作系统平台，取值范围：Windows Server、CentOS、Ubuntu (Optional) */ + Platform *string `json:"platform"` - /* 镜像支持的系统盘类型，[localDisk,cloudDisk] (Optional) */ - RootDeviceType *string `json:"rootDeviceType"` + /* 镜像ID列表，如果指定了此参数，其它参数可为空 (Optional) */ + Ids []string `json:"ids"` - /* 参考镜像状态 (Optional) */ - Status *string `json:"status"` + /* 镜像支持的系统盘类型，[localDisk,cloudDisk] (Optional) */ + RootDeviceType *string `json:"rootDeviceType"` - /* 页码；默认为1 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 参考镜像状态 (Optional) */ + Status *string `json:"status"` - /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 页码；默认为1 (Optional) */ + PageNumber *int `json:"pageNumber"` + + /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ + PageSize *int `json:"pageSize"` } /* @@ -55,17 +56,17 @@ type DescribeImagesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeImagesRequest( - regionId string, + regionId string, ) *DescribeImagesRequest { return &DescribeImagesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -80,100 +81,100 @@ func NewDescribeImagesRequest( * param pageSize: 分页大小；默认为20；取值范围[10, 100] (Optional) */ func NewDescribeImagesRequestWithAllParams( - regionId string, - imageSource *string, - platform *string, - ids []string, - rootDeviceType *string, - status *string, - pageNumber *int, - pageSize *int, + regionId string, + imageSource *string, + platform *string, + ids []string, + rootDeviceType *string, + status *string, + pageNumber *int, + pageSize *int, ) *DescribeImagesRequest { - return &DescribeImagesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageSource: imageSource, - Platform: platform, - Ids: ids, - RootDeviceType: rootDeviceType, - Status: status, - PageNumber: pageNumber, - PageSize: pageSize, - } + return &DescribeImagesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageSource: imageSource, + Platform: platform, + Ids: ids, + RootDeviceType: rootDeviceType, + Status: status, + PageNumber: pageNumber, + PageSize: pageSize, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeImagesRequestWithoutParam() *DescribeImagesRequest { - return &DescribeImagesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeImagesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeImagesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageSource: 镜像来源，如果没有指定ids参数，此参数必传；取值范围：public、shared、thirdparty、private(Optional) */ func (r *DescribeImagesRequest) SetImageSource(imageSource string) { - r.ImageSource = &imageSource + r.ImageSource = &imageSource } /* param platform: 操作系统平台，取值范围：Windows Server、CentOS、Ubuntu(Optional) */ func (r *DescribeImagesRequest) SetPlatform(platform string) { - r.Platform = &platform + r.Platform = &platform } /* param ids: 镜像ID列表，如果指定了此参数，其它参数可为空(Optional) */ func (r *DescribeImagesRequest) SetIds(ids []string) { - r.Ids = ids + r.Ids = ids } /* param rootDeviceType: 镜像支持的系统盘类型，[localDisk,cloudDisk](Optional) */ func (r *DescribeImagesRequest) SetRootDeviceType(rootDeviceType string) { - r.RootDeviceType = &rootDeviceType + r.RootDeviceType = &rootDeviceType } /* param status: 参考镜像状态(Optional) */ func (r *DescribeImagesRequest) SetStatus(status string) { - r.Status = &status + r.Status = &status } /* param pageNumber: 页码；默认为1(Optional) */ func (r *DescribeImagesRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小；默认为20；取值范围[10, 100](Optional) */ func (r *DescribeImagesRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeImagesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeImagesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeImagesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeImagesResult `json:"result"` } type DescribeImagesResult struct { - Images []vm.Image `json:"images"` - TotalCount int `json:"totalCount"` -} + Images []vm.Image `json:"images"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstance.go index 6783a1532..84eb194e0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstance.go @@ -17,18 +17,19 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type DescribeInstanceRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* 云主机ID */ + InstanceId string `json:"instanceId"` } /* @@ -38,19 +39,19 @@ type DescribeInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeInstanceRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *DescribeInstanceRequest { return &DescribeInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -59,57 +60,57 @@ func NewDescribeInstanceRequest( * param instanceId: 云主机ID (Required) */ func NewDescribeInstanceRequestWithAllParams( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *DescribeInstanceRequest { - return &DescribeInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - } + return &DescribeInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeInstanceRequestWithoutParam() *DescribeInstanceRequest { - return &DescribeInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *DescribeInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeInstanceResult `json:"result"` } type DescribeInstanceResult struct { - Instance vm.Instance `json:"instance"` -} + Instance vm.Instance `json:"instance"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstancePrivateIpAddress.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstancePrivateIpAddress.go index 99a47de0b..457d57089 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstancePrivateIpAddress.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstancePrivateIpAddress.go @@ -17,33 +17,34 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeInstancePrivateIpAddressRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 页码；默认为1 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 页码；默认为1 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* instanceId - 云主机ID，精确匹配，支持多个 - privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个 - vpcId - 私有网络ID，精确匹配，支持多个 - status - 云主机状态，精确匹配，支持多个，参考云主机状态 - name - 云主机名称，模糊匹配，支持单个 - imageId - 镜像ID，精确匹配，支持多个 - networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 - subnetId - 子网ID，精确匹配，支持多个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ + PageSize *int `json:"pageSize"` + + /* instanceId - 云主机ID，精确匹配，支持多个 +privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个 +vpcId - 私有网络ID，精确匹配，支持多个 +status - 云主机状态，精确匹配，支持多个，参考云主机状态 +name - 云主机名称，模糊匹配，支持单个 +imageId - 镜像ID，精确匹配，支持多个 +networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 +subnetId - 子网ID，精确匹配，支持多个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -52,17 +53,17 @@ type DescribeInstancePrivateIpAddressRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeInstancePrivateIpAddressRequest( - regionId string, + regionId string, ) *DescribeInstancePrivateIpAddressRequest { return &DescribeInstancePrivateIpAddressRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instancePrivateIpAddress", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -79,54 +80,54 @@ imageId - 镜像ID，精确匹配，支持多个 networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 subnetId - 子网ID，精确匹配，支持多个 (Optional) -*/ + */ func NewDescribeInstancePrivateIpAddressRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeInstancePrivateIpAddressRequest { - return &DescribeInstancePrivateIpAddressRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instancePrivateIpAddress", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeInstancePrivateIpAddressRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instancePrivateIpAddress", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeInstancePrivateIpAddressRequestWithoutParam() *DescribeInstancePrivateIpAddressRequest { - return &DescribeInstancePrivateIpAddressRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instancePrivateIpAddress", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeInstancePrivateIpAddressRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instancePrivateIpAddress", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeInstancePrivateIpAddressRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码；默认为1(Optional) */ func (r *DescribeInstancePrivateIpAddressRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小；默认为20；取值范围[10, 100](Optional) */ func (r *DescribeInstancePrivateIpAddressRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: instanceId - 云主机ID，精确匹配，支持多个 @@ -139,22 +140,22 @@ networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 subnetId - 子网ID，精确匹配，支持多个 (Optional) */ func (r *DescribeInstancePrivateIpAddressRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeInstancePrivateIpAddressRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeInstancePrivateIpAddressResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeInstancePrivateIpAddressResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeInstancePrivateIpAddressResult `json:"result"` } type DescribeInstancePrivateIpAddressResult struct { - InstancePrivateIpAddress []vm.InstancePrivateIpAddress `json:"instancePrivateIpAddress"` - TotalCount int `json:"totalCount"` -} + InstancePrivateIpAddress []vm.InstancePrivateIpAddress `json:"instancePrivateIpAddress"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceStatus.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceStatus.go index 5db261b45..2dbeb035a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceStatus.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceStatus.go @@ -17,33 +17,34 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeInstanceStatusRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 页码；默认为1 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 页码；默认为1 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* instanceId - 云主机ID，精确匹配，支持多个 - privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个 - vpcId - 私有网络ID，精确匹配，支持多个 - status - 云主机状态，精确匹配，支持多个，参考云主机状态 - name - 云主机名称，模糊匹配，支持单个 - imageId - 镜像ID，精确匹配，支持多个 - networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 - subnetId - 子网ID，精确匹配，支持多个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ + PageSize *int `json:"pageSize"` + + /* instanceId - 云主机ID，精确匹配，支持多个 +privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个 +vpcId - 私有网络ID，精确匹配，支持多个 +status - 云主机状态，精确匹配，支持多个，参考云主机状态 +name - 云主机名称，模糊匹配，支持单个 +imageId - 镜像ID，精确匹配，支持多个 +networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 +subnetId - 子网ID，精确匹配，支持多个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -52,17 +53,17 @@ type DescribeInstanceStatusRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeInstanceStatusRequest( - regionId string, + regionId string, ) *DescribeInstanceStatusRequest { return &DescribeInstanceStatusRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instanceStatus", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -79,54 +80,54 @@ imageId - 镜像ID，精确匹配，支持多个 networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 subnetId - 子网ID，精确匹配，支持多个 (Optional) -*/ + */ func NewDescribeInstanceStatusRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeInstanceStatusRequest { - return &DescribeInstanceStatusRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instanceStatus", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeInstanceStatusRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instanceStatus", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeInstanceStatusRequestWithoutParam() *DescribeInstanceStatusRequest { - return &DescribeInstanceStatusRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instanceStatus", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeInstanceStatusRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instanceStatus", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeInstanceStatusRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码；默认为1(Optional) */ func (r *DescribeInstanceStatusRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小；默认为20；取值范围[10, 100](Optional) */ func (r *DescribeInstanceStatusRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: instanceId - 云主机ID，精确匹配，支持多个 @@ -139,22 +140,22 @@ networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 subnetId - 子网ID，精确匹配，支持多个 (Optional) */ func (r *DescribeInstanceStatusRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeInstanceStatusRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeInstanceStatusResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeInstanceStatusResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeInstanceStatusResult `json:"result"` } type DescribeInstanceStatusResult struct { - InstanceStatuses []vm.InstanceStatus `json:"instanceStatuses"` - TotalCount int `json:"totalCount"` -} + InstanceStatuses []vm.InstanceStatus `json:"instanceStatuses"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceTypes.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceTypes.go index c997144af..6ff9017ff 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceTypes.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceTypes.go @@ -17,21 +17,22 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeInstanceTypesRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* instanceTypes - 实例规格，精确匹配，支持多个 - az - 可用区，精确匹配，支持多个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* instanceTypes - 实例规格，精确匹配，支持多个 +az - 可用区，精确匹配，支持多个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -40,17 +41,17 @@ type DescribeInstanceTypesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeInstanceTypesRequest( - regionId string, + regionId string, ) *DescribeInstanceTypesRequest { return &DescribeInstanceTypesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instanceTypes", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -59,63 +60,63 @@ func NewDescribeInstanceTypesRequest( * param filters: instanceTypes - 实例规格，精确匹配，支持多个 az - 可用区，精确匹配，支持多个 (Optional) -*/ + */ func NewDescribeInstanceTypesRequestWithAllParams( - regionId string, - filters []common.Filter, + regionId string, + filters []common.Filter, ) *DescribeInstanceTypesRequest { - return &DescribeInstanceTypesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instanceTypes", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - Filters: filters, - } + return &DescribeInstanceTypesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instanceTypes", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeInstanceTypesRequestWithoutParam() *DescribeInstanceTypesRequest { - return &DescribeInstanceTypesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instanceTypes", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeInstanceTypesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instanceTypes", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeInstanceTypesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param filters: instanceTypes - 实例规格，精确匹配，支持多个 az - 可用区，精确匹配，支持多个 (Optional) */ func (r *DescribeInstanceTypesRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeInstanceTypesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeInstanceTypesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeInstanceTypesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeInstanceTypesResult `json:"result"` } type DescribeInstanceTypesResult struct { - InstanceTypes []vm.InstanceType `json:"instanceTypes"` - SpecificInstanceTypes []vm.InstanceType `json:"specificInstanceTypes"` - TotalCount int `json:"totalCount"` -} + InstanceTypes []vm.InstanceType `json:"instanceTypes"` + SpecificInstanceTypes []vm.InstanceType `json:"specificInstanceTypes"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceVncUrl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceVncUrl.go index b60e1a224..3026725f6 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceVncUrl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstanceVncUrl.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DescribeInstanceVncUrlRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* 云主机ID */ + InstanceId string `json:"instanceId"` } /* @@ -37,19 +38,19 @@ type DescribeInstanceVncUrlRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeInstanceVncUrlRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *DescribeInstanceVncUrlRequest { return &DescribeInstanceVncUrlRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}/vnc", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -58,57 +59,57 @@ func NewDescribeInstanceVncUrlRequest( * param instanceId: 云主机ID (Required) */ func NewDescribeInstanceVncUrlRequestWithAllParams( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *DescribeInstanceVncUrlRequest { - return &DescribeInstanceVncUrlRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}/vnc", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - } + return &DescribeInstanceVncUrlRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}/vnc", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeInstanceVncUrlRequestWithoutParam() *DescribeInstanceVncUrlRequest { - return &DescribeInstanceVncUrlRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}/vnc", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeInstanceVncUrlRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}/vnc", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeInstanceVncUrlRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *DescribeInstanceVncUrlRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeInstanceVncUrlRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeInstanceVncUrlResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeInstanceVncUrlResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeInstanceVncUrlResult `json:"result"` } type DescribeInstanceVncUrlResult struct { - VncUrl string `json:"vncUrl"` -} + VncUrl string `json:"vncUrl"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstances.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstances.go index 6eca2a945..a1330c290 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstances.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeInstances.go @@ -17,36 +17,37 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeInstancesRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 页码；默认为1 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 页码；默认为1 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* instanceId - 云主机ID，精确匹配，支持多个 - privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个 - az - 可用区，精确匹配，支持多个 - vpcId - 私有网络ID，精确匹配，支持多个 - status - 云主机状态，精确匹配，支持多个，参考云主机状态 - name - 云主机名称，模糊匹配，支持单个 - imageId - 镜像ID，精确匹配，支持多个 - networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 - subnetId - 子网ID，精确匹配，支持多个 - agId - 使用可用组id，支持单个 - faultDomain - 错误域，支持多个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ + PageSize *int `json:"pageSize"` + + /* instanceId - 云主机ID，精确匹配，支持多个 +privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个 +az - 可用区，精确匹配，支持多个 +vpcId - 私有网络ID，精确匹配，支持多个 +status - 云主机状态，精确匹配，支持多个，参考云主机状态 +name - 云主机名称，模糊匹配，支持单个 +imageId - 镜像ID，精确匹配，支持多个 +networkInterfaceId - 弹性网卡ID，精确匹配，支持多个 +subnetId - 子网ID，精确匹配，支持多个 +agId - 使用可用组id，支持单个 +faultDomain - 错误域，支持多个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -55,17 +56,17 @@ type DescribeInstancesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeInstancesRequest( - regionId string, + regionId string, ) *DescribeInstancesRequest { return &DescribeInstancesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -85,54 +86,54 @@ subnetId - 子网ID，精确匹配，支持多个 agId - 使用可用组id，支持单个 faultDomain - 错误域，支持多个 (Optional) -*/ + */ func NewDescribeInstancesRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeInstancesRequest { - return &DescribeInstancesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeInstancesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeInstancesRequestWithoutParam() *DescribeInstancesRequest { - return &DescribeInstancesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeInstancesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeInstancesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码；默认为1(Optional) */ func (r *DescribeInstancesRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小；默认为20；取值范围[10, 100](Optional) */ func (r *DescribeInstancesRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: instanceId - 云主机ID，精确匹配，支持多个 @@ -148,22 +149,22 @@ agId - 使用可用组id，支持单个 faultDomain - 错误域，支持多个 (Optional) */ func (r *DescribeInstancesRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeInstancesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeInstancesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeInstancesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeInstancesResult `json:"result"` } type DescribeInstancesResult struct { - Instances []vm.Instance `json:"instances"` - TotalCount int `json:"totalCount"` -} + Instances []vm.Instance `json:"instances"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeKeypairs.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeKeypairs.go index 42b2a4264..75b6c5c53 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeKeypairs.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeKeypairs.go @@ -17,26 +17,27 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeKeypairsRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 页码；默认为1 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 页码；默认为1 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* keyNames - 密钥对名称，精确匹配，支持多个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 分页大小；默认为20；取值范围[10, 100] (Optional) */ + PageSize *int `json:"pageSize"` + + /* keyNames - 密钥对名称，精确匹配，支持多个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -45,17 +46,17 @@ type DescribeKeypairsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeKeypairsRequest( - regionId string, + regionId string, ) *DescribeKeypairsRequest { return &DescribeKeypairsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/keypairs", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -65,75 +66,75 @@ func NewDescribeKeypairsRequest( * param pageSize: 分页大小；默认为20；取值范围[10, 100] (Optional) * param filters: keyNames - 密钥对名称，精确匹配，支持多个 (Optional) -*/ + */ func NewDescribeKeypairsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeKeypairsRequest { - return &DescribeKeypairsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeKeypairsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeKeypairsRequestWithoutParam() *DescribeKeypairsRequest { - return &DescribeKeypairsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeKeypairsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeKeypairsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码；默认为1(Optional) */ func (r *DescribeKeypairsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小；默认为20；取值范围[10, 100](Optional) */ func (r *DescribeKeypairsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: keyNames - 密钥对名称，精确匹配，支持多个 (Optional) */ func (r *DescribeKeypairsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeKeypairsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeKeypairsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeKeypairsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeKeypairsResult `json:"result"` } type DescribeKeypairsResult struct { - Keypairs []vm.Keypair `json:"keypairs"` - TotalCount int `json:"totalCount"` -} + Keypairs []vm.Keypair `json:"keypairs"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeQuotas.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeQuotas.go index 64a79b559..66041bb0c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeQuotas.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DescribeQuotas.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeQuotasRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* resourceTypes - 资源类型，支持多个[instance，keypair，image，instanceTemplate，imageShare] - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 私有镜像Id，查询镜像共享(imageShare)配额时，此参数必传 (Optional) */ - ImageId *string `json:"imageId"` + /* resourceTypes - 资源类型，支持多个[instance，keypair，image，instanceTemplate，imageShare] + (Optional) */ + Filters []common.Filter `json:"filters"` + + /* 私有镜像Id，查询镜像共享(imageShare)配额时，此参数必传 (Optional) */ + ImageId *string `json:"imageId"` } /* @@ -42,17 +43,17 @@ type DescribeQuotasRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeQuotasRequest( - regionId string, + regionId string, ) *DescribeQuotasRequest { return &DescribeQuotasRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/quotas", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -61,67 +62,67 @@ func NewDescribeQuotasRequest( * param filters: resourceTypes - 资源类型，支持多个[instance，keypair，image，instanceTemplate，imageShare] (Optional) * param imageId: 私有镜像Id，查询镜像共享(imageShare)配额时，此参数必传 (Optional) -*/ + */ func NewDescribeQuotasRequestWithAllParams( - regionId string, - filters []common.Filter, - imageId *string, + regionId string, + filters []common.Filter, + imageId *string, ) *DescribeQuotasRequest { - return &DescribeQuotasRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/quotas", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - Filters: filters, - ImageId: imageId, - } + return &DescribeQuotasRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/quotas", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + Filters: filters, + ImageId: imageId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeQuotasRequestWithoutParam() *DescribeQuotasRequest { - return &DescribeQuotasRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/quotas", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeQuotasRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/quotas", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DescribeQuotasRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param filters: resourceTypes - 资源类型，支持多个[instance，keypair，image，instanceTemplate，imageShare] (Optional) */ func (r *DescribeQuotasRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } /* param imageId: 私有镜像Id，查询镜像共享(imageShare)配额时，此参数必传(Optional) */ func (r *DescribeQuotasRequest) SetImageId(imageId string) { - r.ImageId = &imageId + r.ImageId = &imageId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeQuotasRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeQuotasResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeQuotasResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeQuotasResult `json:"result"` } type DescribeQuotasResult struct { - Quotas []vm.Quota `json:"quotas"` -} + Quotas []vm.Quota `json:"quotas"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachDisk.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachDisk.go index 39525f058..e393dfb85 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachDisk.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachDisk.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DetachDiskRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 云硬盘ID */ - DiskId string `json:"diskId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 强制缷载，默认False。如果此参数传值为True，代表数据盘的IO会被强制断掉。 (Optional) */ - Force *bool `json:"force"` + /* 云硬盘ID */ + DiskId string `json:"diskId"` + + /* 强制缷载，默认False。如果此参数传值为True，代表数据盘的IO会被强制断掉。 (Optional) */ + Force *bool `json:"force"` } /* @@ -44,21 +45,21 @@ type DetachDiskRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDetachDiskRequest( - regionId string, - instanceId string, - diskId string, + regionId string, + instanceId string, + diskId string, ) *DetachDiskRequest { return &DetachDiskRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:detachDisk", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - DiskId: diskId, + RegionId: regionId, + InstanceId: instanceId, + DiskId: diskId, } } @@ -69,70 +70,70 @@ func NewDetachDiskRequest( * param force: 强制缷载，默认False。如果此参数传值为True，代表数据盘的IO会被强制断掉。 (Optional) */ func NewDetachDiskRequestWithAllParams( - regionId string, - instanceId string, - diskId string, - force *bool, + regionId string, + instanceId string, + diskId string, + force *bool, ) *DetachDiskRequest { - return &DetachDiskRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:detachDisk", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - DiskId: diskId, - Force: force, - } + return &DetachDiskRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:detachDisk", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + DiskId: diskId, + Force: force, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDetachDiskRequestWithoutParam() *DetachDiskRequest { - return &DetachDiskRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:detachDisk", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &DetachDiskRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:detachDisk", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DetachDiskRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *DetachDiskRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param diskId: 云硬盘ID(Required) */ func (r *DetachDiskRequest) SetDiskId(diskId string) { - r.DiskId = diskId + r.DiskId = diskId } /* param force: 强制缷载，默认False。如果此参数传值为True，代表数据盘的IO会被强制断掉。(Optional) */ func (r *DetachDiskRequest) SetForce(force bool) { - r.Force = &force + r.Force = &force } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DetachDiskRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DetachDiskResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DetachDiskResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DetachDiskResult `json:"result"` } type DetachDiskResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachNetworkInterface.go index 3d19658f0..83087439f 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DetachNetworkInterface.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DetachNetworkInterfaceRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 弹性网卡ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` + + /* 弹性网卡ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` } /* @@ -41,21 +42,21 @@ type DetachNetworkInterfaceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDetachNetworkInterfaceRequest( - regionId string, - instanceId string, - networkInterfaceId string, + regionId string, + instanceId string, + networkInterfaceId string, ) *DetachNetworkInterfaceRequest { return &DetachNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:detachNetworkInterface", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + InstanceId: instanceId, + NetworkInterfaceId: networkInterfaceId, } } @@ -65,63 +66,63 @@ func NewDetachNetworkInterfaceRequest( * param networkInterfaceId: 弹性网卡ID (Required) */ func NewDetachNetworkInterfaceRequestWithAllParams( - regionId string, - instanceId string, - networkInterfaceId string, + regionId string, + instanceId string, + networkInterfaceId string, ) *DetachNetworkInterfaceRequest { - return &DetachNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:detachNetworkInterface", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - NetworkInterfaceId: networkInterfaceId, - } + return &DetachNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:detachNetworkInterface", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + NetworkInterfaceId: networkInterfaceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDetachNetworkInterfaceRequestWithoutParam() *DetachNetworkInterfaceRequest { - return &DetachNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:detachNetworkInterface", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &DetachNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:detachNetworkInterface", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DetachNetworkInterfaceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *DetachNetworkInterfaceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param networkInterfaceId: 弹性网卡ID(Required) */ func (r *DetachNetworkInterfaceRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DetachNetworkInterfaceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DetachNetworkInterfaceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DetachNetworkInterfaceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DetachNetworkInterfaceResult `json:"result"` } type DetachNetworkInterfaceResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DisassociateElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DisassociateElasticIp.go index da1c69220..d1c023f6b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DisassociateElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/DisassociateElasticIp.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DisassociateElasticIpRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 弹性公网IP的ID */ - ElasticIpId string `json:"elasticIpId"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` + + /* 弹性公网IP的ID */ + ElasticIpId string `json:"elasticIpId"` } /* @@ -41,21 +42,21 @@ type DisassociateElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDisassociateElasticIpRequest( - regionId string, - instanceId string, - elasticIpId string, + regionId string, + instanceId string, + elasticIpId string, ) *DisassociateElasticIpRequest { return &DisassociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:disassociateElasticIp", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - ElasticIpId: elasticIpId, + RegionId: regionId, + InstanceId: instanceId, + ElasticIpId: elasticIpId, } } @@ -65,63 +66,63 @@ func NewDisassociateElasticIpRequest( * param elasticIpId: 弹性公网IP的ID (Required) */ func NewDisassociateElasticIpRequestWithAllParams( - regionId string, - instanceId string, - elasticIpId string, + regionId string, + instanceId string, + elasticIpId string, ) *DisassociateElasticIpRequest { - return &DisassociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:disassociateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - ElasticIpId: elasticIpId, - } + return &DisassociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:disassociateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + ElasticIpId: elasticIpId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDisassociateElasticIpRequestWithoutParam() *DisassociateElasticIpRequest { - return &DisassociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:disassociateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &DisassociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:disassociateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *DisassociateElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *DisassociateElasticIpRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param elasticIpId: 弹性公网IP的ID(Required) */ func (r *DisassociateElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = elasticIpId + r.ElasticIpId = elasticIpId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DisassociateElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DisassociateElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DisassociateElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DisassociateElasticIpResult `json:"result"` } type DisassociateElasticIpResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ImportKeypair.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ImportKeypair.go index eed6d9827..387a85c6b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ImportKeypair.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ImportKeypair.go @@ -17,21 +17,22 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ImportKeypairRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 - */ - KeyName string `json:"keyName"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 密钥对的公钥部分 */ - PublicKey string `json:"publicKey"` + /* 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 + */ + KeyName string `json:"keyName"` + + /* 密钥对的公钥部分 */ + PublicKey string `json:"publicKey"` } /* @@ -41,23 +42,23 @@ type ImportKeypairRequest struct { * param publicKey: 密钥对的公钥部分 (Required) * * @Deprecated, not compatible when mandatory parameters changed -*/ + */ func NewImportKeypairRequest( - regionId string, - keyName string, - publicKey string, + regionId string, + keyName string, + publicKey string, ) *ImportKeypairRequest { return &ImportKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/keypairs:import", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - KeyName: keyName, - PublicKey: publicKey, + RegionId: regionId, + KeyName: keyName, + PublicKey: publicKey, } } @@ -66,68 +67,68 @@ func NewImportKeypairRequest( * param keyName: 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 (Required) * param publicKey: 密钥对的公钥部分 (Required) -*/ + */ func NewImportKeypairRequestWithAllParams( - regionId string, - keyName string, - publicKey string, + regionId string, + keyName string, + publicKey string, ) *ImportKeypairRequest { - return &ImportKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs:import", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - KeyName: keyName, - PublicKey: publicKey, - } + return &ImportKeypairRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs:import", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + KeyName: keyName, + PublicKey: publicKey, + } } /* This constructor has better compatible ability when API parameters changed */ func NewImportKeypairRequestWithoutParam() *ImportKeypairRequest { - return &ImportKeypairRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/keypairs:import", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ImportKeypairRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/keypairs:import", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ImportKeypairRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param keyName: 密钥对名称，需要全局唯一。只允许数字、大小写字母、下划线“_”及中划线“-”，不超过32个字符。 (Required) */ func (r *ImportKeypairRequest) SetKeyName(keyName string) { - r.KeyName = keyName + r.KeyName = keyName } /* param publicKey: 密钥对的公钥部分(Required) */ func (r *ImportKeypairRequest) SetPublicKey(publicKey string) { - r.PublicKey = publicKey + r.PublicKey = publicKey } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ImportKeypairRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ImportKeypairResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ImportKeypairResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ImportKeypairResult `json:"result"` } type ImportKeypairResult struct { - KeyName string `json:"keyName"` - KeyFingerprint string `json:"keyFingerprint"` -} + KeyName string `json:"keyName"` + KeyFingerprint string `json:"keyFingerprint"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyImageAttribute.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyImageAttribute.go index 8b68ea046..0b811aaf6 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyImageAttribute.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyImageAttribute.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyImageAttributeRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 镜像ID */ - ImageId string `json:"imageId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 名称，参考公共参数规范。 (Optional) */ - Name *string `json:"name"` + /* 镜像ID */ + ImageId string `json:"imageId"` - /* 描述，参考公共参数规范。 (Optional) */ - Description *string `json:"description"` + /* 名称，参考公共参数规范。 (Optional) */ + Name *string `json:"name"` + + /* 描述，参考公共参数规范。 (Optional) */ + Description *string `json:"description"` } /* @@ -43,19 +44,19 @@ type ModifyImageAttributeRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyImageAttributeRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *ModifyImageAttributeRequest { return &ModifyImageAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}:modifyImageAttribute", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -66,70 +67,70 @@ func NewModifyImageAttributeRequest( * param description: 描述，参考公共参数规范。 (Optional) */ func NewModifyImageAttributeRequestWithAllParams( - regionId string, - imageId string, - name *string, - description *string, + regionId string, + imageId string, + name *string, + description *string, ) *ModifyImageAttributeRequest { - return &ModifyImageAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}:modifyImageAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - Name: name, - Description: description, - } + return &ModifyImageAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}:modifyImageAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + Name: name, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyImageAttributeRequestWithoutParam() *ModifyImageAttributeRequest { - return &ModifyImageAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}:modifyImageAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyImageAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}:modifyImageAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ModifyImageAttributeRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *ModifyImageAttributeRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } /* param name: 名称，参考公共参数规范。(Optional) */ func (r *ModifyImageAttributeRequest) SetName(name string) { - r.Name = &name + r.Name = &name } /* param description: 描述，参考公共参数规范。(Optional) */ func (r *ModifyImageAttributeRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyImageAttributeRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyImageAttributeResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyImageAttributeResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyImageAttributeResult `json:"result"` } type ModifyImageAttributeResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceAttribute.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceAttribute.go index a8bd346a9..cba1debfd 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceAttribute.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceAttribute.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyInstanceAttributeRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 名称，参考公共参数规范。 (Optional) */ - Name *string `json:"name"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 描述，参考公共参数规范。 (Optional) */ - Description *string `json:"description"` + /* 名称，参考公共参数规范。 (Optional) */ + Name *string `json:"name"` + + /* 描述，参考公共参数规范。 (Optional) */ + Description *string `json:"description"` } /* @@ -43,19 +44,19 @@ type ModifyInstanceAttributeRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyInstanceAttributeRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *ModifyInstanceAttributeRequest { return &ModifyInstanceAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceAttribute", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -66,70 +67,70 @@ func NewModifyInstanceAttributeRequest( * param description: 描述，参考公共参数规范。 (Optional) */ func NewModifyInstanceAttributeRequestWithAllParams( - regionId string, - instanceId string, - name *string, - description *string, + regionId string, + instanceId string, + name *string, + description *string, ) *ModifyInstanceAttributeRequest { - return &ModifyInstanceAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - Name: name, - Description: description, - } + return &ModifyInstanceAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + Name: name, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyInstanceAttributeRequestWithoutParam() *ModifyInstanceAttributeRequest { - return &ModifyInstanceAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyInstanceAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ModifyInstanceAttributeRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *ModifyInstanceAttributeRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param name: 名称，参考公共参数规范。(Optional) */ func (r *ModifyInstanceAttributeRequest) SetName(name string) { - r.Name = &name + r.Name = &name } /* param description: 描述，参考公共参数规范。(Optional) */ func (r *ModifyInstanceAttributeRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyInstanceAttributeRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyInstanceAttributeResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyInstanceAttributeResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyInstanceAttributeResult `json:"result"` } type ModifyInstanceAttributeResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceDiskAttribute.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceDiskAttribute.go index a12780e77..8be479476 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceDiskAttribute.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceDiskAttribute.go @@ -17,21 +17,22 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type ModifyInstanceDiskAttributeRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 云硬盘列表 (Optional) */ - DataDisks []vm.InstanceDiskAttribute `json:"dataDisks"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` + + /* 云硬盘列表 (Optional) */ + DataDisks []vm.InstanceDiskAttribute `json:"dataDisks"` } /* @@ -41,19 +42,19 @@ type ModifyInstanceDiskAttributeRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyInstanceDiskAttributeRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *ModifyInstanceDiskAttributeRequest { return &ModifyInstanceDiskAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceDiskAttribute", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -63,63 +64,63 @@ func NewModifyInstanceDiskAttributeRequest( * param dataDisks: 云硬盘列表 (Optional) */ func NewModifyInstanceDiskAttributeRequestWithAllParams( - regionId string, - instanceId string, - dataDisks []vm.InstanceDiskAttribute, + regionId string, + instanceId string, + dataDisks []vm.InstanceDiskAttribute, ) *ModifyInstanceDiskAttributeRequest { - return &ModifyInstanceDiskAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceDiskAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - DataDisks: dataDisks, - } + return &ModifyInstanceDiskAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceDiskAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + DataDisks: dataDisks, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyInstanceDiskAttributeRequestWithoutParam() *ModifyInstanceDiskAttributeRequest { - return &ModifyInstanceDiskAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceDiskAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyInstanceDiskAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceDiskAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ModifyInstanceDiskAttributeRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *ModifyInstanceDiskAttributeRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param dataDisks: 云硬盘列表(Optional) */ func (r *ModifyInstanceDiskAttributeRequest) SetDataDisks(dataDisks []vm.InstanceDiskAttribute) { - r.DataDisks = dataDisks + r.DataDisks = dataDisks } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyInstanceDiskAttributeRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyInstanceDiskAttributeResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyInstanceDiskAttributeResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyInstanceDiskAttributeResult `json:"result"` } type ModifyInstanceDiskAttributeResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceNetworkAttribute.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceNetworkAttribute.go index 262133b4b..dd219907c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceNetworkAttribute.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstanceNetworkAttribute.go @@ -17,21 +17,22 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" ) type ModifyInstanceNetworkAttributeRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 弹性网卡列表 (Optional) */ - Networks []vm.InstanceNetworkAttribute `json:"networks"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` + + /* 弹性网卡列表 (Optional) */ + Networks []vm.InstanceNetworkAttribute `json:"networks"` } /* @@ -41,19 +42,19 @@ type ModifyInstanceNetworkAttributeRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyInstanceNetworkAttributeRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *ModifyInstanceNetworkAttributeRequest { return &ModifyInstanceNetworkAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceNetworkAttribute", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -63,63 +64,63 @@ func NewModifyInstanceNetworkAttributeRequest( * param networks: 弹性网卡列表 (Optional) */ func NewModifyInstanceNetworkAttributeRequestWithAllParams( - regionId string, - instanceId string, - networks []vm.InstanceNetworkAttribute, + regionId string, + instanceId string, + networks []vm.InstanceNetworkAttribute, ) *ModifyInstanceNetworkAttributeRequest { - return &ModifyInstanceNetworkAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceNetworkAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - Networks: networks, - } + return &ModifyInstanceNetworkAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceNetworkAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + Networks: networks, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyInstanceNetworkAttributeRequestWithoutParam() *ModifyInstanceNetworkAttributeRequest { - return &ModifyInstanceNetworkAttributeRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceNetworkAttribute", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyInstanceNetworkAttributeRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstanceNetworkAttribute", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ModifyInstanceNetworkAttributeRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *ModifyInstanceNetworkAttributeRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param networks: 弹性网卡列表(Optional) */ func (r *ModifyInstanceNetworkAttributeRequest) SetNetworks(networks []vm.InstanceNetworkAttribute) { - r.Networks = networks + r.Networks = networks } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyInstanceNetworkAttributeRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyInstanceNetworkAttributeResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyInstanceNetworkAttributeResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyInstanceNetworkAttributeResult `json:"result"` } type ModifyInstanceNetworkAttributeResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstancePassword.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstancePassword.go index 8c3f3e0de..0d82721ef 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstancePassword.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ModifyInstancePassword.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyInstancePasswordRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 密码，参考公共参数规范。 */ - Password string `json:"password"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` + + /* 密码，参考公共参数规范。 */ + Password string `json:"password"` } /* @@ -41,21 +42,21 @@ type ModifyInstancePasswordRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyInstancePasswordRequest( - regionId string, - instanceId string, - password string, + regionId string, + instanceId string, + password string, ) *ModifyInstancePasswordRequest { return &ModifyInstancePasswordRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:modifyInstancePassword", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - Password: password, + RegionId: regionId, + InstanceId: instanceId, + Password: password, } } @@ -65,63 +66,63 @@ func NewModifyInstancePasswordRequest( * param password: 密码，参考公共参数规范。 (Required) */ func NewModifyInstancePasswordRequestWithAllParams( - regionId string, - instanceId string, - password string, + regionId string, + instanceId string, + password string, ) *ModifyInstancePasswordRequest { - return &ModifyInstancePasswordRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstancePassword", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - Password: password, - } + return &ModifyInstancePasswordRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstancePassword", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + Password: password, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyInstancePasswordRequestWithoutParam() *ModifyInstancePasswordRequest { - return &ModifyInstancePasswordRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:modifyInstancePassword", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyInstancePasswordRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:modifyInstancePassword", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ModifyInstancePasswordRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *ModifyInstancePasswordRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param password: 密码，参考公共参数规范。(Required) */ func (r *ModifyInstancePasswordRequest) SetPassword(password string) { - r.Password = password + r.Password = password } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyInstancePasswordRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyInstancePasswordResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyInstancePasswordResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyInstancePasswordResult `json:"result"` } type ModifyInstancePasswordResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebootInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebootInstance.go index f4fae6f1b..7bfac4809 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebootInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebootInstance.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type RebootInstanceRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* 云主机ID */ + InstanceId string `json:"instanceId"` } /* @@ -37,19 +38,19 @@ type RebootInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewRebootInstanceRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *RebootInstanceRequest { return &RebootInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:rebootInstance", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -58,56 +59,56 @@ func NewRebootInstanceRequest( * param instanceId: 云主机ID (Required) */ func NewRebootInstanceRequestWithAllParams( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *RebootInstanceRequest { - return &RebootInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:rebootInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - } + return &RebootInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:rebootInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewRebootInstanceRequestWithoutParam() *RebootInstanceRequest { - return &RebootInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:rebootInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &RebootInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:rebootInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *RebootInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *RebootInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r RebootInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type RebootInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result RebootInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result RebootInstanceResult `json:"result"` } type RebootInstanceResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebuildInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebuildInstance.go index 2c15d0968..0aa5380f7 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebuildInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/RebuildInstance.go @@ -17,26 +17,27 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type RebuildInstanceRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 云主机密码，参考公共参数规范。 */ - Password string `json:"password"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` - /* 镜像ID。可查询DescribeImages接口获得指定地域的镜像信息。 (Optional) */ - ImageId *string `json:"imageId"` + /* 云主机密码，参考公共参数规范。 */ + Password string `json:"password"` - /* 密钥对名称；当前只支持一个。仅Linux系统支持指定。 (Optional) */ - KeyNames []string `json:"keyNames"` + /* 镜像ID。可查询DescribeImages接口获得指定地域的镜像信息。 (Optional) */ + ImageId *string `json:"imageId"` + + /* 密钥对名称；当前只支持一个。仅Linux系统支持指定。 (Optional) */ + KeyNames []string `json:"keyNames"` } /* @@ -47,21 +48,21 @@ type RebuildInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewRebuildInstanceRequest( - regionId string, - instanceId string, - password string, + regionId string, + instanceId string, + password string, ) *RebuildInstanceRequest { return &RebuildInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:rebuildInstance", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - Password: password, + RegionId: regionId, + InstanceId: instanceId, + Password: password, } } @@ -73,77 +74,77 @@ func NewRebuildInstanceRequest( * param keyNames: 密钥对名称；当前只支持一个。仅Linux系统支持指定。 (Optional) */ func NewRebuildInstanceRequestWithAllParams( - regionId string, - instanceId string, - password string, - imageId *string, - keyNames []string, + regionId string, + instanceId string, + password string, + imageId *string, + keyNames []string, ) *RebuildInstanceRequest { - return &RebuildInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:rebuildInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - Password: password, - ImageId: imageId, - KeyNames: keyNames, - } + return &RebuildInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:rebuildInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + Password: password, + ImageId: imageId, + KeyNames: keyNames, + } } /* This constructor has better compatible ability when API parameters changed */ func NewRebuildInstanceRequestWithoutParam() *RebuildInstanceRequest { - return &RebuildInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:rebuildInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &RebuildInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:rebuildInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *RebuildInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *RebuildInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param password: 云主机密码，参考公共参数规范。(Required) */ func (r *RebuildInstanceRequest) SetPassword(password string) { - r.Password = password + r.Password = password } /* param imageId: 镜像ID。可查询DescribeImages接口获得指定地域的镜像信息。(Optional) */ func (r *RebuildInstanceRequest) SetImageId(imageId string) { - r.ImageId = &imageId + r.ImageId = &imageId } /* param keyNames: 密钥对名称；当前只支持一个。仅Linux系统支持指定。(Optional) */ func (r *RebuildInstanceRequest) SetKeyNames(keyNames []string) { - r.KeyNames = keyNames + r.KeyNames = keyNames } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r RebuildInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type RebuildInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result RebuildInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result RebuildInstanceResult `json:"result"` } type RebuildInstanceResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ResizeInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ResizeInstance.go index 28c9e5e18..4c5f83bc3 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ResizeInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ResizeInstance.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ResizeInstanceRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 实例规格，可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 */ - InstanceType string `json:"instanceType"` + /* 云主机ID */ + InstanceId string `json:"instanceId"` + + /* 实例规格，可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 */ + InstanceType string `json:"instanceType"` } /* @@ -41,21 +42,21 @@ type ResizeInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewResizeInstanceRequest( - regionId string, - instanceId string, - instanceType string, + regionId string, + instanceId string, + instanceType string, ) *ResizeInstanceRequest { return &ResizeInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:resizeInstance", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, - InstanceType: instanceType, + RegionId: regionId, + InstanceId: instanceId, + InstanceType: instanceType, } } @@ -65,63 +66,63 @@ func NewResizeInstanceRequest( * param instanceType: 实例规格，可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 (Required) */ func NewResizeInstanceRequestWithAllParams( - regionId string, - instanceId string, - instanceType string, + regionId string, + instanceId string, + instanceType string, ) *ResizeInstanceRequest { - return &ResizeInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:resizeInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - InstanceType: instanceType, - } + return &ResizeInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:resizeInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + InstanceType: instanceType, + } } /* This constructor has better compatible ability when API parameters changed */ func NewResizeInstanceRequestWithoutParam() *ResizeInstanceRequest { - return &ResizeInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:resizeInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ResizeInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:resizeInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ResizeInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *ResizeInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } /* param instanceType: 实例规格，可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。(Required) */ func (r *ResizeInstanceRequest) SetInstanceType(instanceType string) { - r.InstanceType = instanceType + r.InstanceType = instanceType } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ResizeInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ResizeInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ResizeInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ResizeInstanceResult `json:"result"` } type ResizeInstanceResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ShareImage.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ShareImage.go index f5ef68b22..3f047a801 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ShareImage.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/ShareImage.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ShareImageRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 镜像ID */ - ImageId string `json:"imageId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 需要共享的帐户 (Optional) */ - Pins []string `json:"pins"` + /* 镜像ID */ + ImageId string `json:"imageId"` + + /* 需要共享的帐户 (Optional) */ + Pins []string `json:"pins"` } /* @@ -40,19 +41,19 @@ type ShareImageRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewShareImageRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *ShareImageRequest { return &ShareImageRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}:share", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -62,63 +63,63 @@ func NewShareImageRequest( * param pins: 需要共享的帐户 (Optional) */ func NewShareImageRequestWithAllParams( - regionId string, - imageId string, - pins []string, + regionId string, + imageId string, + pins []string, ) *ShareImageRequest { - return &ShareImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}:share", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - Pins: pins, - } + return &ShareImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}:share", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + Pins: pins, + } } /* This constructor has better compatible ability when API parameters changed */ func NewShareImageRequestWithoutParam() *ShareImageRequest { - return &ShareImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}:share", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ShareImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}:share", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *ShareImageRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *ShareImageRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } /* param pins: 需要共享的帐户(Optional) */ func (r *ShareImageRequest) SetPins(pins []string) { - r.Pins = pins + r.Pins = pins } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ShareImageRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ShareImageResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ShareImageResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ShareImageResult `json:"result"` } type ShareImageResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StartInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StartInstance.go index 19c1d4e4b..cdb93d9d9 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StartInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StartInstance.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type StartInstanceRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* 云主机ID */ + InstanceId string `json:"instanceId"` } /* @@ -37,19 +38,19 @@ type StartInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewStartInstanceRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *StartInstanceRequest { return &StartInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:startInstance", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -58,56 +59,56 @@ func NewStartInstanceRequest( * param instanceId: 云主机ID (Required) */ func NewStartInstanceRequestWithAllParams( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *StartInstanceRequest { - return &StartInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:startInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - } + return &StartInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:startInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewStartInstanceRequestWithoutParam() *StartInstanceRequest { - return &StartInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:startInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &StartInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:startInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *StartInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *StartInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r StartInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type StartInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result StartInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result StartInstanceResult `json:"result"` } type StartInstanceResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StopInstance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StopInstance.go index f3a2c8024..c23c6cd42 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StopInstance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/StopInstance.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type StopInstanceRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 云主机ID */ - InstanceId string `json:"instanceId"` + /* 地域ID */ + RegionId string `json:"regionId"` + + /* 云主机ID */ + InstanceId string `json:"instanceId"` } /* @@ -37,19 +38,19 @@ type StopInstanceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewStopInstanceRequest( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *StopInstanceRequest { return &StopInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/instances/{instanceId}:stopInstance", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - InstanceId: instanceId, + RegionId: regionId, + InstanceId: instanceId, } } @@ -58,56 +59,56 @@ func NewStopInstanceRequest( * param instanceId: 云主机ID (Required) */ func NewStopInstanceRequestWithAllParams( - regionId string, - instanceId string, + regionId string, + instanceId string, ) *StopInstanceRequest { - return &StopInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:stopInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - InstanceId: instanceId, - } + return &StopInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:stopInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + InstanceId: instanceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewStopInstanceRequestWithoutParam() *StopInstanceRequest { - return &StopInstanceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/instances/{instanceId}:stopInstance", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &StopInstanceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/instances/{instanceId}:stopInstance", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *StopInstanceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param instanceId: 云主机ID(Required) */ func (r *StopInstanceRequest) SetInstanceId(instanceId string) { - r.InstanceId = instanceId + r.InstanceId = instanceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r StopInstanceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type StopInstanceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result StopInstanceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result StopInstanceResult `json:"result"` } type StopInstanceResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/UnShareImage.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/UnShareImage.go index ad7e1a79e..0e34ed4f9 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/UnShareImage.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis/UnShareImage.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type UnShareImageRequest struct { - core.JDCloudRequest - /* 地域ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 镜像ID */ - ImageId string `json:"imageId"` + /* 地域ID */ + RegionId string `json:"regionId"` - /* 需要取消的帐户 (Optional) */ - Pins []string `json:"pins"` + /* 镜像ID */ + ImageId string `json:"imageId"` + + /* 需要取消的帐户 (Optional) */ + Pins []string `json:"pins"` } /* @@ -40,19 +41,19 @@ type UnShareImageRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewUnShareImageRequest( - regionId string, - imageId string, + regionId string, + imageId string, ) *UnShareImageRequest { return &UnShareImageRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/images/{imageId}:unshare", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - ImageId: imageId, + RegionId: regionId, + ImageId: imageId, } } @@ -62,63 +63,63 @@ func NewUnShareImageRequest( * param pins: 需要取消的帐户 (Optional) */ func NewUnShareImageRequestWithAllParams( - regionId string, - imageId string, - pins []string, + regionId string, + imageId string, + pins []string, ) *UnShareImageRequest { - return &UnShareImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}:unshare", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ImageId: imageId, - Pins: pins, - } + return &UnShareImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}:unshare", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ImageId: imageId, + Pins: pins, + } } /* This constructor has better compatible ability when API parameters changed */ func NewUnShareImageRequestWithoutParam() *UnShareImageRequest { - return &UnShareImageRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/images/{imageId}:unshare", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &UnShareImageRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/images/{imageId}:unshare", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: 地域ID(Required) */ func (r *UnShareImageRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param imageId: 镜像ID(Required) */ func (r *UnShareImageRequest) SetImageId(imageId string) { - r.ImageId = imageId + r.ImageId = imageId } /* param pins: 需要取消的帐户(Optional) */ func (r *UnShareImageRequest) SetPins(pins []string) { - r.Pins = pins + r.Pins = pins } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r UnShareImageRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type UnShareImageResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result UnShareImageResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result UnShareImageResult `json:"result"` } type UnShareImageResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client/VmClient.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client/VmClient.go index 4694e4814..6ec95e956 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client/VmClient.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client/VmClient.go @@ -17,85 +17,85 @@ package client import ( - "encoding/json" - "errors" - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" + "encoding/json" + "errors" ) type VmClient struct { - core.JDCloudClient + core.JDCloudClient } func NewVmClient(credential *core.Credential) *VmClient { - if credential == nil { - return nil - } + if credential == nil { + return nil + } - config := core.NewConfig() - config.SetEndpoint("vm.jdcloud-api.com") + config := core.NewConfig() + config.SetEndpoint("vm.jdcloud-api.com") - return &VmClient{ - core.JDCloudClient{ - Credential: *credential, - Config: *config, - ServiceName: "vm", - Revision: "1.0.8", - Logger: core.NewDefaultLogger(core.LogInfo), - }} + return &VmClient{ + core.JDCloudClient{ + Credential: *credential, + Config: *config, + ServiceName: "vm", + Revision: "1.0.8", + Logger: core.NewDefaultLogger(core.LogInfo), + }} } func (c *VmClient) SetConfig(config *core.Config) { - c.Config = *config + c.Config = *config } func (c *VmClient) SetLogger(logger core.Logger) { - c.Logger = logger + c.Logger = logger } /* 查询镜像共享帐户列表，只允许操作您的个人私有镜像。 */ func (c *VmClient) DescribeImageMembers(request *vm.DescribeImageMembersRequest) (*vm.DescribeImageMembersResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeImageMembersResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeImageMembersResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 为云主机创建私有镜像。云主机状态必须为stopped。
    云主机没有正在进行中的任务才可制作镜像。
    制作镜像以备份系统盘为基础，在此之上可选择全部或部分挂载数据盘制作整机镜像（如不做任何更改将默认制作整机镜像），制作镜像过程会为所挂载云硬盘创建快照并与镜像关联。
    调用接口后，需要等待镜像状态变为ready后，才能正常使用镜像。 -*/ + */ func (c *VmClient) CreateImage(request *vm.CreateImageRequest) (*vm.CreateImageResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.CreateImageResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.CreateImageResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建一台或多台指定配置的云主机，创建模式分为三种：1.普通方式、2.使用高可用组、3.使用启动模板。三种方式创建云主机时参数的必传与非必传是不同的，具体请参考参数详细说明
    @@ -147,199 +147,199 @@ func (c *VmClient) CreateImage(request *vm.CreateImageRequest) (*vm.CreateImageR - 虚机的az会覆盖磁盘的az属性 - 密码 - 参考公共参数规范 -*/ + */ func (c *VmClient) CreateInstances(request *vm.CreateInstancesRequest) (*vm.CreateInstancesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.CreateInstancesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.CreateInstancesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 为云主机主网卡下的主内网IP绑定弹性公网IP。
    一台云主机只能绑定一个弹性公网IP(主网卡)，若主网卡已存在弹性公网IP，会返回错误。
    -*/ + */ func (c *VmClient) AssociateElasticIp(request *vm.AssociateElasticIpRequest) (*vm.AssociateElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.AssociateElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.AssociateElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 共享镜像，只允许操作您的个人私有镜像，单个镜像最多可共享给20个京东云帐户。
    整机镜像目前不支持共享。 -*/ + */ func (c *VmClient) ShareImage(request *vm.ShareImageRequest) (*vm.ShareImageResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ShareImageResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ShareImageResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 云主机解绑弹性公网IP，解绑的是主网卡、内网主IP对应的弹性公网IP。 */ func (c *VmClient) DisassociateElasticIp(request *vm.DisassociateElasticIpRequest) (*vm.DisassociateElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DisassociateElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DisassociateElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 停止单个云主机，只能停止running状态的云主机，云主机没有正在进行中的任务才可停止 */ func (c *VmClient) StopInstance(request *vm.StopInstanceRequest) (*vm.StopInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.StopInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.StopInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 启动单个云主机，只能启动stopped状态的云主机，云主机没有正在进行中的任务才可启动。
    只能启动正常计费状态的云主机。 -*/ + */ func (c *VmClient) StartInstance(request *vm.StartInstanceRequest) (*vm.StartInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.StartInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.StartInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询镜像信息列表。
    通过此接口可以查询到京东云官方镜像、第三方镜像、私有镜像、或其他用户共享给您的镜像。
    此接口支持分页查询，默认每页20条。 -*/ + */ func (c *VmClient) DescribeImages(request *vm.DescribeImagesRequest) (*vm.DescribeImagesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeImagesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeImagesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询镜像的实例规格限制。
    通过此接口可以查看镜像不支持的实例规格。只有官方镜像、第三方镜像有实例规格的限制，个人的私有镜像没有此限制。 -*/ + */ func (c *VmClient) DescribeImageConstraints(request *vm.DescribeImageConstraintsRequest) (*vm.DescribeImageConstraintsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeImageConstraintsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeImageConstraintsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 获取云主机vnc，用于连接管理云主机。
    vnc地址的有效期为1个小时，调用接口获取vnc地址后如果1个小时内没有使用，vnc地址自动失效，再次使用需要重新获取。 -*/ + */ func (c *VmClient) DescribeInstanceVncUrl(request *vm.DescribeInstanceVncUrlRequest) (*vm.DescribeInstanceVncUrlResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeInstanceVncUrlResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeInstanceVncUrlResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 云主机使用指定镜像重置云主机系统
    @@ -347,66 +347,66 @@ func (c *VmClient) DescribeInstanceVncUrl(request *vm.DescribeInstanceVncUrlRequ 若当前云主机的系统盘类型为local类型，那么更换的镜像必须为localDisk类型的镜像；同理若当前云主机的系统盘为cloud类型，那么更换的镜像必须为cloudDisk类型的镜像。可查询DescribeImages接口获得指定地域的镜像信息。
    若不指定镜像ID，默认使用当前主机的原镜像重置系统。
    指定的镜像必须能够支持当前主机的实例规格(instanceType)，否则会返回错误。可查询DescribeImageConstraints接口获得指定镜像支持的系统盘类型信息。 -*/ + */ func (c *VmClient) RebuildInstance(request *vm.RebuildInstanceRequest) (*vm.RebuildInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.RebuildInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.RebuildInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 取消共享镜像，只允许操作您的个人私有镜像。 */ func (c *VmClient) UnShareImage(request *vm.UnShareImageRequest) (*vm.UnShareImageResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.UnShareImageResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.UnShareImageResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改云主机部分信息，包括名称、描述。 */ func (c *VmClient) ModifyInstanceAttribute(request *vm.ModifyInstanceAttributeRequest) (*vm.ModifyInstanceAttributeResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ModifyInstanceAttributeResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ModifyInstanceAttributeResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 云主机变更实例规格
    @@ -418,134 +418,134 @@ func (c *VmClient) ModifyInstanceAttribute(request *vm.ModifyInstanceAttributeRe 如果当前主机中的弹性网卡数量，大于新实例规格允许的弹性网卡数量，会返回错误。可查询DescribeInstanceTypes接口获得指定地域及可用区下的实例规格信息。
    当前主机所使用的镜像，需要支持要变更的目标实例规格，否则返回错误。可查询DescribeImageConstraints接口获得指定镜像的实例规格限制信息。
    云主机欠费或到期时，无法更改实例规格。 -*/ + */ func (c *VmClient) ResizeInstance(request *vm.ResizeInstanceRequest) (*vm.ResizeInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ResizeInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ResizeInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 批量查询镜像的实例规格限制。
    通过此接口可以查看镜像不支持的实例规格。只有官方镜像、第三方镜像有实例规格的限制，个人的私有镜像没有此限制。 -*/ + */ func (c *VmClient) DescribeImageConstraintsBatch(request *vm.DescribeImageConstraintsBatchRequest) (*vm.DescribeImageConstraintsBatchResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeImageConstraintsBatchResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeImageConstraintsBatchResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 为一台云主机挂载一块数据盘(云硬盘)，云主机和云硬盘没有正在进行中的的任务时才可挂载。
    云主机状态必须是running或stopped状态。
    本地盘(local类型)做系统盘的云主机可挂载8块数据盘，云硬盘(cloud类型)做系统盘的云主机可挂载7块数据盘。 -*/ + */ func (c *VmClient) AttachDisk(request *vm.AttachDiskRequest) (*vm.AttachDiskResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.AttachDiskResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.AttachDiskResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改云主机密码，主机没有正在进行中的任务时才可操作。
    修改密码后，需要重启云主机后生效。 -*/ + */ func (c *VmClient) ModifyInstancePassword(request *vm.ModifyInstancePasswordRequest) (*vm.ModifyInstancePasswordResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ModifyInstancePasswordResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ModifyInstancePasswordResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除一个私有镜像，只允许操作您的个人私有镜像。
    若镜像已共享给其他用户，需先取消共享才可删除。 -*/ + */ func (c *VmClient) DeleteImage(request *vm.DeleteImageRequest) (*vm.DeleteImageResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DeleteImageResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DeleteImageResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询实例规格信息列表 */ func (c *VmClient) DescribeInstanceTypes(request *vm.DescribeInstanceTypesRequest) (*vm.DescribeInstanceTypesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeInstanceTypesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeInstanceTypesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 云主机挂载一块弹性网卡。
    @@ -553,343 +553,343 @@ func (c *VmClient) DescribeInstanceTypes(request *vm.DescribeInstanceTypesReques 弹性网卡上如果绑定了公网IP，那么公网IP所在az需要与云主机的az保持一致，或者公网IP属于全可用区，才可挂载。
    云主机挂载弹性网卡的数量，不能超过实例规格的限制。可查询DescribeInstanceTypes接口获得指定规格可挂载弹性网卡的数量上限。
    弹性网卡与云主机必须在相同vpc下。 -*/ + */ func (c *VmClient) AttachNetworkInterface(request *vm.AttachNetworkInterfaceRequest) (*vm.AttachNetworkInterfaceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.AttachNetworkInterfaceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.AttachNetworkInterfaceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除ssh密钥对。 */ func (c *VmClient) DeleteKeypair(request *vm.DeleteKeypairRequest) (*vm.DeleteKeypairResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DeleteKeypairResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DeleteKeypairResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询镜像详情。 */ func (c *VmClient) DescribeImage(request *vm.DescribeImageRequest) (*vm.DescribeImageResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeImageResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeImageResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 云主机缷载一块弹性网卡。
    云主机状态必须为running或stopped状态，并且没有正在进行中的任务才可操作。
    不能缷载主网卡。 -*/ + */ func (c *VmClient) DetachNetworkInterface(request *vm.DetachNetworkInterfaceRequest) (*vm.DetachNetworkInterfaceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DetachNetworkInterfaceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DetachNetworkInterfaceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 导入由其他工具生成的密钥对的公钥部分。
    若传入已存在的密钥名称，会返回错误。 -*/ + */ func (c *VmClient) ImportKeypair(request *vm.ImportKeypairRequest) (*vm.ImportKeypairResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ImportKeypairResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ImportKeypairResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 镜像跨区复制，将私有镜像复制到其它地域下，只允许操作您的个人私有镜像。
    只支持rootDeviceType为cloudDisk的云硬盘系统盘镜像操作。 -*/ + */ func (c *VmClient) CopyImages(request *vm.CopyImagesRequest) (*vm.CopyImagesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.CopyImagesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.CopyImagesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询一台云主机的详细信息 */ func (c *VmClient) DescribeInstance(request *vm.DescribeInstanceRequest) (*vm.DescribeInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改虚机弹性网卡属性，包括是否随云主机一起删除。
    不能修改主网卡。 -*/ + */ func (c *VmClient) ModifyInstanceNetworkAttribute(request *vm.ModifyInstanceNetworkAttributeRequest) (*vm.ModifyInstanceNetworkAttributeResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ModifyInstanceNetworkAttributeResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ModifyInstanceNetworkAttributeResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询配额，支持：云主机、镜像、密钥、模板、镜像共享 */ func (c *VmClient) DescribeQuotas(request *vm.DescribeQuotasRequest) (*vm.DescribeQuotasResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeQuotasResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeQuotasResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改镜像信息，包括名称、描述；只允许操作您的个人私有镜像。 */ func (c *VmClient) ModifyImageAttribute(request *vm.ModifyImageAttributeRequest) (*vm.ModifyImageAttributeResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ModifyImageAttributeResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ModifyImageAttributeResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 重启单个云主机，只能重启running状态的云主机，云主机没有正在进行中的任务才可重启。 */ func (c *VmClient) RebootInstance(request *vm.RebootInstanceRequest) (*vm.RebootInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.RebootInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.RebootInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改云主机挂载的数据盘属性，包括是否随主机删除。 */ func (c *VmClient) ModifyInstanceDiskAttribute(request *vm.ModifyInstanceDiskAttributeRequest) (*vm.ModifyInstanceDiskAttributeResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.ModifyInstanceDiskAttributeResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.ModifyInstanceDiskAttributeResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 批量查询云主机内网IP地址，查询的是主网卡内网主IP地址。 */ func (c *VmClient) DescribeInstancePrivateIpAddress(request *vm.DescribeInstancePrivateIpAddressRequest) (*vm.DescribeInstancePrivateIpAddressResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeInstancePrivateIpAddressResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeInstancePrivateIpAddressResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 批量查询云主机状态 */ func (c *VmClient) DescribeInstanceStatus(request *vm.DescribeInstanceStatusRequest) (*vm.DescribeInstanceStatusResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeInstanceStatusResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeInstanceStatusResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 批量查询密钥对。
    此接口支持分页查询，默认每页20条。 -*/ + */ func (c *VmClient) DescribeKeypairs(request *vm.DescribeKeypairsRequest) (*vm.DescribeKeypairsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeKeypairsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeKeypairsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 云主机缷载数据盘，云主机和云硬盘没有正在进行中的任务时才可缷载。
    */ func (c *VmClient) DetachDisk(request *vm.DetachDiskRequest) (*vm.DetachDiskResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DetachDiskResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DetachDiskResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除按配置计费、或包年包月已到期的单个云主机。不能删除没有计费信息的云主机。
    @@ -898,64 +898,65 @@ func (c *VmClient) DetachDisk(request *vm.DetachDiskRequest) (*vm.DetachDiskResp 如果主机中挂载的数据盘为按配置计费的云硬盘，并且不是共享型云硬盘，并且AutoDelete属性为true，那么数据盘会随主机一起删除。 [MFA enabled] */ func (c *VmClient) DeleteInstance(request *vm.DeleteInstanceRequest) (*vm.DeleteInstanceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DeleteInstanceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DeleteInstanceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 批量查询云主机的详细信息
    此接口支持分页查询，默认每页20条。 -*/ + */ func (c *VmClient) DescribeInstances(request *vm.DescribeInstancesRequest) (*vm.DescribeInstancesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.DescribeInstancesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.DescribeInstancesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建ssh密钥对。公钥部分存储在京东云，并返回未加密的 PEM 编码的 PKCS#8 格式私钥，您只有一次机会保存您的私钥。请妥善保管。
    若传入已存在的密钥名称，会返回错误。 -*/ + */ func (c *VmClient) CreateKeypair(request *vm.CreateKeypairRequest) (*vm.CreateKeypairResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vm.CreateKeypairResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vm.CreateKeypairResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } + diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Ag.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Ag.go index 2a0c190e0..2e2d48e6a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Ag.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Ag.go @@ -16,11 +16,12 @@ package models + type Ag struct { - /* 高可用组名称 (Optional) */ - Name string `json:"name"` + /* 高可用组名称 (Optional) */ + Name string `json:"name"` - /* 高可用组id (Optional) */ - Id string `json:"id"` + /* 高可用组id (Optional) */ + Id string `json:"id"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/CopyImage.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/CopyImage.go index aaf55013d..43332d8c5 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/CopyImage.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/CopyImage.go @@ -16,11 +16,12 @@ package models + type CopyImage struct { - /* 复制后的目标镜像ID (Optional) */ - DestinationImageId string `json:"destinationImageId"` + /* 复制后的目标镜像ID (Optional) */ + DestinationImageId string `json:"destinationImageId"` - /* 源镜像ID (Optional) */ - SourceImageId string `json:"sourceImageId"` + /* 源镜像ID (Optional) */ + SourceImageId string `json:"sourceImageId"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Gpu.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Gpu.go index c4cbd0265..4755199be 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Gpu.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Gpu.go @@ -16,11 +16,12 @@ package models + type Gpu struct { - /* GPU型号 (Optional) */ - Model string `json:"model"` + /* GPU型号 (Optional) */ + Model string `json:"model"` - /* GPU数量 (Optional) */ - Number int `json:"number"` + /* GPU数量 (Optional) */ + Number int `json:"number"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Image.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Image.go index 0f9c0ddc6..70e7a6d95 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Image.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Image.go @@ -16,56 +16,57 @@ package models + type Image struct { - /* 镜像ID (Optional) */ - ImageId string `json:"imageId"` + /* 镜像ID (Optional) */ + ImageId string `json:"imageId"` - /* 镜像名称 (Optional) */ - Name string `json:"name"` + /* 镜像名称 (Optional) */ + Name string `json:"name"` - /* 镜像的操作系统发行版。取值：Ubuntu,CentOS,Windows Server (Optional) */ - Platform string `json:"platform"` + /* 镜像的操作系统发行版。取值：Ubuntu,CentOS,Windows Server (Optional) */ + Platform string `json:"platform"` - /* 镜像的操作系统版本。 (Optional) */ - OsVersion string `json:"osVersion"` + /* 镜像的操作系统版本。 (Optional) */ + OsVersion string `json:"osVersion"` - /* 镜像架构。取值：i386,x86_64 (Optional) */ - Architecture string `json:"architecture"` + /* 镜像架构。取值：i386,x86_64 (Optional) */ + Architecture string `json:"architecture"` - /* 镜像系统盘大小 (Optional) */ - SystemDiskSizeGB int `json:"systemDiskSizeGB"` + /* 镜像系统盘大小 (Optional) */ + SystemDiskSizeGB int `json:"systemDiskSizeGB"` - /* 镜像来源。取值：jcloud：官方镜像；marketplace：镜像市场镜像；self：用户自己的镜像；shared：其他用户分享的镜像 (Optional) */ - ImageSource string `json:"imageSource"` + /* 镜像来源。取值：jcloud：官方镜像；marketplace：镜像市场镜像；self：用户自己的镜像；shared：其他用户分享的镜像 (Optional) */ + ImageSource string `json:"imageSource"` - /* 镜像的操作系统类型。取值：windows,linux (Optional) */ - OsType string `json:"osType"` + /* 镜像的操作系统类型。取值：windows,linux (Optional) */ + OsType string `json:"osType"` - /* 参考镜像状态 (Optional) */ - Status string `json:"status"` + /* 参考镜像状态 (Optional) */ + Status string `json:"status"` - /* 创建时间 (Optional) */ - CreateTime string `json:"createTime"` + /* 创建时间 (Optional) */ + CreateTime string `json:"createTime"` - /* 镜像文件实际大小 (Optional) */ - SizeMB int `json:"sizeMB"` + /* 镜像文件实际大小 (Optional) */ + SizeMB int `json:"sizeMB"` - /* 镜像描述 (Optional) */ - Desc string `json:"desc"` + /* 镜像描述 (Optional) */ + Desc string `json:"desc"` - /* 镜像系统盘配置 (Optional) */ - SystemDisk InstanceDiskAttachment `json:"systemDisk"` + /* 镜像系统盘配置 (Optional) */ + SystemDisk InstanceDiskAttachment `json:"systemDisk"` - /* 镜像数据盘映射信息 (Optional) */ - DataDisks []InstanceDiskAttachment `json:"dataDisks"` + /* 镜像数据盘映射信息 (Optional) */ + DataDisks []InstanceDiskAttachment `json:"dataDisks"` - /* 创建云盘系统盘所使用的云硬盘快照ID。系统盘类型为本地盘的镜像，此参数为空。 (Optional) */ - SnapshotId string `json:"snapshotId"` + /* 创建云盘系统盘所使用的云硬盘快照ID。系统盘类型为本地盘的镜像，此参数为空。 (Optional) */ + SnapshotId string `json:"snapshotId"` - /* 镜像支持的系统盘类型。取值：localDisk：本地盘系统盘；cloudDisk：云盘系统盘。 (Optional) */ - RootDeviceType string `json:"rootDeviceType"` + /* 镜像支持的系统盘类型。取值：localDisk：本地盘系统盘；cloudDisk：云盘系统盘。 (Optional) */ + RootDeviceType string `json:"rootDeviceType"` - /* 镜像复制和转换时的进度，仅显示数值，单位为百分比 (Optional) */ - Progress string `json:"progress"` + /* 镜像复制和转换时的进度，仅显示数值，单位为百分比 (Optional) */ + Progress string `json:"progress"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageConstraint.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageConstraint.go index 4a6600165..66bca6972 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageConstraint.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageConstraint.go @@ -16,11 +16,12 @@ package models + type ImageConstraint struct { - /* 镜像ID (Optional) */ - ImageId string `json:"imageId"` + /* 镜像ID (Optional) */ + ImageId string `json:"imageId"` - /* 使用镜像创建实例的规格限制 (Optional) */ - ImageInstanceTypeConstraint ImageInstanceTypeConstraint `json:"imageInstanceTypeConstraint"` + /* 使用镜像创建实例的规格限制 (Optional) */ + ImageInstanceTypeConstraint ImageInstanceTypeConstraint `json:"imageInstanceTypeConstraint"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageInstanceTypeConstraint.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageInstanceTypeConstraint.go index 9cb6bd735..a53ef7835 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageInstanceTypeConstraint.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/ImageInstanceTypeConstraint.go @@ -16,11 +16,12 @@ package models + type ImageInstanceTypeConstraint struct { - /* 限制类型。取值：excludes：不支持的实例类型；includes：支持的实例类型。 (Optional) */ - ConstraintsType string `json:"constraintsType"` + /* 限制类型。取值：excludes：不支持的实例类型；includes：支持的实例类型。 (Optional) */ + ConstraintsType string `json:"constraintsType"` - /* 实例规格列表 (Optional) */ - InstanceTypes []string `json:"instanceTypes"` + /* 实例规格列表 (Optional) */ + InstanceTypes []string `json:"instanceTypes"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Instance.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Instance.go index 8e1af0861..c49c6471c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Instance.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Instance.go @@ -21,69 +21,69 @@ import disk "github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models" type Instance struct { - /* 云主机ID (Optional) */ - InstanceId string `json:"instanceId"` + /* 云主机ID (Optional) */ + InstanceId string `json:"instanceId"` - /* 云主机名称 (Optional) */ - InstanceName string `json:"instanceName"` + /* 云主机名称 (Optional) */ + InstanceName string `json:"instanceName"` - /* 实例规格 (Optional) */ - InstanceType string `json:"instanceType"` + /* 实例规格 (Optional) */ + InstanceType string `json:"instanceType"` - /* 主网卡所属VPC的ID (Optional) */ - VpcId string `json:"vpcId"` + /* 主网卡所属VPC的ID (Optional) */ + VpcId string `json:"vpcId"` - /* 主网卡所属子网的ID (Optional) */ - SubnetId string `json:"subnetId"` + /* 主网卡所属子网的ID (Optional) */ + SubnetId string `json:"subnetId"` - /* 主网卡主IP地址 (Optional) */ - PrivateIpAddress string `json:"privateIpAddress"` + /* 主网卡主IP地址 (Optional) */ + PrivateIpAddress string `json:"privateIpAddress"` - /* 主网卡主IP绑定弹性IP的ID (Optional) */ - ElasticIpId string `json:"elasticIpId"` + /* 主网卡主IP绑定弹性IP的ID (Optional) */ + ElasticIpId string `json:"elasticIpId"` - /* 主网卡主IP绑定弹性IP的地址 (Optional) */ - ElasticIpAddress string `json:"elasticIpAddress"` + /* 主网卡主IP绑定弹性IP的地址 (Optional) */ + ElasticIpAddress string `json:"elasticIpAddress"` - /* 云主机状态，参考云主机状态 (Optional) */ - Status string `json:"status"` + /* 云主机状态，参考云主机状态 (Optional) */ + Status string `json:"status"` - /* 云主机描述 (Optional) */ - Description string `json:"description"` + /* 云主机描述 (Optional) */ + Description string `json:"description"` - /* 镜像ID (Optional) */ - ImageId string `json:"imageId"` + /* 镜像ID (Optional) */ + ImageId string `json:"imageId"` - /* 系统盘配置 (Optional) */ - SystemDisk InstanceDiskAttachment `json:"systemDisk"` + /* 系统盘配置 (Optional) */ + SystemDisk InstanceDiskAttachment `json:"systemDisk"` - /* 数据盘配置 (Optional) */ - DataDisks []InstanceDiskAttachment `json:"dataDisks"` + /* 数据盘配置 (Optional) */ + DataDisks []InstanceDiskAttachment `json:"dataDisks"` - /* 主网卡配置 (Optional) */ - PrimaryNetworkInterface InstanceNetworkInterfaceAttachment `json:"primaryNetworkInterface"` + /* 主网卡配置 (Optional) */ + PrimaryNetworkInterface InstanceNetworkInterfaceAttachment `json:"primaryNetworkInterface"` - /* 辅助网卡配置 (Optional) */ - SecondaryNetworkInterfaces []InstanceNetworkInterfaceAttachment `json:"secondaryNetworkInterfaces"` + /* 辅助网卡配置 (Optional) */ + SecondaryNetworkInterfaces []InstanceNetworkInterfaceAttachment `json:"secondaryNetworkInterfaces"` - /* 创建时间 (Optional) */ - LaunchTime string `json:"launchTime"` + /* 创建时间 (Optional) */ + LaunchTime string `json:"launchTime"` - /* 云主机所在可用区 (Optional) */ - Az string `json:"az"` + /* 云主机所在可用区 (Optional) */ + Az string `json:"az"` - /* 密钥对名称 (Optional) */ - KeyNames []string `json:"keyNames"` + /* 密钥对名称 (Optional) */ + KeyNames []string `json:"keyNames"` - /* 计费信息 (Optional) */ - Charge charge.Charge `json:"charge"` + /* 计费信息 (Optional) */ + Charge charge.Charge `json:"charge"` - /* 高可用组，如果创建云主机使用了高可用组，此处可展示高可用组名称 (Optional) */ - Ag Ag `json:"ag"` + /* 高可用组，如果创建云主机使用了高可用组，此处可展示高可用组名称 (Optional) */ + Ag Ag `json:"ag"` - /* 高可用组中的错误域 (Optional) */ - FaultDomain string `json:"faultDomain"` + /* 高可用组中的错误域 (Optional) */ + FaultDomain string `json:"faultDomain"` - /* Tag信息 (Optional) */ - Tags []disk.Tag `json:"tags"` + /* Tag信息 (Optional) */ + Tags []disk.Tag `json:"tags"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachment.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachment.go index 5b8e3e1d3..33aa425e8 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachment.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachment.go @@ -20,27 +20,27 @@ import disk "github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models" type InstanceDiskAttachment struct { - /* 磁盘分类，取值为本地盘(local)或者数据盘(cloud)。 - 系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 - 数据盘仅支持云硬盘(cloud)。 - (Optional) */ - DiskCategory string `json:"diskCategory"` + /* 磁盘分类，取值为本地盘(local)或者数据盘(cloud)。 +系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 +数据盘仅支持云硬盘(cloud)。 + (Optional) */ + DiskCategory string `json:"diskCategory"` - /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 - 如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 - 如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 - (Optional) */ - AutoDelete bool `json:"autoDelete"` + /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 +如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 +如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 + (Optional) */ + AutoDelete bool `json:"autoDelete"` - /* 本地磁盘配置 (Optional) */ - LocalDisk LocalDisk `json:"localDisk"` + /* 本地磁盘配置 (Optional) */ + LocalDisk LocalDisk `json:"localDisk"` - /* 云硬盘配置 (Optional) */ - CloudDisk disk.Disk `json:"cloudDisk"` + /* 云硬盘配置 (Optional) */ + CloudDisk disk.Disk `json:"cloudDisk"` - /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi (Optional) */ - DeviceName string `json:"deviceName"` + /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi (Optional) */ + DeviceName string `json:"deviceName"` - /* 数据盘挂载状态，取值范围：attaching,detaching,attached,detached,error_attach,error_detach (Optional) */ - Status string `json:"status"` + /* 数据盘挂载状态，取值范围：attaching,detaching,attached,detached,error_attach,error_detach (Optional) */ + Status string `json:"status"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachmentSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachmentSpec.go index 1e4d57aed..452770331 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachmentSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttachmentSpec.go @@ -20,28 +20,28 @@ import disk "github.com/jdcloud-api/jdcloud-sdk-go/services/disk/models" type InstanceDiskAttachmentSpec struct { - /* 磁盘分类，取值为本地盘(local)或者云硬盘(cloud)。 - 系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 - 数据盘仅支持云硬盘(cloud)。 - (Optional) */ - DiskCategory *string `json:"diskCategory"` + /* 磁盘分类，取值为本地盘(local)或者云硬盘(cloud)。 +系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 +数据盘仅支持云硬盘(cloud)。 + (Optional) */ + DiskCategory *string `json:"diskCategory"` - /* 是否随云主机一起删除，即删除主机时是否自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 - 如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 - 如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 - (Optional) */ - AutoDelete *bool `json:"autoDelete"` + /* 是否随云主机一起删除，即删除主机时是否自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 +如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 +如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 + (Optional) */ + AutoDelete *bool `json:"autoDelete"` - /* 数据盘配置 (Optional) */ - CloudDiskSpec *disk.DiskSpec `json:"cloudDiskSpec"` + /* 数据盘配置 (Optional) */ + CloudDiskSpec *disk.DiskSpec `json:"cloudDiskSpec"` - /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi (Optional) */ - DeviceName *string `json:"deviceName"` + /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi (Optional) */ + DeviceName *string `json:"deviceName"` - /* 排除设备，使用此参数noDevice配合deviceName一起使用。 - 创建整机镜像：如deviceName:vdb、noDevice:true，则表示云主机中的数据盘vdb不参与创建镜像。 - 创建模板：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb不参与创建主机。 - 创建主机：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb，或者模板(使用模板创建主机)中的数据盘vdb不参与创建主机。 - (Optional) */ - NoDevice *bool `json:"noDevice"` + /* 排除设备，使用此参数noDevice配合deviceName一起使用。 +创建整机镜像：如deviceName:vdb、noDevice:true，则表示云主机中的数据盘vdb不参与创建镜像。 +创建模板：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb不参与创建主机。 +创建主机：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb，或者模板(使用模板创建主机)中的数据盘vdb不参与创建主机。 + (Optional) */ + NoDevice *bool `json:"noDevice"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttribute.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttribute.go index dc86ab65c..ef0197d39 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttribute.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceDiskAttribute.go @@ -16,14 +16,15 @@ package models + type InstanceDiskAttribute struct { - /* 云硬盘ID (Optional) */ - DiskId *string `json:"diskId"` + /* 云硬盘ID (Optional) */ + DiskId *string `json:"diskId"` - /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为false，本地盘(local)不能更改此值。 - 如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 - 如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 - (Optional) */ - AutoDelete *bool `json:"autoDelete"` + /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为false，本地盘(local)不能更改此值。 +如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 +如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 + (Optional) */ + AutoDelete *bool `json:"autoDelete"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkAttribute.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkAttribute.go index 266bd0392..c44383dc5 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkAttribute.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkAttribute.go @@ -16,11 +16,12 @@ package models + type InstanceNetworkAttribute struct { - /* 弹性网卡ID (Optional) */ - NetworkInterfaceId *string `json:"networkInterfaceId"` + /* 弹性网卡ID (Optional) */ + NetworkInterfaceId *string `json:"networkInterfaceId"` - /* 随主机自动删除，默认为False (Optional) */ - AutoDelete *bool `json:"autoDelete"` + /* 随主机自动删除，默认为False (Optional) */ + AutoDelete *bool `json:"autoDelete"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterface.go index 97a4c6866..29af23e42 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterface.go @@ -20,27 +20,27 @@ import vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" type InstanceNetworkInterface struct { - /* 弹性网卡ID (Optional) */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* 弹性网卡ID (Optional) */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* 以太网地址 (Optional) */ - MacAddress string `json:"macAddress"` + /* 以太网地址 (Optional) */ + MacAddress string `json:"macAddress"` - /* 虚拟网络ID (Optional) */ - VpcId string `json:"vpcId"` + /* 虚拟网络ID (Optional) */ + VpcId string `json:"vpcId"` - /* 子网ID (Optional) */ - SubnetId string `json:"subnetId"` + /* 子网ID (Optional) */ + SubnetId string `json:"subnetId"` - /* (Optional) */ - SecurityGroups []SecurityGroupSimple `json:"securityGroups"` + /* (Optional) */ + SecurityGroups []SecurityGroupSimple `json:"securityGroups"` - /* 源和目标IP地址校验，取值为0或者1 (Optional) */ - SanityCheck int `json:"sanityCheck"` + /* 源和目标IP地址校验，取值为0或者1 (Optional) */ + SanityCheck int `json:"sanityCheck"` - /* 网卡主IP (Optional) */ - PrimaryIp vpc.NetworkInterfacePrivateIp `json:"primaryIp"` + /* 网卡主IP (Optional) */ + PrimaryIp vpc.NetworkInterfacePrivateIp `json:"primaryIp"` - /* 网卡辅IP (Optional) */ - SecondaryIps []vpc.NetworkInterfacePrivateIp `json:"secondaryIps"` + /* 网卡辅IP (Optional) */ + SecondaryIps []vpc.NetworkInterfacePrivateIp `json:"secondaryIps"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachment.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachment.go index e490a2db9..2a8c79961 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachment.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachment.go @@ -16,14 +16,15 @@ package models + type InstanceNetworkInterfaceAttachment struct { - /* 设备Index (Optional) */ - DeviceIndex int `json:"deviceIndex"` + /* 设备Index (Optional) */ + DeviceIndex int `json:"deviceIndex"` - /* 指明删除实例时是否删除网卡，默认true；当前只能是true (Optional) */ - AutoDelete bool `json:"autoDelete"` + /* 指明删除实例时是否删除网卡，默认true；当前只能是true (Optional) */ + AutoDelete bool `json:"autoDelete"` - /* 网卡接口规范 (Optional) */ - NetworkInterface InstanceNetworkInterface `json:"networkInterface"` + /* 网卡接口规范 (Optional) */ + NetworkInterface InstanceNetworkInterface `json:"networkInterface"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachmentSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachmentSpec.go index df91dede0..d6e11621b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachmentSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceNetworkInterfaceAttachmentSpec.go @@ -20,9 +20,9 @@ import vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" type InstanceNetworkInterfaceAttachmentSpec struct { - /* 网卡设备Index，主网卡只能是1 (Optional) */ - DeviceIndex *int `json:"deviceIndex"` + /* 网卡设备Index，主网卡只能是1 (Optional) */ + DeviceIndex *int `json:"deviceIndex"` - /* 网卡接口规范 (Optional) */ - NetworkInterface *vpc.NetworkInterfaceSpec `json:"networkInterface"` + /* 网卡接口规范 (Optional) */ + NetworkInterface *vpc.NetworkInterfaceSpec `json:"networkInterface"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstancePrivateIpAddress.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstancePrivateIpAddress.go index 5d557520c..6436045c2 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstancePrivateIpAddress.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstancePrivateIpAddress.go @@ -16,11 +16,12 @@ package models + type InstancePrivateIpAddress struct { - /* 云主机ID (Optional) */ - InstanceId string `json:"instanceId"` + /* 云主机ID (Optional) */ + InstanceId string `json:"instanceId"` - /* 主网卡内网主IP地址 (Optional) */ - PrivateIpAddress string `json:"privateIpAddress"` + /* 主网卡内网主IP地址 (Optional) */ + PrivateIpAddress string `json:"privateIpAddress"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceSpec.go index 56b5799ce..5dc4861c5 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceSpec.go @@ -21,49 +21,49 @@ import charge "github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models" type InstanceSpec struct { - /* 高可用组Id。指定了此参数后，只能通过高可用组关联的实例模板创建虚机，并且实例模板中的参数不可覆盖替换。实例模板以外的参数还可以指定。 (Optional) */ - AgId *string `json:"agId"` + /* 高可用组Id。指定了此参数后，只能通过高可用组关联的实例模板创建虚机，并且实例模板中的参数不可覆盖替换。实例模板以外的参数还可以指定。 (Optional) */ + AgId *string `json:"agId"` - /* 实例模板id，如果没有使用高可用组，那么对于实例模板中没有的信息，需要使用创建虚机的参数进行补充，或者选择覆盖启动模板中的参数。 (Optional) */ - InstanceTemplateId *string `json:"instanceTemplateId"` + /* 实例模板id，如果没有使用高可用组，那么对于实例模板中没有的信息，需要使用创建虚机的参数进行补充，或者选择覆盖启动模板中的参数。 (Optional) */ + InstanceTemplateId *string `json:"instanceTemplateId"` - /* 云主机所属的可用区。 (Optional) */ - Az *string `json:"az"` + /* 云主机所属的可用区。 (Optional) */ + Az *string `json:"az"` - /* 实例规格。可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 (Optional) */ - InstanceType *string `json:"instanceType"` + /* 实例规格。可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 (Optional) */ + InstanceType *string `json:"instanceType"` - /* 镜像ID。可查询DescribeImages接口获得指定地域的镜像信息。 (Optional) */ - ImageId *string `json:"imageId"` + /* 镜像ID。可查询DescribeImages接口获得指定地域的镜像信息。 (Optional) */ + ImageId *string `json:"imageId"` - /* 云主机名称，参考公共参数规范。 */ - Name string `json:"name"` + /* 云主机名称，参考公共参数规范。 */ + Name string `json:"name"` - /* 密码，参考公共参数规范。 (Optional) */ - Password *string `json:"password"` + /* 密码，参考公共参数规范。 (Optional) */ + Password *string `json:"password"` - /* 密钥对名称，当前只支持传入一个。 (Optional) */ - KeyNames []string `json:"keyNames"` + /* 密钥对名称，当前只支持传入一个。 (Optional) */ + KeyNames []string `json:"keyNames"` - /* 主网卡主IP关联的弹性IP规格 (Optional) */ - ElasticIp *vpc.ElasticIpSpec `json:"elasticIp"` + /* 主网卡主IP关联的弹性IP规格 (Optional) */ + ElasticIp *vpc.ElasticIpSpec `json:"elasticIp"` - /* 主网卡配置信息 (Optional) */ - PrimaryNetworkInterface *InstanceNetworkInterfaceAttachmentSpec `json:"primaryNetworkInterface"` + /* 主网卡配置信息 (Optional) */ + PrimaryNetworkInterface *InstanceNetworkInterfaceAttachmentSpec `json:"primaryNetworkInterface"` - /* 系统盘配置信息 (Optional) */ - SystemDisk *InstanceDiskAttachmentSpec `json:"systemDisk"` + /* 系统盘配置信息 (Optional) */ + SystemDisk *InstanceDiskAttachmentSpec `json:"systemDisk"` - /* 数据盘配置信息，本地盘(local类型)做系统盘的云主机可挂载8块数据盘，云硬盘(cloud类型)做系统盘的云主机可挂载7块数据盘。 (Optional) */ - DataDisks []InstanceDiskAttachmentSpec `json:"dataDisks"` + /* 数据盘配置信息，本地盘(local类型)做系统盘的云主机可挂载8块数据盘，云硬盘(cloud类型)做系统盘的云主机可挂载7块数据盘。 (Optional) */ + DataDisks []InstanceDiskAttachmentSpec `json:"dataDisks"` - /* 计费配置 - 云主机不支持按用量方式计费，默认为按配置计费。 - 打包创建数据盘的情况下，数据盘的计费方式只能与云主机保持一致。 - 打包创建弹性公网IP的情况下，若公网IP的计费方式没有指定为按用量计费，那么公网IP计费方式只能与云主机保持一致。 - (Optional) */ - Charge *charge.ChargeSpec `json:"charge"` + /* 计费配置 +云主机不支持按用量方式计费，默认为按配置计费。 +打包创建数据盘的情况下，数据盘的计费方式只能与云主机保持一致。 +打包创建弹性公网IP的情况下，若公网IP的计费方式没有指定为按用量计费，那么公网IP计费方式只能与云主机保持一致。 + (Optional) */ + Charge *charge.ChargeSpec `json:"charge"` - /* 主机描述，参考公共参数规范。 (Optional) */ - Description *string `json:"description"` + /* 主机描述，参考公共参数规范。 (Optional) */ + Description *string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceStatus.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceStatus.go index 9725d909d..3752f1930 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceStatus.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceStatus.go @@ -16,11 +16,12 @@ package models + type InstanceStatus struct { - /* 云主机ID (Optional) */ - InstanceId string `json:"instanceId"` + /* 云主机ID (Optional) */ + InstanceId string `json:"instanceId"` - /* 参考云主机状态 (Optional) */ - Status string `json:"status"` + /* 参考云主机状态 (Optional) */ + Status string `json:"status"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplate.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplate.go index 7f5999ea5..324918daf 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplate.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplate.go @@ -16,23 +16,24 @@ package models + type InstanceTemplate struct { - /* 启动模板ID (Optional) */ - Id string `json:"id"` + /* 启动模板ID (Optional) */ + Id string `json:"id"` - /* 启动模板名称 (Optional) */ - Name string `json:"name"` + /* 启动模板名称 (Optional) */ + Name string `json:"name"` - /* 启动模板描述 (Optional) */ - Description string `json:"description"` + /* 启动模板描述 (Optional) */ + Description string `json:"description"` - /* 启动模板的数据 (Optional) */ - InstanceTemplateData InstanceTemplateData `json:"instanceTemplateData"` + /* 启动模板的数据 (Optional) */ + InstanceTemplateData InstanceTemplateData `json:"instanceTemplateData"` - /* 关联的高可用组(ag)信息 (Optional) */ - Ags []Ag `json:"ags"` + /* 关联的高可用组(ag)信息 (Optional) */ + Ags []Ag `json:"ags"` - /* 创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateData.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateData.go index 0cfbe50eb..025e481cd 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateData.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateData.go @@ -16,32 +16,33 @@ package models + type InstanceTemplateData struct { - /* 实例规格 (Optional) */ - InstanceType string `json:"instanceType"` + /* 实例规格 (Optional) */ + InstanceType string `json:"instanceType"` - /* 主网卡所属VPC的ID (Optional) */ - VpcId string `json:"vpcId"` + /* 主网卡所属VPC的ID (Optional) */ + VpcId string `json:"vpcId"` - /* 镜像ID (Optional) */ - ImageId string `json:"imageId"` + /* 镜像ID (Optional) */ + ImageId string `json:"imageId"` - /* 启动模板中是否包含自定义密码，true：包含密码，false：不包含密码 (Optional) */ - IncludePassword bool `json:"includePassword"` + /* 启动模板中是否包含自定义密码，true：包含密码，false：不包含密码 (Optional) */ + IncludePassword bool `json:"includePassword"` - /* 系统盘信息 (Optional) */ - SystemDisk InstanceTemplateDiskAttachment `json:"systemDisk"` + /* 系统盘信息 (Optional) */ + SystemDisk InstanceTemplateDiskAttachment `json:"systemDisk"` - /* 数据盘信息，本地盘(local类型)做系统盘的云主机可挂载8块数据盘，云硬盘(cloud类型)做系统盘的云主机可挂载7块数据盘。 (Optional) */ - DataDisks []InstanceTemplateDiskAttachment `json:"dataDisks"` + /* 数据盘信息，本地盘(local类型)做系统盘的云主机可挂载8块数据盘，云硬盘(cloud类型)做系统盘的云主机可挂载7块数据盘。 (Optional) */ + DataDisks []InstanceTemplateDiskAttachment `json:"dataDisks"` - /* 主网卡信息 (Optional) */ - PrimaryNetworkInterface InstanceTemplateNetworkInterfaceAttachmentSpec `json:"primaryNetworkInterface"` + /* 主网卡信息 (Optional) */ + PrimaryNetworkInterface InstanceTemplateNetworkInterfaceAttachmentSpec `json:"primaryNetworkInterface"` - /* 主网卡主IP关联的弹性IP规格 (Optional) */ - ElasticIp InstanceTemplateElasticIp `json:"elasticIp"` + /* 主网卡主IP关联的弹性IP规格 (Optional) */ + ElasticIp InstanceTemplateElasticIp `json:"elasticIp"` - /* 密钥对名称；当前只支持一个 (Optional) */ - KeyNames []string `json:"keyNames"` + /* 密钥对名称；当前只支持一个 (Optional) */ + KeyNames []string `json:"keyNames"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDisk.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDisk.go index 6c0ef4637..460df4513 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDisk.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDisk.go @@ -16,14 +16,15 @@ package models + type InstanceTemplateDisk struct { - /* 云硬盘类型，取值为 ssd 或 premium-hdd (Optional) */ - DiskType string `json:"diskType"` + /* 云硬盘类型，取值为 ssd 或 premium-hdd (Optional) */ + DiskType string `json:"diskType"` - /* 云硬盘大小，单位为 GiB；ssd 类型取值范围[20,1000]GB，步长为10G，premium-hdd 类型取值范围[20,3000]GB，步长为10G (Optional) */ - DiskSizeGB int `json:"diskSizeGB"` + /* 云硬盘大小，单位为 GiB；ssd 类型取值范围[20,1000]GB，步长为10G，premium-hdd 类型取值范围[20,3000]GB，步长为10G (Optional) */ + DiskSizeGB int `json:"diskSizeGB"` - /* 用于创建云硬盘的快照ID (Optional) */ - SnapshotId string `json:"snapshotId"` + /* 用于创建云硬盘的快照ID (Optional) */ + SnapshotId string `json:"snapshotId"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachment.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachment.go index f3bfb26d9..ca4db289a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachment.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachment.go @@ -16,30 +16,31 @@ package models + type InstanceTemplateDiskAttachment struct { - /* 磁盘分类，取值为本地盘(local)或者数据盘(cloud)。 - 系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 - 数据盘仅支持云硬盘(cloud)。 - (Optional) */ - DiskCategory string `json:"diskCategory"` + /* 磁盘分类，取值为本地盘(local)或者数据盘(cloud)。 +系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 +数据盘仅支持云硬盘(cloud)。 + (Optional) */ + DiskCategory string `json:"diskCategory"` - /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 - 如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 - 如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 - (Optional) */ - AutoDelete bool `json:"autoDelete"` + /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 +如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 +如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 + (Optional) */ + AutoDelete bool `json:"autoDelete"` - /* 数据盘配置 (Optional) */ - InstanceTemplateDisk InstanceTemplateDisk `json:"instanceTemplateDisk"` + /* 数据盘配置 (Optional) */ + InstanceTemplateDisk InstanceTemplateDisk `json:"instanceTemplateDisk"` - /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi。系统盘不需要使用，数据盘时才能够使用。 (Optional) */ - DeviceName string `json:"deviceName"` + /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi。系统盘不需要使用，数据盘时才能够使用。 (Optional) */ + DeviceName string `json:"deviceName"` - /* 排除设备，使用此参数noDevice配合deviceName一起使用。 - 创建整机镜像：如deviceName:vdb、noDevice:true，则表示云主机中的数据盘vdb不参与创建镜像。 - 创建模板：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb不参与创建主机。 - 创建主机：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb，或者模板(使用模板创建主机)中的数据盘vdb不参与创建主机。 - (Optional) */ - NoDevice bool `json:"noDevice"` + /* 排除设备，使用此参数noDevice配合deviceName一起使用。 +创建整机镜像：如deviceName:vdb、noDevice:true，则表示云主机中的数据盘vdb不参与创建镜像。 +创建模板：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb不参与创建主机。 +创建主机：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb，或者模板(使用模板创建主机)中的数据盘vdb不参与创建主机。 + (Optional) */ + NoDevice bool `json:"noDevice"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachmentSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachmentSpec.go index c9d4d5d54..1a6746bd8 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachmentSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskAttachmentSpec.go @@ -16,28 +16,29 @@ package models + type InstanceTemplateDiskAttachmentSpec struct { - /* 磁盘分类，取值为本地盘(local)或者数据盘(cloud)。 - 系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 - 数据盘仅支持云硬盘(cloud)。 - (Optional) */ - DiskCategory string `json:"diskCategory"` + /* 磁盘分类，取值为本地盘(local)或者数据盘(cloud)。 +系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。 +数据盘仅支持云硬盘(cloud)。 + (Optional) */ + DiskCategory string `json:"diskCategory"` - /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 - 如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 - 如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 - (Optional) */ - AutoDelete bool `json:"autoDelete"` + /* 随云主机一起删除，删除主机时自动删除此磁盘，默认为true，本地盘(local)不能更改此值。 +如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。 +如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。 + (Optional) */ + AutoDelete bool `json:"autoDelete"` - /* 数据盘规格 (Optional) */ - CloudDiskSpec InstanceTemplateDiskSpec `json:"cloudDiskSpec"` + /* 数据盘规格 (Optional) */ + CloudDiskSpec InstanceTemplateDiskSpec `json:"cloudDiskSpec"` - /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi (Optional) */ - DeviceName string `json:"deviceName"` + /* 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi (Optional) */ + DeviceName string `json:"deviceName"` - /* 排除设备，使用此参数noDevice配合deviceName一起使用。 - 创建模板：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb不参与创建主机。 - (Optional) */ - NoDevice bool `json:"noDevice"` + /* 排除设备，使用此参数noDevice配合deviceName一起使用。 +创建模板：如deviceName:vdb、noDevice:true，则表示镜像中的数据盘vdb不参与创建主机。 + (Optional) */ + NoDevice bool `json:"noDevice"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskSpec.go index f16de8424..b9784ffe7 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateDiskSpec.go @@ -16,14 +16,15 @@ package models + type InstanceTemplateDiskSpec struct { - /* 云硬盘类型，取值为 ssd 或 premium-hdd (Optional) */ - DiskType string `json:"diskType"` + /* 云硬盘类型，取值为 ssd 或 premium-hdd (Optional) */ + DiskType string `json:"diskType"` - /* 云硬盘大小，单位为 GiB；ssd 类型取值范围[20,1000]GB，步长为10G，premium-hdd 类型取值范围[20,3000]GB，步长为10G (Optional) */ - DiskSizeGB int `json:"diskSizeGB"` + /* 云硬盘大小，单位为 GiB；ssd 类型取值范围[20,1000]GB，步长为10G，premium-hdd 类型取值范围[20,3000]GB，步长为10G (Optional) */ + DiskSizeGB int `json:"diskSizeGB"` - /* 用于创建云硬盘的快照ID (Optional) */ - SnapshotId string `json:"snapshotId"` + /* 用于创建云硬盘的快照ID (Optional) */ + SnapshotId string `json:"snapshotId"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIp.go index f30ca0f1a..b6db16956 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIp.go @@ -16,14 +16,15 @@ package models + type InstanceTemplateElasticIp struct { - /* 弹性公网IP的限速（单位：MB） */ - BandwidthMbps int `json:"bandwidthMbps"` + /* 弹性公网IP的限速（单位：MB） */ + BandwidthMbps int `json:"bandwidthMbps"` - /* IP服务商，取值为BGP,nonBGP (Optional) */ - Provider string `json:"provider"` + /* IP服务商，取值为BGP,nonBGP (Optional) */ + Provider string `json:"provider"` - /* 计费类型，支持按带宽计费(bandwith)，按流量计费(flow) */ - ChargeMode string `json:"chargeMode"` + /* 计费类型，支持按带宽计费(bandwith)，按流量计费(flow) */ + ChargeMode string `json:"chargeMode"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIpSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIpSpec.go index d71e97075..8ef4e0061 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIpSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateElasticIpSpec.go @@ -16,14 +16,15 @@ package models + type InstanceTemplateElasticIpSpec struct { - /* 弹性公网IP的限速（单位：MB） */ - BandwidthMbps int `json:"bandwidthMbps"` + /* 弹性公网IP的限速（单位：MB） */ + BandwidthMbps int `json:"bandwidthMbps"` - /* IP服务商，取值为BGP,nonBGP (Optional) */ - Provider string `json:"provider"` + /* IP服务商，取值为BGP,nonBGP (Optional) */ + Provider string `json:"provider"` - /* 计费类型，支持按带宽计费(bandwith)，按流量计费(flow) */ - ChargeMode string `json:"chargeMode"` + /* 计费类型，支持按带宽计费(bandwith)，按流量计费(flow) */ + ChargeMode string `json:"chargeMode"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceAttachmentSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceAttachmentSpec.go index f563eebf8..755410d02 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceAttachmentSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceAttachmentSpec.go @@ -16,14 +16,15 @@ package models + type InstanceTemplateNetworkInterfaceAttachmentSpec struct { - /* 设备Index；主网卡的index必须为1；当前仅支持主网卡 (Optional) */ - DeviceIndex int `json:"deviceIndex"` + /* 设备Index；主网卡的index必须为1；当前仅支持主网卡 (Optional) */ + DeviceIndex int `json:"deviceIndex"` - /* 指明删除实例时是否删除网卡，默认true；当前只能是true (Optional) */ - AutoDelete bool `json:"autoDelete"` + /* 指明删除实例时是否删除网卡，默认true；当前只能是true (Optional) */ + AutoDelete bool `json:"autoDelete"` - /* 网卡接口规范；此字段当前必填 */ - NetworkInterface InstanceTemplateNetworkInterfaceSpec `json:"networkInterface"` + /* 网卡接口规范；此字段当前必填 */ + NetworkInterface InstanceTemplateNetworkInterfaceSpec `json:"networkInterface"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceSpec.go index b9acb4ada..84ee385bf 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateNetworkInterfaceSpec.go @@ -16,14 +16,15 @@ package models + type InstanceTemplateNetworkInterfaceSpec struct { - /* 子网ID */ - SubnetId string `json:"subnetId"` + /* 子网ID */ + SubnetId string `json:"subnetId"` - /* 安全组ID列表 (Optional) */ - SecurityGroups []string `json:"securityGroups"` + /* 安全组ID列表 (Optional) */ + SecurityGroups []string `json:"securityGroups"` - /* PortSecurity，取值为0或者1，默认为1 (Optional) */ - SanityCheck int `json:"sanityCheck"` + /* PortSecurity，取值为0或者1，默认为1 (Optional) */ + SanityCheck int `json:"sanityCheck"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateSpec.go index 0b0d422c2..1eb5b7a7b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTemplateSpec.go @@ -16,29 +16,30 @@ package models + type InstanceTemplateSpec struct { - /* 实例规格，可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 */ - InstanceType string `json:"instanceType"` + /* 实例规格，可查询DescribeInstanceTypes接口获得指定地域或可用区的规格信息。 */ + InstanceType string `json:"instanceType"` - /* 镜像ID，可查询DescribeImages接口获得指定地域的镜像信息。 */ - ImageId string `json:"imageId"` + /* 镜像ID，可查询DescribeImages接口获得指定地域的镜像信息。 */ + ImageId string `json:"imageId"` - /* 密码，参考公共参数规范。 (Optional) */ - Password string `json:"password"` + /* 密码，参考公共参数规范。 (Optional) */ + Password string `json:"password"` - /* 密钥对名称；当前只支持一个 (Optional) */ - KeyNames []string `json:"keyNames"` + /* 密钥对名称；当前只支持一个 (Optional) */ + KeyNames []string `json:"keyNames"` - /* 主网卡主IP关联的弹性IP规格 (Optional) */ - ElasticIp InstanceTemplateElasticIpSpec `json:"elasticIp"` + /* 主网卡主IP关联的弹性IP规格 (Optional) */ + ElasticIp InstanceTemplateElasticIpSpec `json:"elasticIp"` - /* 主网卡配置信息 */ - PrimaryNetworkInterface InstanceTemplateNetworkInterfaceAttachmentSpec `json:"primaryNetworkInterface"` + /* 主网卡配置信息 */ + PrimaryNetworkInterface InstanceTemplateNetworkInterfaceAttachmentSpec `json:"primaryNetworkInterface"` - /* 系统盘配置信息 */ - SystemDisk InstanceTemplateDiskAttachmentSpec `json:"systemDisk"` + /* 系统盘配置信息 */ + SystemDisk InstanceTemplateDiskAttachmentSpec `json:"systemDisk"` - /* 数据盘配置信息 (Optional) */ - DataDisks []InstanceTemplateDiskAttachmentSpec `json:"dataDisks"` + /* 数据盘配置信息 (Optional) */ + DataDisks []InstanceTemplateDiskAttachmentSpec `json:"dataDisks"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceType.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceType.go index 770ffbfa2..dbe403b20 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceType.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceType.go @@ -16,32 +16,33 @@ package models + type InstanceType struct { - /* 实例规格类型 (Optional) */ - Family string `json:"family"` + /* 实例规格类型 (Optional) */ + Family string `json:"family"` - /* 实例规格，比如g.b1.2xlarge (Optional) */ - InstanceType string `json:"instanceType"` + /* 实例规格，比如g.b1.2xlarge (Optional) */ + InstanceType string `json:"instanceType"` - /* cpu个数 (Optional) */ - Cpu int `json:"cpu"` + /* cpu个数 (Optional) */ + Cpu int `json:"cpu"` - /* 内存大小 (Optional) */ - MemoryMB int `json:"memoryMB"` + /* 内存大小 (Optional) */ + MemoryMB int `json:"memoryMB"` - /* 支持弹性网卡的数量 (Optional) */ - NicLimit int `json:"nicLimit"` + /* 支持弹性网卡的数量 (Optional) */ + NicLimit int `json:"nicLimit"` - /* 描述 (Optional) */ - Desc string `json:"desc"` + /* 描述 (Optional) */ + Desc string `json:"desc"` - /* 规格状态 (Optional) */ - State []InstanceTypeState `json:"state"` + /* 规格状态 (Optional) */ + State []InstanceTypeState `json:"state"` - /* Gpu配置 (Optional) */ - Gpu Gpu `json:"gpu"` + /* Gpu配置 (Optional) */ + Gpu Gpu `json:"gpu"` - /* 本地缓存盘配置，目前只有Gpu规格上才有 (Optional) */ - LocalDisks []LocalDisk `json:"localDisks"` + /* 本地缓存盘配置，目前只有Gpu规格上才有 (Optional) */ + LocalDisks []LocalDisk `json:"localDisks"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTypeState.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTypeState.go index 13d55fa59..e047de43e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTypeState.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/InstanceTypeState.go @@ -16,11 +16,12 @@ package models + type InstanceTypeState struct { - /* 可用区 (Optional) */ - Az string `json:"az"` + /* 可用区 (Optional) */ + Az string `json:"az"` - /* 可售卖情况，true:可售卖、false:已售罄不可用 (Optional) */ - InStock bool `json:"inStock"` + /* 可售卖情况，true:可售卖、false:已售罄不可用 (Optional) */ + InStock bool `json:"inStock"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Keypair.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Keypair.go index 15e5544d0..05c7ae891 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Keypair.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Keypair.go @@ -16,14 +16,15 @@ package models + type Keypair struct { - /* 密钥对名称 (Optional) */ - KeyName string `json:"keyName"` + /* 密钥对名称 (Optional) */ + KeyName string `json:"keyName"` - /* 密钥对的指纹，根据 RFC4716 定义的公钥指纹格式，采用 MD5 信息摘要算法。 (Optional) */ - KeyFingerprint string `json:"keyFingerprint"` + /* 密钥对的指纹，根据 RFC4716 定义的公钥指纹格式，采用 MD5 信息摘要算法。 (Optional) */ + KeyFingerprint string `json:"keyFingerprint"` - /* 创建时间 (Optional) */ - CreateTime string `json:"createTime"` + /* 创建时间 (Optional) */ + CreateTime string `json:"createTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/LocalDisk.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/LocalDisk.go index 46ac8e441..740e65288 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/LocalDisk.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/LocalDisk.go @@ -16,11 +16,12 @@ package models + type LocalDisk struct { - /* 磁盘类型，取值范围{premium-hdd, ssd} (Optional) */ - DiskType string `json:"diskType"` + /* 磁盘类型，取值范围{premium-hdd, ssd} (Optional) */ + DiskType string `json:"diskType"` - /* 磁盘大小 (Optional) */ - DiskSizeGB int `json:"diskSizeGB"` + /* 磁盘大小 (Optional) */ + DiskSizeGB int `json:"diskSizeGB"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Quota.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Quota.go index e268f55c1..4d7f16df6 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Quota.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Quota.go @@ -16,14 +16,15 @@ package models + type Quota struct { - /* 资源类型[instance，keypair，image，instanceTemplate] (Optional) */ - ResourceType string `json:"resourceType"` + /* 资源类型[instance，keypair，image，instanceTemplate] (Optional) */ + ResourceType string `json:"resourceType"` - /* 配额上限 (Optional) */ - Limit int `json:"limit"` + /* 配额上限 (Optional) */ + Limit int `json:"limit"` - /* 已用配额 (Optional) */ - Used int `json:"used"` + /* 已用配额 (Optional) */ + Used int `json:"used"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/SecurityGroupSimple.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/SecurityGroupSimple.go index 17e4eeeba..17e221b6e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/SecurityGroupSimple.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/SecurityGroupSimple.go @@ -16,11 +16,12 @@ package models + type SecurityGroupSimple struct { - /* 安全组ID (Optional) */ - GroupId string `json:"groupId"` + /* 安全组ID (Optional) */ + GroupId string `json:"groupId"` - /* 安全组名称 (Optional) */ - GroupName string `json:"groupName"` + /* 安全组名称 (Optional) */ + GroupName string `json:"groupName"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Tag.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Tag.go index 22f6316be..467465457 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Tag.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/Tag.go @@ -16,11 +16,12 @@ package models + type Tag struct { - /* Tag键 (Optional) */ - Key string `json:"key"` + /* Tag键 (Optional) */ + Key string `json:"key"` - /* Tag值 (Optional) */ - Value string `json:"value"` + /* Tag值 (Optional) */ + Value string `json:"value"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/TagFilter.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/TagFilter.go index d8371cb24..13daa19a1 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/TagFilter.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models/TagFilter.go @@ -16,11 +16,12 @@ package models + type TagFilter struct { - /* Tag键 (Optional) */ - Key string `json:"key"` + /* Tag键 (Optional) */ + Key string `json:"key"` - /* Tag值 (Optional) */ - Values []string `json:"values"` + /* Tag值 (Optional) */ + Values []string `json:"values"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkAclRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkAclRules.go index 6becd221d..9f52c7283 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkAclRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkAclRules.go @@ -17,21 +17,22 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type AddNetworkAclRulesRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* networkAcl规则列表 */ - NetworkAclRuleSpecs []vpc.AddNetworkAclRuleSpec `json:"networkAclRuleSpecs"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` + + /* networkAcl规则列表 */ + NetworkAclRuleSpecs []vpc.AddNetworkAclRuleSpec `json:"networkAclRuleSpecs"` } /* @@ -42,21 +43,21 @@ type AddNetworkAclRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAddNetworkAclRulesRequest( - regionId string, - networkAclId string, - networkAclRuleSpecs []vpc.AddNetworkAclRuleSpec, + regionId string, + networkAclId string, + networkAclRuleSpecs []vpc.AddNetworkAclRuleSpec, ) *AddNetworkAclRulesRequest { return &AddNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}:addNetworkAclRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, - NetworkAclRuleSpecs: networkAclRuleSpecs, + RegionId: regionId, + NetworkAclId: networkAclId, + NetworkAclRuleSpecs: networkAclRuleSpecs, } } @@ -66,63 +67,63 @@ func NewAddNetworkAclRulesRequest( * param networkAclRuleSpecs: networkAcl规则列表 (Required) */ func NewAddNetworkAclRulesRequestWithAllParams( - regionId string, - networkAclId string, - networkAclRuleSpecs []vpc.AddNetworkAclRuleSpec, + regionId string, + networkAclId string, + networkAclRuleSpecs []vpc.AddNetworkAclRuleSpec, ) *AddNetworkAclRulesRequest { - return &AddNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:addNetworkAclRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - NetworkAclRuleSpecs: networkAclRuleSpecs, - } + return &AddNetworkAclRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:addNetworkAclRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + NetworkAclRuleSpecs: networkAclRuleSpecs, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAddNetworkAclRulesRequestWithoutParam() *AddNetworkAclRulesRequest { - return &AddNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:addNetworkAclRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AddNetworkAclRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:addNetworkAclRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AddNetworkAclRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *AddNetworkAclRulesRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } /* param networkAclRuleSpecs: networkAcl规则列表(Required) */ func (r *AddNetworkAclRulesRequest) SetNetworkAclRuleSpecs(networkAclRuleSpecs []vpc.AddNetworkAclRuleSpec) { - r.NetworkAclRuleSpecs = networkAclRuleSpecs + r.NetworkAclRuleSpecs = networkAclRuleSpecs } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AddNetworkAclRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AddNetworkAclRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AddNetworkAclRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AddNetworkAclRulesResult `json:"result"` } type AddNetworkAclRulesResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkSecurityGroupRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkSecurityGroupRules.go index 662d17814..e4f635018 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkSecurityGroupRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddNetworkSecurityGroupRules.go @@ -17,21 +17,22 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type AddNetworkSecurityGroupRulesRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* NetworkSecurityGroup ID */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 安全组规则信息 */ - NetworkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules `json:"networkSecurityGroupRuleSpecs"` + /* NetworkSecurityGroup ID */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + + /* 安全组规则信息 */ + NetworkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules `json:"networkSecurityGroupRuleSpecs"` } /* @@ -42,21 +43,21 @@ type AddNetworkSecurityGroupRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAddNetworkSecurityGroupRulesRequest( - regionId string, - networkSecurityGroupId string, - networkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules, + regionId string, + networkSecurityGroupId string, + networkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules, ) *AddNetworkSecurityGroupRulesRequest { return &AddNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:addNetworkSecurityGroupRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - NetworkSecurityGroupRuleSpecs: networkSecurityGroupRuleSpecs, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + NetworkSecurityGroupRuleSpecs: networkSecurityGroupRuleSpecs, } } @@ -66,63 +67,63 @@ func NewAddNetworkSecurityGroupRulesRequest( * param networkSecurityGroupRuleSpecs: 安全组规则信息 (Required) */ func NewAddNetworkSecurityGroupRulesRequestWithAllParams( - regionId string, - networkSecurityGroupId string, - networkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules, + regionId string, + networkSecurityGroupId string, + networkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules, ) *AddNetworkSecurityGroupRulesRequest { - return &AddNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:addNetworkSecurityGroupRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - NetworkSecurityGroupRuleSpecs: networkSecurityGroupRuleSpecs, - } + return &AddNetworkSecurityGroupRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:addNetworkSecurityGroupRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + NetworkSecurityGroupRuleSpecs: networkSecurityGroupRuleSpecs, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAddNetworkSecurityGroupRulesRequestWithoutParam() *AddNetworkSecurityGroupRulesRequest { - return &AddNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:addNetworkSecurityGroupRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AddNetworkSecurityGroupRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:addNetworkSecurityGroupRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AddNetworkSecurityGroupRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkSecurityGroupId: NetworkSecurityGroup ID(Required) */ func (r *AddNetworkSecurityGroupRulesRequest) SetNetworkSecurityGroupId(networkSecurityGroupId string) { - r.NetworkSecurityGroupId = networkSecurityGroupId + r.NetworkSecurityGroupId = networkSecurityGroupId } /* param networkSecurityGroupRuleSpecs: 安全组规则信息(Required) */ func (r *AddNetworkSecurityGroupRulesRequest) SetNetworkSecurityGroupRuleSpecs(networkSecurityGroupRuleSpecs []vpc.AddSecurityGroupRules) { - r.NetworkSecurityGroupRuleSpecs = networkSecurityGroupRuleSpecs + r.NetworkSecurityGroupRuleSpecs = networkSecurityGroupRuleSpecs } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AddNetworkSecurityGroupRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AddNetworkSecurityGroupRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AddNetworkSecurityGroupRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AddNetworkSecurityGroupRulesResult `json:"result"` } type AddNetworkSecurityGroupRulesResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddRouteTableRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddRouteTableRules.go index 8bd43417d..1dbd5382b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddRouteTableRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AddRouteTableRules.go @@ -17,21 +17,22 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type AddRouteTableRulesRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 安全组规则信息 */ - RouteTableRuleSpecs []vpc.AddRouteTableRules `json:"routeTableRuleSpecs"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` + + /* 安全组规则信息 */ + RouteTableRuleSpecs []vpc.AddRouteTableRules `json:"routeTableRuleSpecs"` } /* @@ -42,21 +43,21 @@ type AddRouteTableRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAddRouteTableRulesRequest( - regionId string, - routeTableId string, - routeTableRuleSpecs []vpc.AddRouteTableRules, + regionId string, + routeTableId string, + routeTableRuleSpecs []vpc.AddRouteTableRules, ) *AddRouteTableRulesRequest { return &AddRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}:addRouteTableRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, - RouteTableRuleSpecs: routeTableRuleSpecs, + RegionId: regionId, + RouteTableId: routeTableId, + RouteTableRuleSpecs: routeTableRuleSpecs, } } @@ -66,63 +67,63 @@ func NewAddRouteTableRulesRequest( * param routeTableRuleSpecs: 安全组规则信息 (Required) */ func NewAddRouteTableRulesRequestWithAllParams( - regionId string, - routeTableId string, - routeTableRuleSpecs []vpc.AddRouteTableRules, + regionId string, + routeTableId string, + routeTableRuleSpecs []vpc.AddRouteTableRules, ) *AddRouteTableRulesRequest { - return &AddRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:addRouteTableRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - RouteTableRuleSpecs: routeTableRuleSpecs, - } + return &AddRouteTableRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:addRouteTableRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + RouteTableRuleSpecs: routeTableRuleSpecs, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAddRouteTableRulesRequestWithoutParam() *AddRouteTableRulesRequest { - return &AddRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:addRouteTableRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AddRouteTableRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:addRouteTableRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AddRouteTableRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *AddRouteTableRulesRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } /* param routeTableRuleSpecs: 安全组规则信息(Required) */ func (r *AddRouteTableRulesRequest) SetRouteTableRuleSpecs(routeTableRuleSpecs []vpc.AddRouteTableRules) { - r.RouteTableRuleSpecs = routeTableRuleSpecs + r.RouteTableRuleSpecs = routeTableRuleSpecs } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AddRouteTableRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AddRouteTableRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AddRouteTableRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AddRouteTableRulesResult `json:"result"` } type AddRouteTableRulesResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssignSecondaryIps.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssignSecondaryIps.go index 38d71461b..ecf6b3a43 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssignSecondaryIps.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssignSecondaryIps.go @@ -17,26 +17,27 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AssignSecondaryIpsRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* secondary ip被其他接口占用时，是否抢占。false：非抢占重分配，true：抢占重分配，默认抢占重分配。默认值：true (Optional) */ - Force *bool `json:"force"` + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* 指定分配的secondaryIp地址 (Optional) */ - SecondaryIps []string `json:"secondaryIps"` + /* secondary ip被其他接口占用时，是否抢占。false：非抢占重分配，true：抢占重分配，默认抢占重分配。默认值：true (Optional) */ + Force *bool `json:"force"` - /* 指定自动分配的secondaryIp个数 (Optional) */ - SecondaryIpCount *int `json:"secondaryIpCount"` + /* 指定分配的secondaryIp地址 (Optional) */ + SecondaryIps []string `json:"secondaryIps"` + + /* 指定自动分配的secondaryIp个数 (Optional) */ + SecondaryIpCount *int `json:"secondaryIpCount"` } /* @@ -46,19 +47,19 @@ type AssignSecondaryIpsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAssignSecondaryIpsRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *AssignSecondaryIpsRequest { return &AssignSecondaryIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:assignSecondaryIps", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -70,77 +71,77 @@ func NewAssignSecondaryIpsRequest( * param secondaryIpCount: 指定自动分配的secondaryIp个数 (Optional) */ func NewAssignSecondaryIpsRequestWithAllParams( - regionId string, - networkInterfaceId string, - force *bool, - secondaryIps []string, - secondaryIpCount *int, + regionId string, + networkInterfaceId string, + force *bool, + secondaryIps []string, + secondaryIpCount *int, ) *AssignSecondaryIpsRequest { - return &AssignSecondaryIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:assignSecondaryIps", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - Force: force, - SecondaryIps: secondaryIps, - SecondaryIpCount: secondaryIpCount, - } + return &AssignSecondaryIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:assignSecondaryIps", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + Force: force, + SecondaryIps: secondaryIps, + SecondaryIpCount: secondaryIpCount, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAssignSecondaryIpsRequestWithoutParam() *AssignSecondaryIpsRequest { - return &AssignSecondaryIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:assignSecondaryIps", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AssignSecondaryIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:assignSecondaryIps", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AssignSecondaryIpsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *AssignSecondaryIpsRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } /* param force: secondary ip被其他接口占用时，是否抢占。false：非抢占重分配，true：抢占重分配，默认抢占重分配。默认值：true(Optional) */ func (r *AssignSecondaryIpsRequest) SetForce(force bool) { - r.Force = &force + r.Force = &force } /* param secondaryIps: 指定分配的secondaryIp地址(Optional) */ func (r *AssignSecondaryIpsRequest) SetSecondaryIps(secondaryIps []string) { - r.SecondaryIps = secondaryIps + r.SecondaryIps = secondaryIps } /* param secondaryIpCount: 指定自动分配的secondaryIp个数(Optional) */ func (r *AssignSecondaryIpsRequest) SetSecondaryIpCount(secondaryIpCount int) { - r.SecondaryIpCount = &secondaryIpCount + r.SecondaryIpCount = &secondaryIpCount } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AssignSecondaryIpsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AssignSecondaryIpsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AssignSecondaryIpsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AssignSecondaryIpsResult `json:"result"` } type AssignSecondaryIpsResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateElasticIp.go index c0380d3e4..325099c4f 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateElasticIp.go @@ -17,26 +17,27 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AssociateElasticIpRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 绑定的弹性Ip Id (Optional) */ - ElasticIpId *string `json:"elasticIpId"` + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* 绑定弹性Ip到指定的privateIp (Optional) */ - PrivateIpAddress *string `json:"privateIpAddress"` + /* 绑定的弹性Ip Id (Optional) */ + ElasticIpId *string `json:"elasticIpId"` - /* 绑定的弹性Ip地址 (Optional) */ - ElasticIpAddress *string `json:"elasticIpAddress"` + /* 绑定弹性Ip到指定的privateIp (Optional) */ + PrivateIpAddress *string `json:"privateIpAddress"` + + /* 绑定的弹性Ip地址 (Optional) */ + ElasticIpAddress *string `json:"elasticIpAddress"` } /* @@ -46,19 +47,19 @@ type AssociateElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAssociateElasticIpRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *AssociateElasticIpRequest { return &AssociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:associateElasticIp", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -70,77 +71,77 @@ func NewAssociateElasticIpRequest( * param elasticIpAddress: 绑定的弹性Ip地址 (Optional) */ func NewAssociateElasticIpRequestWithAllParams( - regionId string, - networkInterfaceId string, - elasticIpId *string, - privateIpAddress *string, - elasticIpAddress *string, + regionId string, + networkInterfaceId string, + elasticIpId *string, + privateIpAddress *string, + elasticIpAddress *string, ) *AssociateElasticIpRequest { - return &AssociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:associateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - ElasticIpId: elasticIpId, - PrivateIpAddress: privateIpAddress, - ElasticIpAddress: elasticIpAddress, - } + return &AssociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:associateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + ElasticIpId: elasticIpId, + PrivateIpAddress: privateIpAddress, + ElasticIpAddress: elasticIpAddress, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAssociateElasticIpRequestWithoutParam() *AssociateElasticIpRequest { - return &AssociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:associateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AssociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:associateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AssociateElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *AssociateElasticIpRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } /* param elasticIpId: 绑定的弹性Ip Id(Optional) */ func (r *AssociateElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = &elasticIpId + r.ElasticIpId = &elasticIpId } /* param privateIpAddress: 绑定弹性Ip到指定的privateIp(Optional) */ func (r *AssociateElasticIpRequest) SetPrivateIpAddress(privateIpAddress string) { - r.PrivateIpAddress = &privateIpAddress + r.PrivateIpAddress = &privateIpAddress } /* param elasticIpAddress: 绑定的弹性Ip地址(Optional) */ func (r *AssociateElasticIpRequest) SetElasticIpAddress(elasticIpAddress string) { - r.ElasticIpAddress = &elasticIpAddress + r.ElasticIpAddress = &elasticIpAddress } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AssociateElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AssociateElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AssociateElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AssociateElasticIpResult `json:"result"` } type AssociateElasticIpResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateNetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateNetworkAcl.go index e7f5568c2..2e33b993b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateNetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateNetworkAcl.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AssociateNetworkAclRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* networkAcl要绑定的子网ID列表, subnet已被其他networkAcl绑定时，自动解绑 */ - SubnetIds []string `json:"subnetIds"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` + + /* networkAcl要绑定的子网ID列表, subnet已被其他networkAcl绑定时，自动解绑 */ + SubnetIds []string `json:"subnetIds"` } /* @@ -41,21 +42,21 @@ type AssociateNetworkAclRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAssociateNetworkAclRequest( - regionId string, - networkAclId string, - subnetIds []string, + regionId string, + networkAclId string, + subnetIds []string, ) *AssociateNetworkAclRequest { return &AssociateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}:associateNetworkAcl", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, - SubnetIds: subnetIds, + RegionId: regionId, + NetworkAclId: networkAclId, + SubnetIds: subnetIds, } } @@ -65,63 +66,63 @@ func NewAssociateNetworkAclRequest( * param subnetIds: networkAcl要绑定的子网ID列表, subnet已被其他networkAcl绑定时，自动解绑 (Required) */ func NewAssociateNetworkAclRequestWithAllParams( - regionId string, - networkAclId string, - subnetIds []string, + regionId string, + networkAclId string, + subnetIds []string, ) *AssociateNetworkAclRequest { - return &AssociateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:associateNetworkAcl", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - SubnetIds: subnetIds, - } + return &AssociateNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:associateNetworkAcl", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + SubnetIds: subnetIds, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAssociateNetworkAclRequestWithoutParam() *AssociateNetworkAclRequest { - return &AssociateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:associateNetworkAcl", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AssociateNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:associateNetworkAcl", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AssociateNetworkAclRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *AssociateNetworkAclRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } /* param subnetIds: networkAcl要绑定的子网ID列表, subnet已被其他networkAcl绑定时，自动解绑(Required) */ func (r *AssociateNetworkAclRequest) SetSubnetIds(subnetIds []string) { - r.SubnetIds = subnetIds + r.SubnetIds = subnetIds } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AssociateNetworkAclRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AssociateNetworkAclResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AssociateNetworkAclResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AssociateNetworkAclResult `json:"result"` } type AssociateNetworkAclResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateRouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateRouteTable.go index bafa9136f..d7f544e8b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateRouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/AssociateRouteTable.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type AssociateRouteTableRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 路由表要绑定的子网ID列表, subnet已被其他路由表绑定时，自动解绑。 */ - SubnetIds []string `json:"subnetIds"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` + + /* 路由表要绑定的子网ID列表, subnet已被其他路由表绑定时，自动解绑。 */ + SubnetIds []string `json:"subnetIds"` } /* @@ -41,21 +42,21 @@ type AssociateRouteTableRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewAssociateRouteTableRequest( - regionId string, - routeTableId string, - subnetIds []string, + regionId string, + routeTableId string, + subnetIds []string, ) *AssociateRouteTableRequest { return &AssociateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}:associateRouteTable", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, - SubnetIds: subnetIds, + RegionId: regionId, + RouteTableId: routeTableId, + SubnetIds: subnetIds, } } @@ -65,63 +66,63 @@ func NewAssociateRouteTableRequest( * param subnetIds: 路由表要绑定的子网ID列表, subnet已被其他路由表绑定时，自动解绑。 (Required) */ func NewAssociateRouteTableRequestWithAllParams( - regionId string, - routeTableId string, - subnetIds []string, + regionId string, + routeTableId string, + subnetIds []string, ) *AssociateRouteTableRequest { - return &AssociateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:associateRouteTable", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - SubnetIds: subnetIds, - } + return &AssociateRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:associateRouteTable", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + SubnetIds: subnetIds, + } } /* This constructor has better compatible ability when API parameters changed */ func NewAssociateRouteTableRequestWithoutParam() *AssociateRouteTableRequest { - return &AssociateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:associateRouteTable", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &AssociateRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:associateRouteTable", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *AssociateRouteTableRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *AssociateRouteTableRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } /* param subnetIds: 路由表要绑定的子网ID列表, subnet已被其他路由表绑定时，自动解绑。(Required) */ func (r *AssociateRouteTableRequest) SetSubnetIds(subnetIds []string) { - r.SubnetIds = subnetIds + r.SubnetIds = subnetIds } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r AssociateRouteTableRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type AssociateRouteTableResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result AssociateRouteTableResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result AssociateRouteTableResult `json:"result"` } type AssociateRouteTableResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateElasticIps.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateElasticIps.go index fd88f11aa..6ac78c2f5 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateElasticIps.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateElasticIps.go @@ -17,24 +17,25 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type CreateElasticIpsRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 购买弹性ip数量；取值范围：[1,100] */ - MaxCount int `json:"maxCount"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 指定弹性ip地址进行创建，当申请创建多个弹性ip时，必须为空 (Optional) */ - ElasticIpAddress *string `json:"elasticIpAddress"` + /* 购买弹性ip数量；取值范围：[1,100] */ + MaxCount int `json:"maxCount"` - /* 弹性ip规格 */ - ElasticIpSpec *vpc.ElasticIpSpec `json:"elasticIpSpec"` + /* 指定弹性ip地址进行创建，当申请创建多个弹性ip时，必须为空 (Optional) */ + ElasticIpAddress *string `json:"elasticIpAddress"` + + /* 弹性ip规格 */ + ElasticIpSpec *vpc.ElasticIpSpec `json:"elasticIpSpec"` } /* @@ -45,21 +46,21 @@ type CreateElasticIpsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateElasticIpsRequest( - regionId string, - maxCount int, - elasticIpSpec *vpc.ElasticIpSpec, + regionId string, + maxCount int, + elasticIpSpec *vpc.ElasticIpSpec, ) *CreateElasticIpsRequest { return &CreateElasticIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/elasticIps/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - MaxCount: maxCount, - ElasticIpSpec: elasticIpSpec, + RegionId: regionId, + MaxCount: maxCount, + ElasticIpSpec: elasticIpSpec, } } @@ -70,72 +71,72 @@ func NewCreateElasticIpsRequest( * param elasticIpSpec: 弹性ip规格 (Required) */ func NewCreateElasticIpsRequestWithAllParams( - regionId string, - maxCount int, - elasticIpAddress *string, - elasticIpSpec *vpc.ElasticIpSpec, + regionId string, + maxCount int, + elasticIpAddress *string, + elasticIpSpec *vpc.ElasticIpSpec, ) *CreateElasticIpsRequest { - return &CreateElasticIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - MaxCount: maxCount, - ElasticIpAddress: elasticIpAddress, - ElasticIpSpec: elasticIpSpec, - } + return &CreateElasticIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + MaxCount: maxCount, + ElasticIpAddress: elasticIpAddress, + ElasticIpSpec: elasticIpSpec, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateElasticIpsRequestWithoutParam() *CreateElasticIpsRequest { - return &CreateElasticIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateElasticIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateElasticIpsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param maxCount: 购买弹性ip数量；取值范围：[1,100](Required) */ func (r *CreateElasticIpsRequest) SetMaxCount(maxCount int) { - r.MaxCount = maxCount + r.MaxCount = maxCount } /* param elasticIpAddress: 指定弹性ip地址进行创建，当申请创建多个弹性ip时，必须为空(Optional) */ func (r *CreateElasticIpsRequest) SetElasticIpAddress(elasticIpAddress string) { - r.ElasticIpAddress = &elasticIpAddress + r.ElasticIpAddress = &elasticIpAddress } /* param elasticIpSpec: 弹性ip规格(Required) */ func (r *CreateElasticIpsRequest) SetElasticIpSpec(elasticIpSpec *vpc.ElasticIpSpec) { - r.ElasticIpSpec = elasticIpSpec + r.ElasticIpSpec = elasticIpSpec } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateElasticIpsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateElasticIpsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateElasticIpsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateElasticIpsResult `json:"result"` } type CreateElasticIpsResult struct { - ElasticIpIds []string `json:"elasticIpIds"` - RequestId string `json:"requestId"` -} + ElasticIpIds []string `json:"elasticIpIds"` + RequestId string `json:"requestId"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkAcl.go index 4a552d754..f1f81bfd8 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkAcl.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateNetworkAclRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 私有网络id */ - VpcId string `json:"vpcId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* networkAcl名称 */ - NetworkAclName string `json:"networkAclName"` + /* 私有网络id */ + VpcId string `json:"vpcId"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* networkAcl名称 */ + NetworkAclName string `json:"networkAclName"` + + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } /* @@ -44,21 +45,21 @@ type CreateNetworkAclRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateNetworkAclRequest( - regionId string, - vpcId string, - networkAclName string, + regionId string, + vpcId string, + networkAclName string, ) *CreateNetworkAclRequest { return &CreateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, - NetworkAclName: networkAclName, + RegionId: regionId, + VpcId: vpcId, + NetworkAclName: networkAclName, } } @@ -69,71 +70,71 @@ func NewCreateNetworkAclRequest( * param description: 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ func NewCreateNetworkAclRequestWithAllParams( - regionId string, - vpcId string, - networkAclName string, - description *string, + regionId string, + vpcId string, + networkAclName string, + description *string, ) *CreateNetworkAclRequest { - return &CreateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - NetworkAclName: networkAclName, - Description: description, - } + return &CreateNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + NetworkAclName: networkAclName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateNetworkAclRequestWithoutParam() *CreateNetworkAclRequest { - return &CreateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateNetworkAclRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: 私有网络id(Required) */ func (r *CreateNetworkAclRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } /* param networkAclName: networkAcl名称(Required) */ func (r *CreateNetworkAclRequest) SetNetworkAclName(networkAclName string) { - r.NetworkAclName = networkAclName + r.NetworkAclName = networkAclName } /* param description: 描述,允许输入UTF-8编码下的全部字符，不超过256字符(Optional) */ func (r *CreateNetworkAclRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateNetworkAclRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateNetworkAclResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateNetworkAclResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateNetworkAclResult `json:"result"` } type CreateNetworkAclResult struct { - NetworkAclId string `json:"networkAclId"` -} + NetworkAclId string `json:"networkAclId"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkInterface.go index 12003f4c6..14ce0da3c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkInterface.go @@ -17,41 +17,42 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateNetworkInterfaceRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 子网ID */ - SubnetId string `json:"subnetId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 可用区，用户的默认可用区 (Optional) */ - Az *string `json:"az"` + /* 子网ID */ + SubnetId string `json:"subnetId"` - /* 网卡名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - NetworkInterfaceName *string `json:"networkInterfaceName"` + /* 可用区，用户的默认可用区 (Optional) */ + Az *string `json:"az"` - /* 网卡主IP，如果不指定，会自动从子网中分配 (Optional) */ - PrimaryIpAddress *string `json:"primaryIpAddress"` + /* 网卡名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + NetworkInterfaceName *string `json:"networkInterfaceName"` - /* SecondaryIp列表 (Optional) */ - SecondaryIpAddresses []string `json:"secondaryIpAddresses"` + /* 网卡主IP，如果不指定，会自动从子网中分配 (Optional) */ + PrimaryIpAddress *string `json:"primaryIpAddress"` - /* 自动分配的SecondaryIp数量 (Optional) */ - SecondaryIpCount *int `json:"secondaryIpCount"` + /* SecondaryIp列表 (Optional) */ + SecondaryIpAddresses []string `json:"secondaryIpAddresses"` - /* 要绑定的安全组ID列表，最多指定5个安全组 (Optional) */ - SecurityGroups []string `json:"securityGroups"` + /* 自动分配的SecondaryIp数量 (Optional) */ + SecondaryIpCount *int `json:"secondaryIpCount"` - /* 源和目标IP地址校验，取值为0或者1,默认为1 (Optional) */ - SanityCheck *int `json:"sanityCheck"` + /* 要绑定的安全组ID列表，最多指定5个安全组 (Optional) */ + SecurityGroups []string `json:"securityGroups"` - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 源和目标IP地址校验，取值为0或者1,默认为1 (Optional) */ + SanityCheck *int `json:"sanityCheck"` + + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } /* @@ -61,19 +62,19 @@ type CreateNetworkInterfaceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateNetworkInterfaceRequest( - regionId string, - subnetId string, + regionId string, + subnetId string, ) *CreateNetworkInterfaceRequest { return &CreateNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - SubnetId: subnetId, + RegionId: regionId, + SubnetId: subnetId, } } @@ -90,113 +91,113 @@ func NewCreateNetworkInterfaceRequest( * param description: 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ func NewCreateNetworkInterfaceRequestWithAllParams( - regionId string, - subnetId string, - az *string, - networkInterfaceName *string, - primaryIpAddress *string, - secondaryIpAddresses []string, - secondaryIpCount *int, - securityGroups []string, - sanityCheck *int, - description *string, + regionId string, + subnetId string, + az *string, + networkInterfaceName *string, + primaryIpAddress *string, + secondaryIpAddresses []string, + secondaryIpCount *int, + securityGroups []string, + sanityCheck *int, + description *string, ) *CreateNetworkInterfaceRequest { - return &CreateNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - SubnetId: subnetId, - Az: az, - NetworkInterfaceName: networkInterfaceName, - PrimaryIpAddress: primaryIpAddress, - SecondaryIpAddresses: secondaryIpAddresses, - SecondaryIpCount: secondaryIpCount, - SecurityGroups: securityGroups, - SanityCheck: sanityCheck, - Description: description, - } + return &CreateNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + SubnetId: subnetId, + Az: az, + NetworkInterfaceName: networkInterfaceName, + PrimaryIpAddress: primaryIpAddress, + SecondaryIpAddresses: secondaryIpAddresses, + SecondaryIpCount: secondaryIpCount, + SecurityGroups: securityGroups, + SanityCheck: sanityCheck, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateNetworkInterfaceRequestWithoutParam() *CreateNetworkInterfaceRequest { - return &CreateNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateNetworkInterfaceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param subnetId: 子网ID(Required) */ func (r *CreateNetworkInterfaceRequest) SetSubnetId(subnetId string) { - r.SubnetId = subnetId + r.SubnetId = subnetId } /* param az: 可用区，用户的默认可用区(Optional) */ func (r *CreateNetworkInterfaceRequest) SetAz(az string) { - r.Az = &az + r.Az = &az } /* param networkInterfaceName: 网卡名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Optional) */ func (r *CreateNetworkInterfaceRequest) SetNetworkInterfaceName(networkInterfaceName string) { - r.NetworkInterfaceName = &networkInterfaceName + r.NetworkInterfaceName = &networkInterfaceName } /* param primaryIpAddress: 网卡主IP，如果不指定，会自动从子网中分配(Optional) */ func (r *CreateNetworkInterfaceRequest) SetPrimaryIpAddress(primaryIpAddress string) { - r.PrimaryIpAddress = &primaryIpAddress + r.PrimaryIpAddress = &primaryIpAddress } /* param secondaryIpAddresses: SecondaryIp列表(Optional) */ func (r *CreateNetworkInterfaceRequest) SetSecondaryIpAddresses(secondaryIpAddresses []string) { - r.SecondaryIpAddresses = secondaryIpAddresses + r.SecondaryIpAddresses = secondaryIpAddresses } /* param secondaryIpCount: 自动分配的SecondaryIp数量(Optional) */ func (r *CreateNetworkInterfaceRequest) SetSecondaryIpCount(secondaryIpCount int) { - r.SecondaryIpCount = &secondaryIpCount + r.SecondaryIpCount = &secondaryIpCount } /* param securityGroups: 要绑定的安全组ID列表，最多指定5个安全组(Optional) */ func (r *CreateNetworkInterfaceRequest) SetSecurityGroups(securityGroups []string) { - r.SecurityGroups = securityGroups + r.SecurityGroups = securityGroups } /* param sanityCheck: 源和目标IP地址校验，取值为0或者1,默认为1(Optional) */ func (r *CreateNetworkInterfaceRequest) SetSanityCheck(sanityCheck int) { - r.SanityCheck = &sanityCheck + r.SanityCheck = &sanityCheck } /* param description: 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符(Optional) */ func (r *CreateNetworkInterfaceRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateNetworkInterfaceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateNetworkInterfaceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateNetworkInterfaceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateNetworkInterfaceResult `json:"result"` } type CreateNetworkInterfaceResult struct { - NetworkInterfaceId string `json:"networkInterfaceId"` -} + NetworkInterfaceId string `json:"networkInterfaceId"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkSecurityGroup.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkSecurityGroup.go index 74d59b52a..c0765bb2c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkSecurityGroup.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateNetworkSecurityGroup.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateNetworkSecurityGroupRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 私有网络ID */ - VpcId string `json:"vpcId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 安全组名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - NetworkSecurityGroupName string `json:"networkSecurityGroupName"` + /* 私有网络ID */ + VpcId string `json:"vpcId"` - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 安全组名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + NetworkSecurityGroupName string `json:"networkSecurityGroupName"` + + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } /* @@ -44,21 +45,21 @@ type CreateNetworkSecurityGroupRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateNetworkSecurityGroupRequest( - regionId string, - vpcId string, - networkSecurityGroupName string, + regionId string, + vpcId string, + networkSecurityGroupName string, ) *CreateNetworkSecurityGroupRequest { return &CreateNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, - NetworkSecurityGroupName: networkSecurityGroupName, + RegionId: regionId, + VpcId: vpcId, + NetworkSecurityGroupName: networkSecurityGroupName, } } @@ -69,71 +70,71 @@ func NewCreateNetworkSecurityGroupRequest( * param description: 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ func NewCreateNetworkSecurityGroupRequestWithAllParams( - regionId string, - vpcId string, - networkSecurityGroupName string, - description *string, + regionId string, + vpcId string, + networkSecurityGroupName string, + description *string, ) *CreateNetworkSecurityGroupRequest { - return &CreateNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - NetworkSecurityGroupName: networkSecurityGroupName, - Description: description, - } + return &CreateNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + NetworkSecurityGroupName: networkSecurityGroupName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateNetworkSecurityGroupRequestWithoutParam() *CreateNetworkSecurityGroupRequest { - return &CreateNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateNetworkSecurityGroupRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: 私有网络ID(Required) */ func (r *CreateNetworkSecurityGroupRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } /* param networkSecurityGroupName: 安全组名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Required) */ func (r *CreateNetworkSecurityGroupRequest) SetNetworkSecurityGroupName(networkSecurityGroupName string) { - r.NetworkSecurityGroupName = networkSecurityGroupName + r.NetworkSecurityGroupName = networkSecurityGroupName } /* param description: 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符(Optional) */ func (r *CreateNetworkSecurityGroupRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateNetworkSecurityGroupRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateNetworkSecurityGroupResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateNetworkSecurityGroupResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateNetworkSecurityGroupResult `json:"result"` } type CreateNetworkSecurityGroupResult struct { - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` -} + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateRouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateRouteTable.go index 7e0a36a84..9cf289d88 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateRouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateRouteTable.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateRouteTableRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 路由表所属的私有网络ID */ - VpcId string `json:"vpcId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - RouteTableName string `json:"routeTableName"` + /* 路由表所属的私有网络ID */ + VpcId string `json:"vpcId"` - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + RouteTableName string `json:"routeTableName"` + + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } /* @@ -44,21 +45,21 @@ type CreateRouteTableRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateRouteTableRequest( - regionId string, - vpcId string, - routeTableName string, + regionId string, + vpcId string, + routeTableName string, ) *CreateRouteTableRequest { return &CreateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, - RouteTableName: routeTableName, + RegionId: regionId, + VpcId: vpcId, + RouteTableName: routeTableName, } } @@ -69,71 +70,71 @@ func NewCreateRouteTableRequest( * param description: 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ func NewCreateRouteTableRequestWithAllParams( - regionId string, - vpcId string, - routeTableName string, - description *string, + regionId string, + vpcId string, + routeTableName string, + description *string, ) *CreateRouteTableRequest { - return &CreateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - RouteTableName: routeTableName, - Description: description, - } + return &CreateRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + RouteTableName: routeTableName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateRouteTableRequestWithoutParam() *CreateRouteTableRequest { - return &CreateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateRouteTableRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: 路由表所属的私有网络ID(Required) */ func (r *CreateRouteTableRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } /* param routeTableName: 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Required) */ func (r *CreateRouteTableRequest) SetRouteTableName(routeTableName string) { - r.RouteTableName = routeTableName + r.RouteTableName = routeTableName } /* param description: 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符(Optional) */ func (r *CreateRouteTableRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateRouteTableRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateRouteTableResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateRouteTableResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateRouteTableResult `json:"result"` } type CreateRouteTableResult struct { - RouteTableId string `json:"routeTableId"` -} + RouteTableId string `json:"routeTableId"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateSubnet.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateSubnet.go index aceed5090..eb2523d43 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateSubnet.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateSubnet.go @@ -17,29 +17,30 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateSubnetRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 子网所属vpc的Id */ - VpcId string `json:"vpcId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - SubnetName string `json:"subnetName"` + /* 子网所属vpc的Id */ + VpcId string `json:"vpcId"` - /* 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果vpc含有cidr，则必须为vpc所在cidr的子网 */ - AddressPrefix string `json:"addressPrefix"` + /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + SubnetName string `json:"subnetName"` - /* 子网关联的路由表Id, 默认为vpc的默认路由表 (Optional) */ - RouteTableId *string `json:"routeTableId"` + /* 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果vpc含有cidr，则必须为vpc所在cidr的子网 */ + AddressPrefix string `json:"addressPrefix"` - /* 子网描述信息,允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description *string `json:"description"` + /* 子网关联的路由表Id, 默认为vpc的默认路由表 (Optional) */ + RouteTableId *string `json:"routeTableId"` + + /* 子网描述信息,允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description *string `json:"description"` } /* @@ -51,23 +52,23 @@ type CreateSubnetRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateSubnetRequest( - regionId string, - vpcId string, - subnetName string, - addressPrefix string, + regionId string, + vpcId string, + subnetName string, + addressPrefix string, ) *CreateSubnetRequest { return &CreateSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/subnets/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, - SubnetName: subnetName, - AddressPrefix: addressPrefix, + RegionId: regionId, + VpcId: vpcId, + SubnetName: subnetName, + AddressPrefix: addressPrefix, } } @@ -80,85 +81,85 @@ func NewCreateSubnetRequest( * param description: 子网描述信息,允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ func NewCreateSubnetRequestWithAllParams( - regionId string, - vpcId string, - subnetName string, - addressPrefix string, - routeTableId *string, - description *string, + regionId string, + vpcId string, + subnetName string, + addressPrefix string, + routeTableId *string, + description *string, ) *CreateSubnetRequest { - return &CreateSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - SubnetName: subnetName, - AddressPrefix: addressPrefix, - RouteTableId: routeTableId, - Description: description, - } + return &CreateSubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + SubnetName: subnetName, + AddressPrefix: addressPrefix, + RouteTableId: routeTableId, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateSubnetRequestWithoutParam() *CreateSubnetRequest { - return &CreateSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateSubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateSubnetRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: 子网所属vpc的Id(Required) */ func (r *CreateSubnetRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } /* param subnetName: 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Required) */ func (r *CreateSubnetRequest) SetSubnetName(subnetName string) { - r.SubnetName = subnetName + r.SubnetName = subnetName } /* param addressPrefix: 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果vpc含有cidr，则必须为vpc所在cidr的子网(Required) */ func (r *CreateSubnetRequest) SetAddressPrefix(addressPrefix string) { - r.AddressPrefix = addressPrefix + r.AddressPrefix = addressPrefix } /* param routeTableId: 子网关联的路由表Id, 默认为vpc的默认路由表(Optional) */ func (r *CreateSubnetRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = &routeTableId + r.RouteTableId = &routeTableId } /* param description: 子网描述信息,允许输入UTF-8编码下的全部字符，不超过256字符。(Optional) */ func (r *CreateSubnetRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateSubnetRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateSubnetResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateSubnetResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateSubnetResult `json:"result"` } type CreateSubnetResult struct { - SubnetId string `json:"subnetId"` -} + SubnetId string `json:"subnetId"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpc.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpc.go index a59fda811..60641f9d9 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpc.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpc.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type CreateVpcRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - VpcName string `json:"vpcName"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ - AddressPrefix *string `json:"addressPrefix"` + /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + VpcName string `json:"vpcName"` - /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description *string `json:"description"` + /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ + AddressPrefix *string `json:"addressPrefix"` + + /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description *string `json:"description"` } /* @@ -43,19 +44,19 @@ type CreateVpcRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateVpcRequest( - regionId string, - vpcName string, + regionId string, + vpcName string, ) *CreateVpcRequest { return &CreateVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcs/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcName: vpcName, + RegionId: regionId, + VpcName: vpcName, } } @@ -66,71 +67,71 @@ func NewCreateVpcRequest( * param description: vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ func NewCreateVpcRequestWithAllParams( - regionId string, - vpcName string, - addressPrefix *string, - description *string, + regionId string, + vpcName string, + addressPrefix *string, + description *string, ) *CreateVpcRequest { - return &CreateVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcName: vpcName, - AddressPrefix: addressPrefix, - Description: description, - } + return &CreateVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcName: vpcName, + AddressPrefix: addressPrefix, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateVpcRequestWithoutParam() *CreateVpcRequest { - return &CreateVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateVpcRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcName: 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Required) */ func (r *CreateVpcRequest) SetVpcName(vpcName string) { - r.VpcName = vpcName + r.VpcName = vpcName } /* param addressPrefix: 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间(Optional) */ func (r *CreateVpcRequest) SetAddressPrefix(addressPrefix string) { - r.AddressPrefix = &addressPrefix + r.AddressPrefix = &addressPrefix } /* param description: vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。(Optional) */ func (r *CreateVpcRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateVpcRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateVpcResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateVpcResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateVpcResult `json:"result"` } type CreateVpcResult struct { - VpcId string `json:"vpcId"` -} + VpcId string `json:"vpcId"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpcPeering.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpcPeering.go index b92b7e855..518a33f57 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpcPeering.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/CreateVpcPeering.go @@ -17,27 +17,28 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type CreateVpcPeeringRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 */ - VpcPeeringName string `json:"vpcPeeringName"` + /* Region ID */ + RegionId string `json:"regionId"` - /* VpcPeering本端Vpc的Id */ - VpcId string `json:"vpcId"` + /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 */ + VpcPeeringName string `json:"vpcPeeringName"` - /* VpcPeering对端Vpc的Id */ - RemoteVpcId string `json:"remoteVpcId"` + /* VpcPeering本端Vpc的Id */ + VpcId string `json:"vpcId"` - /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - Description *string `json:"description"` + /* VpcPeering对端Vpc的Id */ + RemoteVpcId string `json:"remoteVpcId"` + + /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + Description *string `json:"description"` } /* @@ -49,23 +50,23 @@ type CreateVpcPeeringRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewCreateVpcPeeringRequest( - regionId string, - vpcPeeringName string, - vpcId string, - remoteVpcId string, + regionId string, + vpcPeeringName string, + vpcId string, + remoteVpcId string, ) *CreateVpcPeeringRequest { return &CreateVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcPeerings/", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcPeeringName: vpcPeeringName, - VpcId: vpcId, - RemoteVpcId: remoteVpcId, + RegionId: regionId, + VpcPeeringName: vpcPeeringName, + VpcId: vpcId, + RemoteVpcId: remoteVpcId, } } @@ -77,78 +78,78 @@ func NewCreateVpcPeeringRequest( * param description: VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ func NewCreateVpcPeeringRequestWithAllParams( - regionId string, - vpcPeeringName string, - vpcId string, - remoteVpcId string, - description *string, + regionId string, + vpcPeeringName string, + vpcId string, + remoteVpcId string, + description *string, ) *CreateVpcPeeringRequest { - return &CreateVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcPeeringName: vpcPeeringName, - VpcId: vpcId, - RemoteVpcId: remoteVpcId, - Description: description, - } + return &CreateVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcPeeringName: vpcPeeringName, + VpcId: vpcId, + RemoteVpcId: remoteVpcId, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewCreateVpcPeeringRequestWithoutParam() *CreateVpcPeeringRequest { - return &CreateVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &CreateVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *CreateVpcPeeringRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcPeeringName: VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符(Required) */ func (r *CreateVpcPeeringRequest) SetVpcPeeringName(vpcPeeringName string) { - r.VpcPeeringName = vpcPeeringName + r.VpcPeeringName = vpcPeeringName } /* param vpcId: VpcPeering本端Vpc的Id(Required) */ func (r *CreateVpcPeeringRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } /* param remoteVpcId: VpcPeering对端Vpc的Id(Required) */ func (r *CreateVpcPeeringRequest) SetRemoteVpcId(remoteVpcId string) { - r.RemoteVpcId = remoteVpcId + r.RemoteVpcId = remoteVpcId } /* param description: VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符(Optional) */ func (r *CreateVpcPeeringRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r CreateVpcPeeringRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type CreateVpcPeeringResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result CreateVpcPeeringResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result CreateVpcPeeringResult `json:"result"` } type CreateVpcPeeringResult struct { - VpcPeering vpc.VpcPeering `json:"vpcPeering"` -} + VpcPeering vpc.VpcPeering `json:"vpcPeering"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteElasticIp.go index 5bab1d635..0aa9c8bcc 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteElasticIp.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteElasticIpRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* ElasticIp ID */ - ElasticIpId string `json:"elasticIpId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* ElasticIp ID */ + ElasticIpId string `json:"elasticIpId"` } /* @@ -37,19 +38,19 @@ type DeleteElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteElasticIpRequest( - regionId string, - elasticIpId string, + regionId string, + elasticIpId string, ) *DeleteElasticIpRequest { return &DeleteElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/elasticIps/{elasticIpId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - ElasticIpId: elasticIpId, + RegionId: regionId, + ElasticIpId: elasticIpId, } } @@ -58,56 +59,56 @@ func NewDeleteElasticIpRequest( * param elasticIpId: ElasticIp ID (Required) */ func NewDeleteElasticIpRequestWithAllParams( - regionId string, - elasticIpId string, + regionId string, + elasticIpId string, ) *DeleteElasticIpRequest { - return &DeleteElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/{elasticIpId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ElasticIpId: elasticIpId, - } + return &DeleteElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/{elasticIpId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ElasticIpId: elasticIpId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteElasticIpRequestWithoutParam() *DeleteElasticIpRequest { - return &DeleteElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/{elasticIpId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/{elasticIpId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param elasticIpId: ElasticIp ID(Required) */ func (r *DeleteElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = elasticIpId + r.ElasticIpId = elasticIpId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteElasticIpResult `json:"result"` } type DeleteElasticIpResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkAcl.go index bbea5dd4c..a4be188bb 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkAcl.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteNetworkAclRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` } /* @@ -37,19 +38,19 @@ type DeleteNetworkAclRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteNetworkAclRequest( - regionId string, - networkAclId string, + regionId string, + networkAclId string, ) *DeleteNetworkAclRequest { return &DeleteNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, + RegionId: regionId, + NetworkAclId: networkAclId, } } @@ -58,56 +59,56 @@ func NewDeleteNetworkAclRequest( * param networkAclId: networkAclId ID (Required) */ func NewDeleteNetworkAclRequestWithAllParams( - regionId string, - networkAclId string, + regionId string, + networkAclId string, ) *DeleteNetworkAclRequest { - return &DeleteNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - } + return &DeleteNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteNetworkAclRequestWithoutParam() *DeleteNetworkAclRequest { - return &DeleteNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteNetworkAclRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *DeleteNetworkAclRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteNetworkAclRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteNetworkAclResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteNetworkAclResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteNetworkAclResult `json:"result"` } type DeleteNetworkAclResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkInterface.go index ab96d8b20..3e64d6fde 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkInterface.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteNetworkInterfaceRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` } /* @@ -37,19 +38,19 @@ type DeleteNetworkInterfaceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteNetworkInterfaceRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *DeleteNetworkInterfaceRequest { return &DeleteNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -58,56 +59,56 @@ func NewDeleteNetworkInterfaceRequest( * param networkInterfaceId: networkInterface ID (Required) */ func NewDeleteNetworkInterfaceRequestWithAllParams( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *DeleteNetworkInterfaceRequest { - return &DeleteNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - } + return &DeleteNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteNetworkInterfaceRequestWithoutParam() *DeleteNetworkInterfaceRequest { - return &DeleteNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteNetworkInterfaceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *DeleteNetworkInterfaceRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteNetworkInterfaceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteNetworkInterfaceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteNetworkInterfaceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteNetworkInterfaceResult `json:"result"` } type DeleteNetworkInterfaceResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkSecurityGroup.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkSecurityGroup.go index 4f4f904bb..f48291b13 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkSecurityGroup.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteNetworkSecurityGroup.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteNetworkSecurityGroupRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* NetworkSecurityGroup ID */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* NetworkSecurityGroup ID */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` } /* @@ -37,19 +38,19 @@ type DeleteNetworkSecurityGroupRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteNetworkSecurityGroupRequest( - regionId string, - networkSecurityGroupId string, + regionId string, + networkSecurityGroupId string, ) *DeleteNetworkSecurityGroupRequest { return &DeleteNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, } } @@ -58,56 +59,56 @@ func NewDeleteNetworkSecurityGroupRequest( * param networkSecurityGroupId: NetworkSecurityGroup ID (Required) */ func NewDeleteNetworkSecurityGroupRequestWithAllParams( - regionId string, - networkSecurityGroupId string, + regionId string, + networkSecurityGroupId string, ) *DeleteNetworkSecurityGroupRequest { - return &DeleteNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - } + return &DeleteNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteNetworkSecurityGroupRequestWithoutParam() *DeleteNetworkSecurityGroupRequest { - return &DeleteNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteNetworkSecurityGroupRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkSecurityGroupId: NetworkSecurityGroup ID(Required) */ func (r *DeleteNetworkSecurityGroupRequest) SetNetworkSecurityGroupId(networkSecurityGroupId string) { - r.NetworkSecurityGroupId = networkSecurityGroupId + r.NetworkSecurityGroupId = networkSecurityGroupId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteNetworkSecurityGroupRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteNetworkSecurityGroupResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteNetworkSecurityGroupResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteNetworkSecurityGroupResult `json:"result"` } type DeleteNetworkSecurityGroupResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteRouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteRouteTable.go index 3808cfb8d..e272e5b2e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteRouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteRouteTable.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteRouteTableRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` } /* @@ -37,19 +38,19 @@ type DeleteRouteTableRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteRouteTableRequest( - regionId string, - routeTableId string, + regionId string, + routeTableId string, ) *DeleteRouteTableRequest { return &DeleteRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, + RegionId: regionId, + RouteTableId: routeTableId, } } @@ -58,56 +59,56 @@ func NewDeleteRouteTableRequest( * param routeTableId: RouteTable ID (Required) */ func NewDeleteRouteTableRequestWithAllParams( - regionId string, - routeTableId string, + regionId string, + routeTableId string, ) *DeleteRouteTableRequest { - return &DeleteRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - } + return &DeleteRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteRouteTableRequestWithoutParam() *DeleteRouteTableRequest { - return &DeleteRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteRouteTableRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *DeleteRouteTableRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteRouteTableRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteRouteTableResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteRouteTableResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteRouteTableResult `json:"result"` } type DeleteRouteTableResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteSubnet.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteSubnet.go index 7e4b1f298..15c2be6af 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteSubnet.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteSubnet.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteSubnetRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* Subnet ID */ - SubnetId string `json:"subnetId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* Subnet ID */ + SubnetId string `json:"subnetId"` } /* @@ -37,19 +38,19 @@ type DeleteSubnetRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteSubnetRequest( - regionId string, - subnetId string, + regionId string, + subnetId string, ) *DeleteSubnetRequest { return &DeleteSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/subnets/{subnetId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - SubnetId: subnetId, + RegionId: regionId, + SubnetId: subnetId, } } @@ -58,56 +59,56 @@ func NewDeleteSubnetRequest( * param subnetId: Subnet ID (Required) */ func NewDeleteSubnetRequestWithAllParams( - regionId string, - subnetId string, + regionId string, + subnetId string, ) *DeleteSubnetRequest { - return &DeleteSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/{subnetId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - SubnetId: subnetId, - } + return &DeleteSubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/{subnetId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + SubnetId: subnetId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteSubnetRequestWithoutParam() *DeleteSubnetRequest { - return &DeleteSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/{subnetId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteSubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/{subnetId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteSubnetRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param subnetId: Subnet ID(Required) */ func (r *DeleteSubnetRequest) SetSubnetId(subnetId string) { - r.SubnetId = subnetId + r.SubnetId = subnetId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteSubnetRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteSubnetResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteSubnetResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteSubnetResult `json:"result"` } type DeleteSubnetResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpc.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpc.go index 4ab0333de..ef98f098d 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpc.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpc.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteVpcRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* Vpc ID */ - VpcId string `json:"vpcId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* Vpc ID */ + VpcId string `json:"vpcId"` } /* @@ -37,19 +38,19 @@ type DeleteVpcRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteVpcRequest( - regionId string, - vpcId string, + regionId string, + vpcId string, ) *DeleteVpcRequest { return &DeleteVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcs/{vpcId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, + RegionId: regionId, + VpcId: vpcId, } } @@ -58,56 +59,56 @@ func NewDeleteVpcRequest( * param vpcId: Vpc ID (Required) */ func NewDeleteVpcRequestWithAllParams( - regionId string, - vpcId string, + regionId string, + vpcId string, ) *DeleteVpcRequest { - return &DeleteVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/{vpcId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - } + return &DeleteVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/{vpcId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteVpcRequestWithoutParam() *DeleteVpcRequest { - return &DeleteVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/{vpcId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/{vpcId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteVpcRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: Vpc ID(Required) */ func (r *DeleteVpcRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteVpcRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteVpcResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteVpcResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteVpcResult `json:"result"` } type DeleteVpcResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpcPeering.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpcPeering.go index a60833c70..b77e471dd 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpcPeering.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DeleteVpcPeering.go @@ -17,17 +17,18 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DeleteVpcPeeringRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* vpcPeeringId ID */ - VpcPeeringId string `json:"vpcPeeringId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* vpcPeeringId ID */ + VpcPeeringId string `json:"vpcPeeringId"` } /* @@ -37,19 +38,19 @@ type DeleteVpcPeeringRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDeleteVpcPeeringRequest( - regionId string, - vpcPeeringId string, + regionId string, + vpcPeeringId string, ) *DeleteVpcPeeringRequest { return &DeleteVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", Method: "DELETE", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcPeeringId: vpcPeeringId, + RegionId: regionId, + VpcPeeringId: vpcPeeringId, } } @@ -58,56 +59,56 @@ func NewDeleteVpcPeeringRequest( * param vpcPeeringId: vpcPeeringId ID (Required) */ func NewDeleteVpcPeeringRequestWithAllParams( - regionId string, - vpcPeeringId string, + regionId string, + vpcPeeringId string, ) *DeleteVpcPeeringRequest { - return &DeleteVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcPeeringId: vpcPeeringId, - } + return &DeleteVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcPeeringId: vpcPeeringId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDeleteVpcPeeringRequestWithoutParam() *DeleteVpcPeeringRequest { - return &DeleteVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", - Method: "DELETE", - Header: nil, - Version: "v1", - }, - } + return &DeleteVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", + Method: "DELETE", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DeleteVpcPeeringRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcPeeringId: vpcPeeringId ID(Required) */ func (r *DeleteVpcPeeringRequest) SetVpcPeeringId(vpcPeeringId string) { - r.VpcPeeringId = vpcPeeringId + r.VpcPeeringId = vpcPeeringId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DeleteVpcPeeringRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DeleteVpcPeeringResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DeleteVpcPeeringResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DeleteVpcPeeringResult `json:"result"` } type DeleteVpcPeeringResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIp.go index e5e942d6b..6ecb5a97c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIp.go @@ -17,18 +17,19 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeElasticIpRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* ElasticIp ID */ - ElasticIpId string `json:"elasticIpId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* ElasticIp ID */ + ElasticIpId string `json:"elasticIpId"` } /* @@ -38,19 +39,19 @@ type DescribeElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeElasticIpRequest( - regionId string, - elasticIpId string, + regionId string, + elasticIpId string, ) *DescribeElasticIpRequest { return &DescribeElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/elasticIps/{elasticIpId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - ElasticIpId: elasticIpId, + RegionId: regionId, + ElasticIpId: elasticIpId, } } @@ -59,57 +60,57 @@ func NewDescribeElasticIpRequest( * param elasticIpId: ElasticIp ID (Required) */ func NewDescribeElasticIpRequestWithAllParams( - regionId string, - elasticIpId string, + regionId string, + elasticIpId string, ) *DescribeElasticIpRequest { - return &DescribeElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/{elasticIpId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ElasticIpId: elasticIpId, - } + return &DescribeElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/{elasticIpId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ElasticIpId: elasticIpId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeElasticIpRequestWithoutParam() *DescribeElasticIpRequest { - return &DescribeElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/{elasticIpId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/{elasticIpId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param elasticIpId: ElasticIp ID(Required) */ func (r *DescribeElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = elasticIpId + r.ElasticIpId = elasticIpId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeElasticIpResult `json:"result"` } type DescribeElasticIpResult struct { - ElasticIp vpc.ElasticIp `json:"elasticIp"` -} + ElasticIp vpc.ElasticIp `json:"elasticIp"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIps.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIps.go index 9f5a2b448..94927eff2 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIps.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeElasticIps.go @@ -17,28 +17,29 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeElasticIpsRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* elasticIpIds - elasticip id数组条件，支持多个 - elasticIpAddress - eip的IP地址，支持单个 - chargeStatus - eip的费用支付状态,normal(正常状态) or overdue(预付费已到期) or arrear(欠费状态)，支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` + + /* elasticIpIds - elasticip id数组条件，支持多个 +elasticIpAddress - eip的IP地址，支持单个 +chargeStatus - eip的费用支付状态,normal(正常状态) or overdue(预付费已到期) or arrear(欠费状态)，支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -47,17 +48,17 @@ type DescribeElasticIpsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeElasticIpsRequest( - regionId string, + regionId string, ) *DescribeElasticIpsRequest { return &DescribeElasticIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/elasticIps/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -69,54 +70,54 @@ func NewDescribeElasticIpsRequest( elasticIpAddress - eip的IP地址，支持单个 chargeStatus - eip的费用支付状态,normal(正常状态) or overdue(预付费已到期) or arrear(欠费状态)，支持单个 (Optional) -*/ + */ func NewDescribeElasticIpsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeElasticIpsRequest { - return &DescribeElasticIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeElasticIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeElasticIpsRequestWithoutParam() *DescribeElasticIpsRequest { - return &DescribeElasticIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeElasticIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeElasticIpsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeElasticIpsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeElasticIpsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: elasticIpIds - elasticip id数组条件，支持多个 @@ -124,22 +125,22 @@ elasticIpAddress - eip的IP地址，支持单个 chargeStatus - eip的费用支付状态,normal(正常状态) or overdue(预付费已到期) or arrear(欠费状态)，支持单个 (Optional) */ func (r *DescribeElasticIpsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeElasticIpsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeElasticIpsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeElasticIpsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeElasticIpsResult `json:"result"` } type DescribeElasticIpsResult struct { - ElasticIps []vpc.ElasticIp `json:"elasticIps"` - TotalCount int `json:"totalCount"` -} + ElasticIps []vpc.ElasticIp `json:"elasticIps"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcl.go index ff7f522dc..6692a7f70 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcl.go @@ -17,18 +17,19 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeNetworkAclRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` } /* @@ -38,19 +39,19 @@ type DescribeNetworkAclRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeNetworkAclRequest( - regionId string, - networkAclId string, + regionId string, + networkAclId string, ) *DescribeNetworkAclRequest { return &DescribeNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, + RegionId: regionId, + NetworkAclId: networkAclId, } } @@ -59,57 +60,57 @@ func NewDescribeNetworkAclRequest( * param networkAclId: networkAclId ID (Required) */ func NewDescribeNetworkAclRequestWithAllParams( - regionId string, - networkAclId string, + regionId string, + networkAclId string, ) *DescribeNetworkAclRequest { - return &DescribeNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - } + return &DescribeNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeNetworkAclRequestWithoutParam() *DescribeNetworkAclRequest { - return &DescribeNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeNetworkAclRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *DescribeNetworkAclRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeNetworkAclRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeNetworkAclResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeNetworkAclResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeNetworkAclResult `json:"result"` } type DescribeNetworkAclResult struct { - NetworkAcl vpc.NetworkAcl `json:"networkAcl"` -} + NetworkAcl vpc.NetworkAcl `json:"networkAcl"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcls.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcls.go index 4a8f2c876..5344e55ad 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcls.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkAcls.go @@ -17,28 +17,29 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeNetworkAclsRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* networkAclIds - 弹性网卡ID列表，支持多个 - networkAclNames - 弹性网卡名称列表，支持多个 - vpcId - 弹性网卡所属vpc Id，支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` + + /* networkAclIds - 弹性网卡ID列表，支持多个 +networkAclNames - 弹性网卡名称列表，支持多个 +vpcId - 弹性网卡所属vpc Id，支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -47,17 +48,17 @@ type DescribeNetworkAclsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeNetworkAclsRequest( - regionId string, + regionId string, ) *DescribeNetworkAclsRequest { return &DescribeNetworkAclsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -69,54 +70,54 @@ func NewDescribeNetworkAclsRequest( networkAclNames - 弹性网卡名称列表，支持多个 vpcId - 弹性网卡所属vpc Id，支持单个 (Optional) -*/ + */ func NewDescribeNetworkAclsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeNetworkAclsRequest { - return &DescribeNetworkAclsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeNetworkAclsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeNetworkAclsRequestWithoutParam() *DescribeNetworkAclsRequest { - return &DescribeNetworkAclsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeNetworkAclsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeNetworkAclsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeNetworkAclsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeNetworkAclsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: networkAclIds - 弹性网卡ID列表，支持多个 @@ -124,22 +125,22 @@ networkAclNames - 弹性网卡名称列表，支持多个 vpcId - 弹性网卡所属vpc Id，支持单个 (Optional) */ func (r *DescribeNetworkAclsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeNetworkAclsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeNetworkAclsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeNetworkAclsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeNetworkAclsResult `json:"result"` } type DescribeNetworkAclsResult struct { - NetworkAcls []vpc.NetworkAcl `json:"networkAcls"` - TotalCount int `json:"totalCount"` -} + NetworkAcls []vpc.NetworkAcl `json:"networkAcls"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterface.go index c02ce6eac..284b32b5d 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterface.go @@ -17,18 +17,19 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeNetworkInterfaceRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` } /* @@ -38,19 +39,19 @@ type DescribeNetworkInterfaceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeNetworkInterfaceRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *DescribeNetworkInterfaceRequest { return &DescribeNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -59,57 +60,57 @@ func NewDescribeNetworkInterfaceRequest( * param networkInterfaceId: networkInterface ID (Required) */ func NewDescribeNetworkInterfaceRequestWithAllParams( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *DescribeNetworkInterfaceRequest { - return &DescribeNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - } + return &DescribeNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeNetworkInterfaceRequestWithoutParam() *DescribeNetworkInterfaceRequest { - return &DescribeNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeNetworkInterfaceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *DescribeNetworkInterfaceRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeNetworkInterfaceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeNetworkInterfaceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeNetworkInterfaceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeNetworkInterfaceResult `json:"result"` } type DescribeNetworkInterfaceResult struct { - NetworkInterface vpc.NetworkInterface `json:"networkInterface"` -} + NetworkInterface vpc.NetworkInterface `json:"networkInterface"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterfaces.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterfaces.go index 899184d8e..2503ca0e1 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterfaces.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkInterfaces.go @@ -17,30 +17,31 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeNetworkInterfacesRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* networkInterfaceIds - 弹性网卡ID列表，支持多个 - networkInterfaceNames - 弹性网卡名称列表，支持多个 - vpcId - 弹性网卡所属vpc Id，支持单个 - subnetId - 弹性网卡所属子网Id，支持单个 - role - 网卡角色，取值范围：Primary（主网卡）、Secondary（辅助网卡），支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` + + /* networkInterfaceIds - 弹性网卡ID列表，支持多个 +networkInterfaceNames - 弹性网卡名称列表，支持多个 +vpcId - 弹性网卡所属vpc Id，支持单个 +subnetId - 弹性网卡所属子网Id，支持单个 +role - 网卡角色，取值范围：Primary（主网卡）、Secondary（辅助网卡），支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -49,17 +50,17 @@ type DescribeNetworkInterfacesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeNetworkInterfacesRequest( - regionId string, + regionId string, ) *DescribeNetworkInterfacesRequest { return &DescribeNetworkInterfacesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -73,54 +74,54 @@ vpcId - 弹性网卡所属vpc Id，支持单个 subnetId - 弹性网卡所属子网Id，支持单个 role - 网卡角色，取值范围：Primary（主网卡）、Secondary（辅助网卡），支持单个 (Optional) -*/ + */ func NewDescribeNetworkInterfacesRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeNetworkInterfacesRequest { - return &DescribeNetworkInterfacesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeNetworkInterfacesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeNetworkInterfacesRequestWithoutParam() *DescribeNetworkInterfacesRequest { - return &DescribeNetworkInterfacesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeNetworkInterfacesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeNetworkInterfacesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeNetworkInterfacesRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeNetworkInterfacesRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: networkInterfaceIds - 弹性网卡ID列表，支持多个 @@ -130,22 +131,22 @@ subnetId - 弹性网卡所属子网Id，支持单个 role - 网卡角色，取值范围：Primary（主网卡）、Secondary（辅助网卡），支持单个 (Optional) */ func (r *DescribeNetworkInterfacesRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeNetworkInterfacesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeNetworkInterfacesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeNetworkInterfacesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeNetworkInterfacesResult `json:"result"` } type DescribeNetworkInterfacesResult struct { - NetworkInterfaces []vpc.NetworkInterface `json:"networkInterfaces"` - TotalCount int `json:"totalCount"` -} + NetworkInterfaces []vpc.NetworkInterface `json:"networkInterfaces"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroup.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroup.go index e8efdfb5e..b7f29d797 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroup.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroup.go @@ -17,18 +17,19 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeNetworkSecurityGroupRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* NetworkSecurityGroup ID */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* NetworkSecurityGroup ID */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` } /* @@ -38,19 +39,19 @@ type DescribeNetworkSecurityGroupRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeNetworkSecurityGroupRequest( - regionId string, - networkSecurityGroupId string, + regionId string, + networkSecurityGroupId string, ) *DescribeNetworkSecurityGroupRequest { return &DescribeNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, } } @@ -59,57 +60,57 @@ func NewDescribeNetworkSecurityGroupRequest( * param networkSecurityGroupId: NetworkSecurityGroup ID (Required) */ func NewDescribeNetworkSecurityGroupRequestWithAllParams( - regionId string, - networkSecurityGroupId string, + regionId string, + networkSecurityGroupId string, ) *DescribeNetworkSecurityGroupRequest { - return &DescribeNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - } + return &DescribeNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeNetworkSecurityGroupRequestWithoutParam() *DescribeNetworkSecurityGroupRequest { - return &DescribeNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeNetworkSecurityGroupRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkSecurityGroupId: NetworkSecurityGroup ID(Required) */ func (r *DescribeNetworkSecurityGroupRequest) SetNetworkSecurityGroupId(networkSecurityGroupId string) { - r.NetworkSecurityGroupId = networkSecurityGroupId + r.NetworkSecurityGroupId = networkSecurityGroupId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeNetworkSecurityGroupRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeNetworkSecurityGroupResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeNetworkSecurityGroupResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeNetworkSecurityGroupResult `json:"result"` } type DescribeNetworkSecurityGroupResult struct { - NetworkSecurityGroup vpc.NetworkSecurityGroup `json:"networkSecurityGroup"` -} + NetworkSecurityGroup vpc.NetworkSecurityGroup `json:"networkSecurityGroup"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroups.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroups.go index 79cc3d503..e85cc7170 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroups.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeNetworkSecurityGroups.go @@ -17,28 +17,29 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeNetworkSecurityGroupsRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* networkSecurityGroupIds - 安全组ID列表，支持多个 - networkSecurityGroupNames - 安全组名称列表，支持多个 - vpcId - 安全组所属vpc Id，支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` + + /* networkSecurityGroupIds - 安全组ID列表，支持多个 +networkSecurityGroupNames - 安全组名称列表，支持多个 +vpcId - 安全组所属vpc Id，支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -47,17 +48,17 @@ type DescribeNetworkSecurityGroupsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeNetworkSecurityGroupsRequest( - regionId string, + regionId string, ) *DescribeNetworkSecurityGroupsRequest { return &DescribeNetworkSecurityGroupsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -69,54 +70,54 @@ func NewDescribeNetworkSecurityGroupsRequest( networkSecurityGroupNames - 安全组名称列表，支持多个 vpcId - 安全组所属vpc Id，支持单个 (Optional) -*/ + */ func NewDescribeNetworkSecurityGroupsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeNetworkSecurityGroupsRequest { - return &DescribeNetworkSecurityGroupsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeNetworkSecurityGroupsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeNetworkSecurityGroupsRequestWithoutParam() *DescribeNetworkSecurityGroupsRequest { - return &DescribeNetworkSecurityGroupsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeNetworkSecurityGroupsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeNetworkSecurityGroupsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeNetworkSecurityGroupsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeNetworkSecurityGroupsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: networkSecurityGroupIds - 安全组ID列表，支持多个 @@ -124,22 +125,22 @@ networkSecurityGroupNames - 安全组名称列表，支持多个 vpcId - 安全组所属vpc Id，支持单个 (Optional) */ func (r *DescribeNetworkSecurityGroupsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeNetworkSecurityGroupsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeNetworkSecurityGroupsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeNetworkSecurityGroupsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeNetworkSecurityGroupsResult `json:"result"` } type DescribeNetworkSecurityGroupsResult struct { - NetworkSecurityGroups []vpc.NetworkSecurityGroup `json:"networkSecurityGroups"` - TotalCount int `json:"totalCount"` -} + NetworkSecurityGroups []vpc.NetworkSecurityGroup `json:"networkSecurityGroups"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeQuota.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeQuota.go index a56d7ec44..4b6544e0f 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeQuota.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeQuota.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DescribeQuotaRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡） */ - Type string `json:"type"` + /* Region ID */ + RegionId string `json:"regionId"` - /* type为vpc、elastic_ip、network_interface不设置, type为subnet、security_group、vpcpeering设置为vpcId (Optional) */ - ParentResourceId *string `json:"parentResourceId"` + /* 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡） */ + Type string `json:"type"` + + /* type为vpc、elastic_ip、network_interface不设置, type为subnet、security_group、vpcpeering设置为vpcId (Optional) */ + ParentResourceId *string `json:"parentResourceId"` } /* @@ -40,19 +41,19 @@ type DescribeQuotaRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeQuotaRequest( - regionId string, - type_ string, + regionId string, + type_ string, ) *DescribeQuotaRequest { return &DescribeQuotaRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/quotas/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - Type: type_, + RegionId: regionId, + Type: type_, } } @@ -62,64 +63,64 @@ func NewDescribeQuotaRequest( * param parentResourceId: type为vpc、elastic_ip、network_interface不设置, type为subnet、security_group、vpcpeering设置为vpcId (Optional) */ func NewDescribeQuotaRequestWithAllParams( - regionId string, - type_ string, - parentResourceId *string, + regionId string, + type_ string, + parentResourceId *string, ) *DescribeQuotaRequest { - return &DescribeQuotaRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/quotas/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - Type: type_, - ParentResourceId: parentResourceId, - } + return &DescribeQuotaRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/quotas/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + Type: type_, + ParentResourceId: parentResourceId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeQuotaRequestWithoutParam() *DescribeQuotaRequest { - return &DescribeQuotaRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/quotas/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeQuotaRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/quotas/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeQuotaRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param type_: 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡）(Required) */ func (r *DescribeQuotaRequest) SetType(type_ string) { - r.Type = type_ + r.Type = type_ } /* param parentResourceId: type为vpc、elastic_ip、network_interface不设置, type为subnet、security_group、vpcpeering设置为vpcId(Optional) */ func (r *DescribeQuotaRequest) SetParentResourceId(parentResourceId string) { - r.ParentResourceId = &parentResourceId + r.ParentResourceId = &parentResourceId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeQuotaRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeQuotaResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeQuotaResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeQuotaResult `json:"result"` } type DescribeQuotaResult struct { - Quota interface{} `json:"quota"` -} + Quota interface{} `json:"quota"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTable.go index e555d5a74..5e6785914 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTable.go @@ -17,18 +17,19 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeRouteTableRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` } /* @@ -38,19 +39,19 @@ type DescribeRouteTableRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeRouteTableRequest( - regionId string, - routeTableId string, + regionId string, + routeTableId string, ) *DescribeRouteTableRequest { return &DescribeRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, + RegionId: regionId, + RouteTableId: routeTableId, } } @@ -59,57 +60,57 @@ func NewDescribeRouteTableRequest( * param routeTableId: RouteTable ID (Required) */ func NewDescribeRouteTableRequestWithAllParams( - regionId string, - routeTableId string, + regionId string, + routeTableId string, ) *DescribeRouteTableRequest { - return &DescribeRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - } + return &DescribeRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeRouteTableRequestWithoutParam() *DescribeRouteTableRequest { - return &DescribeRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeRouteTableRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *DescribeRouteTableRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeRouteTableRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeRouteTableResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeRouteTableResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeRouteTableResult `json:"result"` } type DescribeRouteTableResult struct { - RouteTable vpc.RouteTable `json:"routeTable"` -} + RouteTable vpc.RouteTable `json:"routeTable"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTables.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTables.go index 210076b5d..801d94c8b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTables.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeRouteTables.go @@ -17,28 +17,29 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeRouteTablesRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* routeTableIds - 路由表ID列表，支持多个 - routeTableNames - 路由表名称列表，支持多个 - vpcId - 路由表所属vpc Id，支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` + + /* routeTableIds - 路由表ID列表，支持多个 +routeTableNames - 路由表名称列表，支持多个 +vpcId - 路由表所属vpc Id，支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -47,17 +48,17 @@ type DescribeRouteTablesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeRouteTablesRequest( - regionId string, + regionId string, ) *DescribeRouteTablesRequest { return &DescribeRouteTablesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -69,54 +70,54 @@ func NewDescribeRouteTablesRequest( routeTableNames - 路由表名称列表，支持多个 vpcId - 路由表所属vpc Id，支持单个 (Optional) -*/ + */ func NewDescribeRouteTablesRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeRouteTablesRequest { - return &DescribeRouteTablesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeRouteTablesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeRouteTablesRequestWithoutParam() *DescribeRouteTablesRequest { - return &DescribeRouteTablesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeRouteTablesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeRouteTablesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeRouteTablesRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeRouteTablesRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: routeTableIds - 路由表ID列表，支持多个 @@ -124,22 +125,22 @@ routeTableNames - 路由表名称列表，支持多个 vpcId - 路由表所属vpc Id，支持单个 (Optional) */ func (r *DescribeRouteTablesRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeRouteTablesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeRouteTablesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeRouteTablesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeRouteTablesResult `json:"result"` } type DescribeRouteTablesResult struct { - RouteTables []vpc.RouteTable `json:"routeTables"` - TotalCount int `json:"totalCount"` -} + RouteTables []vpc.RouteTable `json:"routeTables"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnet.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnet.go index fe3b0bdc8..2fee1a574 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnet.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnet.go @@ -17,18 +17,19 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeSubnetRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* Subnet ID */ - SubnetId string `json:"subnetId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* Subnet ID */ + SubnetId string `json:"subnetId"` } /* @@ -38,19 +39,19 @@ type DescribeSubnetRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeSubnetRequest( - regionId string, - subnetId string, + regionId string, + subnetId string, ) *DescribeSubnetRequest { return &DescribeSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/subnets/{subnetId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - SubnetId: subnetId, + RegionId: regionId, + SubnetId: subnetId, } } @@ -59,57 +60,57 @@ func NewDescribeSubnetRequest( * param subnetId: Subnet ID (Required) */ func NewDescribeSubnetRequestWithAllParams( - regionId string, - subnetId string, + regionId string, + subnetId string, ) *DescribeSubnetRequest { - return &DescribeSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/{subnetId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - SubnetId: subnetId, - } + return &DescribeSubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/{subnetId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + SubnetId: subnetId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeSubnetRequestWithoutParam() *DescribeSubnetRequest { - return &DescribeSubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/{subnetId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeSubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/{subnetId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeSubnetRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param subnetId: Subnet ID(Required) */ func (r *DescribeSubnetRequest) SetSubnetId(subnetId string) { - r.SubnetId = subnetId + r.SubnetId = subnetId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeSubnetRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeSubnetResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeSubnetResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeSubnetResult `json:"result"` } type DescribeSubnetResult struct { - Subnet vpc.Subnet `json:"subnet"` -} + Subnet vpc.Subnet `json:"subnet"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnets.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnets.go index bfe08e656..6bb8ce98d 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnets.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeSubnets.go @@ -17,30 +17,31 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeSubnetsRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* subnetIds - subnet ID列表，支持多个 - subnetNames - subnet名称列表，支持多个 - routeTableId - 子网关联路由表Id，支持单个 - aclId - 子网关联acl Id，支持单个 - vpcId - 子网所属VPC Id，支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` + + /* subnetIds - subnet ID列表，支持多个 +subnetNames - subnet名称列表，支持多个 +routeTableId - 子网关联路由表Id，支持单个 +aclId - 子网关联acl Id，支持单个 +vpcId - 子网所属VPC Id，支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -49,17 +50,17 @@ type DescribeSubnetsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeSubnetsRequest( - regionId string, + regionId string, ) *DescribeSubnetsRequest { return &DescribeSubnetsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/subnets/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -73,54 +74,54 @@ routeTableId - 子网关联路由表Id，支持单个 aclId - 子网关联acl Id，支持单个 vpcId - 子网所属VPC Id，支持单个 (Optional) -*/ + */ func NewDescribeSubnetsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeSubnetsRequest { - return &DescribeSubnetsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeSubnetsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeSubnetsRequestWithoutParam() *DescribeSubnetsRequest { - return &DescribeSubnetsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeSubnetsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeSubnetsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeSubnetsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeSubnetsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: subnetIds - subnet ID列表，支持多个 @@ -130,22 +131,22 @@ aclId - 子网关联acl Id，支持单个 vpcId - 子网所属VPC Id，支持单个 (Optional) */ func (r *DescribeSubnetsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeSubnetsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeSubnetsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeSubnetsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeSubnetsResult `json:"result"` } type DescribeSubnetsResult struct { - Subnets []vpc.Subnet `json:"subnets"` - TotalCount int `json:"totalCount"` -} + Subnets []vpc.Subnet `json:"subnets"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpc.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpc.go index d955b69e2..d406b724c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpc.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpc.go @@ -17,18 +17,19 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeVpcRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* Vpc ID */ - VpcId string `json:"vpcId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* Vpc ID */ + VpcId string `json:"vpcId"` } /* @@ -38,19 +39,19 @@ type DescribeVpcRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeVpcRequest( - regionId string, - vpcId string, + regionId string, + vpcId string, ) *DescribeVpcRequest { return &DescribeVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcs/{vpcId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, + RegionId: regionId, + VpcId: vpcId, } } @@ -59,57 +60,57 @@ func NewDescribeVpcRequest( * param vpcId: Vpc ID (Required) */ func NewDescribeVpcRequestWithAllParams( - regionId string, - vpcId string, + regionId string, + vpcId string, ) *DescribeVpcRequest { - return &DescribeVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/{vpcId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - } + return &DescribeVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/{vpcId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeVpcRequestWithoutParam() *DescribeVpcRequest { - return &DescribeVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/{vpcId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/{vpcId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeVpcRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: Vpc ID(Required) */ func (r *DescribeVpcRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeVpcRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeVpcResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeVpcResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeVpcResult `json:"result"` } type DescribeVpcResult struct { - Vpc vpc.Vpc `json:"vpc"` -} + Vpc vpc.Vpc `json:"vpc"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeering.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeering.go index 889e215f4..e0230599a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeering.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeering.go @@ -17,18 +17,19 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type DescribeVpcPeeringRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* vpcPeeringId ID */ - VpcPeeringId string `json:"vpcPeeringId"` + /* Region ID */ + RegionId string `json:"regionId"` + + /* vpcPeeringId ID */ + VpcPeeringId string `json:"vpcPeeringId"` } /* @@ -38,19 +39,19 @@ type DescribeVpcPeeringRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeVpcPeeringRequest( - regionId string, - vpcPeeringId string, + regionId string, + vpcPeeringId string, ) *DescribeVpcPeeringRequest { return &DescribeVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcPeeringId: vpcPeeringId, + RegionId: regionId, + VpcPeeringId: vpcPeeringId, } } @@ -59,57 +60,57 @@ func NewDescribeVpcPeeringRequest( * param vpcPeeringId: vpcPeeringId ID (Required) */ func NewDescribeVpcPeeringRequestWithAllParams( - regionId string, - vpcPeeringId string, + regionId string, + vpcPeeringId string, ) *DescribeVpcPeeringRequest { - return &DescribeVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcPeeringId: vpcPeeringId, - } + return &DescribeVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcPeeringId: vpcPeeringId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeVpcPeeringRequestWithoutParam() *DescribeVpcPeeringRequest { - return &DescribeVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeVpcPeeringRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcPeeringId: vpcPeeringId ID(Required) */ func (r *DescribeVpcPeeringRequest) SetVpcPeeringId(vpcPeeringId string) { - r.VpcPeeringId = vpcPeeringId + r.VpcPeeringId = vpcPeeringId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeVpcPeeringRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeVpcPeeringResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeVpcPeeringResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeVpcPeeringResult `json:"result"` } type DescribeVpcPeeringResult struct { - VpcPeering vpc.VpcPeering `json:"vpcPeering"` -} + VpcPeering vpc.VpcPeering `json:"vpcPeering"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeerings.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeerings.go index 7cc33b59c..391f01b16 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeerings.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcPeerings.go @@ -17,29 +17,30 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeVpcPeeringsRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* vpcPeeringIds - vpcPeering ID，支持多个 - vpcPeeringNames - vpcPeering名称列表，支持多个 - vpcId - vpcPeering本端Vpc Id，支持单个 - remoteVpcId - vpcPeering对端Vpc Id，支持单个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` + + /* vpcPeeringIds - vpcPeering ID，支持多个 +vpcPeeringNames - vpcPeering名称列表，支持多个 +vpcId - vpcPeering本端Vpc Id，支持单个 +remoteVpcId - vpcPeering对端Vpc Id，支持单个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -48,17 +49,17 @@ type DescribeVpcPeeringsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeVpcPeeringsRequest( - regionId string, + regionId string, ) *DescribeVpcPeeringsRequest { return &DescribeVpcPeeringsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcPeerings/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -71,54 +72,54 @@ vpcPeeringNames - vpcPeering名称列表，支持多个 vpcId - vpcPeering本端Vpc Id，支持单个 remoteVpcId - vpcPeering对端Vpc Id，支持单个 (Optional) -*/ + */ func NewDescribeVpcPeeringsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeVpcPeeringsRequest { - return &DescribeVpcPeeringsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeVpcPeeringsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeVpcPeeringsRequestWithoutParam() *DescribeVpcPeeringsRequest { - return &DescribeVpcPeeringsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeVpcPeeringsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeVpcPeeringsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeVpcPeeringsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeVpcPeeringsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: vpcPeeringIds - vpcPeering ID，支持多个 @@ -127,22 +128,22 @@ vpcId - vpcPeering本端Vpc Id，支持单个 remoteVpcId - vpcPeering对端Vpc Id，支持单个 (Optional) */ func (r *DescribeVpcPeeringsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeVpcPeeringsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeVpcPeeringsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeVpcPeeringsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeVpcPeeringsResult `json:"result"` } type DescribeVpcPeeringsResult struct { - VpcPeerings []vpc.VpcPeering `json:"vpcPeerings"` - TotalCount int `json:"totalCount"` -} + VpcPeerings []vpc.VpcPeering `json:"vpcPeerings"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcs.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcs.go index 8eea9237e..8faac163c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcs.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DescribeVpcs.go @@ -17,27 +17,28 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + common "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" ) type DescribeVpcsRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ - PageNumber *int `json:"pageNumber"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ - PageSize *int `json:"pageSize"` + /* 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页 (Optional) */ + PageNumber *int `json:"pageNumber"` - /* vpcIds - vpc ID列表，支持多个 - vpcNames - vpc名称列表,支持多个 - (Optional) */ - Filters []common.Filter `json:"filters"` + /* 分页大小，默认为20，取值范围：[10,100] (Optional) */ + PageSize *int `json:"pageSize"` + + /* vpcIds - vpc ID列表，支持多个 +vpcNames - vpc名称列表,支持多个 + (Optional) */ + Filters []common.Filter `json:"filters"` } /* @@ -46,17 +47,17 @@ type DescribeVpcsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDescribeVpcsRequest( - regionId string, + regionId string, ) *DescribeVpcsRequest { return &DescribeVpcsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcs/", Method: "GET", Header: nil, Version: "v1", }, - RegionId: regionId, + RegionId: regionId, } } @@ -67,76 +68,76 @@ func NewDescribeVpcsRequest( * param filters: vpcIds - vpc ID列表，支持多个 vpcNames - vpc名称列表,支持多个 (Optional) -*/ + */ func NewDescribeVpcsRequestWithAllParams( - regionId string, - pageNumber *int, - pageSize *int, - filters []common.Filter, + regionId string, + pageNumber *int, + pageSize *int, + filters []common.Filter, ) *DescribeVpcsRequest { - return &DescribeVpcsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/", - Method: "GET", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - PageNumber: pageNumber, - PageSize: pageSize, - Filters: filters, - } + return &DescribeVpcsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/", + Method: "GET", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + PageNumber: pageNumber, + PageSize: pageSize, + Filters: filters, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDescribeVpcsRequestWithoutParam() *DescribeVpcsRequest { - return &DescribeVpcsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/", - Method: "GET", - Header: nil, - Version: "v1", - }, - } + return &DescribeVpcsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/", + Method: "GET", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DescribeVpcsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param pageNumber: 页码, 默认为1, 取值范围：[1,∞), 页码超过总页数时, 显示最后一页(Optional) */ func (r *DescribeVpcsRequest) SetPageNumber(pageNumber int) { - r.PageNumber = &pageNumber + r.PageNumber = &pageNumber } /* param pageSize: 分页大小，默认为20，取值范围：[10,100](Optional) */ func (r *DescribeVpcsRequest) SetPageSize(pageSize int) { - r.PageSize = &pageSize + r.PageSize = &pageSize } /* param filters: vpcIds - vpc ID列表，支持多个 vpcNames - vpc名称列表,支持多个 (Optional) */ func (r *DescribeVpcsRequest) SetFilters(filters []common.Filter) { - r.Filters = filters + r.Filters = filters } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DescribeVpcsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DescribeVpcsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DescribeVpcsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DescribeVpcsResult `json:"result"` } type DescribeVpcsResult struct { - Vpcs []vpc.Vpc `json:"vpcs"` - TotalCount int `json:"totalCount"` -} + Vpcs []vpc.Vpc `json:"vpcs"` + TotalCount int `json:"totalCount"` +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateElasticIp.go index 3b1202670..35e7dc50e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateElasticIp.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DisassociateElasticIpRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 指定解绑的弹性Ip Id (Optional) */ - ElasticIpId *string `json:"elasticIpId"` + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* 指定解绑的弹性Ip地址 (Optional) */ - ElasticIpAddress *string `json:"elasticIpAddress"` + /* 指定解绑的弹性Ip Id (Optional) */ + ElasticIpId *string `json:"elasticIpId"` + + /* 指定解绑的弹性Ip地址 (Optional) */ + ElasticIpAddress *string `json:"elasticIpAddress"` } /* @@ -43,19 +44,19 @@ type DisassociateElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDisassociateElasticIpRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *DisassociateElasticIpRequest { return &DisassociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:disassociateElasticIp", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -66,70 +67,70 @@ func NewDisassociateElasticIpRequest( * param elasticIpAddress: 指定解绑的弹性Ip地址 (Optional) */ func NewDisassociateElasticIpRequestWithAllParams( - regionId string, - networkInterfaceId string, - elasticIpId *string, - elasticIpAddress *string, + regionId string, + networkInterfaceId string, + elasticIpId *string, + elasticIpAddress *string, ) *DisassociateElasticIpRequest { - return &DisassociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:disassociateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - ElasticIpId: elasticIpId, - ElasticIpAddress: elasticIpAddress, - } + return &DisassociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:disassociateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + ElasticIpId: elasticIpId, + ElasticIpAddress: elasticIpAddress, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDisassociateElasticIpRequestWithoutParam() *DisassociateElasticIpRequest { - return &DisassociateElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:disassociateElasticIp", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &DisassociateElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:disassociateElasticIp", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DisassociateElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *DisassociateElasticIpRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } /* param elasticIpId: 指定解绑的弹性Ip Id(Optional) */ func (r *DisassociateElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = &elasticIpId + r.ElasticIpId = &elasticIpId } /* param elasticIpAddress: 指定解绑的弹性Ip地址(Optional) */ func (r *DisassociateElasticIpRequest) SetElasticIpAddress(elasticIpAddress string) { - r.ElasticIpAddress = &elasticIpAddress + r.ElasticIpAddress = &elasticIpAddress } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DisassociateElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DisassociateElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DisassociateElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DisassociateElasticIpResult `json:"result"` } type DisassociateElasticIpResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateNetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateNetworkAcl.go index 0127d46d3..41874c7bb 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateNetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateNetworkAcl.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DisassociateNetworkAclRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* networkAcl要解绑的子网ID */ - SubnetId string `json:"subnetId"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` + + /* networkAcl要解绑的子网ID */ + SubnetId string `json:"subnetId"` } /* @@ -41,21 +42,21 @@ type DisassociateNetworkAclRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDisassociateNetworkAclRequest( - regionId string, - networkAclId string, - subnetId string, + regionId string, + networkAclId string, + subnetId string, ) *DisassociateNetworkAclRequest { return &DisassociateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}:disassociateNetworkAcl", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, - SubnetId: subnetId, + RegionId: regionId, + NetworkAclId: networkAclId, + SubnetId: subnetId, } } @@ -65,63 +66,63 @@ func NewDisassociateNetworkAclRequest( * param subnetId: networkAcl要解绑的子网ID (Required) */ func NewDisassociateNetworkAclRequestWithAllParams( - regionId string, - networkAclId string, - subnetId string, + regionId string, + networkAclId string, + subnetId string, ) *DisassociateNetworkAclRequest { - return &DisassociateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:disassociateNetworkAcl", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - SubnetId: subnetId, - } + return &DisassociateNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:disassociateNetworkAcl", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + SubnetId: subnetId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDisassociateNetworkAclRequestWithoutParam() *DisassociateNetworkAclRequest { - return &DisassociateNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:disassociateNetworkAcl", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &DisassociateNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:disassociateNetworkAcl", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DisassociateNetworkAclRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *DisassociateNetworkAclRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } /* param subnetId: networkAcl要解绑的子网ID(Required) */ func (r *DisassociateNetworkAclRequest) SetSubnetId(subnetId string) { - r.SubnetId = subnetId + r.SubnetId = subnetId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DisassociateNetworkAclRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DisassociateNetworkAclResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DisassociateNetworkAclResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DisassociateNetworkAclResult `json:"result"` } type DisassociateNetworkAclResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateRouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateRouteTable.go index 059a13d29..65d7f1c65 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateRouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/DisassociateRouteTable.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type DisassociateRouteTableRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 路由表要解绑的子网ID，解绑后子网绑定默认路由表 */ - SubnetId string `json:"subnetId"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` + + /* 路由表要解绑的子网ID，解绑后子网绑定默认路由表 */ + SubnetId string `json:"subnetId"` } /* @@ -41,21 +42,21 @@ type DisassociateRouteTableRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewDisassociateRouteTableRequest( - regionId string, - routeTableId string, - subnetId string, + regionId string, + routeTableId string, + subnetId string, ) *DisassociateRouteTableRequest { return &DisassociateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}:disassociateRouteTable", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, - SubnetId: subnetId, + RegionId: regionId, + RouteTableId: routeTableId, + SubnetId: subnetId, } } @@ -65,63 +66,63 @@ func NewDisassociateRouteTableRequest( * param subnetId: 路由表要解绑的子网ID，解绑后子网绑定默认路由表 (Required) */ func NewDisassociateRouteTableRequestWithAllParams( - regionId string, - routeTableId string, - subnetId string, + regionId string, + routeTableId string, + subnetId string, ) *DisassociateRouteTableRequest { - return &DisassociateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:disassociateRouteTable", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - SubnetId: subnetId, - } + return &DisassociateRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:disassociateRouteTable", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + SubnetId: subnetId, + } } /* This constructor has better compatible ability when API parameters changed */ func NewDisassociateRouteTableRequestWithoutParam() *DisassociateRouteTableRequest { - return &DisassociateRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:disassociateRouteTable", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &DisassociateRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:disassociateRouteTable", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *DisassociateRouteTableRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *DisassociateRouteTableRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } /* param subnetId: 路由表要解绑的子网ID，解绑后子网绑定默认路由表(Required) */ func (r *DisassociateRouteTableRequest) SetSubnetId(subnetId string) { - r.SubnetId = subnetId + r.SubnetId = subnetId } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r DisassociateRouteTableRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type DisassociateRouteTableResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result DisassociateRouteTableResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result DisassociateRouteTableResult `json:"result"` } type DisassociateRouteTableResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyElasticIp.go index 49f5a1bad..146229ba0 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyElasticIp.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyElasticIpRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* ElasticIp ID */ - ElasticIpId string `json:"elasticIpId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] */ - BandwidthMbps int `json:"bandwidthMbps"` + /* ElasticIp ID */ + ElasticIpId string `json:"elasticIpId"` + + /* 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] */ + BandwidthMbps int `json:"bandwidthMbps"` } /* @@ -41,21 +42,21 @@ type ModifyElasticIpRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyElasticIpRequest( - regionId string, - elasticIpId string, - bandwidthMbps int, + regionId string, + elasticIpId string, + bandwidthMbps int, ) *ModifyElasticIpRequest { return &ModifyElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/elasticIps/{elasticIpId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - ElasticIpId: elasticIpId, - BandwidthMbps: bandwidthMbps, + RegionId: regionId, + ElasticIpId: elasticIpId, + BandwidthMbps: bandwidthMbps, } } @@ -65,63 +66,63 @@ func NewModifyElasticIpRequest( * param bandwidthMbps: 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] (Required) */ func NewModifyElasticIpRequestWithAllParams( - regionId string, - elasticIpId string, - bandwidthMbps int, + regionId string, + elasticIpId string, + bandwidthMbps int, ) *ModifyElasticIpRequest { - return &ModifyElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/{elasticIpId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - ElasticIpId: elasticIpId, - BandwidthMbps: bandwidthMbps, - } + return &ModifyElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/{elasticIpId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + ElasticIpId: elasticIpId, + BandwidthMbps: bandwidthMbps, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyElasticIpRequestWithoutParam() *ModifyElasticIpRequest { - return &ModifyElasticIpRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/elasticIps/{elasticIpId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifyElasticIpRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/elasticIps/{elasticIpId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyElasticIpRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param elasticIpId: ElasticIp ID(Required) */ func (r *ModifyElasticIpRequest) SetElasticIpId(elasticIpId string) { - r.ElasticIpId = elasticIpId + r.ElasticIpId = elasticIpId } /* param bandwidthMbps: 弹性公网IP的限速（单位：Mbps），取值范围为[1-200](Required) */ func (r *ModifyElasticIpRequest) SetBandwidthMbps(bandwidthMbps int) { - r.BandwidthMbps = bandwidthMbps + r.BandwidthMbps = bandwidthMbps } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyElasticIpRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyElasticIpResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyElasticIpResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyElasticIpResult `json:"result"` } type ModifyElasticIpResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAcl.go index d13c78064..c091d48a3 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAcl.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyNetworkAclRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* networkAcl名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ - NetworkAclName *string `json:"networkAclName"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* networkAcl名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ + NetworkAclName *string `json:"networkAclName"` + + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } /* @@ -43,19 +44,19 @@ type ModifyNetworkAclRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyNetworkAclRequest( - regionId string, - networkAclId string, + regionId string, + networkAclId string, ) *ModifyNetworkAclRequest { return &ModifyNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, + RegionId: regionId, + NetworkAclId: networkAclId, } } @@ -66,70 +67,70 @@ func NewModifyNetworkAclRequest( * param description: 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ func NewModifyNetworkAclRequestWithAllParams( - regionId string, - networkAclId string, - networkAclName *string, - description *string, + regionId string, + networkAclId string, + networkAclName *string, + description *string, ) *ModifyNetworkAclRequest { - return &ModifyNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - NetworkAclName: networkAclName, - Description: description, - } + return &ModifyNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + NetworkAclName: networkAclName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyNetworkAclRequestWithoutParam() *ModifyNetworkAclRequest { - return &ModifyNetworkAclRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifyNetworkAclRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyNetworkAclRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *ModifyNetworkAclRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } /* param networkAclName: networkAcl名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符(Optional) */ func (r *ModifyNetworkAclRequest) SetNetworkAclName(networkAclName string) { - r.NetworkAclName = &networkAclName + r.NetworkAclName = &networkAclName } /* param description: 描述,允许输入UTF-8编码下的全部字符，不超过256字符(Optional) */ func (r *ModifyNetworkAclRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyNetworkAclRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyNetworkAclResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyNetworkAclResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyNetworkAclResult `json:"result"` } type ModifyNetworkAclResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAclRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAclRules.go index 36e18b8ea..21f44d284 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAclRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkAclRules.go @@ -17,21 +17,22 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type ModifyNetworkAclRulesRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* networkAcl规则列表 */ - ModifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec `json:"modifyNetworkAclRuleSpecs"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` + + /* networkAcl规则列表 */ + ModifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec `json:"modifyNetworkAclRuleSpecs"` } /* @@ -42,21 +43,21 @@ type ModifyNetworkAclRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyNetworkAclRulesRequest( - regionId string, - networkAclId string, - modifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec, + regionId string, + networkAclId string, + modifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec, ) *ModifyNetworkAclRulesRequest { return &ModifyNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}:modifyNetworkAclRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, - ModifyNetworkAclRuleSpecs: modifyNetworkAclRuleSpecs, + RegionId: regionId, + NetworkAclId: networkAclId, + ModifyNetworkAclRuleSpecs: modifyNetworkAclRuleSpecs, } } @@ -66,63 +67,63 @@ func NewModifyNetworkAclRulesRequest( * param modifyNetworkAclRuleSpecs: networkAcl规则列表 (Required) */ func NewModifyNetworkAclRulesRequestWithAllParams( - regionId string, - networkAclId string, - modifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec, + regionId string, + networkAclId string, + modifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec, ) *ModifyNetworkAclRulesRequest { - return &ModifyNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:modifyNetworkAclRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - ModifyNetworkAclRuleSpecs: modifyNetworkAclRuleSpecs, - } + return &ModifyNetworkAclRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:modifyNetworkAclRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + ModifyNetworkAclRuleSpecs: modifyNetworkAclRuleSpecs, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyNetworkAclRulesRequestWithoutParam() *ModifyNetworkAclRulesRequest { - return &ModifyNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:modifyNetworkAclRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyNetworkAclRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:modifyNetworkAclRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyNetworkAclRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *ModifyNetworkAclRulesRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } /* param modifyNetworkAclRuleSpecs: networkAcl规则列表(Required) */ func (r *ModifyNetworkAclRulesRequest) SetModifyNetworkAclRuleSpecs(modifyNetworkAclRuleSpecs []vpc.ModifyNetworkAclRuleSpec) { - r.ModifyNetworkAclRuleSpecs = modifyNetworkAclRuleSpecs + r.ModifyNetworkAclRuleSpecs = modifyNetworkAclRuleSpecs } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyNetworkAclRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyNetworkAclRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyNetworkAclRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyNetworkAclRulesResult `json:"result"` } type ModifyNetworkAclRulesResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkInterface.go index 0d1392c5e..071bfebe4 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkInterface.go @@ -17,26 +17,27 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyNetworkInterfaceRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 弹性网卡名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ - NetworkInterfaceName *string `json:"networkInterfaceName"` + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 弹性网卡名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ + NetworkInterfaceName *string `json:"networkInterfaceName"` - /* 以覆盖原有安全组的方式更新的安全组。如果更新安全组ID列表，最多5个安全组 (Optional) */ - SecurityGroups []string `json:"securityGroups"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` + + /* 以覆盖原有安全组的方式更新的安全组。如果更新安全组ID列表，最多5个安全组 (Optional) */ + SecurityGroups []string `json:"securityGroups"` } /* @@ -46,19 +47,19 @@ type ModifyNetworkInterfaceRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyNetworkInterfaceRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *ModifyNetworkInterfaceRequest { return &ModifyNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -70,77 +71,77 @@ func NewModifyNetworkInterfaceRequest( * param securityGroups: 以覆盖原有安全组的方式更新的安全组。如果更新安全组ID列表，最多5个安全组 (Optional) */ func NewModifyNetworkInterfaceRequestWithAllParams( - regionId string, - networkInterfaceId string, - networkInterfaceName *string, - description *string, - securityGroups []string, + regionId string, + networkInterfaceId string, + networkInterfaceName *string, + description *string, + securityGroups []string, ) *ModifyNetworkInterfaceRequest { - return &ModifyNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - NetworkInterfaceName: networkInterfaceName, - Description: description, - SecurityGroups: securityGroups, - } + return &ModifyNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + NetworkInterfaceName: networkInterfaceName, + Description: description, + SecurityGroups: securityGroups, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyNetworkInterfaceRequestWithoutParam() *ModifyNetworkInterfaceRequest { - return &ModifyNetworkInterfaceRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifyNetworkInterfaceRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyNetworkInterfaceRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *ModifyNetworkInterfaceRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } /* param networkInterfaceName: 弹性网卡名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符(Optional) */ func (r *ModifyNetworkInterfaceRequest) SetNetworkInterfaceName(networkInterfaceName string) { - r.NetworkInterfaceName = &networkInterfaceName + r.NetworkInterfaceName = &networkInterfaceName } /* param description: 描述,允许输入UTF-8编码下的全部字符，不超过256字符(Optional) */ func (r *ModifyNetworkInterfaceRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } /* param securityGroups: 以覆盖原有安全组的方式更新的安全组。如果更新安全组ID列表，最多5个安全组(Optional) */ func (r *ModifyNetworkInterfaceRequest) SetSecurityGroups(securityGroups []string) { - r.SecurityGroups = securityGroups + r.SecurityGroups = securityGroups } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyNetworkInterfaceRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyNetworkInterfaceResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyNetworkInterfaceResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyNetworkInterfaceResult `json:"result"` } type ModifyNetworkInterfaceResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroup.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroup.go index dd851e76e..eccec066c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroup.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroup.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyNetworkSecurityGroupRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* NetworkSecurityGroup ID */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 安全组的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - NetworkSecurityGroupName *string `json:"networkSecurityGroupName"` + /* NetworkSecurityGroup ID */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` - /* 安全组的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ - Description *string `json:"description"` + /* 安全组的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + NetworkSecurityGroupName *string `json:"networkSecurityGroupName"` + + /* 安全组的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ + Description *string `json:"description"` } /* @@ -43,19 +44,19 @@ type ModifyNetworkSecurityGroupRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyNetworkSecurityGroupRequest( - regionId string, - networkSecurityGroupId string, + regionId string, + networkSecurityGroupId string, ) *ModifyNetworkSecurityGroupRequest { return &ModifyNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, } } @@ -66,70 +67,70 @@ func NewModifyNetworkSecurityGroupRequest( * param description: 安全组的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ func NewModifyNetworkSecurityGroupRequestWithAllParams( - regionId string, - networkSecurityGroupId string, - networkSecurityGroupName *string, - description *string, + regionId string, + networkSecurityGroupId string, + networkSecurityGroupName *string, + description *string, ) *ModifyNetworkSecurityGroupRequest { - return &ModifyNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - NetworkSecurityGroupName: networkSecurityGroupName, - Description: description, - } + return &ModifyNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + NetworkSecurityGroupName: networkSecurityGroupName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyNetworkSecurityGroupRequestWithoutParam() *ModifyNetworkSecurityGroupRequest { - return &ModifyNetworkSecurityGroupRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifyNetworkSecurityGroupRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyNetworkSecurityGroupRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkSecurityGroupId: NetworkSecurityGroup ID(Required) */ func (r *ModifyNetworkSecurityGroupRequest) SetNetworkSecurityGroupId(networkSecurityGroupId string) { - r.NetworkSecurityGroupId = networkSecurityGroupId + r.NetworkSecurityGroupId = networkSecurityGroupId } /* param networkSecurityGroupName: 安全组的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符(Optional) */ func (r *ModifyNetworkSecurityGroupRequest) SetNetworkSecurityGroupName(networkSecurityGroupName string) { - r.NetworkSecurityGroupName = &networkSecurityGroupName + r.NetworkSecurityGroupName = &networkSecurityGroupName } /* param description: 安全组的描述，取值范围：0-256个UTF-8编码下的全部字符(Optional) */ func (r *ModifyNetworkSecurityGroupRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyNetworkSecurityGroupRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyNetworkSecurityGroupResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyNetworkSecurityGroupResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyNetworkSecurityGroupResult `json:"result"` } type ModifyNetworkSecurityGroupResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroupRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroupRules.go index 9901c80c1..63b6949f8 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroupRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyNetworkSecurityGroupRules.go @@ -17,21 +17,22 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type ModifyNetworkSecurityGroupRulesRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* NetworkSecurityGroup ID */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 安全组规则信息 */ - ModifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules `json:"modifySecurityGroupRuleSpecs"` + /* NetworkSecurityGroup ID */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + + /* 安全组规则信息 */ + ModifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules `json:"modifySecurityGroupRuleSpecs"` } /* @@ -42,21 +43,21 @@ type ModifyNetworkSecurityGroupRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyNetworkSecurityGroupRulesRequest( - regionId string, - networkSecurityGroupId string, - modifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules, + regionId string, + networkSecurityGroupId string, + modifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules, ) *ModifyNetworkSecurityGroupRulesRequest { return &ModifyNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:modifyNetworkSecurityGroupRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - ModifySecurityGroupRuleSpecs: modifySecurityGroupRuleSpecs, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + ModifySecurityGroupRuleSpecs: modifySecurityGroupRuleSpecs, } } @@ -66,63 +67,63 @@ func NewModifyNetworkSecurityGroupRulesRequest( * param modifySecurityGroupRuleSpecs: 安全组规则信息 (Required) */ func NewModifyNetworkSecurityGroupRulesRequestWithAllParams( - regionId string, - networkSecurityGroupId string, - modifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules, + regionId string, + networkSecurityGroupId string, + modifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules, ) *ModifyNetworkSecurityGroupRulesRequest { - return &ModifyNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:modifyNetworkSecurityGroupRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - ModifySecurityGroupRuleSpecs: modifySecurityGroupRuleSpecs, - } + return &ModifyNetworkSecurityGroupRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:modifyNetworkSecurityGroupRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + ModifySecurityGroupRuleSpecs: modifySecurityGroupRuleSpecs, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyNetworkSecurityGroupRulesRequestWithoutParam() *ModifyNetworkSecurityGroupRulesRequest { - return &ModifyNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:modifyNetworkSecurityGroupRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyNetworkSecurityGroupRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:modifyNetworkSecurityGroupRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyNetworkSecurityGroupRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkSecurityGroupId: NetworkSecurityGroup ID(Required) */ func (r *ModifyNetworkSecurityGroupRulesRequest) SetNetworkSecurityGroupId(networkSecurityGroupId string) { - r.NetworkSecurityGroupId = networkSecurityGroupId + r.NetworkSecurityGroupId = networkSecurityGroupId } /* param modifySecurityGroupRuleSpecs: 安全组规则信息(Required) */ func (r *ModifyNetworkSecurityGroupRulesRequest) SetModifySecurityGroupRuleSpecs(modifySecurityGroupRuleSpecs []vpc.ModifySecurityGroupRules) { - r.ModifySecurityGroupRuleSpecs = modifySecurityGroupRuleSpecs + r.ModifySecurityGroupRuleSpecs = modifySecurityGroupRuleSpecs } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyNetworkSecurityGroupRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyNetworkSecurityGroupRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyNetworkSecurityGroupRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyNetworkSecurityGroupRulesResult `json:"result"` } type ModifyNetworkSecurityGroupRulesResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTable.go index f6bc71406..e97386635 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTable.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyRouteTableRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 路由表的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - RouteTableName *string `json:"routeTableName"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` - /* 路由表的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ - Description *string `json:"description"` + /* 路由表的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + RouteTableName *string `json:"routeTableName"` + + /* 路由表的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ + Description *string `json:"description"` } /* @@ -43,19 +44,19 @@ type ModifyRouteTableRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyRouteTableRequest( - regionId string, - routeTableId string, + regionId string, + routeTableId string, ) *ModifyRouteTableRequest { return &ModifyRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, + RegionId: regionId, + RouteTableId: routeTableId, } } @@ -66,70 +67,70 @@ func NewModifyRouteTableRequest( * param description: 路由表的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ func NewModifyRouteTableRequestWithAllParams( - regionId string, - routeTableId string, - routeTableName *string, - description *string, + regionId string, + routeTableId string, + routeTableName *string, + description *string, ) *ModifyRouteTableRequest { - return &ModifyRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - RouteTableName: routeTableName, - Description: description, - } + return &ModifyRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + RouteTableName: routeTableName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyRouteTableRequestWithoutParam() *ModifyRouteTableRequest { - return &ModifyRouteTableRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifyRouteTableRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyRouteTableRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *ModifyRouteTableRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } /* param routeTableName: 路由表的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符(Optional) */ func (r *ModifyRouteTableRequest) SetRouteTableName(routeTableName string) { - r.RouteTableName = &routeTableName + r.RouteTableName = &routeTableName } /* param description: 路由表的描述，取值范围：0-256个UTF-8编码下的全部字符(Optional) */ func (r *ModifyRouteTableRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyRouteTableRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyRouteTableResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyRouteTableResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyRouteTableResult `json:"result"` } type ModifyRouteTableResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTableRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTableRules.go index 346f7c0c9..7a1479c9c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTableRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyRouteTableRules.go @@ -17,21 +17,22 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models" ) type ModifyRouteTableRulesRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 路由表规则信息 */ - ModifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules `json:"modifyRouteTableRuleSpecs"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` + + /* 路由表规则信息 */ + ModifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules `json:"modifyRouteTableRuleSpecs"` } /* @@ -42,21 +43,21 @@ type ModifyRouteTableRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyRouteTableRulesRequest( - regionId string, - routeTableId string, - modifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules, + regionId string, + routeTableId string, + modifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules, ) *ModifyRouteTableRulesRequest { return &ModifyRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}:modifyRouteTableRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, - ModifyRouteTableRuleSpecs: modifyRouteTableRuleSpecs, + RegionId: regionId, + RouteTableId: routeTableId, + ModifyRouteTableRuleSpecs: modifyRouteTableRuleSpecs, } } @@ -66,63 +67,63 @@ func NewModifyRouteTableRulesRequest( * param modifyRouteTableRuleSpecs: 路由表规则信息 (Required) */ func NewModifyRouteTableRulesRequestWithAllParams( - regionId string, - routeTableId string, - modifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules, + regionId string, + routeTableId string, + modifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules, ) *ModifyRouteTableRulesRequest { - return &ModifyRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:modifyRouteTableRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - ModifyRouteTableRuleSpecs: modifyRouteTableRuleSpecs, - } + return &ModifyRouteTableRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:modifyRouteTableRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + ModifyRouteTableRuleSpecs: modifyRouteTableRuleSpecs, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyRouteTableRulesRequestWithoutParam() *ModifyRouteTableRulesRequest { - return &ModifyRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:modifyRouteTableRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &ModifyRouteTableRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:modifyRouteTableRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyRouteTableRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *ModifyRouteTableRulesRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } /* param modifyRouteTableRuleSpecs: 路由表规则信息(Required) */ func (r *ModifyRouteTableRulesRequest) SetModifyRouteTableRuleSpecs(modifyRouteTableRuleSpecs []vpc.ModifyRouteTableRules) { - r.ModifyRouteTableRuleSpecs = modifyRouteTableRuleSpecs + r.ModifyRouteTableRuleSpecs = modifyRouteTableRuleSpecs } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyRouteTableRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyRouteTableRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyRouteTableRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyRouteTableRulesResult `json:"result"` } type ModifyRouteTableRulesResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifySubnet.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifySubnet.go index ee0996b7a..1465afc76 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifySubnet.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifySubnet.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifySubnetRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* Subnet ID */ - SubnetId string `json:"subnetId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - SubnetName *string `json:"subnetName"` + /* Subnet ID */ + SubnetId string `json:"subnetId"` - /* 子网描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description *string `json:"description"` + /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + SubnetName *string `json:"subnetName"` + + /* 子网描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description *string `json:"description"` } /* @@ -43,19 +44,19 @@ type ModifySubnetRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifySubnetRequest( - regionId string, - subnetId string, + regionId string, + subnetId string, ) *ModifySubnetRequest { return &ModifySubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/subnets/{subnetId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - SubnetId: subnetId, + RegionId: regionId, + SubnetId: subnetId, } } @@ -66,70 +67,70 @@ func NewModifySubnetRequest( * param description: 子网描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ func NewModifySubnetRequestWithAllParams( - regionId string, - subnetId string, - subnetName *string, - description *string, + regionId string, + subnetId string, + subnetName *string, + description *string, ) *ModifySubnetRequest { - return &ModifySubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/{subnetId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - SubnetId: subnetId, - SubnetName: subnetName, - Description: description, - } + return &ModifySubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/{subnetId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + SubnetId: subnetId, + SubnetName: subnetName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifySubnetRequestWithoutParam() *ModifySubnetRequest { - return &ModifySubnetRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/subnets/{subnetId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifySubnetRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/subnets/{subnetId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifySubnetRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param subnetId: Subnet ID(Required) */ func (r *ModifySubnetRequest) SetSubnetId(subnetId string) { - r.SubnetId = subnetId + r.SubnetId = subnetId } /* param subnetName: 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Optional) */ func (r *ModifySubnetRequest) SetSubnetName(subnetName string) { - r.SubnetName = &subnetName + r.SubnetName = &subnetName } /* param description: 子网描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。(Optional) */ func (r *ModifySubnetRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifySubnetRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifySubnetResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifySubnetResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifySubnetResult `json:"result"` } type ModifySubnetResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpc.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpc.go index ee817110a..c66845701 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpc.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpc.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyVpcRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* Vpc ID */ - VpcId string `json:"vpcId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - VpcName *string `json:"vpcName"` + /* Vpc ID */ + VpcId string `json:"vpcId"` - /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description *string `json:"description"` + /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + VpcName *string `json:"vpcName"` + + /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description *string `json:"description"` } /* @@ -43,19 +44,19 @@ type ModifyVpcRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyVpcRequest( - regionId string, - vpcId string, + regionId string, + vpcId string, ) *ModifyVpcRequest { return &ModifyVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcs/{vpcId}", Method: "PATCH", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcId: vpcId, + RegionId: regionId, + VpcId: vpcId, } } @@ -66,70 +67,70 @@ func NewModifyVpcRequest( * param description: vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ func NewModifyVpcRequestWithAllParams( - regionId string, - vpcId string, - vpcName *string, - description *string, + regionId string, + vpcId string, + vpcName *string, + description *string, ) *ModifyVpcRequest { - return &ModifyVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/{vpcId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcId: vpcId, - VpcName: vpcName, - Description: description, - } + return &ModifyVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/{vpcId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcId: vpcId, + VpcName: vpcName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyVpcRequestWithoutParam() *ModifyVpcRequest { - return &ModifyVpcRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcs/{vpcId}", - Method: "PATCH", - Header: nil, - Version: "v1", - }, - } + return &ModifyVpcRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcs/{vpcId}", + Method: "PATCH", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyVpcRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcId: Vpc ID(Required) */ func (r *ModifyVpcRequest) SetVpcId(vpcId string) { - r.VpcId = vpcId + r.VpcId = vpcId } /* param vpcName: 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。(Optional) */ func (r *ModifyVpcRequest) SetVpcName(vpcName string) { - r.VpcName = &vpcName + r.VpcName = &vpcName } /* param description: vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。(Optional) */ func (r *ModifyVpcRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyVpcRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyVpcResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyVpcResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyVpcResult `json:"result"` } type ModifyVpcResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpcPeering.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpcPeering.go index 965e946c1..804b6c5b8 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpcPeering.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/ModifyVpcPeering.go @@ -17,23 +17,24 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type ModifyVpcPeeringRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* vpcPeeringId ID */ - VpcPeeringId string `json:"vpcPeeringId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - VpcPeeringName *string `json:"vpcPeeringName"` + /* vpcPeeringId ID */ + VpcPeeringId string `json:"vpcPeeringId"` - /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - Description *string `json:"description"` + /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + VpcPeeringName *string `json:"vpcPeeringName"` + + /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + Description *string `json:"description"` } /* @@ -43,19 +44,19 @@ type ModifyVpcPeeringRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewModifyVpcPeeringRequest( - regionId string, - vpcPeeringId string, + regionId string, + vpcPeeringId string, ) *ModifyVpcPeeringRequest { return &ModifyVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", Method: "PUT", Header: nil, Version: "v1", }, - RegionId: regionId, - VpcPeeringId: vpcPeeringId, + RegionId: regionId, + VpcPeeringId: vpcPeeringId, } } @@ -66,70 +67,70 @@ func NewModifyVpcPeeringRequest( * param description: VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ func NewModifyVpcPeeringRequestWithAllParams( - regionId string, - vpcPeeringId string, - vpcPeeringName *string, - description *string, + regionId string, + vpcPeeringId string, + vpcPeeringName *string, + description *string, ) *ModifyVpcPeeringRequest { - return &ModifyVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", - Method: "PUT", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - VpcPeeringId: vpcPeeringId, - VpcPeeringName: vpcPeeringName, - Description: description, - } + return &ModifyVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", + Method: "PUT", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + VpcPeeringId: vpcPeeringId, + VpcPeeringName: vpcPeeringName, + Description: description, + } } /* This constructor has better compatible ability when API parameters changed */ func NewModifyVpcPeeringRequestWithoutParam() *ModifyVpcPeeringRequest { - return &ModifyVpcPeeringRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", - Method: "PUT", - Header: nil, - Version: "v1", - }, - } + return &ModifyVpcPeeringRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/vpcPeerings/{vpcPeeringId}", + Method: "PUT", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *ModifyVpcPeeringRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param vpcPeeringId: vpcPeeringId ID(Required) */ func (r *ModifyVpcPeeringRequest) SetVpcPeeringId(vpcPeeringId string) { - r.VpcPeeringId = vpcPeeringId + r.VpcPeeringId = vpcPeeringId } /* param vpcPeeringName: VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符(Optional) */ func (r *ModifyVpcPeeringRequest) SetVpcPeeringName(vpcPeeringName string) { - r.VpcPeeringName = &vpcPeeringName + r.VpcPeeringName = &vpcPeeringName } /* param description: VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符(Optional) */ func (r *ModifyVpcPeeringRequest) SetDescription(description string) { - r.Description = &description + r.Description = &description } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r ModifyVpcPeeringRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type ModifyVpcPeeringResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result ModifyVpcPeeringResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result ModifyVpcPeeringResult `json:"result"` } type ModifyVpcPeeringResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkAclRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkAclRules.go index 538642733..3bea0a0b7 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkAclRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkAclRules.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type RemoveNetworkAclRulesRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkAclId ID */ - NetworkAclId string `json:"networkAclId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* networkAcl规则ID列表 */ - RuleIds []string `json:"ruleIds"` + /* networkAclId ID */ + NetworkAclId string `json:"networkAclId"` + + /* networkAcl规则ID列表 */ + RuleIds []string `json:"ruleIds"` } /* @@ -41,21 +42,21 @@ type RemoveNetworkAclRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewRemoveNetworkAclRulesRequest( - regionId string, - networkAclId string, - ruleIds []string, + regionId string, + networkAclId string, + ruleIds []string, ) *RemoveNetworkAclRulesRequest { return &RemoveNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkAcls/{networkAclId}:removeNetworkAclRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkAclId: networkAclId, - RuleIds: ruleIds, + RegionId: regionId, + NetworkAclId: networkAclId, + RuleIds: ruleIds, } } @@ -65,63 +66,63 @@ func NewRemoveNetworkAclRulesRequest( * param ruleIds: networkAcl规则ID列表 (Required) */ func NewRemoveNetworkAclRulesRequestWithAllParams( - regionId string, - networkAclId string, - ruleIds []string, + regionId string, + networkAclId string, + ruleIds []string, ) *RemoveNetworkAclRulesRequest { - return &RemoveNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:removeNetworkAclRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkAclId: networkAclId, - RuleIds: ruleIds, - } + return &RemoveNetworkAclRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:removeNetworkAclRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkAclId: networkAclId, + RuleIds: ruleIds, + } } /* This constructor has better compatible ability when API parameters changed */ func NewRemoveNetworkAclRulesRequestWithoutParam() *RemoveNetworkAclRulesRequest { - return &RemoveNetworkAclRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkAcls/{networkAclId}:removeNetworkAclRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &RemoveNetworkAclRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkAcls/{networkAclId}:removeNetworkAclRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *RemoveNetworkAclRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkAclId: networkAclId ID(Required) */ func (r *RemoveNetworkAclRulesRequest) SetNetworkAclId(networkAclId string) { - r.NetworkAclId = networkAclId + r.NetworkAclId = networkAclId } /* param ruleIds: networkAcl规则ID列表(Required) */ func (r *RemoveNetworkAclRulesRequest) SetRuleIds(ruleIds []string) { - r.RuleIds = ruleIds + r.RuleIds = ruleIds } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r RemoveNetworkAclRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type RemoveNetworkAclRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result RemoveNetworkAclRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result RemoveNetworkAclRulesResult `json:"result"` } type RemoveNetworkAclRulesResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkSecurityGroupRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkSecurityGroupRules.go index 4a1f0eaf3..abb2c3977 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkSecurityGroupRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveNetworkSecurityGroupRules.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type RemoveNetworkSecurityGroupRulesRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* NetworkSecurityGroup ID */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 安全组规则Id列表 */ - RuleIds []string `json:"ruleIds"` + /* NetworkSecurityGroup ID */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + + /* 安全组规则Id列表 */ + RuleIds []string `json:"ruleIds"` } /* @@ -41,21 +42,21 @@ type RemoveNetworkSecurityGroupRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewRemoveNetworkSecurityGroupRulesRequest( - regionId string, - networkSecurityGroupId string, - ruleIds []string, + regionId string, + networkSecurityGroupId string, + ruleIds []string, ) *RemoveNetworkSecurityGroupRulesRequest { return &RemoveNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:removeNetworkSecurityGroupRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - RuleIds: ruleIds, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + RuleIds: ruleIds, } } @@ -65,63 +66,63 @@ func NewRemoveNetworkSecurityGroupRulesRequest( * param ruleIds: 安全组规则Id列表 (Required) */ func NewRemoveNetworkSecurityGroupRulesRequestWithAllParams( - regionId string, - networkSecurityGroupId string, - ruleIds []string, + regionId string, + networkSecurityGroupId string, + ruleIds []string, ) *RemoveNetworkSecurityGroupRulesRequest { - return &RemoveNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:removeNetworkSecurityGroupRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkSecurityGroupId: networkSecurityGroupId, - RuleIds: ruleIds, - } + return &RemoveNetworkSecurityGroupRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:removeNetworkSecurityGroupRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkSecurityGroupId: networkSecurityGroupId, + RuleIds: ruleIds, + } } /* This constructor has better compatible ability when API parameters changed */ func NewRemoveNetworkSecurityGroupRulesRequestWithoutParam() *RemoveNetworkSecurityGroupRulesRequest { - return &RemoveNetworkSecurityGroupRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:removeNetworkSecurityGroupRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &RemoveNetworkSecurityGroupRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkSecurityGroups/{networkSecurityGroupId}:removeNetworkSecurityGroupRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *RemoveNetworkSecurityGroupRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkSecurityGroupId: NetworkSecurityGroup ID(Required) */ func (r *RemoveNetworkSecurityGroupRulesRequest) SetNetworkSecurityGroupId(networkSecurityGroupId string) { - r.NetworkSecurityGroupId = networkSecurityGroupId + r.NetworkSecurityGroupId = networkSecurityGroupId } /* param ruleIds: 安全组规则Id列表(Required) */ func (r *RemoveNetworkSecurityGroupRulesRequest) SetRuleIds(ruleIds []string) { - r.RuleIds = ruleIds + r.RuleIds = ruleIds } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r RemoveNetworkSecurityGroupRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type RemoveNetworkSecurityGroupRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result RemoveNetworkSecurityGroupRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result RemoveNetworkSecurityGroupRulesResult `json:"result"` } type RemoveNetworkSecurityGroupRulesResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveRouteTableRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveRouteTableRules.go index 3a0425b77..a307b98db 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveRouteTableRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/RemoveRouteTableRules.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type RemoveRouteTableRulesRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* RouteTable ID */ - RouteTableId string `json:"routeTableId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 路由表规则Id列表 */ - RuleIds []string `json:"ruleIds"` + /* RouteTable ID */ + RouteTableId string `json:"routeTableId"` + + /* 路由表规则Id列表 */ + RuleIds []string `json:"ruleIds"` } /* @@ -41,21 +42,21 @@ type RemoveRouteTableRulesRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewRemoveRouteTableRulesRequest( - regionId string, - routeTableId string, - ruleIds []string, + regionId string, + routeTableId string, + ruleIds []string, ) *RemoveRouteTableRulesRequest { return &RemoveRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/routeTables/{routeTableId}:removeRouteTableRules", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - RouteTableId: routeTableId, - RuleIds: ruleIds, + RegionId: regionId, + RouteTableId: routeTableId, + RuleIds: ruleIds, } } @@ -65,63 +66,63 @@ func NewRemoveRouteTableRulesRequest( * param ruleIds: 路由表规则Id列表 (Required) */ func NewRemoveRouteTableRulesRequestWithAllParams( - regionId string, - routeTableId string, - ruleIds []string, + regionId string, + routeTableId string, + ruleIds []string, ) *RemoveRouteTableRulesRequest { - return &RemoveRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:removeRouteTableRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - RouteTableId: routeTableId, - RuleIds: ruleIds, - } + return &RemoveRouteTableRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:removeRouteTableRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + RouteTableId: routeTableId, + RuleIds: ruleIds, + } } /* This constructor has better compatible ability when API parameters changed */ func NewRemoveRouteTableRulesRequestWithoutParam() *RemoveRouteTableRulesRequest { - return &RemoveRouteTableRulesRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/routeTables/{routeTableId}:removeRouteTableRules", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &RemoveRouteTableRulesRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/routeTables/{routeTableId}:removeRouteTableRules", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *RemoveRouteTableRulesRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param routeTableId: RouteTable ID(Required) */ func (r *RemoveRouteTableRulesRequest) SetRouteTableId(routeTableId string) { - r.RouteTableId = routeTableId + r.RouteTableId = routeTableId } /* param ruleIds: 路由表规则Id列表(Required) */ func (r *RemoveRouteTableRulesRequest) SetRuleIds(ruleIds []string) { - r.RuleIds = ruleIds + r.RuleIds = ruleIds } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r RemoveRouteTableRulesRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type RemoveRouteTableRulesResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result RemoveRouteTableRulesResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result RemoveRouteTableRulesResult `json:"result"` } type RemoveRouteTableRulesResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/UnassignSecondaryIps.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/UnassignSecondaryIps.go index f8fec38b2..5d3e7260f 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/UnassignSecondaryIps.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis/UnassignSecondaryIps.go @@ -17,20 +17,21 @@ package apis import ( - "github.com/jdcloud-api/jdcloud-sdk-go/core" + "github.com/jdcloud-api/jdcloud-sdk-go/core" ) type UnassignSecondaryIpsRequest struct { - core.JDCloudRequest - /* Region ID */ - RegionId string `json:"regionId"` + core.JDCloudRequest - /* networkInterface ID */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* Region ID */ + RegionId string `json:"regionId"` - /* 指定删除的secondaryIp地址 (Optional) */ - SecondaryIps []string `json:"secondaryIps"` + /* networkInterface ID */ + NetworkInterfaceId string `json:"networkInterfaceId"` + + /* 指定删除的secondaryIp地址 (Optional) */ + SecondaryIps []string `json:"secondaryIps"` } /* @@ -40,19 +41,19 @@ type UnassignSecondaryIpsRequest struct { * @Deprecated, not compatible when mandatory parameters changed */ func NewUnassignSecondaryIpsRequest( - regionId string, - networkInterfaceId string, + regionId string, + networkInterfaceId string, ) *UnassignSecondaryIpsRequest { return &UnassignSecondaryIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ + JDCloudRequest: core.JDCloudRequest{ URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:unassignSecondaryIps", Method: "POST", Header: nil, Version: "v1", }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, } } @@ -62,63 +63,63 @@ func NewUnassignSecondaryIpsRequest( * param secondaryIps: 指定删除的secondaryIp地址 (Optional) */ func NewUnassignSecondaryIpsRequestWithAllParams( - regionId string, - networkInterfaceId string, - secondaryIps []string, + regionId string, + networkInterfaceId string, + secondaryIps []string, ) *UnassignSecondaryIpsRequest { - return &UnassignSecondaryIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:unassignSecondaryIps", - Method: "POST", - Header: nil, - Version: "v1", - }, - RegionId: regionId, - NetworkInterfaceId: networkInterfaceId, - SecondaryIps: secondaryIps, - } + return &UnassignSecondaryIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:unassignSecondaryIps", + Method: "POST", + Header: nil, + Version: "v1", + }, + RegionId: regionId, + NetworkInterfaceId: networkInterfaceId, + SecondaryIps: secondaryIps, + } } /* This constructor has better compatible ability when API parameters changed */ func NewUnassignSecondaryIpsRequestWithoutParam() *UnassignSecondaryIpsRequest { - return &UnassignSecondaryIpsRequest{ - JDCloudRequest: core.JDCloudRequest{ - URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:unassignSecondaryIps", - Method: "POST", - Header: nil, - Version: "v1", - }, - } + return &UnassignSecondaryIpsRequest{ + JDCloudRequest: core.JDCloudRequest{ + URL: "/regions/{regionId}/networkInterfaces/{networkInterfaceId}:unassignSecondaryIps", + Method: "POST", + Header: nil, + Version: "v1", + }, + } } /* param regionId: Region ID(Required) */ func (r *UnassignSecondaryIpsRequest) SetRegionId(regionId string) { - r.RegionId = regionId + r.RegionId = regionId } /* param networkInterfaceId: networkInterface ID(Required) */ func (r *UnassignSecondaryIpsRequest) SetNetworkInterfaceId(networkInterfaceId string) { - r.NetworkInterfaceId = networkInterfaceId + r.NetworkInterfaceId = networkInterfaceId } /* param secondaryIps: 指定删除的secondaryIp地址(Optional) */ func (r *UnassignSecondaryIpsRequest) SetSecondaryIps(secondaryIps []string) { - r.SecondaryIps = secondaryIps + r.SecondaryIps = secondaryIps } // GetRegionId returns path parameter 'regionId' if exist, // otherwise return empty string func (r UnassignSecondaryIpsRequest) GetRegionId() string { - return r.RegionId + return r.RegionId } type UnassignSecondaryIpsResponse struct { - RequestID string `json:"requestId"` - Error core.ErrorResponse `json:"error"` - Result UnassignSecondaryIpsResult `json:"result"` + RequestID string `json:"requestId"` + Error core.ErrorResponse `json:"error"` + Result UnassignSecondaryIpsResult `json:"result"` } type UnassignSecondaryIpsResult struct { -} +} \ No newline at end of file diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client/VpcClient.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client/VpcClient.go index 9d21939b6..a81ad2155 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client/VpcClient.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client/VpcClient.go @@ -17,1198 +17,1199 @@ package client import ( - "encoding/json" - "errors" - "github.com/jdcloud-api/jdcloud-sdk-go/core" - vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis" + "github.com/jdcloud-api/jdcloud-sdk-go/core" + vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis" + "encoding/json" + "errors" ) type VpcClient struct { - core.JDCloudClient + core.JDCloudClient } func NewVpcClient(credential *core.Credential) *VpcClient { - if credential == nil { - return nil - } + if credential == nil { + return nil + } - config := core.NewConfig() - config.SetEndpoint("vpc.jdcloud-api.com") + config := core.NewConfig() + config.SetEndpoint("vpc.jdcloud-api.com") - return &VpcClient{ - core.JDCloudClient{ - Credential: *credential, - Config: *config, - ServiceName: "vpc", - Revision: "0.5.1", - Logger: core.NewDefaultLogger(core.LogInfo), - }} + return &VpcClient{ + core.JDCloudClient{ + Credential: *credential, + Config: *config, + ServiceName: "vpc", + Revision: "0.5.1", + Logger: core.NewDefaultLogger(core.LogInfo), + }} } func (c *VpcClient) SetConfig(config *core.Config) { - c.Config = *config + c.Config = *config } func (c *VpcClient) SetLogger(logger core.Logger) { - c.Logger = logger + c.Logger = logger } /* 删除弹性Ip */ func (c *VpcClient) DeleteElasticIp(request *vpc.DeleteElasticIpRequest) (*vpc.DeleteElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改VpcPeering接口 */ func (c *VpcClient) ModifyVpcPeering(request *vpc.ModifyVpcPeeringRequest) (*vpc.ModifyVpcPeeringResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyVpcPeeringResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyVpcPeeringResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改弹性IP */ func (c *VpcClient) ModifyElasticIp(request *vpc.ModifyElasticIpRequest) (*vpc.ModifyElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改networkAcl接口 */ func (c *VpcClient) ModifyNetworkAclRules(request *vpc.ModifyNetworkAclRulesRequest) (*vpc.ModifyNetworkAclRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyNetworkAclRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyNetworkAclRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除networkAcl接口 */ func (c *VpcClient) DeleteNetworkAcl(request *vpc.DeleteNetworkAclRequest) (*vpc.DeleteNetworkAclResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteNetworkAclResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteNetworkAclResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除子网 */ func (c *VpcClient) DeleteSubnet(request *vpc.DeleteSubnetRequest) (*vpc.DeleteSubnetResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteSubnetResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteSubnetResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询子网列表 */ func (c *VpcClient) DescribeSubnets(request *vpc.DescribeSubnetsRequest) (*vpc.DescribeSubnetsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeSubnetsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeSubnetsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询弹性网卡列表 */ func (c *VpcClient) DescribeNetworkInterfaces(request *vpc.DescribeNetworkInterfacesRequest) (*vpc.DescribeNetworkInterfacesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeNetworkInterfacesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeNetworkInterfacesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 移除安全组规则 */ func (c *VpcClient) RemoveNetworkSecurityGroupRules(request *vpc.RemoveNetworkSecurityGroupRulesRequest) (*vpc.RemoveNetworkSecurityGroupRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.RemoveNetworkSecurityGroupRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.RemoveNetworkSecurityGroupRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改安全组属性 */ func (c *VpcClient) ModifyNetworkSecurityGroup(request *vpc.ModifyNetworkSecurityGroupRequest) (*vpc.ModifyNetworkSecurityGroupResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyNetworkSecurityGroupResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyNetworkSecurityGroupResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 添加安全组规则 */ func (c *VpcClient) AddNetworkSecurityGroupRules(request *vpc.AddNetworkSecurityGroupRulesRequest) (*vpc.AddNetworkSecurityGroupRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AddNetworkSecurityGroupRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AddNetworkSecurityGroupRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建networkAcl接口 */ func (c *VpcClient) CreateNetworkAcl(request *vpc.CreateNetworkAclRequest) (*vpc.CreateNetworkAclResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateNetworkAclResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateNetworkAclResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询配额信息 */ func (c *VpcClient) DescribeQuota(request *vpc.DescribeQuotaRequest) (*vpc.DescribeQuotaResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeQuotaResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeQuotaResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建路由表 */ func (c *VpcClient) CreateRouteTable(request *vpc.CreateRouteTableRequest) (*vpc.CreateRouteTableResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateRouteTableResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateRouteTableResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除安全组 */ func (c *VpcClient) DeleteNetworkSecurityGroup(request *vpc.DeleteNetworkSecurityGroupRequest) (*vpc.DeleteNetworkSecurityGroupResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteNetworkSecurityGroupResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteNetworkSecurityGroupResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询路由表信息详情 */ func (c *VpcClient) DescribeRouteTable(request *vpc.DescribeRouteTableRequest) (*vpc.DescribeRouteTableResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeRouteTableResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeRouteTableResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除私有网络 */ func (c *VpcClient) DeleteVpc(request *vpc.DeleteVpcRequest) (*vpc.DeleteVpcResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteVpcResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteVpcResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询VpcPeering资源列表 */ func (c *VpcClient) DescribeVpcPeerings(request *vpc.DescribeVpcPeeringsRequest) (*vpc.DescribeVpcPeeringsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeVpcPeeringsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeVpcPeeringsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询Acl列表 */ func (c *VpcClient) DescribeNetworkAcls(request *vpc.DescribeNetworkAclsRequest) (*vpc.DescribeNetworkAclsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeNetworkAclsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeNetworkAclsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询子网信息详情 */ func (c *VpcClient) DescribeSubnet(request *vpc.DescribeSubnetRequest) (*vpc.DescribeSubnetResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeSubnetResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeSubnetResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询安全组信息详情 */ func (c *VpcClient) DescribeNetworkSecurityGroup(request *vpc.DescribeNetworkSecurityGroupRequest) (*vpc.DescribeNetworkSecurityGroupResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeNetworkSecurityGroupResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeNetworkSecurityGroupResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询安全组列表 */ func (c *VpcClient) DescribeNetworkSecurityGroups(request *vpc.DescribeNetworkSecurityGroupsRequest) (*vpc.DescribeNetworkSecurityGroupsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeNetworkSecurityGroupsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeNetworkSecurityGroupsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询Vpc信息详情 */ func (c *VpcClient) DescribeVpc(request *vpc.DescribeVpcRequest) (*vpc.DescribeVpcResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeVpcResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeVpcResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给子网解绑NetworkAcl接口 */ func (c *VpcClient) DisassociateNetworkAcl(request *vpc.DisassociateNetworkAclRequest) (*vpc.DisassociateNetworkAclResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DisassociateNetworkAclResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DisassociateNetworkAclResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 移除networkAcl规则 */ func (c *VpcClient) RemoveNetworkAclRules(request *vpc.RemoveNetworkAclRulesRequest) (*vpc.RemoveNetworkAclRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.RemoveNetworkAclRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.RemoveNetworkAclRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 路由表绑定子网接口 */ func (c *VpcClient) AssociateRouteTable(request *vpc.AssociateRouteTableRequest) (*vpc.AssociateRouteTableResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AssociateRouteTableResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AssociateRouteTableResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询私有网络列表 */ func (c *VpcClient) DescribeVpcs(request *vpc.DescribeVpcsRequest) (*vpc.DescribeVpcsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeVpcsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeVpcsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建安全组 */ func (c *VpcClient) CreateNetworkSecurityGroup(request *vpc.CreateNetworkSecurityGroupRequest) (*vpc.CreateNetworkSecurityGroupResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateNetworkSecurityGroupResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateNetworkSecurityGroupResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建子网 */ func (c *VpcClient) CreateSubnet(request *vpc.CreateSubnetRequest) (*vpc.CreateSubnetResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateSubnetResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateSubnetResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除路由表 */ func (c *VpcClient) DeleteRouteTable(request *vpc.DeleteRouteTableRequest) (*vpc.DeleteRouteTableResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteRouteTableResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteRouteTableResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询VpcPeering资源详情 */ func (c *VpcClient) DescribeVpcPeering(request *vpc.DescribeVpcPeeringRequest) (*vpc.DescribeVpcPeeringResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeVpcPeeringResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeVpcPeeringResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 移除路由表规则 */ func (c *VpcClient) RemoveRouteTableRules(request *vpc.RemoveRouteTableRulesRequest) (*vpc.RemoveRouteTableRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.RemoveRouteTableRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.RemoveRouteTableRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建VpcPeering接口 */ func (c *VpcClient) CreateVpcPeering(request *vpc.CreateVpcPeeringRequest) (*vpc.CreateVpcPeeringResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateVpcPeeringResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateVpcPeeringResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给网卡分配secondaryIp接口 */ func (c *VpcClient) AssignSecondaryIps(request *vpc.AssignSecondaryIpsRequest) (*vpc.AssignSecondaryIpsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AssignSecondaryIpsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AssignSecondaryIpsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询路由表列表 */ func (c *VpcClient) DescribeRouteTables(request *vpc.DescribeRouteTablesRequest) (*vpc.DescribeRouteTablesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeRouteTablesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeRouteTablesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改弹性网卡接口 */ func (c *VpcClient) ModifyNetworkInterface(request *vpc.ModifyNetworkInterfaceRequest) (*vpc.ModifyNetworkInterfaceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyNetworkInterfaceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyNetworkInterfaceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询弹性ip列表 */ func (c *VpcClient) DescribeElasticIps(request *vpc.DescribeElasticIpsRequest) (*vpc.DescribeElasticIpsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeElasticIpsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeElasticIpsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改安全组规则 */ func (c *VpcClient) ModifyNetworkSecurityGroupRules(request *vpc.ModifyNetworkSecurityGroupRulesRequest) (*vpc.ModifyNetworkSecurityGroupRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyNetworkSecurityGroupRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyNetworkSecurityGroupRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改networkAcl接口 */ func (c *VpcClient) ModifyNetworkAcl(request *vpc.ModifyNetworkAclRequest) (*vpc.ModifyNetworkAclResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyNetworkAclResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyNetworkAclResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询弹性网卡信息详情 */ func (c *VpcClient) DescribeNetworkInterface(request *vpc.DescribeNetworkInterfaceRequest) (*vpc.DescribeNetworkInterfaceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeNetworkInterfaceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeNetworkInterfaceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给网卡解绑弹性Ip接口 */ func (c *VpcClient) DisassociateElasticIp(request *vpc.DisassociateElasticIpRequest) (*vpc.DisassociateElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DisassociateElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DisassociateElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除VpcPeering接口 */ func (c *VpcClient) DeleteVpcPeering(request *vpc.DeleteVpcPeeringRequest) (*vpc.DeleteVpcPeeringResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteVpcPeeringResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteVpcPeeringResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建网卡接口，只能创建辅助网卡 */ func (c *VpcClient) CreateNetworkInterface(request *vpc.CreateNetworkInterfaceRequest) (*vpc.CreateNetworkInterfaceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateNetworkInterfaceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateNetworkInterfaceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建私有网络 */ func (c *VpcClient) CreateVpc(request *vpc.CreateVpcRequest) (*vpc.CreateVpcResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateVpcResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateVpcResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改路由表规则 */ func (c *VpcClient) ModifyRouteTableRules(request *vpc.ModifyRouteTableRulesRequest) (*vpc.ModifyRouteTableRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyRouteTableRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyRouteTableRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 添加路由表规则 */ func (c *VpcClient) AddRouteTableRules(request *vpc.AddRouteTableRulesRequest) (*vpc.AddRouteTableRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AddRouteTableRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AddRouteTableRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* ElasticIp资源信息详情 */ func (c *VpcClient) DescribeElasticIp(request *vpc.DescribeElasticIpRequest) (*vpc.DescribeElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给网卡删除secondaryIp接口 */ func (c *VpcClient) UnassignSecondaryIps(request *vpc.UnassignSecondaryIpsRequest) (*vpc.UnassignSecondaryIpsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.UnassignSecondaryIpsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.UnassignSecondaryIpsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改路由表属性 */ func (c *VpcClient) ModifyRouteTable(request *vpc.ModifyRouteTableRequest) (*vpc.ModifyRouteTableResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyRouteTableResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyRouteTableResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给网卡绑定弹性Ip接口 */ func (c *VpcClient) AssociateElasticIp(request *vpc.AssociateElasticIpRequest) (*vpc.AssociateElasticIpResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AssociateElasticIpResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AssociateElasticIpResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给路由表解绑子网接口 */ func (c *VpcClient) DisassociateRouteTable(request *vpc.DisassociateRouteTableRequest) (*vpc.DisassociateRouteTableResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DisassociateRouteTableResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DisassociateRouteTableResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改私有网络接口 */ func (c *VpcClient) ModifyVpc(request *vpc.ModifyVpcRequest) (*vpc.ModifyVpcResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifyVpcResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifyVpcResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 给子网绑定networkAcl接口 */ func (c *VpcClient) AssociateNetworkAcl(request *vpc.AssociateNetworkAclRequest) (*vpc.AssociateNetworkAclResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AssociateNetworkAclResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AssociateNetworkAclResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 修改子网接口 */ func (c *VpcClient) ModifySubnet(request *vpc.ModifySubnetRequest) (*vpc.ModifySubnetResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.ModifySubnetResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.ModifySubnetResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 创建一个或者多个弹性Ip */ func (c *VpcClient) CreateElasticIps(request *vpc.CreateElasticIpsRequest) (*vpc.CreateElasticIpsResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.CreateElasticIpsResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.CreateElasticIpsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 删除弹性网卡接口 */ func (c *VpcClient) DeleteNetworkInterface(request *vpc.DeleteNetworkInterfaceRequest) (*vpc.DeleteNetworkInterfaceResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DeleteNetworkInterfaceResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DeleteNetworkInterfaceResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 查询networkAcl资源详情 */ func (c *VpcClient) DescribeNetworkAcl(request *vpc.DescribeNetworkAclRequest) (*vpc.DescribeNetworkAclResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.DescribeNetworkAclResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.DescribeNetworkAclResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } /* 添加networkAcl规则接口 */ func (c *VpcClient) AddNetworkAclRules(request *vpc.AddNetworkAclRulesRequest) (*vpc.AddNetworkAclRulesResponse, error) { - if request == nil { - return nil, errors.New("Request object is nil. ") - } - resp, err := c.Send(request, c.ServiceName) - if err != nil { - return nil, err - } + if request == nil { + return nil, errors.New("Request object is nil. ") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } - jdResp := &vpc.AddNetworkAclRulesResponse{} - err = json.Unmarshal(resp, jdResp) - if err != nil { - c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) - return nil, err - } + jdResp := &vpc.AddNetworkAclRulesResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } - return jdResp, err + return jdResp, err } + diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRuleSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRuleSpec.go index 673f47b4e..8a4a6f079 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRuleSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRuleSpec.go @@ -16,29 +16,30 @@ package models + type AddNetworkAclRuleSpec struct { - /* 规则限定协议。取值范围：All,TCP,UDP,ICMP */ - Protocol string `json:"protocol"` + /* 规则限定协议。取值范围：All,TCP,UDP,ICMP */ + Protocol string `json:"protocol"` - /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - FromPort *int `json:"fromPort"` + /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + FromPort *int `json:"fromPort"` - /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - ToPort *int `json:"toPort"` + /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + ToPort *int `json:"toPort"` - /* networkAcl规则方向。ingress：入规则; egress：出规则 */ - Direction string `json:"direction"` + /* networkAcl规则方向。ingress：入规则; egress：出规则 */ + Direction string `json:"direction"` - /* 匹配地址前缀 */ - AddressPrefix string `json:"addressPrefix"` + /* 匹配地址前缀 */ + AddressPrefix string `json:"addressPrefix"` - /* 访问控制策略：allow:允许，deny：拒绝 */ - RuleAction string `json:"ruleAction"` + /* 访问控制策略：allow:允许，deny：拒绝 */ + RuleAction string `json:"ruleAction"` - /* 规则匹配优先级，取值范围为[1,32768]，优先级数字越小优先级越高 */ - Priority int `json:"priority"` + /* 规则匹配优先级，取值范围为[1,32768]，优先级数字越小优先级越高 */ + Priority int `json:"priority"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRulesSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRulesSpec.go index c06ce58fb..1ab41cf86 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRulesSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkAclRulesSpec.go @@ -16,8 +16,9 @@ package models + type AddNetworkAclRulesSpec struct { - /* networkAcl规则列表 */ - NetworkAclRuleSpecs []AddNetworkAclRuleSpec `json:"networkAclRuleSpecs"` + /* networkAcl规则列表 */ + NetworkAclRuleSpecs []AddNetworkAclRuleSpec `json:"networkAclRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkSecurityGroupRulesSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkSecurityGroupRulesSpec.go index 38ca435f6..1c4473104 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkSecurityGroupRulesSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddNetworkSecurityGroupRulesSpec.go @@ -16,8 +16,9 @@ package models + type AddNetworkSecurityGroupRulesSpec struct { - /* 安全组规则信息 */ - NetworkSecurityGroupRuleSpecs []AddSecurityGroupRules `json:"networkSecurityGroupRuleSpecs"` + /* 安全组规则信息 */ + NetworkSecurityGroupRuleSpecs []AddSecurityGroupRules `json:"networkSecurityGroupRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRules.go index 985399bd0..d6c3fac30 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRules.go @@ -16,17 +16,18 @@ package models + type AddRouteTableRules struct { - /* 下一跳类型, 取值范围:instance:云主机, internet:公网, vpc_peering:vpc对等连接, bgw:边界网关 */ - NextHopType string `json:"nextHopType"` + /* 下一跳类型, 取值范围:instance:云主机, internet:公网, vpc_peering:vpc对等连接, bgw:边界网关 */ + NextHopType string `json:"nextHopType"` - /* 下一跳id */ - NextHopId string `json:"nextHopId"` + /* 下一跳id */ + NextHopId string `json:"nextHopId"` - /* 匹配地址前缀, internet类型路由跟其他类型的路由，addressPrefix不允许重复 */ - AddressPrefix string `json:"addressPrefix"` + /* 匹配地址前缀, internet类型路由跟其他类型的路由，addressPrefix不允许重复 */ + AddressPrefix string `json:"addressPrefix"` - /* 规则匹配优先级，取值范围[1,255]，默认为100。当路由规则子网掩码不同时，路由最长匹配优先；当路由规则子网掩码相同时, 按照优先级匹配转发, 优先级数字越小优先级越高，路由规则子网掩码相同、优先级相同、下一跳不同时，形成等价路由，不同下一跳负载均担。 (Optional) */ - Priority *int `json:"priority"` + /* 规则匹配优先级，取值范围[1,255]，默认为100。当路由规则子网掩码不同时，路由最长匹配优先；当路由规则子网掩码相同时, 按照优先级匹配转发, 优先级数字越小优先级越高，路由规则子网掩码相同、优先级相同、下一跳不同时，形成等价路由，不同下一跳负载均担。 (Optional) */ + Priority *int `json:"priority"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRulesSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRulesSpec.go index 9618ecdaa..599703cd7 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRulesSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddRouteTableRulesSpec.go @@ -16,8 +16,9 @@ package models + type AddRouteTableRulesSpec struct { - /* 安全组规则信息 */ - RouteTableRuleSpecs []AddRouteTableRules `json:"routeTableRuleSpecs"` + /* 安全组规则信息 */ + RouteTableRuleSpecs []AddRouteTableRules `json:"routeTableRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddSecurityGroupRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddSecurityGroupRules.go index 6a2affa09..f9b279022 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddSecurityGroupRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AddSecurityGroupRules.go @@ -16,23 +16,24 @@ package models + type AddSecurityGroupRules struct { - /* 规则限定协议。300:All; 6:TCP; 17:UDP; 1:ICMP */ - Protocol int `json:"protocol"` + /* 规则限定协议。300:All; 6:TCP; 17:UDP; 1:ICMP */ + Protocol int `json:"protocol"` - /* 安全组规则方向。0：入规则; 1：出规则 */ - Direction int `json:"direction"` + /* 安全组规则方向。0：入规则; 1：出规则 */ + Direction int `json:"direction"` - /* 匹配地址前缀 */ - AddressPrefix string `json:"addressPrefix"` + /* 匹配地址前缀 */ + AddressPrefix string `json:"addressPrefix"` - /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - FromPort *int `json:"fromPort"` + /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + FromPort *int `json:"fromPort"` - /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - ToPort *int `json:"toPort"` + /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + ToPort *int `json:"toPort"` - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssignSecondaryIpsSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssignSecondaryIpsSpec.go index 34edf0d88..fb151872b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssignSecondaryIpsSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssignSecondaryIpsSpec.go @@ -16,14 +16,15 @@ package models + type AssignSecondaryIpsSpec struct { - /* secondary ip被其他接口占用时，是否抢占。false：非抢占重分配，true：抢占重分配，默认抢占重分配。默认值：true (Optional) */ - Force bool `json:"force"` + /* secondary ip被其他接口占用时，是否抢占。false：非抢占重分配，true：抢占重分配，默认抢占重分配。默认值：true (Optional) */ + Force bool `json:"force"` - /* 指定分配的secondaryIp地址 (Optional) */ - SecondaryIps []string `json:"secondaryIps"` + /* 指定分配的secondaryIp地址 (Optional) */ + SecondaryIps []string `json:"secondaryIps"` - /* 指定自动分配的secondaryIp个数 (Optional) */ - SecondaryIpCount int `json:"secondaryIpCount"` + /* 指定自动分配的secondaryIp个数 (Optional) */ + SecondaryIpCount int `json:"secondaryIpCount"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateElasticIpSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateElasticIpSpec.go index c5261f225..fea484c08 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateElasticIpSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateElasticIpSpec.go @@ -16,14 +16,15 @@ package models + type AssociateElasticIpSpec struct { - /* 绑定的弹性Ip Id (Optional) */ - ElasticIpId string `json:"elasticIpId"` + /* 绑定的弹性Ip Id (Optional) */ + ElasticIpId string `json:"elasticIpId"` - /* 绑定弹性Ip到指定的privateIp (Optional) */ - PrivateIpAddress string `json:"privateIpAddress"` + /* 绑定弹性Ip到指定的privateIp (Optional) */ + PrivateIpAddress string `json:"privateIpAddress"` - /* 绑定的弹性Ip地址 (Optional) */ - ElasticIpAddress string `json:"elasticIpAddress"` + /* 绑定的弹性Ip地址 (Optional) */ + ElasticIpAddress string `json:"elasticIpAddress"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateRouteTableSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateRouteTableSpec.go index 7063e1bf6..77cbe3c90 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateRouteTableSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/AssociateRouteTableSpec.go @@ -16,8 +16,9 @@ package models + type AssociateRouteTableSpec struct { - /* 路由表要绑定的子网ID列表, subnet已被其他路由表绑定时，自动解绑。 */ - SubnetIds []string `json:"subnetIds"` + /* 路由表要绑定的子网ID列表, subnet已被其他路由表绑定时，自动解绑。 */ + SubnetIds []string `json:"subnetIds"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateElasticIpSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateElasticIpSpec.go index 43acc99bb..681f0f2e7 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateElasticIpSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateElasticIpSpec.go @@ -16,14 +16,15 @@ package models + type CreateElasticIpSpec struct { - /* 购买弹性ip数量；取值范围：[1,100] */ - MaxCount int `json:"maxCount"` + /* 购买弹性ip数量；取值范围：[1,100] */ + MaxCount int `json:"maxCount"` - /* 指定弹性ip地址进行创建，当申请创建多个弹性ip时，必须为空 (Optional) */ - ElasticIpAddress string `json:"elasticIpAddress"` + /* 指定弹性ip地址进行创建，当申请创建多个弹性ip时，必须为空 (Optional) */ + ElasticIpAddress string `json:"elasticIpAddress"` - /* 弹性ip规格 */ - ElasticIpSpec ElasticIpSpec `json:"elasticIpSpec"` + /* 弹性ip规格 */ + ElasticIpSpec ElasticIpSpec `json:"elasticIpSpec"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateVpcPeeringSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateVpcPeeringSpec.go index e3d85603d..5733faa74 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateVpcPeeringSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/CreateVpcPeeringSpec.go @@ -16,17 +16,18 @@ package models + type CreateVpcPeeringSpec struct { - /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 */ - VpcPeeringName string `json:"vpcPeeringName"` + /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 */ + VpcPeeringName string `json:"vpcPeeringName"` - /* VpcPeering本端Vpc的Id */ - VpcId string `json:"vpcId"` + /* VpcPeering本端Vpc的Id */ + VpcId string `json:"vpcId"` - /* VpcPeering对端Vpc的Id */ - RemoteVpcId string `json:"remoteVpcId"` + /* VpcPeering对端Vpc的Id */ + RemoteVpcId string `json:"remoteVpcId"` - /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - Description string `json:"description"` + /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateElasticIpSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateElasticIpSpec.go index d49fb0006..c9512a325 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateElasticIpSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateElasticIpSpec.go @@ -16,11 +16,12 @@ package models + type DisassociateElasticIpSpec struct { - /* 指定解绑的弹性Ip Id (Optional) */ - ElasticIpId string `json:"elasticIpId"` + /* 指定解绑的弹性Ip Id (Optional) */ + ElasticIpId string `json:"elasticIpId"` - /* 指定解绑的弹性Ip地址 (Optional) */ - ElasticIpAddress string `json:"elasticIpAddress"` + /* 指定解绑的弹性Ip地址 (Optional) */ + ElasticIpAddress string `json:"elasticIpAddress"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateRouteTableSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateRouteTableSpec.go index 7f1310bb0..86aad64ef 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateRouteTableSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/DisassociateRouteTableSpec.go @@ -16,8 +16,9 @@ package models + type DisassociateRouteTableSpec struct { - /* 路由表要解绑的子网ID，解绑后子网绑定默认路由表 */ - SubnetId string `json:"subnetId"` + /* 路由表要解绑的子网ID，解绑后子网绑定默认路由表 */ + SubnetId string `json:"subnetId"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIp.go index 364daa165..11822a39d 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIp.go @@ -20,36 +20,36 @@ import charge "github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models" type ElasticIp struct { - /* 弹性IP的Id (Optional) */ - ElasticIpId string `json:"elasticIpId"` + /* 弹性IP的Id (Optional) */ + ElasticIpId string `json:"elasticIpId"` - /* 弹性IP地址 (Optional) */ - ElasticIpAddress string `json:"elasticIpAddress"` + /* 弹性IP地址 (Optional) */ + ElasticIpAddress string `json:"elasticIpAddress"` - /* 弹性ip的限速（单位：Mbps) (Optional) */ - BandwidthMbps int `json:"bandwidthMbps"` + /* 弹性ip的限速（单位：Mbps) (Optional) */ + BandwidthMbps int `json:"bandwidthMbps"` - /* IP服务商，取值为bgp或no_bgp (Optional) */ - Provider string `json:"provider"` + /* IP服务商，取值为bgp或no_bgp (Optional) */ + Provider string `json:"provider"` - /* 私有IP的IPV4地址 (Optional) */ - PrivateIpAddress string `json:"privateIpAddress"` + /* 私有IP的IPV4地址 (Optional) */ + PrivateIpAddress string `json:"privateIpAddress"` - /* 配置弹性网卡Id (Optional) */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* 配置弹性网卡Id (Optional) */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* 实例Id (Optional) */ - InstanceId string `json:"instanceId"` + /* 实例Id (Optional) */ + InstanceId string `json:"instanceId"` - /* 实例类型 (Optional) */ - InstanceType string `json:"instanceType"` + /* 实例类型 (Optional) */ + InstanceType string `json:"instanceType"` - /* 计费配置 (Optional) */ - Charge charge.Charge `json:"charge"` + /* 计费配置 (Optional) */ + Charge charge.Charge `json:"charge"` - /* 弹性ip创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 弹性ip创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` - /* 弹性ip可用区属性，如果为空，表示全可用区 (Optional) */ - Az string `json:"az"` + /* 弹性ip可用区属性，如果为空，表示全可用区 (Optional) */ + Az string `json:"az"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIpSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIpSpec.go index 21de49bfb..bc641a734 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIpSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ElasticIpSpec.go @@ -20,12 +20,12 @@ import charge "github.com/jdcloud-api/jdcloud-sdk-go/services/charge/models" type ElasticIpSpec struct { - /* 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] */ - BandwidthMbps int `json:"bandwidthMbps"` + /* 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] */ + BandwidthMbps int `json:"bandwidthMbps"` - /* IP服务商，取值为bgp或no_bgp，cn-north-1：bgp；cn-south-1：[bgp，no_bgp]；cn-east-1：[bgp，no_bgp]；cn-east-2：bgp */ - Provider string `json:"provider"` + /* IP服务商，取值为bgp或no_bgp，cn-north-1：bgp；cn-south-1：[bgp，no_bgp]；cn-east-1：[bgp，no_bgp]；cn-east-2：bgp */ + Provider string `json:"provider"` - /* 计费配置 (Optional) */ - ChargeSpec *charge.ChargeSpec `json:"chargeSpec"` + /* 计费配置 (Optional) */ + ChargeSpec *charge.ChargeSpec `json:"chargeSpec"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyElasticIpSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyElasticIpSpec.go index 551e2255f..d4c8823f7 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyElasticIpSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyElasticIpSpec.go @@ -16,8 +16,9 @@ package models + type ModifyElasticIpSpec struct { - /* 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] */ - BandwidthMbps int `json:"bandwidthMbps"` + /* 弹性公网IP的限速（单位：Mbps），取值范围为[1-200] */ + BandwidthMbps int `json:"bandwidthMbps"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpec.go index 37521223c..7e8a9aa32 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpec.go @@ -16,29 +16,30 @@ package models + type ModifyNetworkAclRuleSpec struct { - /* networkAcl规则ID */ - RuleId string `json:"ruleId"` + /* networkAcl规则ID */ + RuleId string `json:"ruleId"` - /* 规则限定协议。取值范围：All,TCP,UDP,ICMP (Optional) */ - Protocol *string `json:"protocol"` + /* 规则限定协议。取值范围：All,TCP,UDP,ICMP (Optional) */ + Protocol *string `json:"protocol"` - /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - FromPort *int `json:"fromPort"` + /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + FromPort *int `json:"fromPort"` - /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - ToPort *int `json:"toPort"` + /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + ToPort *int `json:"toPort"` - /* 匹配地址前缀 (Optional) */ - AddressPrefix *string `json:"addressPrefix"` + /* 匹配地址前缀 (Optional) */ + AddressPrefix *string `json:"addressPrefix"` - /* 访问控制策略：allow:允许，deny：拒绝 (Optional) */ - RuleAction *string `json:"ruleAction"` + /* 访问控制策略：allow:允许，deny：拒绝 (Optional) */ + RuleAction *string `json:"ruleAction"` - /* 规则匹配优先级，取值范围为[1,32768]，优先级数字越小优先级越高 (Optional) */ - Priority *int `json:"priority"` + /* 规则匹配优先级，取值范围为[1,32768]，优先级数字越小优先级越高 (Optional) */ + Priority *int `json:"priority"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpecs.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpecs.go index 3ec056e19..9864bdb22 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpecs.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRuleSpecs.go @@ -16,8 +16,9 @@ package models + type ModifyNetworkAclRuleSpecs struct { - /* networkAcl规则列表 */ - ModifyNetworkAclRuleSpecs []ModifyNetworkAclRuleSpec `json:"modifyNetworkAclRuleSpecs"` + /* networkAcl规则列表 */ + ModifyNetworkAclRuleSpecs []ModifyNetworkAclRuleSpec `json:"modifyNetworkAclRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRulesSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRulesSpec.go index 221d6626c..13df02392 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRulesSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclRulesSpec.go @@ -16,8 +16,9 @@ package models + type ModifyNetworkAclRulesSpec struct { - /* networkAcl规则列表 */ - ModifyNetworkAclRuleSpecs []ModifyNetworkAclRuleSpec `json:"modifyNetworkAclRuleSpecs"` + /* networkAcl规则列表 */ + ModifyNetworkAclRuleSpecs []ModifyNetworkAclRuleSpec `json:"modifyNetworkAclRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclSpec.go index 501c35d3f..4c2170648 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkAclSpec.go @@ -16,11 +16,12 @@ package models + type ModifyNetworkAclSpec struct { - /* networkAcl名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ - NetworkAclName string `json:"networkAclName"` + /* networkAcl名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ + NetworkAclName string `json:"networkAclName"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkInterfaceSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkInterfaceSpec.go index 8a9b4868f..292bfe914 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkInterfaceSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkInterfaceSpec.go @@ -16,14 +16,15 @@ package models + type ModifyNetworkInterfaceSpec struct { - /* 弹性网卡名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ - NetworkInterfaceName string `json:"networkInterfaceName"` + /* 弹性网卡名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符 (Optional) */ + NetworkInterfaceName string `json:"networkInterfaceName"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` - /* 以覆盖原有安全组的方式更新的安全组。如果更新安全组ID列表，最多5个安全组 (Optional) */ - SecurityGroups []string `json:"securityGroups"` + /* 以覆盖原有安全组的方式更新的安全组。如果更新安全组ID列表，最多5个安全组 (Optional) */ + SecurityGroups []string `json:"securityGroups"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkSecurityGroupSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkSecurityGroupSpec.go index 1537edc11..335009736 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkSecurityGroupSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyNetworkSecurityGroupSpec.go @@ -16,11 +16,12 @@ package models + type ModifyNetworkSecurityGroupSpec struct { - /* 安全组的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - NetworkSecurityGroupName string `json:"networkSecurityGroupName"` + /* 安全组的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + NetworkSecurityGroupName string `json:"networkSecurityGroupName"` - /* 安全组的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ - Description string `json:"description"` + /* 安全组的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyQuotaSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyQuotaSpec.go index 5592a222a..ec25778c1 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyQuotaSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyQuotaSpec.go @@ -16,14 +16,15 @@ package models + type ModifyQuotaSpec struct { - /* 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡） */ - Type string `json:"type"` + /* 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡） */ + Type string `json:"type"` - /* type为vpc、elastic_ip、network_interface不设置, type为subnet、security_group、vpcpeering设置为vpcId (Optional) */ - ParentResourceId string `json:"parentResourceId"` + /* type为vpc、elastic_ip、network_interface不设置, type为subnet、security_group、vpcpeering设置为vpcId (Optional) */ + ParentResourceId string `json:"parentResourceId"` - /* 配额大小 */ - MaxLimit int `json:"maxLimit"` + /* 配额大小 */ + MaxLimit int `json:"maxLimit"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRules.go index c65695b5a..8b79e5a38 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRules.go @@ -16,20 +16,21 @@ package models + type ModifyRouteTableRules struct { - /* 路由表规则的ID */ - RuleId string `json:"ruleId"` + /* 路由表规则的ID */ + RuleId string `json:"ruleId"` - /* 规则匹配优先级，取值范围[1,255]。当路由规则子网掩码不同时，路由最长匹配优先；当路由规则子网掩码相同时, 按照优先级匹配转发, 优先级数字越小优先级越高，路由规则子网掩码相同、优先级相同、下一跳不同时，形成等价路由，不同下一跳负载均担。 (Optional) */ - Priority *int `json:"priority"` + /* 规则匹配优先级，取值范围[1,255]。当路由规则子网掩码不同时，路由最长匹配优先；当路由规则子网掩码相同时, 按照优先级匹配转发, 优先级数字越小优先级越高，路由规则子网掩码相同、优先级相同、下一跳不同时，形成等价路由，不同下一跳负载均担。 (Optional) */ + Priority *int `json:"priority"` - /* 下一跳类型, 取值范围:instance:云主机, internet:公网, vpc_peering:vpc对等连接, bgw:边界网关 (Optional) */ - NextHopType *string `json:"nextHopType"` + /* 下一跳类型, 取值范围:instance:云主机, internet:公网, vpc_peering:vpc对等连接, bgw:边界网关 (Optional) */ + NextHopType *string `json:"nextHopType"` - /* 下一跳id (Optional) */ - NextHopId *string `json:"nextHopId"` + /* 下一跳id (Optional) */ + NextHopId *string `json:"nextHopId"` - /* 路由表规则前缀, internet类型路由跟其他类型的路由，addressPrefix不允许重复 (Optional) */ - AddressPrefix *string `json:"addressPrefix"` + /* 路由表规则前缀, internet类型路由跟其他类型的路由，addressPrefix不允许重复 (Optional) */ + AddressPrefix *string `json:"addressPrefix"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRulesSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRulesSpec.go index 080b506e0..d8894b0dc 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRulesSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableRulesSpec.go @@ -16,8 +16,9 @@ package models + type ModifyRouteTableRulesSpec struct { - /* 路由表规则信息 */ - ModifyRouteTableRuleSpecs []ModifyRouteTableRules `json:"modifyRouteTableRuleSpecs"` + /* 路由表规则信息 */ + ModifyRouteTableRuleSpecs []ModifyRouteTableRules `json:"modifyRouteTableRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableSpec.go index 992b6f898..3a1c902dc 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyRouteTableSpec.go @@ -16,11 +16,12 @@ package models + type ModifyRouteTableSpec struct { - /* 路由表的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - RouteTableName string `json:"routeTableName"` + /* 路由表的名字。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + RouteTableName string `json:"routeTableName"` - /* 路由表的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ - Description string `json:"description"` + /* 路由表的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRuleSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRuleSpec.go index 91d05e07b..f59fc26b5 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRuleSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRuleSpec.go @@ -16,8 +16,9 @@ package models + type ModifySecurityGroupRuleSpec struct { - /* 安全组规则信息 */ - ModifySecurityGroupRuleSpecs []ModifySecurityGroupRules `json:"modifySecurityGroupRuleSpecs"` + /* 安全组规则信息 */ + ModifySecurityGroupRuleSpecs []ModifySecurityGroupRules `json:"modifySecurityGroupRuleSpecs"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRules.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRules.go index df0def62a..38d47fc7e 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRules.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySecurityGroupRules.go @@ -16,23 +16,24 @@ package models + type ModifySecurityGroupRules struct { - /* 安全组规则的ID。 */ - RuleId string `json:"ruleId"` + /* 安全组规则的ID。 */ + RuleId string `json:"ruleId"` - /* 规则限定协议。300:All; 6:TCP; 17:UDP; 1:ICMP (Optional) */ - Protocol *int `json:"protocol"` + /* 规则限定协议。300:All; 6:TCP; 17:UDP; 1:ICMP (Optional) */ + Protocol *int `json:"protocol"` - /* 安全组规则的起始端口。取值范围：1-65535 (Optional) */ - FromPort *int `json:"fromPort"` + /* 安全组规则的起始端口。取值范围：1-65535 (Optional) */ + FromPort *int `json:"fromPort"` - /* 安全组规则的终端口。取值范围：1-65535 (Optional) */ - ToPort *int `json:"toPort"` + /* 安全组规则的终端口。取值范围：1-65535 (Optional) */ + ToPort *int `json:"toPort"` - /* 安全组规则前缀，取值范围：正确的CIDR (Optional) */ - AddressPrefix *string `json:"addressPrefix"` + /* 安全组规则前缀，取值范围：正确的CIDR (Optional) */ + AddressPrefix *string `json:"addressPrefix"` - /* 安全组规则的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ - Description *string `json:"description"` + /* 安全组规则的描述，取值范围：0-256个UTF-8编码下的全部字符 (Optional) */ + Description *string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySubnetSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySubnetSpec.go index 998384538..aac57100f 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySubnetSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifySubnetSpec.go @@ -16,11 +16,12 @@ package models + type ModifySubnetSpec struct { - /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - SubnetName string `json:"subnetName"` + /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + SubnetName string `json:"subnetName"` - /* 子网描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* 子网描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcPeeringSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcPeeringSpec.go index 63732ab3f..056f0f1f5 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcPeeringSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcPeeringSpec.go @@ -16,11 +16,12 @@ package models + type ModifyVpcPeeringSpec struct { - /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - VpcPeeringName string `json:"vpcPeeringName"` + /* VpcPeering的名字,不为空。名称取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + VpcPeeringName string `json:"vpcPeeringName"` - /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - Description string `json:"description"` + /* VpcPeering 描述，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcSpec.go index bfc73b0f1..9c4419843 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/ModifyVpcSpec.go @@ -16,11 +16,12 @@ package models + type ModifyVpcSpec struct { - /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - VpcName string `json:"vpcName"` + /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + VpcName string `json:"vpcName"` - /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAcl.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAcl.go index f4ccb1ca1..422ed1611 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAcl.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAcl.go @@ -16,26 +16,27 @@ package models + type NetworkAcl struct { - /* networkAcl ID (Optional) */ - NetworkAclId string `json:"networkAclId"` + /* networkAcl ID (Optional) */ + NetworkAclId string `json:"networkAclId"` - /* networkAcl名称 (Optional) */ - NetworkAclName string `json:"networkAclName"` + /* networkAcl名称 (Optional) */ + NetworkAclName string `json:"networkAclName"` - /* 私有网络 ID (Optional) */ - VpcId string `json:"vpcId"` + /* 私有网络 ID (Optional) */ + VpcId string `json:"vpcId"` - /* networkAcl规则列表 (Optional) */ - NetworkAclRules []NetworkAclRule `json:"networkAclRules"` + /* networkAcl规则列表 (Optional) */ + NetworkAclRules []NetworkAclRule `json:"networkAclRules"` - /* networkAcl绑定的子网列表 (Optional) */ - SubnetIds []string `json:"subnetIds"` + /* networkAcl绑定的子网列表 (Optional) */ + SubnetIds []string `json:"subnetIds"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` - /* networkAcl创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* networkAcl创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclRule.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclRule.go index 9c3ebcc00..2cd5027b6 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclRule.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclRule.go @@ -16,35 +16,36 @@ package models + type NetworkAclRule struct { - /* networkAcl规则ID (Optional) */ - RuleId string `json:"ruleId"` + /* networkAcl规则ID (Optional) */ + RuleId string `json:"ruleId"` - /* 规则限定协议。取值范围：All,TCP,UDP,ICMP (Optional) */ - Protocol string `json:"protocol"` + /* 规则限定协议。取值范围：All,TCP,UDP,ICMP (Optional) */ + Protocol string `json:"protocol"` - /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - FromPort int `json:"fromPort"` + /* 规则限定起始传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为1，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + FromPort int `json:"fromPort"` - /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ - ToPort int `json:"toPort"` + /* 规则限定终止传输层端口, 取值范围:1-65535, 若protocol为传输层协议，默认值为65535，若protocol不是传输层协议，设置无效，恒为0。如果规则只限定一个端口号，fromPort和toPort填写同一个值 (Optional) */ + ToPort int `json:"toPort"` - /* networkAcl规则方向。ingress：入规则; egress：出规则 (Optional) */ - Direction string `json:"direction"` + /* networkAcl规则方向。ingress：入规则; egress：出规则 (Optional) */ + Direction string `json:"direction"` - /* 匹配地址前缀 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 匹配地址前缀 (Optional) */ + AddressPrefix string `json:"addressPrefix"` - /* 访问控制策略：allow:允许，deny：拒绝 (Optional) */ - RuleAction string `json:"ruleAction"` + /* 访问控制策略：allow:允许，deny：拒绝 (Optional) */ + RuleAction string `json:"ruleAction"` - /* 规则匹配优先级，取值范围为[1,32768]，优先级数字越小优先级越高 (Optional) */ - Priority int `json:"priority"` + /* 规则匹配优先级，取值范围为[1,32768]，优先级数字越小优先级越高 (Optional) */ + Priority int `json:"priority"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` - /* networkAclRule创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* networkAclRule创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclSpec.go index c0c12ce09..9710fddec 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkAclSpec.go @@ -16,14 +16,15 @@ package models + type NetworkAclSpec struct { - /* 私有网络id */ - VpcId string `json:"vpcId"` + /* 私有网络id */ + VpcId string `json:"vpcId"` - /* networkAcl名称 */ - NetworkAclName string `json:"networkAclName"` + /* networkAcl名称 */ + NetworkAclName string `json:"networkAclName"` - /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterface.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterface.go index 750933236..b9fc7244b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterface.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterface.go @@ -16,56 +16,57 @@ package models + type NetworkInterface struct { - /* 弹性网卡名称 (Optional) */ - NetworkInterfaceName string `json:"networkInterfaceName"` + /* 弹性网卡名称 (Optional) */ + NetworkInterfaceName string `json:"networkInterfaceName"` - /* 弹性网卡ID (Optional) */ - NetworkInterfaceId string `json:"networkInterfaceId"` + /* 弹性网卡ID (Optional) */ + NetworkInterfaceId string `json:"networkInterfaceId"` - /* 可用区名称 (Optional) */ - Az string `json:"az"` + /* 可用区名称 (Optional) */ + Az string `json:"az"` - /* 网卡角色，取值范围：Primary（主网卡）、Secondary（辅助网卡） (Optional) */ - Role string `json:"role"` + /* 网卡角色，取值范围：Primary（主网卡）、Secondary（辅助网卡） (Optional) */ + Role string `json:"role"` - /* 以太网地址 (Optional) */ - MacAddress string `json:"macAddress"` + /* 以太网地址 (Optional) */ + MacAddress string `json:"macAddress"` - /* 虚拟网络ID (Optional) */ - VpcId string `json:"vpcId"` + /* 虚拟网络ID (Optional) */ + VpcId string `json:"vpcId"` - /* 子网ID (Optional) */ - SubnetId string `json:"subnetId"` + /* 子网ID (Optional) */ + SubnetId string `json:"subnetId"` - /* 安全组ID列表 (Optional) */ - NetworkSecurityGroupIds []string `json:"networkSecurityGroupIds"` + /* 安全组ID列表 (Optional) */ + NetworkSecurityGroupIds []string `json:"networkSecurityGroupIds"` - /* 源和目标IP地址校验，取值为0或者1 (Optional) */ - SanityCheck int `json:"sanityCheck"` + /* 源和目标IP地址校验，取值为0或者1 (Optional) */ + SanityCheck int `json:"sanityCheck"` - /* 网卡主IP (Optional) */ - PrimaryIp NetworkInterfacePrivateIp `json:"primaryIp"` + /* 网卡主IP (Optional) */ + PrimaryIp NetworkInterfacePrivateIp `json:"primaryIp"` - /* 网卡附属IP列表 (Optional) */ - SecondaryIps []NetworkInterfacePrivateIp `json:"secondaryIps"` + /* 网卡附属IP列表 (Optional) */ + SecondaryIps []NetworkInterfacePrivateIp `json:"secondaryIps"` - /* 关联实例类型，取值范围：vm (Optional) */ - InstanceType string `json:"instanceType"` + /* 关联实例类型，取值范围：vm (Optional) */ + InstanceType string `json:"instanceType"` - /* 关联实例ID (Optional) */ - InstanceId string `json:"instanceId"` + /* 关联实例ID (Optional) */ + InstanceId string `json:"instanceId"` - /* 实例所属的账号 (Optional) */ - InstanceOwnerId string `json:"instanceOwnerId"` + /* 实例所属的账号 (Optional) */ + InstanceOwnerId string `json:"instanceOwnerId"` - /* 网卡在实例上的设备索引号，取值范围：[0,8]，0：辅助网卡未绑定设备，1：主网卡，2-8：辅助网卡已绑定设备 (Optional) */ - DeviceIndex int `json:"deviceIndex"` + /* 网卡在实例上的设备索引号，取值范围：[0,8]，0：辅助网卡未绑定设备，1：主网卡，2-8：辅助网卡已绑定设备 (Optional) */ + DeviceIndex int `json:"deviceIndex"` - /* 网卡描述信息 (Optional) */ - Description string `json:"description"` + /* 网卡描述信息 (Optional) */ + Description string `json:"description"` - /* 弹性网卡创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 弹性网卡创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfacePrivateIp.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfacePrivateIp.go index 762b3ed22..ba235e86a 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfacePrivateIp.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfacePrivateIp.go @@ -16,14 +16,15 @@ package models + type NetworkInterfacePrivateIp struct { - /* 私有IP的IPV4地址 (Optional) */ - PrivateIpAddress string `json:"privateIpAddress"` + /* 私有IP的IPV4地址 (Optional) */ + PrivateIpAddress string `json:"privateIpAddress"` - /* 弹性IP实例ID (Optional) */ - ElasticIpId string `json:"elasticIpId"` + /* 弹性IP实例ID (Optional) */ + ElasticIpId string `json:"elasticIpId"` - /* 弹性IP实例地址 (Optional) */ - ElasticIpAddress string `json:"elasticIpAddress"` + /* 弹性IP实例地址 (Optional) */ + ElasticIpAddress string `json:"elasticIpAddress"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfaceSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfaceSpec.go index 3211c8ac6..75c2909e6 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfaceSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkInterfaceSpec.go @@ -16,32 +16,33 @@ package models + type NetworkInterfaceSpec struct { - /* 子网ID */ - SubnetId string `json:"subnetId"` + /* 子网ID */ + SubnetId string `json:"subnetId"` - /* 可用区，用户的默认可用区 (Optional) */ - Az *string `json:"az"` + /* 可用区，用户的默认可用区 (Optional) */ + Az *string `json:"az"` - /* 网卡名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - NetworkInterfaceName *string `json:"networkInterfaceName"` + /* 网卡名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + NetworkInterfaceName *string `json:"networkInterfaceName"` - /* 网卡主IP，如果不指定，会自动从子网中分配 (Optional) */ - PrimaryIpAddress *string `json:"primaryIpAddress"` + /* 网卡主IP，如果不指定，会自动从子网中分配 (Optional) */ + PrimaryIpAddress *string `json:"primaryIpAddress"` - /* SecondaryIp列表 (Optional) */ - SecondaryIpAddresses []string `json:"secondaryIpAddresses"` + /* SecondaryIp列表 (Optional) */ + SecondaryIpAddresses []string `json:"secondaryIpAddresses"` - /* 自动分配的SecondaryIp数量 (Optional) */ - SecondaryIpCount *int `json:"secondaryIpCount"` + /* 自动分配的SecondaryIp数量 (Optional) */ + SecondaryIpCount *int `json:"secondaryIpCount"` - /* 要绑定的安全组ID列表，最多指定5个安全组 (Optional) */ - SecurityGroups []string `json:"securityGroups"` + /* 要绑定的安全组ID列表，最多指定5个安全组 (Optional) */ + SecurityGroups []string `json:"securityGroups"` - /* 源和目标IP地址校验，取值为0或者1,默认为1 (Optional) */ - SanityCheck *int `json:"sanityCheck"` + /* 源和目标IP地址校验，取值为0或者1,默认为1 (Optional) */ + SanityCheck *int `json:"sanityCheck"` - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description *string `json:"description"` + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description *string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroup.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroup.go index e56ce9a29..406631dfe 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroup.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroup.go @@ -16,23 +16,24 @@ package models + type NetworkSecurityGroup struct { - /* 安全组ID (Optional) */ - NetworkSecurityGroupId string `json:"networkSecurityGroupId"` + /* 安全组ID (Optional) */ + NetworkSecurityGroupId string `json:"networkSecurityGroupId"` - /* 安全组名称 (Optional) */ - NetworkSecurityGroupName string `json:"networkSecurityGroupName"` + /* 安全组名称 (Optional) */ + NetworkSecurityGroupName string `json:"networkSecurityGroupName"` - /* 安全组描述信息 (Optional) */ - Description string `json:"description"` + /* 安全组描述信息 (Optional) */ + Description string `json:"description"` - /* 安全组所在vpc的Id (Optional) */ - VpcId string `json:"vpcId"` + /* 安全组所在vpc的Id (Optional) */ + VpcId string `json:"vpcId"` - /* 安全组规则信息 (Optional) */ - SecurityGroupRules []SecurityGroupRule `json:"securityGroupRules"` + /* 安全组规则信息 (Optional) */ + SecurityGroupRules []SecurityGroupRule `json:"securityGroupRules"` - /* 安全组创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 安全组创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroupSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroupSpec.go index c585ade17..b38e540b4 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroupSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/NetworkSecurityGroupSpec.go @@ -16,14 +16,15 @@ package models + type NetworkSecurityGroupSpec struct { - /* 私有网络ID */ - VpcId string `json:"vpcId"` + /* 私有网络ID */ + VpcId string `json:"vpcId"` - /* 安全组名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - NetworkSecurityGroupName string `json:"networkSecurityGroupName"` + /* 安全组名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + NetworkSecurityGroupName string `json:"networkSecurityGroupName"` - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Quota.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Quota.go index 047723759..cb0f4081f 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Quota.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Quota.go @@ -16,17 +16,18 @@ package models + type Quota struct { - /* 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡） (Optional) */ - Type string `json:"type"` + /* 资源类型，取值范围：vpc、elastic_ip、subnet、security_group、vpcpeering、network_interface（配额只统计辅助网卡） (Optional) */ + Type string `json:"type"` - /* vpc、elastic_ip、network_interface为空, subnet、security_group、vpcpeering为vpcId (Optional) */ - ParentResourceId string `json:"parentResourceId"` + /* vpc、elastic_ip、network_interface为空, subnet、security_group、vpcpeering为vpcId (Optional) */ + ParentResourceId string `json:"parentResourceId"` - /* 配额大小 (Optional) */ - MaxLimit int `json:"maxLimit"` + /* 配额大小 (Optional) */ + MaxLimit int `json:"maxLimit"` - /* 已存在的资源数量 (Optional) */ - Count int `json:"count"` + /* 已存在的资源数量 (Optional) */ + Count int `json:"count"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTable.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTable.go index 70d8b5d54..b7bf11e18 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTable.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTable.go @@ -16,29 +16,30 @@ package models + type RouteTable struct { - /* 路由表ID (Optional) */ - RouteTableId string `json:"routeTableId"` + /* 路由表ID (Optional) */ + RouteTableId string `json:"routeTableId"` - /* 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - RouteTableName string `json:"routeTableName"` + /* 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + RouteTableName string `json:"routeTableName"` - /* 路由表类型，default：默认路由表，custom：自定义路由表 (Optional) */ - RouteTableType string `json:"routeTableType"` + /* 路由表类型，default：默认路由表，custom：自定义路由表 (Optional) */ + RouteTableType string `json:"routeTableType"` - /* 路由表描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* 路由表描述信息，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` - /* 私有网络ID (Optional) */ - VpcId string `json:"vpcId"` + /* 私有网络ID (Optional) */ + VpcId string `json:"vpcId"` - /* 路由表规则信息 (Optional) */ - RouteTableRules []RouteTableRule `json:"routeTableRules"` + /* 路由表规则信息 (Optional) */ + RouteTableRules []RouteTableRule `json:"routeTableRules"` - /* 路由表绑定的子网列表 (Optional) */ - SubnetIds []string `json:"subnetIds"` + /* 路由表绑定的子网列表 (Optional) */ + SubnetIds []string `json:"subnetIds"` - /* 路由表创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 路由表创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableRule.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableRule.go index 9d282f6ba..049d9b766 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableRule.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableRule.go @@ -16,20 +16,21 @@ package models + type RouteTableRule struct { - /* 路由表规则ID (Optional) */ - RuleId string `json:"ruleId"` + /* 路由表规则ID (Optional) */ + RuleId string `json:"ruleId"` - /* 规则匹配优先级，取值范围[1,255]，默认为100。当路由规则子网掩码不同时，路由最长匹配优先；当路由规则子网掩码相同时, 按照优先级匹配转发, 优先级数字越小优先级越高，路由规则子网掩码相同、优先级相同、下一跳不同时，形成等价路由，不同下一跳负载均担。 (Optional) */ - Priority int `json:"priority"` + /* 规则匹配优先级，取值范围[1,255]，默认为100。当路由规则子网掩码不同时，路由最长匹配优先；当路由规则子网掩码相同时, 按照优先级匹配转发, 优先级数字越小优先级越高，路由规则子网掩码相同、优先级相同、下一跳不同时，形成等价路由，不同下一跳负载均担。 (Optional) */ + Priority int `json:"priority"` - /* 下一跳类型, 取值范围:local:本地, instance:云主机, internet:公网, vpc_peering:vpc对等连接, bgw:边界网关 (Optional) */ - NextHopType string `json:"nextHopType"` + /* 下一跳类型, 取值范围:local:本地, instance:云主机, internet:公网, vpc_peering:vpc对等连接, bgw:边界网关 (Optional) */ + NextHopType string `json:"nextHopType"` - /* 下一跳id (Optional) */ - NextHopId string `json:"nextHopId"` + /* 下一跳id (Optional) */ + NextHopId string `json:"nextHopId"` - /* 匹配地址前缀, internet类型路由跟其他类型的路由，addressPrefix不允许重复 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 匹配地址前缀, internet类型路由跟其他类型的路由，addressPrefix不允许重复 (Optional) */ + AddressPrefix string `json:"addressPrefix"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableSpec.go index 871a63bc0..c91f16c6c 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/RouteTableSpec.go @@ -16,14 +16,15 @@ package models + type RouteTableSpec struct { - /* 路由表所属的私有网络ID */ - VpcId string `json:"vpcId"` + /* 路由表所属的私有网络ID */ + VpcId string `json:"vpcId"` - /* 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - RouteTableName string `json:"routeTableName"` + /* 路由表名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + RouteTableName string `json:"routeTableName"` - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SecurityGroupRule.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SecurityGroupRule.go index 76aefe6e2..74ba05afd 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SecurityGroupRule.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SecurityGroupRule.go @@ -16,32 +16,33 @@ package models + type SecurityGroupRule struct { - /* 安全组规则ID (Optional) */ - RuleId string `json:"ruleId"` + /* 安全组规则ID (Optional) */ + RuleId string `json:"ruleId"` - /* 安全组规则方向。0：入规则; 1：出规则 (Optional) */ - Direction int `json:"direction"` + /* 安全组规则方向。0：入规则; 1：出规则 (Optional) */ + Direction int `json:"direction"` - /* 规则限定协议。300:All; 6:TCP; 17:UDP; 1:ICMP (Optional) */ - Protocol int `json:"protocol"` + /* 规则限定协议。300:All; 6:TCP; 17:UDP; 1:ICMP (Optional) */ + Protocol int `json:"protocol"` - /* 匹配地址前缀 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 匹配地址前缀 (Optional) */ + AddressPrefix string `json:"addressPrefix"` - /* 匹配地址协议版本。4：IPv4 (Optional) */ - IpVersion int `json:"ipVersion"` + /* 匹配地址协议版本。4：IPv4 (Optional) */ + IpVersion int `json:"ipVersion"` - /* 规则限定起始传输层端口, 默认1 ，若protocal不是传输层协议，恒为0 (Optional) */ - FromPort int `json:"fromPort"` + /* 规则限定起始传输层端口, 默认1 ，若protocal不是传输层协议，恒为0 (Optional) */ + FromPort int `json:"fromPort"` - /* 规则限定终止传输层端口, 默认1 ，若protocal不是传输层协议，恒为0 (Optional) */ - ToPort int `json:"toPort"` + /* 规则限定终止传输层端口, 默认1 ，若protocal不是传输层协议，恒为0 (Optional) */ + ToPort int `json:"toPort"` - /* 安全组规则创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 安全组规则创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` - /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ - Description string `json:"description"` + /* 描述,​ 允许输入UTF-8编码下的全部字符，不超过256字符 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Segment.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Segment.go index 9a9bba890..875486ad1 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Segment.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Segment.go @@ -16,29 +16,30 @@ package models + type Segment struct { - /* 网段的Id (Optional) */ - SegmentId string `json:"segmentId"` + /* 网段的Id (Optional) */ + SegmentId string `json:"segmentId"` - /* 网段名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ - SegmentName string `json:"segmentName"` + /* 网段名称，只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 (Optional) */ + SegmentName string `json:"segmentName"` - /* 网段描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* 网段描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` - /* 网络地址段 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 网络地址段 (Optional) */ + AddressPrefix string `json:"addressPrefix"` - /* 网段可用ip数量 (Optional) */ - AvailableIpCount int `json:"availableIpCount"` + /* 网段可用ip数量 (Optional) */ + AvailableIpCount int `json:"availableIpCount"` - /* IP服务商，取值为bgp或no_bgp，cn-north-1：bgp；cn-south-1：[bgp，no_bgp]；cn-east-1：[bgp，no_bgp]；cn-east-2：bgp (Optional) */ - Provider string `json:"provider"` + /* IP服务商，取值为bgp或no_bgp，cn-north-1：bgp；cn-south-1：[bgp，no_bgp]；cn-east-1：[bgp，no_bgp]；cn-east-2：bgp (Optional) */ + Provider string `json:"provider"` - /* 网段的起始地址 (Optional) */ - StartIp string `json:"startIp"` + /* 网段的起始地址 (Optional) */ + StartIp string `json:"startIp"` - /* 网段的结束地址 (Optional) */ - EndIp string `json:"endIp"` + /* 网段的结束地址 (Optional) */ + EndIp string `json:"endIp"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Subnet.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Subnet.go index 902ed9c94..9bd241dae 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Subnet.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Subnet.go @@ -16,38 +16,39 @@ package models + type Subnet struct { - /* Subnet的Id (Optional) */ - SubnetId string `json:"subnetId"` + /* Subnet的Id (Optional) */ + SubnetId string `json:"subnetId"` - /* 子网名称 (Optional) */ - SubnetName string `json:"subnetName"` + /* 子网名称 (Optional) */ + SubnetName string `json:"subnetName"` - /* 子网所属VPC的Id (Optional) */ - VpcId string `json:"vpcId"` + /* 子网所属VPC的Id (Optional) */ + VpcId string `json:"vpcId"` - /* 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果VPC含有Cidr，则必须为VPC所在Cidr的子网 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果VPC含有Cidr，则必须为VPC所在Cidr的子网 (Optional) */ + AddressPrefix string `json:"addressPrefix"` - /* 子网可用ip数量 (Optional) */ - AvailableIpCount int `json:"availableIpCount"` + /* 子网可用ip数量 (Optional) */ + AvailableIpCount int `json:"availableIpCount"` - /* 子网描述信息 (Optional) */ - Description string `json:"description"` + /* 子网描述信息 (Optional) */ + Description string `json:"description"` - /* 子网关联的路由表Id (Optional) */ - RouteTableId string `json:"routeTableId"` + /* 子网关联的路由表Id (Optional) */ + RouteTableId string `json:"routeTableId"` - /* 子网关联的acl Id (Optional) */ - AclId string `json:"aclId"` + /* 子网关联的acl Id (Optional) */ + AclId string `json:"aclId"` - /* 子网的起始地址，子网第1个地位为路由器网关保留，第2个地址为dhcp服务保留 (Optional) */ - StartIp string `json:"startIp"` + /* 子网的起始地址，子网第1个地位为路由器网关保留，第2个地址为dhcp服务保留 (Optional) */ + StartIp string `json:"startIp"` - /* 子网的结束地址，子网第1个地位为路由器网关保留，第2个地址为dhcp服务保留 (Optional) */ - EndIp string `json:"endIp"` + /* 子网的结束地址，子网第1个地位为路由器网关保留，第2个地址为dhcp服务保留 (Optional) */ + EndIp string `json:"endIp"` - /* 子网创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* 子网创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SubnetSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SubnetSpec.go index 07fb7eb64..611a18910 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SubnetSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/SubnetSpec.go @@ -16,20 +16,21 @@ package models + type SubnetSpec struct { - /* 子网所属vpc的Id */ - VpcId string `json:"vpcId"` + /* 子网所属vpc的Id */ + VpcId string `json:"vpcId"` - /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - SubnetName string `json:"subnetName"` + /* 子网名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + SubnetName string `json:"subnetName"` - /* 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果vpc含有cidr，则必须为vpc所在cidr的子网 */ - AddressPrefix string `json:"addressPrefix"` + /* 子网网段，vpc内子网网段不能重叠，cidr的取值范围：10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间，如果vpc含有cidr，则必须为vpc所在cidr的子网 */ + AddressPrefix string `json:"addressPrefix"` - /* 子网关联的路由表Id, 默认为vpc的默认路由表 (Optional) */ - RouteTableId string `json:"routeTableId"` + /* 子网关联的路由表Id, 默认为vpc的默认路由表 (Optional) */ + RouteTableId string `json:"routeTableId"` - /* 子网描述信息,允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* 子网描述信息,允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/UnassignSecondaryIpsSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/UnassignSecondaryIpsSpec.go index 3f34882cd..ba3a12e19 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/UnassignSecondaryIpsSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/UnassignSecondaryIpsSpec.go @@ -16,8 +16,9 @@ package models + type UnassignSecondaryIpsSpec struct { - /* 指定删除的secondaryIp地址 (Optional) */ - SecondaryIps []string `json:"secondaryIps"` + /* 指定删除的secondaryIp地址 (Optional) */ + SecondaryIps []string `json:"secondaryIps"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Vpc.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Vpc.go index 151d884ef..896b3341b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Vpc.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/Vpc.go @@ -16,29 +16,30 @@ package models + type Vpc struct { - /* Vpc的Id (Optional) */ - VpcId string `json:"vpcId"` + /* Vpc的Id (Optional) */ + VpcId string `json:"vpcId"` - /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ + AddressPrefix string `json:"addressPrefix"` - /* VPC 描述，取值范围：1~120个字符 (Optional) */ - Description string `json:"description"` + /* VPC 描述，取值范围：1~120个字符 (Optional) */ + Description string `json:"description"` - /* 私有网络名称，取值范围：1-60个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - VpcName string `json:"vpcName"` + /* 私有网络名称，取值范围：1-60个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + VpcName string `json:"vpcName"` - /* 同一vpc下的acl id 列表 (Optional) */ - AclIds []string `json:"aclIds"` + /* 同一vpc下的acl id 列表 (Optional) */ + AclIds []string `json:"aclIds"` - /* (Optional) */ - RouteTableIds []string `json:"routeTableIds"` + /* (Optional) */ + RouteTableIds []string `json:"routeTableIds"` - /* 私有网络包含的子网列表 (Optional) */ - Subnets []Subnet `json:"subnets"` + /* 私有网络包含的子网列表 (Optional) */ + Subnets []Subnet `json:"subnets"` - /* vpc创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* vpc创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeering.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeering.go index e5436fd35..e6245b759 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeering.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeering.go @@ -16,26 +16,27 @@ package models + type VpcPeering struct { - /* VpcPeering的Id (Optional) */ - VpcPeeringId string `json:"vpcPeeringId"` + /* VpcPeering的Id (Optional) */ + VpcPeeringId string `json:"vpcPeeringId"` - /* VpcPeering名称，同账号下不允许重名，取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - VpcPeeringName string `json:"vpcPeeringName"` + /* VpcPeering名称，同账号下不允许重名，取值范围：1-32个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + VpcPeeringName string `json:"vpcPeeringName"` - /* 状态，取值为Connected，Disconnected，Initiated (Optional) */ - VpcPeeringState string `json:"vpcPeeringState"` + /* 状态，取值为Connected，Disconnected，Initiated (Optional) */ + VpcPeeringState string `json:"vpcPeeringState"` - /* VpcPeering 描述，可为空值，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - Description string `json:"description"` + /* VpcPeering 描述，可为空值，取值范围：0-256个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + Description string `json:"description"` - /* 发起VpcPeering的Vpc信息 (Optional) */ - VpcInfo VpcPeeringVpcInfo `json:"vpcInfo"` + /* 发起VpcPeering的Vpc信息 (Optional) */ + VpcInfo VpcPeeringVpcInfo `json:"vpcInfo"` - /* 对端的Vpc信息 (Optional) */ - RemoteVpcInfo VpcPeeringVpcInfo `json:"remoteVpcInfo"` + /* 对端的Vpc信息 (Optional) */ + RemoteVpcInfo VpcPeeringVpcInfo `json:"remoteVpcInfo"` - /* VpcPeering创建时间 (Optional) */ - CreatedTime string `json:"createdTime"` + /* VpcPeering创建时间 (Optional) */ + CreatedTime string `json:"createdTime"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeeringVpcInfo.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeeringVpcInfo.go index a3a8da0ca..4581b43e9 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeeringVpcInfo.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcPeeringVpcInfo.go @@ -16,14 +16,15 @@ package models + type VpcPeeringVpcInfo struct { - /* 子网所属VPC的Id (Optional) */ - VpcId string `json:"vpcId"` + /* 子网所属VPC的Id (Optional) */ + VpcId string `json:"vpcId"` - /* 私有网络名称，取值范围：1-60个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ - VpcName string `json:"vpcName"` + /* 私有网络名称，取值范围：1-60个中文、英文大小写的字母、数字和下划线分隔符 (Optional) */ + VpcName string `json:"vpcName"` - /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ - AddressPrefix []string `json:"addressPrefix"` + /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ + AddressPrefix []string `json:"addressPrefix"` } diff --git a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcSpec.go b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcSpec.go index b0a1e6396..f9f4f9e1b 100644 --- a/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcSpec.go +++ b/vendor/github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/models/VpcSpec.go @@ -16,14 +16,15 @@ package models + type VpcSpec struct { - /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ - VpcName string `json:"vpcName"` + /* 私有网络名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符。 */ + VpcName string `json:"vpcName"` - /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ - AddressPrefix string `json:"addressPrefix"` + /* 如果为空，则不限制网段，如果不为空，10.0.0.0/8、172.16.0.0/12和192.168.0.0/16及它们包含的子网，且子网掩码长度为16-28之间 (Optional) */ + AddressPrefix string `json:"addressPrefix"` - /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ - Description string `json:"description"` + /* vpc描述，允许输入UTF-8编码下的全部字符，不超过256字符。 (Optional) */ + Description string `json:"description"` } diff --git a/vendor/github.com/masterzen/simplexml/dom/document.go b/vendor/github.com/masterzen/simplexml/dom/document.go index 783587df7..e871c35a3 100644 --- a/vendor/github.com/masterzen/simplexml/dom/document.go +++ b/vendor/github.com/masterzen/simplexml/dom/document.go @@ -6,14 +6,14 @@ import ( ) type Document struct { - root *Element + root *Element PrettyPrint bool Indentation string - DocType bool + DocType bool } func CreateDocument() *Document { - return &Document{PrettyPrint: false, Indentation: " ", DocType: true} + return &Document{ PrettyPrint: false, Indentation: " ", DocType: true } } func (doc *Document) SetRoot(node *Element) { @@ -26,10 +26,10 @@ func (doc *Document) String() string { if doc.DocType { fmt.Fprintln(&b, ``) } - + if doc.root != nil { doc.root.Bytes(&b, doc.PrettyPrint, doc.Indentation, 0) } - + return string(b.Bytes()) -} +} \ No newline at end of file diff --git a/vendor/github.com/masterzen/simplexml/dom/element.go b/vendor/github.com/masterzen/simplexml/dom/element.go index c5708bbc1..1ea16cc97 100644 --- a/vendor/github.com/masterzen/simplexml/dom/element.go +++ b/vendor/github.com/masterzen/simplexml/dom/element.go @@ -1,9 +1,9 @@ package dom import ( - "bytes" "encoding/xml" "fmt" + "bytes" ) type Attr struct { @@ -12,20 +12,20 @@ type Attr struct { } type Element struct { - name xml.Name - children []*Element - parent *Element - content string + name xml.Name + children []*Element + parent *Element + content string attributes []*Attr namespaces []*Namespace - document *Document + document *Document } func CreateElement(n string) *Element { - element := &Element{name: xml.Name{Local: n}} + element := &Element { name: xml.Name { Local: n } } element.children = make([]*Element, 0, 5) element.attributes = make([]*Attr, 0, 10) - element.namespaces = make([]*Namespace, 0, 10) + element.namespaces = make([]*Namespace, 0, 10) return element } @@ -59,7 +59,7 @@ func (node *Element) RemoveChild(child *Element) *Element { func (node *Element) SetAttr(name string, value string) *Element { // namespaces? - attr := &Attr{Name: xml.Name{Local: name}, Value: value} + attr := &Attr{ Name: xml.Name { Local: name }, Value: value } node.attributes = append(node.attributes, attr) return node } @@ -67,18 +67,18 @@ func (node *Element) SetAttr(name string, value string) *Element { func (node *Element) SetParent(parent *Element) *Element { node.parent = parent return node -} +} func (node *Element) SetContent(content string) *Element { node.content = content return node -} +} // Add a namespace declaration to this node func (node *Element) DeclareNamespace(ns Namespace) *Element { // check if we already have it prefix := node.namespacePrefix(ns.Uri) - if prefix == ns.Prefix { + if prefix == ns.Prefix { return node } // add it @@ -94,7 +94,7 @@ func (node *Element) SetNamespace(prefix string, uri string) { resolved := node.namespacePrefix(uri) if resolved == "" { // we couldn't find the namespace, let's declare it at this node - node.namespaces = append(node.namespaces, &Namespace{Prefix: prefix, Uri: uri}) + node.namespaces = append(node.namespaces, &Namespace { Prefix: prefix, Uri: uri }) } node.name.Space = uri } @@ -102,19 +102,19 @@ func (node *Element) SetNamespace(prefix string, uri string) { func (node *Element) Bytes(out *bytes.Buffer, indent bool, indentType string, level int) { empty := len(node.children) == 0 && node.content == "" content := node.content != "" - // children := len(node.children) > 0 - // ns := len(node.namespaces) > 0 - // attrs := len(node.attributes) > 0 - +// children := len(node.children) > 0 +// ns := len(node.namespaces) > 0 +// attrs := len(node.attributes) > 0 + indentStr := "" nextLine := "" if indent { nextLine = "\n" for i := 0; i < level; i++ { - indentStr += indentType + indentStr += indentType } } - + if node.name.Local != "" { if len(node.name.Space) > 0 { // first find if ns has been declared, otherwise @@ -124,7 +124,7 @@ func (node *Element) Bytes(out *bytes.Buffer, indent bool, indentType string, le fmt.Fprintf(out, "%s<%s", indentStr, node.name.Local) } } - + // declared namespaces for _, v := range node.namespaces { prefix := node.namespacePrefix(v.Uri) @@ -140,7 +140,7 @@ func (node *Element) Bytes(out *bytes.Buffer, indent bool, indentType string, le fmt.Fprintf(out, ` %s="%s"`, v.Name.Local, v.Value) } } - + // close tag if empty { fmt.Fprintf(out, "/>%s", nextLine) @@ -148,20 +148,20 @@ func (node *Element) Bytes(out *bytes.Buffer, indent bool, indentType string, le if content { out.WriteRune('>') } else { - fmt.Fprintf(out, ">%s", nextLine) + fmt.Fprintf(out, ">%s", nextLine) } } - + if len(node.children) > 0 { for _, child := range node.children { - child.Bytes(out, indent, indentType, level+1) + child.Bytes(out, indent, indentType, level + 1) } } else if node.content != "" { //val := []byte(node.content) //xml.EscapeText(out, val) out.WriteString(node.content) } - + if !empty && len(node.name.Local) > 0 { var indentation string if content { @@ -192,8 +192,9 @@ func (node *Element) namespacePrefix(uri string) string { return node.parent.namespacePrefix(uri) } + func (node *Element) String() string { var b bytes.Buffer node.Bytes(&b, false, "", 0) return string(b.Bytes()) -} +} \ No newline at end of file diff --git a/vendor/github.com/masterzen/winrm/ntlm.go b/vendor/github.com/masterzen/winrm/ntlm.go index 20debcb31..08de8a522 100644 --- a/vendor/github.com/masterzen/winrm/ntlm.go +++ b/vendor/github.com/masterzen/winrm/ntlm.go @@ -23,10 +23,11 @@ func (c ClientNTLM) Post(client *Client, request *soap.SoapMessage) (string, err return c.clientRequest.Post(client, request) } + func NewClientNTLMWithDial(dial func(network, addr string) (net.Conn, error)) *ClientNTLM { return &ClientNTLM{ clientRequest{ - dial: dial, + dial:dial, }, } -} +} \ No newline at end of file diff --git a/vendor/github.com/mattn/go-tty/tty_plan9.go b/vendor/github.com/mattn/go-tty/tty_plan9.go index 2c31c33d2..8aed66806 100644 --- a/vendor/github.com/mattn/go-tty/tty_plan9.go +++ b/vendor/github.com/mattn/go-tty/tty_plan9.go @@ -2,9 +2,9 @@ package tty import ( "bufio" - "errors" "os" "syscall" + "errors" ) type TTY struct { diff --git a/vendor/github.com/mattn/go-tty/tty_windows.go b/vendor/github.com/mattn/go-tty/tty_windows.go index 22b538cdf..eb3e248d1 100644 --- a/vendor/github.com/mattn/go-tty/tty_windows.go +++ b/vendor/github.com/mattn/go-tty/tty_windows.go @@ -4,8 +4,8 @@ package tty import ( "context" - "errors" "os" + "errors" "syscall" "unsafe" diff --git a/vendor/github.com/mitchellh/go-vnc/client_auth.go b/vendor/github.com/mitchellh/go-vnc/client_auth.go index 601e470ed..4ae7be9fc 100644 --- a/vendor/github.com/mitchellh/go-vnc/client_auth.go +++ b/vendor/github.com/mitchellh/go-vnc/client_auth.go @@ -46,7 +46,7 @@ func (p *PasswordAuth) Handshake(c net.Conn) error { crypted, err := p.encrypt(p.Password, randomValue) - if err != nil { + if (err != nil) { return err } @@ -97,7 +97,7 @@ func (p *PasswordAuth) reverseBits(b byte) byte { } func (p *PasswordAuth) encrypt(key string, bytes []byte) ([]byte, error) { - keyBytes := []byte{0, 0, 0, 0, 0, 0, 0, 0} + keyBytes := []byte{0,0,0,0,0,0,0,0} if len(key) > 8 { key = key[:8] diff --git a/vendor/github.com/modern-go/concurrent/log.go b/vendor/github.com/modern-go/concurrent/log.go index 4899eed02..9756fcc75 100644 --- a/vendor/github.com/modern-go/concurrent/log.go +++ b/vendor/github.com/modern-go/concurrent/log.go @@ -1,13 +1,13 @@ package concurrent import ( - "io/ioutil" - "log" "os" + "log" + "io/ioutil" ) // ErrorLogger is used to print out error, can be set to writer other than stderr var ErrorLogger = log.New(os.Stderr, "", 0) // InfoLogger is used to print informational message, default to off -var InfoLogger = log.New(ioutil.Discard, "", 0) +var InfoLogger = log.New(ioutil.Discard, "", 0) \ No newline at end of file diff --git a/vendor/github.com/modern-go/concurrent/unbounded_executor.go b/vendor/github.com/modern-go/concurrent/unbounded_executor.go index 5ea18eb7b..05a77dceb 100644 --- a/vendor/github.com/modern-go/concurrent/unbounded_executor.go +++ b/vendor/github.com/modern-go/concurrent/unbounded_executor.go @@ -3,11 +3,11 @@ package concurrent import ( "context" "fmt" - "reflect" "runtime" "runtime/debug" "sync" "time" + "reflect" ) // HandlePanic logs goroutine panic by default diff --git a/vendor/github.com/modern-go/reflect2/reflect2.go b/vendor/github.com/modern-go/reflect2/reflect2.go index 4fe9a5965..63b49c799 100644 --- a/vendor/github.com/modern-go/reflect2/reflect2.go +++ b/vendor/github.com/modern-go/reflect2/reflect2.go @@ -136,7 +136,7 @@ type frozenConfig struct { func (cfg Config) Froze() *frozenConfig { return &frozenConfig{ useSafeImplementation: cfg.UseSafeImplementation, - cache: concurrent.NewMap(), + cache: concurrent.NewMap(), } } @@ -291,8 +291,8 @@ func UnsafeCastString(str string) []byte { stringHeader := (*reflect.StringHeader)(unsafe.Pointer(&str)) sliceHeader := &reflect.SliceHeader{ Data: stringHeader.Data, - Cap: stringHeader.Len, - Len: stringHeader.Len, + Cap: stringHeader.Len, + Len: stringHeader.Len, } return *(*[]byte)(unsafe.Pointer(sliceHeader)) } diff --git a/vendor/github.com/nu7hatch/gouuid/uuid.go b/vendor/github.com/nu7hatch/gouuid/uuid.go index ca960aa96..ac9623b72 100644 --- a/vendor/github.com/nu7hatch/gouuid/uuid.go +++ b/vendor/github.com/nu7hatch/gouuid/uuid.go @@ -16,7 +16,7 @@ import ( "regexp" ) -// The UUID reserved variants. +// The UUID reserved variants. const ( ReservedNCS byte = 0x80 ReservedRFC4122 byte = 0x40 diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_access_key.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_access_key.go index e02ac7800..27d8a6215 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_access_key.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_access_key.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type AccessKeyApiService service // CreateAccessKeyOpts Optional parameters for the method 'CreateAccessKey' type CreateAccessKeyOpts struct { - CreateAccessKeyRequest optional.Interface + CreateAccessKeyRequest optional.Interface } /* CreateAccessKey Method for CreateAccessKey * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateAccessKeyOpts - Optional Parameters: - * @param "CreateAccessKeyRequest" (optional.Interface of CreateAccessKeyRequest) - + * @param "CreateAccessKeyRequest" (optional.Interface of CreateAccessKeyRequest) - @return CreateAccessKeyResponse */ func (a *AccessKeyApiService) CreateAccessKey(ctx _context.Context, localVarOptionals *CreateAccessKeyOpts) (CreateAccessKeyResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *AccessKeyApiService) CreateAccessKey(ctx _context.Context, localVarOpti // DeleteAccessKeyOpts Optional parameters for the method 'DeleteAccessKey' type DeleteAccessKeyOpts struct { - DeleteAccessKeyRequest optional.Interface + DeleteAccessKeyRequest optional.Interface } /* DeleteAccessKey Method for DeleteAccessKey * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteAccessKeyOpts - Optional Parameters: - * @param "DeleteAccessKeyRequest" (optional.Interface of DeleteAccessKeyRequest) - + * @param "DeleteAccessKeyRequest" (optional.Interface of DeleteAccessKeyRequest) - @return DeleteAccessKeyResponse */ func (a *AccessKeyApiService) DeleteAccessKey(ctx _context.Context, localVarOptionals *DeleteAccessKeyOpts) (DeleteAccessKeyResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *AccessKeyApiService) DeleteAccessKey(ctx _context.Context, localVarOpti // ReadAccessKeysOpts Optional parameters for the method 'ReadAccessKeys' type ReadAccessKeysOpts struct { - ReadAccessKeysRequest optional.Interface + ReadAccessKeysRequest optional.Interface } /* ReadAccessKeys Method for ReadAccessKeys * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadAccessKeysOpts - Optional Parameters: - * @param "ReadAccessKeysRequest" (optional.Interface of ReadAccessKeysRequest) - + * @param "ReadAccessKeysRequest" (optional.Interface of ReadAccessKeysRequest) - @return ReadAccessKeysResponse */ func (a *AccessKeyApiService) ReadAccessKeys(ctx _context.Context, localVarOptionals *ReadAccessKeysOpts) (ReadAccessKeysResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *AccessKeyApiService) ReadAccessKeys(ctx _context.Context, localVarOptio // ReadSecretAccessKeyOpts Optional parameters for the method 'ReadSecretAccessKey' type ReadSecretAccessKeyOpts struct { - ReadSecretAccessKeyRequest optional.Interface + ReadSecretAccessKeyRequest optional.Interface } /* ReadSecretAccessKey Method for ReadSecretAccessKey * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadSecretAccessKeyOpts - Optional Parameters: - * @param "ReadSecretAccessKeyRequest" (optional.Interface of ReadSecretAccessKeyRequest) - + * @param "ReadSecretAccessKeyRequest" (optional.Interface of ReadSecretAccessKeyRequest) - @return ReadSecretAccessKeyResponse */ func (a *AccessKeyApiService) ReadSecretAccessKey(ctx _context.Context, localVarOptionals *ReadSecretAccessKeyOpts) (ReadSecretAccessKeyResponse, *_nethttp.Response, error) { @@ -472,14 +472,14 @@ func (a *AccessKeyApiService) ReadSecretAccessKey(ctx _context.Context, localVar // UpdateAccessKeyOpts Optional parameters for the method 'UpdateAccessKey' type UpdateAccessKeyOpts struct { - UpdateAccessKeyRequest optional.Interface + UpdateAccessKeyRequest optional.Interface } /* UpdateAccessKey Method for UpdateAccessKey * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateAccessKeyOpts - Optional Parameters: - * @param "UpdateAccessKeyRequest" (optional.Interface of UpdateAccessKeyRequest) - + * @param "UpdateAccessKeyRequest" (optional.Interface of UpdateAccessKeyRequest) - @return UpdateAccessKeyResponse */ func (a *AccessKeyApiService) UpdateAccessKey(ctx _context.Context, localVarOptionals *UpdateAccessKeyOpts) (UpdateAccessKeyResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_account.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_account.go index 2173ded68..0a6cfd046 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_account.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_account.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type AccountApiService service // CheckAuthenticationOpts Optional parameters for the method 'CheckAuthentication' type CheckAuthenticationOpts struct { - CheckAuthenticationRequest optional.Interface + CheckAuthenticationRequest optional.Interface } /* CheckAuthentication Method for CheckAuthentication * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CheckAuthenticationOpts - Optional Parameters: - * @param "CheckAuthenticationRequest" (optional.Interface of CheckAuthenticationRequest) - + * @param "CheckAuthenticationRequest" (optional.Interface of CheckAuthenticationRequest) - @return CheckAuthenticationResponse */ func (a *AccountApiService) CheckAuthentication(ctx _context.Context, localVarOptionals *CheckAuthenticationOpts) (CheckAuthenticationResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *AccountApiService) CheckAuthentication(ctx _context.Context, localVarOp // CreateAccountOpts Optional parameters for the method 'CreateAccount' type CreateAccountOpts struct { - CreateAccountRequest optional.Interface + CreateAccountRequest optional.Interface } /* CreateAccount Method for CreateAccount * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateAccountOpts - Optional Parameters: - * @param "CreateAccountRequest" (optional.Interface of CreateAccountRequest) - + * @param "CreateAccountRequest" (optional.Interface of CreateAccountRequest) - @return CreateAccountResponse */ func (a *AccountApiService) CreateAccount(ctx _context.Context, localVarOptionals *CreateAccountOpts) (CreateAccountResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *AccountApiService) CreateAccount(ctx _context.Context, localVarOptional // ReadAccountsOpts Optional parameters for the method 'ReadAccounts' type ReadAccountsOpts struct { - ReadAccountsRequest optional.Interface + ReadAccountsRequest optional.Interface } /* ReadAccounts Method for ReadAccounts * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadAccountsOpts - Optional Parameters: - * @param "ReadAccountsRequest" (optional.Interface of ReadAccountsRequest) - + * @param "ReadAccountsRequest" (optional.Interface of ReadAccountsRequest) - @return ReadAccountsResponse */ func (a *AccountApiService) ReadAccounts(ctx _context.Context, localVarOptionals *ReadAccountsOpts) (ReadAccountsResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *AccountApiService) ReadAccounts(ctx _context.Context, localVarOptionals // ResetAccountPasswordOpts Optional parameters for the method 'ResetAccountPassword' type ResetAccountPasswordOpts struct { - ResetAccountPasswordRequest optional.Interface + ResetAccountPasswordRequest optional.Interface } /* ResetAccountPassword Method for ResetAccountPassword * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ResetAccountPasswordOpts - Optional Parameters: - * @param "ResetAccountPasswordRequest" (optional.Interface of ResetAccountPasswordRequest) - + * @param "ResetAccountPasswordRequest" (optional.Interface of ResetAccountPasswordRequest) - @return ResetAccountPasswordResponse */ func (a *AccountApiService) ResetAccountPassword(ctx _context.Context, localVarOptionals *ResetAccountPasswordOpts) (ResetAccountPasswordResponse, *_nethttp.Response, error) { @@ -472,14 +472,14 @@ func (a *AccountApiService) ResetAccountPassword(ctx _context.Context, localVarO // SendResetPasswordEmailOpts Optional parameters for the method 'SendResetPasswordEmail' type SendResetPasswordEmailOpts struct { - SendResetPasswordEmailRequest optional.Interface + SendResetPasswordEmailRequest optional.Interface } /* SendResetPasswordEmail Method for SendResetPasswordEmail * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *SendResetPasswordEmailOpts - Optional Parameters: - * @param "SendResetPasswordEmailRequest" (optional.Interface of SendResetPasswordEmailRequest) - + * @param "SendResetPasswordEmailRequest" (optional.Interface of SendResetPasswordEmailRequest) - @return SendResetPasswordEmailResponse */ func (a *AccountApiService) SendResetPasswordEmail(ctx _context.Context, localVarOptionals *SendResetPasswordEmailOpts) (SendResetPasswordEmailResponse, *_nethttp.Response, error) { @@ -583,14 +583,14 @@ func (a *AccountApiService) SendResetPasswordEmail(ctx _context.Context, localVa // UpdateAccountOpts Optional parameters for the method 'UpdateAccount' type UpdateAccountOpts struct { - UpdateAccountRequest optional.Interface + UpdateAccountRequest optional.Interface } /* UpdateAccount Method for UpdateAccount * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateAccountOpts - Optional Parameters: - * @param "UpdateAccountRequest" (optional.Interface of UpdateAccountRequest) - + * @param "UpdateAccountRequest" (optional.Interface of UpdateAccountRequest) - @return UpdateAccountResponse */ func (a *AccountApiService) UpdateAccount(ctx _context.Context, localVarOptionals *UpdateAccountOpts) (UpdateAccountResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_api_log.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_api_log.go index 131eba298..92d6d1c86 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_api_log.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_api_log.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type ApiLogApiService service // ReadApiLogsOpts Optional parameters for the method 'ReadApiLogs' type ReadApiLogsOpts struct { - ReadApiLogsRequest optional.Interface + ReadApiLogsRequest optional.Interface } /* ReadApiLogs Method for ReadApiLogs * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadApiLogsOpts - Optional Parameters: - * @param "ReadApiLogsRequest" (optional.Interface of ReadApiLogsRequest) - + * @param "ReadApiLogsRequest" (optional.Interface of ReadApiLogsRequest) - @return ReadApiLogsResponse */ func (a *ApiLogApiService) ReadApiLogs(ctx _context.Context, localVarOptionals *ReadApiLogsOpts) (ReadApiLogsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_client_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_client_gateway.go index 164354f96..c71cbda03 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_client_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_client_gateway.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type ClientGatewayApiService service // CreateClientGatewayOpts Optional parameters for the method 'CreateClientGateway' type CreateClientGatewayOpts struct { - CreateClientGatewayRequest optional.Interface + CreateClientGatewayRequest optional.Interface } /* CreateClientGateway Method for CreateClientGateway * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateClientGatewayOpts - Optional Parameters: - * @param "CreateClientGatewayRequest" (optional.Interface of CreateClientGatewayRequest) - + * @param "CreateClientGatewayRequest" (optional.Interface of CreateClientGatewayRequest) - @return CreateClientGatewayResponse */ func (a *ClientGatewayApiService) CreateClientGateway(ctx _context.Context, localVarOptionals *CreateClientGatewayOpts) (CreateClientGatewayResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *ClientGatewayApiService) CreateClientGateway(ctx _context.Context, loca // DeleteClientGatewayOpts Optional parameters for the method 'DeleteClientGateway' type DeleteClientGatewayOpts struct { - DeleteClientGatewayRequest optional.Interface + DeleteClientGatewayRequest optional.Interface } /* DeleteClientGateway Method for DeleteClientGateway * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteClientGatewayOpts - Optional Parameters: - * @param "DeleteClientGatewayRequest" (optional.Interface of DeleteClientGatewayRequest) - + * @param "DeleteClientGatewayRequest" (optional.Interface of DeleteClientGatewayRequest) - @return DeleteClientGatewayResponse */ func (a *ClientGatewayApiService) DeleteClientGateway(ctx _context.Context, localVarOptionals *DeleteClientGatewayOpts) (DeleteClientGatewayResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *ClientGatewayApiService) DeleteClientGateway(ctx _context.Context, loca // ReadClientGatewaysOpts Optional parameters for the method 'ReadClientGateways' type ReadClientGatewaysOpts struct { - ReadClientGatewaysRequest optional.Interface + ReadClientGatewaysRequest optional.Interface } /* ReadClientGateways Method for ReadClientGateways * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadClientGatewaysOpts - Optional Parameters: - * @param "ReadClientGatewaysRequest" (optional.Interface of ReadClientGatewaysRequest) - + * @param "ReadClientGatewaysRequest" (optional.Interface of ReadClientGatewaysRequest) - @return ReadClientGatewaysResponse */ func (a *ClientGatewayApiService) ReadClientGateways(ctx _context.Context, localVarOptionals *ReadClientGatewaysOpts) (ReadClientGatewaysResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_default.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_default.go index 97f637ef4..4a962c857 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_default.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_default.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type DefaultApiService service // ReadConsumptionAccountOpts Optional parameters for the method 'ReadConsumptionAccount' type ReadConsumptionAccountOpts struct { - ReadConsumptionAccountRequest optional.Interface + ReadConsumptionAccountRequest optional.Interface } /* ReadConsumptionAccount Method for ReadConsumptionAccount * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadConsumptionAccountOpts - Optional Parameters: - * @param "ReadConsumptionAccountRequest" (optional.Interface of ReadConsumptionAccountRequest) - + * @param "ReadConsumptionAccountRequest" (optional.Interface of ReadConsumptionAccountRequest) - @return ReadConsumptionAccountResponse */ func (a *DefaultApiService) ReadConsumptionAccount(ctx _context.Context, localVarOptionals *ReadConsumptionAccountOpts) (ReadConsumptionAccountResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_dhcp_option.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_dhcp_option.go index a739acca3..d0743341e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_dhcp_option.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_dhcp_option.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type DhcpOptionApiService service // CreateDhcpOptionsOpts Optional parameters for the method 'CreateDhcpOptions' type CreateDhcpOptionsOpts struct { - CreateDhcpOptionsRequest optional.Interface + CreateDhcpOptionsRequest optional.Interface } /* CreateDhcpOptions Method for CreateDhcpOptions * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateDhcpOptionsOpts - Optional Parameters: - * @param "CreateDhcpOptionsRequest" (optional.Interface of CreateDhcpOptionsRequest) - + * @param "CreateDhcpOptionsRequest" (optional.Interface of CreateDhcpOptionsRequest) - @return CreateDhcpOptionsResponse */ func (a *DhcpOptionApiService) CreateDhcpOptions(ctx _context.Context, localVarOptionals *CreateDhcpOptionsOpts) (CreateDhcpOptionsResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *DhcpOptionApiService) CreateDhcpOptions(ctx _context.Context, localVarO // DeleteDhcpOptionsOpts Optional parameters for the method 'DeleteDhcpOptions' type DeleteDhcpOptionsOpts struct { - DeleteDhcpOptionsRequest optional.Interface + DeleteDhcpOptionsRequest optional.Interface } /* DeleteDhcpOptions Method for DeleteDhcpOptions * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteDhcpOptionsOpts - Optional Parameters: - * @param "DeleteDhcpOptionsRequest" (optional.Interface of DeleteDhcpOptionsRequest) - + * @param "DeleteDhcpOptionsRequest" (optional.Interface of DeleteDhcpOptionsRequest) - @return DeleteDhcpOptionsResponse */ func (a *DhcpOptionApiService) DeleteDhcpOptions(ctx _context.Context, localVarOptionals *DeleteDhcpOptionsOpts) (DeleteDhcpOptionsResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *DhcpOptionApiService) DeleteDhcpOptions(ctx _context.Context, localVarO // ReadDhcpOptionsOpts Optional parameters for the method 'ReadDhcpOptions' type ReadDhcpOptionsOpts struct { - ReadDhcpOptionsRequest optional.Interface + ReadDhcpOptionsRequest optional.Interface } /* ReadDhcpOptions Method for ReadDhcpOptions * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadDhcpOptionsOpts - Optional Parameters: - * @param "ReadDhcpOptionsRequest" (optional.Interface of ReadDhcpOptionsRequest) - + * @param "ReadDhcpOptionsRequest" (optional.Interface of ReadDhcpOptionsRequest) - @return ReadDhcpOptionsResponse */ func (a *DhcpOptionApiService) ReadDhcpOptions(ctx _context.Context, localVarOptionals *ReadDhcpOptionsOpts) (ReadDhcpOptionsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link.go index 991c794f3..ff217653d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type DirectLinkApiService service // CreateDirectLinkOpts Optional parameters for the method 'CreateDirectLink' type CreateDirectLinkOpts struct { - CreateDirectLinkRequest optional.Interface + CreateDirectLinkRequest optional.Interface } /* CreateDirectLink Method for CreateDirectLink * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateDirectLinkOpts - Optional Parameters: - * @param "CreateDirectLinkRequest" (optional.Interface of CreateDirectLinkRequest) - + * @param "CreateDirectLinkRequest" (optional.Interface of CreateDirectLinkRequest) - @return CreateDirectLinkResponse */ func (a *DirectLinkApiService) CreateDirectLink(ctx _context.Context, localVarOptionals *CreateDirectLinkOpts) (CreateDirectLinkResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *DirectLinkApiService) CreateDirectLink(ctx _context.Context, localVarOp // DeleteDirectLinkOpts Optional parameters for the method 'DeleteDirectLink' type DeleteDirectLinkOpts struct { - DeleteDirectLinkRequest optional.Interface + DeleteDirectLinkRequest optional.Interface } /* DeleteDirectLink Method for DeleteDirectLink * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteDirectLinkOpts - Optional Parameters: - * @param "DeleteDirectLinkRequest" (optional.Interface of DeleteDirectLinkRequest) - + * @param "DeleteDirectLinkRequest" (optional.Interface of DeleteDirectLinkRequest) - @return DeleteDirectLinkResponse */ func (a *DirectLinkApiService) DeleteDirectLink(ctx _context.Context, localVarOptionals *DeleteDirectLinkOpts) (DeleteDirectLinkResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *DirectLinkApiService) DeleteDirectLink(ctx _context.Context, localVarOp // ReadDirectLinksOpts Optional parameters for the method 'ReadDirectLinks' type ReadDirectLinksOpts struct { - ReadDirectLinksRequest optional.Interface + ReadDirectLinksRequest optional.Interface } /* ReadDirectLinks Method for ReadDirectLinks * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadDirectLinksOpts - Optional Parameters: - * @param "ReadDirectLinksRequest" (optional.Interface of ReadDirectLinksRequest) - + * @param "ReadDirectLinksRequest" (optional.Interface of ReadDirectLinksRequest) - @return ReadDirectLinksResponse */ func (a *DirectLinkApiService) ReadDirectLinks(ctx _context.Context, localVarOptionals *ReadDirectLinksOpts) (ReadDirectLinksResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link_interface.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link_interface.go index dadd38427..a966fa0f6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link_interface.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_direct_link_interface.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type DirectLinkInterfaceApiService service // CreateDirectLinkInterfaceOpts Optional parameters for the method 'CreateDirectLinkInterface' type CreateDirectLinkInterfaceOpts struct { - CreateDirectLinkInterfaceRequest optional.Interface + CreateDirectLinkInterfaceRequest optional.Interface } /* CreateDirectLinkInterface Method for CreateDirectLinkInterface * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateDirectLinkInterfaceOpts - Optional Parameters: - * @param "CreateDirectLinkInterfaceRequest" (optional.Interface of CreateDirectLinkInterfaceRequest) - + * @param "CreateDirectLinkInterfaceRequest" (optional.Interface of CreateDirectLinkInterfaceRequest) - @return CreateDirectLinkInterfaceResponse */ func (a *DirectLinkInterfaceApiService) CreateDirectLinkInterface(ctx _context.Context, localVarOptionals *CreateDirectLinkInterfaceOpts) (CreateDirectLinkInterfaceResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *DirectLinkInterfaceApiService) CreateDirectLinkInterface(ctx _context.C // DeleteDirectLinkInterfaceOpts Optional parameters for the method 'DeleteDirectLinkInterface' type DeleteDirectLinkInterfaceOpts struct { - DeleteDirectLinkInterfaceRequest optional.Interface + DeleteDirectLinkInterfaceRequest optional.Interface } /* DeleteDirectLinkInterface Method for DeleteDirectLinkInterface * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteDirectLinkInterfaceOpts - Optional Parameters: - * @param "DeleteDirectLinkInterfaceRequest" (optional.Interface of DeleteDirectLinkInterfaceRequest) - + * @param "DeleteDirectLinkInterfaceRequest" (optional.Interface of DeleteDirectLinkInterfaceRequest) - @return DeleteDirectLinkInterfaceResponse */ func (a *DirectLinkInterfaceApiService) DeleteDirectLinkInterface(ctx _context.Context, localVarOptionals *DeleteDirectLinkInterfaceOpts) (DeleteDirectLinkInterfaceResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *DirectLinkInterfaceApiService) DeleteDirectLinkInterface(ctx _context.C // ReadDirectLinkInterfacesOpts Optional parameters for the method 'ReadDirectLinkInterfaces' type ReadDirectLinkInterfacesOpts struct { - ReadDirectLinkInterfacesRequest optional.Interface + ReadDirectLinkInterfacesRequest optional.Interface } /* ReadDirectLinkInterfaces Method for ReadDirectLinkInterfaces * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadDirectLinkInterfacesOpts - Optional Parameters: - * @param "ReadDirectLinkInterfacesRequest" (optional.Interface of ReadDirectLinkInterfacesRequest) - + * @param "ReadDirectLinkInterfacesRequest" (optional.Interface of ReadDirectLinkInterfacesRequest) - @return ReadDirectLinkInterfacesResponse */ func (a *DirectLinkInterfaceApiService) ReadDirectLinkInterfaces(ctx _context.Context, localVarOptionals *ReadDirectLinkInterfacesOpts) (ReadDirectLinkInterfacesResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_flexible_gpu.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_flexible_gpu.go index 4f444f61a..de77c0b2f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_flexible_gpu.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_flexible_gpu.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type FlexibleGpuApiService service // CreateFlexibleGpuOpts Optional parameters for the method 'CreateFlexibleGpu' type CreateFlexibleGpuOpts struct { - CreateFlexibleGpuRequest optional.Interface + CreateFlexibleGpuRequest optional.Interface } /* CreateFlexibleGpu Method for CreateFlexibleGpu * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateFlexibleGpuOpts - Optional Parameters: - * @param "CreateFlexibleGpuRequest" (optional.Interface of CreateFlexibleGpuRequest) - + * @param "CreateFlexibleGpuRequest" (optional.Interface of CreateFlexibleGpuRequest) - @return CreateFlexibleGpuResponse */ func (a *FlexibleGpuApiService) CreateFlexibleGpu(ctx _context.Context, localVarOptionals *CreateFlexibleGpuOpts) (CreateFlexibleGpuResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *FlexibleGpuApiService) CreateFlexibleGpu(ctx _context.Context, localVar // DeleteFlexibleGpuOpts Optional parameters for the method 'DeleteFlexibleGpu' type DeleteFlexibleGpuOpts struct { - DeleteFlexibleGpuRequest optional.Interface + DeleteFlexibleGpuRequest optional.Interface } /* DeleteFlexibleGpu Method for DeleteFlexibleGpu * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteFlexibleGpuOpts - Optional Parameters: - * @param "DeleteFlexibleGpuRequest" (optional.Interface of DeleteFlexibleGpuRequest) - + * @param "DeleteFlexibleGpuRequest" (optional.Interface of DeleteFlexibleGpuRequest) - @return DeleteFlexibleGpuResponse */ func (a *FlexibleGpuApiService) DeleteFlexibleGpu(ctx _context.Context, localVarOptionals *DeleteFlexibleGpuOpts) (DeleteFlexibleGpuResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *FlexibleGpuApiService) DeleteFlexibleGpu(ctx _context.Context, localVar // LinkFlexibleGpuOpts Optional parameters for the method 'LinkFlexibleGpu' type LinkFlexibleGpuOpts struct { - LinkFlexibleGpuRequest optional.Interface + LinkFlexibleGpuRequest optional.Interface } /* LinkFlexibleGpu Method for LinkFlexibleGpu * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkFlexibleGpuOpts - Optional Parameters: - * @param "LinkFlexibleGpuRequest" (optional.Interface of LinkFlexibleGpuRequest) - + * @param "LinkFlexibleGpuRequest" (optional.Interface of LinkFlexibleGpuRequest) - @return LinkFlexibleGpuResponse */ func (a *FlexibleGpuApiService) LinkFlexibleGpu(ctx _context.Context, localVarOptionals *LinkFlexibleGpuOpts) (LinkFlexibleGpuResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *FlexibleGpuApiService) LinkFlexibleGpu(ctx _context.Context, localVarOp // ReadFlexibleGpuCatalogOpts Optional parameters for the method 'ReadFlexibleGpuCatalog' type ReadFlexibleGpuCatalogOpts struct { - ReadFlexibleGpuCatalogRequest optional.Interface + ReadFlexibleGpuCatalogRequest optional.Interface } /* ReadFlexibleGpuCatalog Method for ReadFlexibleGpuCatalog * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadFlexibleGpuCatalogOpts - Optional Parameters: - * @param "ReadFlexibleGpuCatalogRequest" (optional.Interface of ReadFlexibleGpuCatalogRequest) - + * @param "ReadFlexibleGpuCatalogRequest" (optional.Interface of ReadFlexibleGpuCatalogRequest) - @return ReadFlexibleGpuCatalogResponse */ func (a *FlexibleGpuApiService) ReadFlexibleGpuCatalog(ctx _context.Context, localVarOptionals *ReadFlexibleGpuCatalogOpts) (ReadFlexibleGpuCatalogResponse, *_nethttp.Response, error) { @@ -460,14 +460,14 @@ func (a *FlexibleGpuApiService) ReadFlexibleGpuCatalog(ctx _context.Context, loc // ReadFlexibleGpusOpts Optional parameters for the method 'ReadFlexibleGpus' type ReadFlexibleGpusOpts struct { - ReadFlexibleGpusRequest optional.Interface + ReadFlexibleGpusRequest optional.Interface } /* ReadFlexibleGpus Method for ReadFlexibleGpus * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadFlexibleGpusOpts - Optional Parameters: - * @param "ReadFlexibleGpusRequest" (optional.Interface of ReadFlexibleGpusRequest) - + * @param "ReadFlexibleGpusRequest" (optional.Interface of ReadFlexibleGpusRequest) - @return ReadFlexibleGpusResponse */ func (a *FlexibleGpuApiService) ReadFlexibleGpus(ctx _context.Context, localVarOptionals *ReadFlexibleGpusOpts) (ReadFlexibleGpusResponse, *_nethttp.Response, error) { @@ -571,14 +571,14 @@ func (a *FlexibleGpuApiService) ReadFlexibleGpus(ctx _context.Context, localVarO // UnlinkFlexibleGpuOpts Optional parameters for the method 'UnlinkFlexibleGpu' type UnlinkFlexibleGpuOpts struct { - UnlinkFlexibleGpuRequest optional.Interface + UnlinkFlexibleGpuRequest optional.Interface } /* UnlinkFlexibleGpu Method for UnlinkFlexibleGpu * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkFlexibleGpuOpts - Optional Parameters: - * @param "UnlinkFlexibleGpuRequest" (optional.Interface of UnlinkFlexibleGpuRequest) - + * @param "UnlinkFlexibleGpuRequest" (optional.Interface of UnlinkFlexibleGpuRequest) - @return UnlinkFlexibleGpuResponse */ func (a *FlexibleGpuApiService) UnlinkFlexibleGpu(ctx _context.Context, localVarOptionals *UnlinkFlexibleGpuOpts) (UnlinkFlexibleGpuResponse, *_nethttp.Response, error) { @@ -682,14 +682,14 @@ func (a *FlexibleGpuApiService) UnlinkFlexibleGpu(ctx _context.Context, localVar // UpdateFlexibleGpuOpts Optional parameters for the method 'UpdateFlexibleGpu' type UpdateFlexibleGpuOpts struct { - UpdateFlexibleGpuRequest optional.Interface + UpdateFlexibleGpuRequest optional.Interface } /* UpdateFlexibleGpu Method for UpdateFlexibleGpu * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateFlexibleGpuOpts - Optional Parameters: - * @param "UpdateFlexibleGpuRequest" (optional.Interface of UpdateFlexibleGpuRequest) - + * @param "UpdateFlexibleGpuRequest" (optional.Interface of UpdateFlexibleGpuRequest) - @return UpdateFlexibleGpuResponse */ func (a *FlexibleGpuApiService) UpdateFlexibleGpu(ctx _context.Context, localVarOptionals *UpdateFlexibleGpuOpts) (UpdateFlexibleGpuResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_image.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_image.go index 0a1d0fdbe..fbb23f3e4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_image.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_image.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type ImageApiService service // CreateImageOpts Optional parameters for the method 'CreateImage' type CreateImageOpts struct { - CreateImageRequest optional.Interface + CreateImageRequest optional.Interface } /* CreateImage Method for CreateImage * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateImageOpts - Optional Parameters: - * @param "CreateImageRequest" (optional.Interface of CreateImageRequest) - + * @param "CreateImageRequest" (optional.Interface of CreateImageRequest) - @return CreateImageResponse */ func (a *ImageApiService) CreateImage(ctx _context.Context, localVarOptionals *CreateImageOpts) (CreateImageResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *ImageApiService) CreateImage(ctx _context.Context, localVarOptionals *C // CreateImageExportTaskOpts Optional parameters for the method 'CreateImageExportTask' type CreateImageExportTaskOpts struct { - CreateImageExportTaskRequest optional.Interface + CreateImageExportTaskRequest optional.Interface } /* CreateImageExportTask Method for CreateImageExportTask * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateImageExportTaskOpts - Optional Parameters: - * @param "CreateImageExportTaskRequest" (optional.Interface of CreateImageExportTaskRequest) - + * @param "CreateImageExportTaskRequest" (optional.Interface of CreateImageExportTaskRequest) - @return CreateImageExportTaskResponse */ func (a *ImageApiService) CreateImageExportTask(ctx _context.Context, localVarOptionals *CreateImageExportTaskOpts) (CreateImageExportTaskResponse, *_nethttp.Response, error) { @@ -280,14 +280,14 @@ func (a *ImageApiService) CreateImageExportTask(ctx _context.Context, localVarOp // DeleteImageOpts Optional parameters for the method 'DeleteImage' type DeleteImageOpts struct { - DeleteImageRequest optional.Interface + DeleteImageRequest optional.Interface } /* DeleteImage Method for DeleteImage * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteImageOpts - Optional Parameters: - * @param "DeleteImageRequest" (optional.Interface of DeleteImageRequest) - + * @param "DeleteImageRequest" (optional.Interface of DeleteImageRequest) - @return DeleteImageResponse */ func (a *ImageApiService) DeleteImage(ctx _context.Context, localVarOptionals *DeleteImageOpts) (DeleteImageResponse, *_nethttp.Response, error) { @@ -421,14 +421,14 @@ func (a *ImageApiService) DeleteImage(ctx _context.Context, localVarOptionals *D // ReadImageExportTasksOpts Optional parameters for the method 'ReadImageExportTasks' type ReadImageExportTasksOpts struct { - ReadImageExportTasksRequest optional.Interface + ReadImageExportTasksRequest optional.Interface } /* ReadImageExportTasks Method for ReadImageExportTasks * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadImageExportTasksOpts - Optional Parameters: - * @param "ReadImageExportTasksRequest" (optional.Interface of ReadImageExportTasksRequest) - + * @param "ReadImageExportTasksRequest" (optional.Interface of ReadImageExportTasksRequest) - @return ReadImageExportTasksResponse */ func (a *ImageApiService) ReadImageExportTasks(ctx _context.Context, localVarOptionals *ReadImageExportTasksOpts) (ReadImageExportTasksResponse, *_nethttp.Response, error) { @@ -532,14 +532,14 @@ func (a *ImageApiService) ReadImageExportTasks(ctx _context.Context, localVarOpt // ReadImagesOpts Optional parameters for the method 'ReadImages' type ReadImagesOpts struct { - ReadImagesRequest optional.Interface + ReadImagesRequest optional.Interface } /* ReadImages Method for ReadImages * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadImagesOpts - Optional Parameters: - * @param "ReadImagesRequest" (optional.Interface of ReadImagesRequest) - + * @param "ReadImagesRequest" (optional.Interface of ReadImagesRequest) - @return ReadImagesResponse */ func (a *ImageApiService) ReadImages(ctx _context.Context, localVarOptionals *ReadImagesOpts) (ReadImagesResponse, *_nethttp.Response, error) { @@ -673,14 +673,14 @@ func (a *ImageApiService) ReadImages(ctx _context.Context, localVarOptionals *Re // UpdateImageOpts Optional parameters for the method 'UpdateImage' type UpdateImageOpts struct { - UpdateImageRequest optional.Interface + UpdateImageRequest optional.Interface } /* UpdateImage Method for UpdateImage * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateImageOpts - Optional Parameters: - * @param "UpdateImageRequest" (optional.Interface of UpdateImageRequest) - + * @param "UpdateImageRequest" (optional.Interface of UpdateImageRequest) - @return UpdateImageResponse */ func (a *ImageApiService) UpdateImage(ctx _context.Context, localVarOptionals *UpdateImageOpts) (UpdateImageResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_internet_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_internet_service.go index c3fd524f8..c8926ae7c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_internet_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_internet_service.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type InternetServiceApiService service // CreateInternetServiceOpts Optional parameters for the method 'CreateInternetService' type CreateInternetServiceOpts struct { - CreateInternetServiceRequest optional.Interface + CreateInternetServiceRequest optional.Interface } /* CreateInternetService Method for CreateInternetService * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateInternetServiceOpts - Optional Parameters: - * @param "CreateInternetServiceRequest" (optional.Interface of CreateInternetServiceRequest) - + * @param "CreateInternetServiceRequest" (optional.Interface of CreateInternetServiceRequest) - @return CreateInternetServiceResponse */ func (a *InternetServiceApiService) CreateInternetService(ctx _context.Context, localVarOptionals *CreateInternetServiceOpts) (CreateInternetServiceResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *InternetServiceApiService) CreateInternetService(ctx _context.Context, // DeleteInternetServiceOpts Optional parameters for the method 'DeleteInternetService' type DeleteInternetServiceOpts struct { - DeleteInternetServiceRequest optional.Interface + DeleteInternetServiceRequest optional.Interface } /* DeleteInternetService Method for DeleteInternetService * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteInternetServiceOpts - Optional Parameters: - * @param "DeleteInternetServiceRequest" (optional.Interface of DeleteInternetServiceRequest) - + * @param "DeleteInternetServiceRequest" (optional.Interface of DeleteInternetServiceRequest) - @return DeleteInternetServiceResponse */ func (a *InternetServiceApiService) DeleteInternetService(ctx _context.Context, localVarOptionals *DeleteInternetServiceOpts) (DeleteInternetServiceResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *InternetServiceApiService) DeleteInternetService(ctx _context.Context, // LinkInternetServiceOpts Optional parameters for the method 'LinkInternetService' type LinkInternetServiceOpts struct { - LinkInternetServiceRequest optional.Interface + LinkInternetServiceRequest optional.Interface } /* LinkInternetService Method for LinkInternetService * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkInternetServiceOpts - Optional Parameters: - * @param "LinkInternetServiceRequest" (optional.Interface of LinkInternetServiceRequest) - + * @param "LinkInternetServiceRequest" (optional.Interface of LinkInternetServiceRequest) - @return LinkInternetServiceResponse */ func (a *InternetServiceApiService) LinkInternetService(ctx _context.Context, localVarOptionals *LinkInternetServiceOpts) (LinkInternetServiceResponse, *_nethttp.Response, error) { @@ -451,14 +451,14 @@ func (a *InternetServiceApiService) LinkInternetService(ctx _context.Context, lo // ReadInternetServicesOpts Optional parameters for the method 'ReadInternetServices' type ReadInternetServicesOpts struct { - ReadInternetServicesRequest optional.Interface + ReadInternetServicesRequest optional.Interface } /* ReadInternetServices Method for ReadInternetServices * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadInternetServicesOpts - Optional Parameters: - * @param "ReadInternetServicesRequest" (optional.Interface of ReadInternetServicesRequest) - + * @param "ReadInternetServicesRequest" (optional.Interface of ReadInternetServicesRequest) - @return ReadInternetServicesResponse */ func (a *InternetServiceApiService) ReadInternetServices(ctx _context.Context, localVarOptionals *ReadInternetServicesOpts) (ReadInternetServicesResponse, *_nethttp.Response, error) { @@ -592,14 +592,14 @@ func (a *InternetServiceApiService) ReadInternetServices(ctx _context.Context, l // UnlinkInternetServiceOpts Optional parameters for the method 'UnlinkInternetService' type UnlinkInternetServiceOpts struct { - UnlinkInternetServiceRequest optional.Interface + UnlinkInternetServiceRequest optional.Interface } /* UnlinkInternetService Method for UnlinkInternetService * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkInternetServiceOpts - Optional Parameters: - * @param "UnlinkInternetServiceRequest" (optional.Interface of UnlinkInternetServiceRequest) - + * @param "UnlinkInternetServiceRequest" (optional.Interface of UnlinkInternetServiceRequest) - @return UnlinkInternetServiceResponse */ func (a *InternetServiceApiService) UnlinkInternetService(ctx _context.Context, localVarOptionals *UnlinkInternetServiceOpts) (UnlinkInternetServiceResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_keypair.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_keypair.go index c57263ff2..ca89255b9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_keypair.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_keypair.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type KeypairApiService service // CreateKeypairOpts Optional parameters for the method 'CreateKeypair' type CreateKeypairOpts struct { - CreateKeypairRequest optional.Interface + CreateKeypairRequest optional.Interface } /* CreateKeypair Method for CreateKeypair * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateKeypairOpts - Optional Parameters: - * @param "CreateKeypairRequest" (optional.Interface of CreateKeypairRequest) - + * @param "CreateKeypairRequest" (optional.Interface of CreateKeypairRequest) - @return CreateKeypairResponse */ func (a *KeypairApiService) CreateKeypair(ctx _context.Context, localVarOptionals *CreateKeypairOpts) (CreateKeypairResponse, *_nethttp.Response, error) { @@ -179,14 +179,14 @@ func (a *KeypairApiService) CreateKeypair(ctx _context.Context, localVarOptional // DeleteKeypairOpts Optional parameters for the method 'DeleteKeypair' type DeleteKeypairOpts struct { - DeleteKeypairRequest optional.Interface + DeleteKeypairRequest optional.Interface } /* DeleteKeypair Method for DeleteKeypair * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteKeypairOpts - Optional Parameters: - * @param "DeleteKeypairRequest" (optional.Interface of DeleteKeypairRequest) - + * @param "DeleteKeypairRequest" (optional.Interface of DeleteKeypairRequest) - @return DeleteKeypairResponse */ func (a *KeypairApiService) DeleteKeypair(ctx _context.Context, localVarOptionals *DeleteKeypairOpts) (DeleteKeypairResponse, *_nethttp.Response, error) { @@ -320,14 +320,14 @@ func (a *KeypairApiService) DeleteKeypair(ctx _context.Context, localVarOptional // ReadKeypairsOpts Optional parameters for the method 'ReadKeypairs' type ReadKeypairsOpts struct { - ReadKeypairsRequest optional.Interface + ReadKeypairsRequest optional.Interface } /* ReadKeypairs Method for ReadKeypairs * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadKeypairsOpts - Optional Parameters: - * @param "ReadKeypairsRequest" (optional.Interface of ReadKeypairsRequest) - + * @param "ReadKeypairsRequest" (optional.Interface of ReadKeypairsRequest) - @return ReadKeypairsResponse */ func (a *KeypairApiService) ReadKeypairs(ctx _context.Context, localVarOptionals *ReadKeypairsOpts) (ReadKeypairsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_listener.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_listener.go index 27b9735be..dbde0e860 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_listener.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_listener.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type ListenerApiService service // CreateListenerRuleOpts Optional parameters for the method 'CreateListenerRule' type CreateListenerRuleOpts struct { - CreateListenerRuleRequest optional.Interface + CreateListenerRuleRequest optional.Interface } /* CreateListenerRule Method for CreateListenerRule * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateListenerRuleOpts - Optional Parameters: - * @param "CreateListenerRuleRequest" (optional.Interface of CreateListenerRuleRequest) - + * @param "CreateListenerRuleRequest" (optional.Interface of CreateListenerRuleRequest) - @return CreateListenerRuleResponse */ func (a *ListenerApiService) CreateListenerRule(ctx _context.Context, localVarOptionals *CreateListenerRuleOpts) (CreateListenerRuleResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *ListenerApiService) CreateListenerRule(ctx _context.Context, localVarOp // CreateLoadBalancerListenersOpts Optional parameters for the method 'CreateLoadBalancerListeners' type CreateLoadBalancerListenersOpts struct { - CreateLoadBalancerListenersRequest optional.Interface + CreateLoadBalancerListenersRequest optional.Interface } /* CreateLoadBalancerListeners Method for CreateLoadBalancerListeners * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateLoadBalancerListenersOpts - Optional Parameters: - * @param "CreateLoadBalancerListenersRequest" (optional.Interface of CreateLoadBalancerListenersRequest) - + * @param "CreateLoadBalancerListenersRequest" (optional.Interface of CreateLoadBalancerListenersRequest) - @return CreateLoadBalancerListenersResponse */ func (a *ListenerApiService) CreateLoadBalancerListeners(ctx _context.Context, localVarOptionals *CreateLoadBalancerListenersOpts) (CreateLoadBalancerListenersResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *ListenerApiService) CreateLoadBalancerListeners(ctx _context.Context, l // DeleteListenerRuleOpts Optional parameters for the method 'DeleteListenerRule' type DeleteListenerRuleOpts struct { - DeleteListenerRuleRequest optional.Interface + DeleteListenerRuleRequest optional.Interface } /* DeleteListenerRule Method for DeleteListenerRule * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteListenerRuleOpts - Optional Parameters: - * @param "DeleteListenerRuleRequest" (optional.Interface of DeleteListenerRuleRequest) - + * @param "DeleteListenerRuleRequest" (optional.Interface of DeleteListenerRuleRequest) - @return DeleteListenerRuleResponse */ func (a *ListenerApiService) DeleteListenerRule(ctx _context.Context, localVarOptionals *DeleteListenerRuleOpts) (DeleteListenerRuleResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *ListenerApiService) DeleteListenerRule(ctx _context.Context, localVarOp // DeleteLoadBalancerListenersOpts Optional parameters for the method 'DeleteLoadBalancerListeners' type DeleteLoadBalancerListenersOpts struct { - DeleteLoadBalancerListenersRequest optional.Interface + DeleteLoadBalancerListenersRequest optional.Interface } /* DeleteLoadBalancerListeners Method for DeleteLoadBalancerListeners * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteLoadBalancerListenersOpts - Optional Parameters: - * @param "DeleteLoadBalancerListenersRequest" (optional.Interface of DeleteLoadBalancerListenersRequest) - + * @param "DeleteLoadBalancerListenersRequest" (optional.Interface of DeleteLoadBalancerListenersRequest) - @return DeleteLoadBalancerListenersResponse */ func (a *ListenerApiService) DeleteLoadBalancerListeners(ctx _context.Context, localVarOptionals *DeleteLoadBalancerListenersOpts) (DeleteLoadBalancerListenersResponse, *_nethttp.Response, error) { @@ -472,14 +472,14 @@ func (a *ListenerApiService) DeleteLoadBalancerListeners(ctx _context.Context, l // ReadListenerRulesOpts Optional parameters for the method 'ReadListenerRules' type ReadListenerRulesOpts struct { - ReadListenerRulesRequest optional.Interface + ReadListenerRulesRequest optional.Interface } /* ReadListenerRules Method for ReadListenerRules * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadListenerRulesOpts - Optional Parameters: - * @param "ReadListenerRulesRequest" (optional.Interface of ReadListenerRulesRequest) - + * @param "ReadListenerRulesRequest" (optional.Interface of ReadListenerRulesRequest) - @return ReadListenerRulesResponse */ func (a *ListenerApiService) ReadListenerRules(ctx _context.Context, localVarOptionals *ReadListenerRulesOpts) (ReadListenerRulesResponse, *_nethttp.Response, error) { @@ -583,14 +583,14 @@ func (a *ListenerApiService) ReadListenerRules(ctx _context.Context, localVarOpt // UpdateListenerRuleOpts Optional parameters for the method 'UpdateListenerRule' type UpdateListenerRuleOpts struct { - UpdateListenerRuleRequest optional.Interface + UpdateListenerRuleRequest optional.Interface } /* UpdateListenerRule Method for UpdateListenerRule * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateListenerRuleOpts - Optional Parameters: - * @param "UpdateListenerRuleRequest" (optional.Interface of UpdateListenerRuleRequest) - + * @param "UpdateListenerRuleRequest" (optional.Interface of UpdateListenerRuleRequest) - @return UpdateListenerRuleResponse */ func (a *ListenerApiService) UpdateListenerRule(ctx _context.Context, localVarOptionals *UpdateListenerRuleOpts) (UpdateListenerRuleResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer.go index 75b074ace..7305f5d21 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type LoadBalancerApiService service // CreateLoadBalancerOpts Optional parameters for the method 'CreateLoadBalancer' type CreateLoadBalancerOpts struct { - CreateLoadBalancerRequest optional.Interface + CreateLoadBalancerRequest optional.Interface } /* CreateLoadBalancer Method for CreateLoadBalancer * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateLoadBalancerOpts - Optional Parameters: - * @param "CreateLoadBalancerRequest" (optional.Interface of CreateLoadBalancerRequest) - + * @param "CreateLoadBalancerRequest" (optional.Interface of CreateLoadBalancerRequest) - @return CreateLoadBalancerResponse */ func (a *LoadBalancerApiService) CreateLoadBalancer(ctx _context.Context, localVarOptionals *CreateLoadBalancerOpts) (CreateLoadBalancerResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *LoadBalancerApiService) CreateLoadBalancer(ctx _context.Context, localV // CreateLoadBalancerTagsOpts Optional parameters for the method 'CreateLoadBalancerTags' type CreateLoadBalancerTagsOpts struct { - CreateLoadBalancerTagsRequest optional.Interface + CreateLoadBalancerTagsRequest optional.Interface } /* CreateLoadBalancerTags Method for CreateLoadBalancerTags * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateLoadBalancerTagsOpts - Optional Parameters: - * @param "CreateLoadBalancerTagsRequest" (optional.Interface of CreateLoadBalancerTagsRequest) - + * @param "CreateLoadBalancerTagsRequest" (optional.Interface of CreateLoadBalancerTagsRequest) - @return CreateLoadBalancerTagsResponse */ func (a *LoadBalancerApiService) CreateLoadBalancerTags(ctx _context.Context, localVarOptionals *CreateLoadBalancerTagsOpts) (CreateLoadBalancerTagsResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *LoadBalancerApiService) CreateLoadBalancerTags(ctx _context.Context, lo // DeleteLoadBalancerOpts Optional parameters for the method 'DeleteLoadBalancer' type DeleteLoadBalancerOpts struct { - DeleteLoadBalancerRequest optional.Interface + DeleteLoadBalancerRequest optional.Interface } /* DeleteLoadBalancer Method for DeleteLoadBalancer * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteLoadBalancerOpts - Optional Parameters: - * @param "DeleteLoadBalancerRequest" (optional.Interface of DeleteLoadBalancerRequest) - + * @param "DeleteLoadBalancerRequest" (optional.Interface of DeleteLoadBalancerRequest) - @return DeleteLoadBalancerResponse */ func (a *LoadBalancerApiService) DeleteLoadBalancer(ctx _context.Context, localVarOptionals *DeleteLoadBalancerOpts) (DeleteLoadBalancerResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *LoadBalancerApiService) DeleteLoadBalancer(ctx _context.Context, localV // DeleteLoadBalancerTagsOpts Optional parameters for the method 'DeleteLoadBalancerTags' type DeleteLoadBalancerTagsOpts struct { - DeleteLoadBalancerTagsRequest optional.Interface + DeleteLoadBalancerTagsRequest optional.Interface } /* DeleteLoadBalancerTags Method for DeleteLoadBalancerTags * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteLoadBalancerTagsOpts - Optional Parameters: - * @param "DeleteLoadBalancerTagsRequest" (optional.Interface of DeleteLoadBalancerTagsRequest) - + * @param "DeleteLoadBalancerTagsRequest" (optional.Interface of DeleteLoadBalancerTagsRequest) - @return DeleteLoadBalancerTagsResponse */ func (a *LoadBalancerApiService) DeleteLoadBalancerTags(ctx _context.Context, localVarOptionals *DeleteLoadBalancerTagsOpts) (DeleteLoadBalancerTagsResponse, *_nethttp.Response, error) { @@ -472,14 +472,14 @@ func (a *LoadBalancerApiService) DeleteLoadBalancerTags(ctx _context.Context, lo // DeregisterVmsInLoadBalancerOpts Optional parameters for the method 'DeregisterVmsInLoadBalancer' type DeregisterVmsInLoadBalancerOpts struct { - DeregisterVmsInLoadBalancerRequest optional.Interface + DeregisterVmsInLoadBalancerRequest optional.Interface } /* DeregisterVmsInLoadBalancer Method for DeregisterVmsInLoadBalancer * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeregisterVmsInLoadBalancerOpts - Optional Parameters: - * @param "DeregisterVmsInLoadBalancerRequest" (optional.Interface of DeregisterVmsInLoadBalancerRequest) - + * @param "DeregisterVmsInLoadBalancerRequest" (optional.Interface of DeregisterVmsInLoadBalancerRequest) - @return DeregisterVmsInLoadBalancerResponse */ func (a *LoadBalancerApiService) DeregisterVmsInLoadBalancer(ctx _context.Context, localVarOptionals *DeregisterVmsInLoadBalancerOpts) (DeregisterVmsInLoadBalancerResponse, *_nethttp.Response, error) { @@ -583,14 +583,14 @@ func (a *LoadBalancerApiService) DeregisterVmsInLoadBalancer(ctx _context.Contex // ReadLoadBalancerTagsOpts Optional parameters for the method 'ReadLoadBalancerTags' type ReadLoadBalancerTagsOpts struct { - ReadLoadBalancerTagsRequest optional.Interface + ReadLoadBalancerTagsRequest optional.Interface } /* ReadLoadBalancerTags Method for ReadLoadBalancerTags * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadLoadBalancerTagsOpts - Optional Parameters: - * @param "ReadLoadBalancerTagsRequest" (optional.Interface of ReadLoadBalancerTagsRequest) - + * @param "ReadLoadBalancerTagsRequest" (optional.Interface of ReadLoadBalancerTagsRequest) - @return ReadLoadBalancerTagsResponse */ func (a *LoadBalancerApiService) ReadLoadBalancerTags(ctx _context.Context, localVarOptionals *ReadLoadBalancerTagsOpts) (ReadLoadBalancerTagsResponse, *_nethttp.Response, error) { @@ -694,14 +694,14 @@ func (a *LoadBalancerApiService) ReadLoadBalancerTags(ctx _context.Context, loca // ReadLoadBalancersOpts Optional parameters for the method 'ReadLoadBalancers' type ReadLoadBalancersOpts struct { - ReadLoadBalancersRequest optional.Interface + ReadLoadBalancersRequest optional.Interface } /* ReadLoadBalancers Method for ReadLoadBalancers * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadLoadBalancersOpts - Optional Parameters: - * @param "ReadLoadBalancersRequest" (optional.Interface of ReadLoadBalancersRequest) - + * @param "ReadLoadBalancersRequest" (optional.Interface of ReadLoadBalancersRequest) - @return ReadLoadBalancersResponse */ func (a *LoadBalancerApiService) ReadLoadBalancers(ctx _context.Context, localVarOptionals *ReadLoadBalancersOpts) (ReadLoadBalancersResponse, *_nethttp.Response, error) { @@ -805,14 +805,14 @@ func (a *LoadBalancerApiService) ReadLoadBalancers(ctx _context.Context, localVa // ReadVmsHealthOpts Optional parameters for the method 'ReadVmsHealth' type ReadVmsHealthOpts struct { - ReadVmsHealthRequest optional.Interface + ReadVmsHealthRequest optional.Interface } /* ReadVmsHealth Method for ReadVmsHealth * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVmsHealthOpts - Optional Parameters: - * @param "ReadVmsHealthRequest" (optional.Interface of ReadVmsHealthRequest) - + * @param "ReadVmsHealthRequest" (optional.Interface of ReadVmsHealthRequest) - @return ReadVmsHealthResponse */ func (a *LoadBalancerApiService) ReadVmsHealth(ctx _context.Context, localVarOptionals *ReadVmsHealthOpts) (ReadVmsHealthResponse, *_nethttp.Response, error) { @@ -916,14 +916,14 @@ func (a *LoadBalancerApiService) ReadVmsHealth(ctx _context.Context, localVarOpt // RegisterVmsInLoadBalancerOpts Optional parameters for the method 'RegisterVmsInLoadBalancer' type RegisterVmsInLoadBalancerOpts struct { - RegisterVmsInLoadBalancerRequest optional.Interface + RegisterVmsInLoadBalancerRequest optional.Interface } /* RegisterVmsInLoadBalancer Method for RegisterVmsInLoadBalancer * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *RegisterVmsInLoadBalancerOpts - Optional Parameters: - * @param "RegisterVmsInLoadBalancerRequest" (optional.Interface of RegisterVmsInLoadBalancerRequest) - + * @param "RegisterVmsInLoadBalancerRequest" (optional.Interface of RegisterVmsInLoadBalancerRequest) - @return RegisterVmsInLoadBalancerResponse */ func (a *LoadBalancerApiService) RegisterVmsInLoadBalancer(ctx _context.Context, localVarOptionals *RegisterVmsInLoadBalancerOpts) (RegisterVmsInLoadBalancerResponse, *_nethttp.Response, error) { @@ -1027,14 +1027,14 @@ func (a *LoadBalancerApiService) RegisterVmsInLoadBalancer(ctx _context.Context, // UpdateLoadBalancerOpts Optional parameters for the method 'UpdateLoadBalancer' type UpdateLoadBalancerOpts struct { - UpdateLoadBalancerRequest optional.Interface + UpdateLoadBalancerRequest optional.Interface } /* UpdateLoadBalancer Method for UpdateLoadBalancer * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateLoadBalancerOpts - Optional Parameters: - * @param "UpdateLoadBalancerRequest" (optional.Interface of UpdateLoadBalancerRequest) - + * @param "UpdateLoadBalancerRequest" (optional.Interface of UpdateLoadBalancerRequest) - @return UpdateLoadBalancerResponse */ func (a *LoadBalancerApiService) UpdateLoadBalancer(ctx _context.Context, localVarOptionals *UpdateLoadBalancerOpts) (UpdateLoadBalancerResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer_policy.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer_policy.go index a70717f70..67c50231e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer_policy.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_load_balancer_policy.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type LoadBalancerPolicyApiService service // CreateLoadBalancerPolicyOpts Optional parameters for the method 'CreateLoadBalancerPolicy' type CreateLoadBalancerPolicyOpts struct { - CreateLoadBalancerPolicyRequest optional.Interface + CreateLoadBalancerPolicyRequest optional.Interface } /* CreateLoadBalancerPolicy Method for CreateLoadBalancerPolicy * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateLoadBalancerPolicyOpts - Optional Parameters: - * @param "CreateLoadBalancerPolicyRequest" (optional.Interface of CreateLoadBalancerPolicyRequest) - + * @param "CreateLoadBalancerPolicyRequest" (optional.Interface of CreateLoadBalancerPolicyRequest) - @return CreateLoadBalancerPolicyResponse */ func (a *LoadBalancerPolicyApiService) CreateLoadBalancerPolicy(ctx _context.Context, localVarOptionals *CreateLoadBalancerPolicyOpts) (CreateLoadBalancerPolicyResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *LoadBalancerPolicyApiService) CreateLoadBalancerPolicy(ctx _context.Con // DeleteLoadBalancerPolicyOpts Optional parameters for the method 'DeleteLoadBalancerPolicy' type DeleteLoadBalancerPolicyOpts struct { - DeleteLoadBalancerPolicyRequest optional.Interface + DeleteLoadBalancerPolicyRequest optional.Interface } /* DeleteLoadBalancerPolicy Method for DeleteLoadBalancerPolicy * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteLoadBalancerPolicyOpts - Optional Parameters: - * @param "DeleteLoadBalancerPolicyRequest" (optional.Interface of DeleteLoadBalancerPolicyRequest) - + * @param "DeleteLoadBalancerPolicyRequest" (optional.Interface of DeleteLoadBalancerPolicyRequest) - @return DeleteLoadBalancerPolicyResponse */ func (a *LoadBalancerPolicyApiService) DeleteLoadBalancerPolicy(ctx _context.Context, localVarOptionals *DeleteLoadBalancerPolicyOpts) (DeleteLoadBalancerPolicyResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_location.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_location.go index 4b489e470..f02b6f7c5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_location.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_location.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type LocationApiService service // ReadLocationsOpts Optional parameters for the method 'ReadLocations' type ReadLocationsOpts struct { - ReadLocationsRequest optional.Interface + ReadLocationsRequest optional.Interface } /* ReadLocations Method for ReadLocations * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadLocationsOpts - Optional Parameters: - * @param "ReadLocationsRequest" (optional.Interface of ReadLocationsRequest) - + * @param "ReadLocationsRequest" (optional.Interface of ReadLocationsRequest) - @return ReadLocationsResponse */ func (a *LocationApiService) ReadLocations(ctx _context.Context, localVarOptionals *ReadLocationsOpts) (ReadLocationsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_nat_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_nat_service.go index 1ef049122..4397921d1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_nat_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_nat_service.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type NatServiceApiService service // CreateNatServiceOpts Optional parameters for the method 'CreateNatService' type CreateNatServiceOpts struct { - CreateNatServiceRequest optional.Interface + CreateNatServiceRequest optional.Interface } /* CreateNatService Method for CreateNatService * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateNatServiceOpts - Optional Parameters: - * @param "CreateNatServiceRequest" (optional.Interface of CreateNatServiceRequest) - + * @param "CreateNatServiceRequest" (optional.Interface of CreateNatServiceRequest) - @return CreateNatServiceResponse */ func (a *NatServiceApiService) CreateNatService(ctx _context.Context, localVarOptionals *CreateNatServiceOpts) (CreateNatServiceResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *NatServiceApiService) CreateNatService(ctx _context.Context, localVarOp // DeleteNatServiceOpts Optional parameters for the method 'DeleteNatService' type DeleteNatServiceOpts struct { - DeleteNatServiceRequest optional.Interface + DeleteNatServiceRequest optional.Interface } /* DeleteNatService Method for DeleteNatService * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteNatServiceOpts - Optional Parameters: - * @param "DeleteNatServiceRequest" (optional.Interface of DeleteNatServiceRequest) - + * @param "DeleteNatServiceRequest" (optional.Interface of DeleteNatServiceRequest) - @return DeleteNatServiceResponse */ func (a *NatServiceApiService) DeleteNatService(ctx _context.Context, localVarOptionals *DeleteNatServiceOpts) (DeleteNatServiceResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *NatServiceApiService) DeleteNatService(ctx _context.Context, localVarOp // ReadNatServicesOpts Optional parameters for the method 'ReadNatServices' type ReadNatServicesOpts struct { - ReadNatServicesRequest optional.Interface + ReadNatServicesRequest optional.Interface } /* ReadNatServices Method for ReadNatServices * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadNatServicesOpts - Optional Parameters: - * @param "ReadNatServicesRequest" (optional.Interface of ReadNatServicesRequest) - + * @param "ReadNatServicesRequest" (optional.Interface of ReadNatServicesRequest) - @return ReadNatServicesResponse */ func (a *NatServiceApiService) ReadNatServices(ctx _context.Context, localVarOptionals *ReadNatServicesOpts) (ReadNatServicesResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_net.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_net.go index 1d468fa1b..80de3d5bf 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_net.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_net.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type NetApiService service // CreateNetOpts Optional parameters for the method 'CreateNet' type CreateNetOpts struct { - CreateNetRequest optional.Interface + CreateNetRequest optional.Interface } /* CreateNet Method for CreateNet * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateNetOpts - Optional Parameters: - * @param "CreateNetRequest" (optional.Interface of CreateNetRequest) - + * @param "CreateNetRequest" (optional.Interface of CreateNetRequest) - @return CreateNetResponse */ func (a *NetApiService) CreateNet(ctx _context.Context, localVarOptionals *CreateNetOpts) (CreateNetResponse, *_nethttp.Response, error) { @@ -179,14 +179,14 @@ func (a *NetApiService) CreateNet(ctx _context.Context, localVarOptionals *Creat // DeleteNetOpts Optional parameters for the method 'DeleteNet' type DeleteNetOpts struct { - DeleteNetRequest optional.Interface + DeleteNetRequest optional.Interface } /* DeleteNet Method for DeleteNet * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteNetOpts - Optional Parameters: - * @param "DeleteNetRequest" (optional.Interface of DeleteNetRequest) - + * @param "DeleteNetRequest" (optional.Interface of DeleteNetRequest) - @return DeleteNetResponse */ func (a *NetApiService) DeleteNet(ctx _context.Context, localVarOptionals *DeleteNetOpts) (DeleteNetResponse, *_nethttp.Response, error) { @@ -320,14 +320,14 @@ func (a *NetApiService) DeleteNet(ctx _context.Context, localVarOptionals *Delet // ReadNetsOpts Optional parameters for the method 'ReadNets' type ReadNetsOpts struct { - ReadNetsRequest optional.Interface + ReadNetsRequest optional.Interface } /* ReadNets Method for ReadNets * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadNetsOpts - Optional Parameters: - * @param "ReadNetsRequest" (optional.Interface of ReadNetsRequest) - + * @param "ReadNetsRequest" (optional.Interface of ReadNetsRequest) - @return ReadNetsResponse */ func (a *NetApiService) ReadNets(ctx _context.Context, localVarOptionals *ReadNetsOpts) (ReadNetsResponse, *_nethttp.Response, error) { @@ -461,14 +461,14 @@ func (a *NetApiService) ReadNets(ctx _context.Context, localVarOptionals *ReadNe // UpdateNetOpts Optional parameters for the method 'UpdateNet' type UpdateNetOpts struct { - UpdateNetRequest optional.Interface + UpdateNetRequest optional.Interface } /* UpdateNet Method for UpdateNet * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateNetOpts - Optional Parameters: - * @param "UpdateNetRequest" (optional.Interface of UpdateNetRequest) - + * @param "UpdateNetRequest" (optional.Interface of UpdateNetRequest) - @return UpdateNetResponse */ func (a *NetApiService) UpdateNet(ctx _context.Context, localVarOptionals *UpdateNetOpts) (UpdateNetResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_net_access_point.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_net_access_point.go index 244c84473..e81f3ebe2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_net_access_point.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_net_access_point.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type NetAccessPointApiService service // CreateNetAccessPointOpts Optional parameters for the method 'CreateNetAccessPoint' type CreateNetAccessPointOpts struct { - CreateNetAccessPointRequest optional.Interface + CreateNetAccessPointRequest optional.Interface } /* CreateNetAccessPoint Method for CreateNetAccessPoint * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateNetAccessPointOpts - Optional Parameters: - * @param "CreateNetAccessPointRequest" (optional.Interface of CreateNetAccessPointRequest) - + * @param "CreateNetAccessPointRequest" (optional.Interface of CreateNetAccessPointRequest) - @return CreateNetAccessPointResponse */ func (a *NetAccessPointApiService) CreateNetAccessPoint(ctx _context.Context, localVarOptionals *CreateNetAccessPointOpts) (CreateNetAccessPointResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *NetAccessPointApiService) CreateNetAccessPoint(ctx _context.Context, lo // DeleteNetAccessPointOpts Optional parameters for the method 'DeleteNetAccessPoint' type DeleteNetAccessPointOpts struct { - DeleteNetAccessPointRequest optional.Interface + DeleteNetAccessPointRequest optional.Interface } /* DeleteNetAccessPoint Method for DeleteNetAccessPoint * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteNetAccessPointOpts - Optional Parameters: - * @param "DeleteNetAccessPointRequest" (optional.Interface of DeleteNetAccessPointRequest) - + * @param "DeleteNetAccessPointRequest" (optional.Interface of DeleteNetAccessPointRequest) - @return DeleteNetAccessPointResponse */ func (a *NetAccessPointApiService) DeleteNetAccessPoint(ctx _context.Context, localVarOptionals *DeleteNetAccessPointOpts) (DeleteNetAccessPointResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *NetAccessPointApiService) DeleteNetAccessPoint(ctx _context.Context, lo // ReadNetAccessPointServicesOpts Optional parameters for the method 'ReadNetAccessPointServices' type ReadNetAccessPointServicesOpts struct { - ReadNetAccessPointServicesRequest optional.Interface + ReadNetAccessPointServicesRequest optional.Interface } /* ReadNetAccessPointServices Method for ReadNetAccessPointServices * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadNetAccessPointServicesOpts - Optional Parameters: - * @param "ReadNetAccessPointServicesRequest" (optional.Interface of ReadNetAccessPointServicesRequest) - + * @param "ReadNetAccessPointServicesRequest" (optional.Interface of ReadNetAccessPointServicesRequest) - @return ReadNetAccessPointServicesResponse */ func (a *NetAccessPointApiService) ReadNetAccessPointServices(ctx _context.Context, localVarOptionals *ReadNetAccessPointServicesOpts) (ReadNetAccessPointServicesResponse, *_nethttp.Response, error) { @@ -349,14 +349,14 @@ func (a *NetAccessPointApiService) ReadNetAccessPointServices(ctx _context.Conte // ReadNetAccessPointsOpts Optional parameters for the method 'ReadNetAccessPoints' type ReadNetAccessPointsOpts struct { - ReadNetAccessPointsRequest optional.Interface + ReadNetAccessPointsRequest optional.Interface } /* ReadNetAccessPoints Method for ReadNetAccessPoints * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadNetAccessPointsOpts - Optional Parameters: - * @param "ReadNetAccessPointsRequest" (optional.Interface of ReadNetAccessPointsRequest) - + * @param "ReadNetAccessPointsRequest" (optional.Interface of ReadNetAccessPointsRequest) - @return ReadNetAccessPointsResponse */ func (a *NetAccessPointApiService) ReadNetAccessPoints(ctx _context.Context, localVarOptionals *ReadNetAccessPointsOpts) (ReadNetAccessPointsResponse, *_nethttp.Response, error) { @@ -460,14 +460,14 @@ func (a *NetAccessPointApiService) ReadNetAccessPoints(ctx _context.Context, loc // UpdateNetAccessPointOpts Optional parameters for the method 'UpdateNetAccessPoint' type UpdateNetAccessPointOpts struct { - UpdateNetAccessPointRequest optional.Interface + UpdateNetAccessPointRequest optional.Interface } /* UpdateNetAccessPoint Method for UpdateNetAccessPoint * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateNetAccessPointOpts - Optional Parameters: - * @param "UpdateNetAccessPointRequest" (optional.Interface of UpdateNetAccessPointRequest) - + * @param "UpdateNetAccessPointRequest" (optional.Interface of UpdateNetAccessPointRequest) - @return UpdateNetAccessPointResponse */ func (a *NetAccessPointApiService) UpdateNetAccessPoint(ctx _context.Context, localVarOptionals *UpdateNetAccessPointOpts) (UpdateNetAccessPointResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_net_peering.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_net_peering.go index 49602646c..095341fb1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_net_peering.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_net_peering.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type NetPeeringApiService service // AcceptNetPeeringOpts Optional parameters for the method 'AcceptNetPeering' type AcceptNetPeeringOpts struct { - AcceptNetPeeringRequest optional.Interface + AcceptNetPeeringRequest optional.Interface } /* AcceptNetPeering Method for AcceptNetPeering * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *AcceptNetPeeringOpts - Optional Parameters: - * @param "AcceptNetPeeringRequest" (optional.Interface of AcceptNetPeeringRequest) - + * @param "AcceptNetPeeringRequest" (optional.Interface of AcceptNetPeeringRequest) - @return AcceptNetPeeringResponse */ func (a *NetPeeringApiService) AcceptNetPeering(ctx _context.Context, localVarOptionals *AcceptNetPeeringOpts) (AcceptNetPeeringResponse, *_nethttp.Response, error) { @@ -179,14 +179,14 @@ func (a *NetPeeringApiService) AcceptNetPeering(ctx _context.Context, localVarOp // CreateNetPeeringOpts Optional parameters for the method 'CreateNetPeering' type CreateNetPeeringOpts struct { - CreateNetPeeringRequest optional.Interface + CreateNetPeeringRequest optional.Interface } /* CreateNetPeering Method for CreateNetPeering * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateNetPeeringOpts - Optional Parameters: - * @param "CreateNetPeeringRequest" (optional.Interface of CreateNetPeeringRequest) - + * @param "CreateNetPeeringRequest" (optional.Interface of CreateNetPeeringRequest) - @return CreateNetPeeringResponse */ func (a *NetPeeringApiService) CreateNetPeering(ctx _context.Context, localVarOptionals *CreateNetPeeringOpts) (CreateNetPeeringResponse, *_nethttp.Response, error) { @@ -320,14 +320,14 @@ func (a *NetPeeringApiService) CreateNetPeering(ctx _context.Context, localVarOp // DeleteNetPeeringOpts Optional parameters for the method 'DeleteNetPeering' type DeleteNetPeeringOpts struct { - DeleteNetPeeringRequest optional.Interface + DeleteNetPeeringRequest optional.Interface } /* DeleteNetPeering Method for DeleteNetPeering * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteNetPeeringOpts - Optional Parameters: - * @param "DeleteNetPeeringRequest" (optional.Interface of DeleteNetPeeringRequest) - + * @param "DeleteNetPeeringRequest" (optional.Interface of DeleteNetPeeringRequest) - @return DeleteNetPeeringResponse */ func (a *NetPeeringApiService) DeleteNetPeering(ctx _context.Context, localVarOptionals *DeleteNetPeeringOpts) (DeleteNetPeeringResponse, *_nethttp.Response, error) { @@ -471,14 +471,14 @@ func (a *NetPeeringApiService) DeleteNetPeering(ctx _context.Context, localVarOp // ReadNetPeeringsOpts Optional parameters for the method 'ReadNetPeerings' type ReadNetPeeringsOpts struct { - ReadNetPeeringsRequest optional.Interface + ReadNetPeeringsRequest optional.Interface } /* ReadNetPeerings Method for ReadNetPeerings * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadNetPeeringsOpts - Optional Parameters: - * @param "ReadNetPeeringsRequest" (optional.Interface of ReadNetPeeringsRequest) - + * @param "ReadNetPeeringsRequest" (optional.Interface of ReadNetPeeringsRequest) - @return ReadNetPeeringsResponse */ func (a *NetPeeringApiService) ReadNetPeerings(ctx _context.Context, localVarOptionals *ReadNetPeeringsOpts) (ReadNetPeeringsResponse, *_nethttp.Response, error) { @@ -612,14 +612,14 @@ func (a *NetPeeringApiService) ReadNetPeerings(ctx _context.Context, localVarOpt // RejectNetPeeringOpts Optional parameters for the method 'RejectNetPeering' type RejectNetPeeringOpts struct { - RejectNetPeeringRequest optional.Interface + RejectNetPeeringRequest optional.Interface } /* RejectNetPeering Method for RejectNetPeering * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *RejectNetPeeringOpts - Optional Parameters: - * @param "RejectNetPeeringRequest" (optional.Interface of RejectNetPeeringRequest) - + * @param "RejectNetPeeringRequest" (optional.Interface of RejectNetPeeringRequest) - @return RejectNetPeeringResponse */ func (a *NetPeeringApiService) RejectNetPeering(ctx _context.Context, localVarOptionals *RejectNetPeeringOpts) (RejectNetPeeringResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_nic.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_nic.go index 05fc1b55e..19b4daeb6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_nic.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_nic.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type NicApiService service // CreateNicOpts Optional parameters for the method 'CreateNic' type CreateNicOpts struct { - CreateNicRequest optional.Interface + CreateNicRequest optional.Interface } /* CreateNic Method for CreateNic * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateNicOpts - Optional Parameters: - * @param "CreateNicRequest" (optional.Interface of CreateNicRequest) - + * @param "CreateNicRequest" (optional.Interface of CreateNicRequest) - @return CreateNicResponse */ func (a *NicApiService) CreateNic(ctx _context.Context, localVarOptionals *CreateNicOpts) (CreateNicResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *NicApiService) CreateNic(ctx _context.Context, localVarOptionals *Creat // DeleteNicOpts Optional parameters for the method 'DeleteNic' type DeleteNicOpts struct { - DeleteNicRequest optional.Interface + DeleteNicRequest optional.Interface } /* DeleteNic Method for DeleteNic * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteNicOpts - Optional Parameters: - * @param "DeleteNicRequest" (optional.Interface of DeleteNicRequest) - + * @param "DeleteNicRequest" (optional.Interface of DeleteNicRequest) - @return DeleteNicResponse */ func (a *NicApiService) DeleteNic(ctx _context.Context, localVarOptionals *DeleteNicOpts) (DeleteNicResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *NicApiService) DeleteNic(ctx _context.Context, localVarOptionals *Delet // LinkNicOpts Optional parameters for the method 'LinkNic' type LinkNicOpts struct { - LinkNicRequest optional.Interface + LinkNicRequest optional.Interface } /* LinkNic Method for LinkNic * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkNicOpts - Optional Parameters: - * @param "LinkNicRequest" (optional.Interface of LinkNicRequest) - + * @param "LinkNicRequest" (optional.Interface of LinkNicRequest) - @return LinkNicResponse */ func (a *NicApiService) LinkNic(ctx _context.Context, localVarOptionals *LinkNicOpts) (LinkNicResponse, *_nethttp.Response, error) { @@ -451,14 +451,14 @@ func (a *NicApiService) LinkNic(ctx _context.Context, localVarOptionals *LinkNic // LinkPrivateIpsOpts Optional parameters for the method 'LinkPrivateIps' type LinkPrivateIpsOpts struct { - LinkPrivateIpsRequest optional.Interface + LinkPrivateIpsRequest optional.Interface } /* LinkPrivateIps Method for LinkPrivateIps * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkPrivateIpsOpts - Optional Parameters: - * @param "LinkPrivateIpsRequest" (optional.Interface of LinkPrivateIpsRequest) - + * @param "LinkPrivateIpsRequest" (optional.Interface of LinkPrivateIpsRequest) - @return LinkPrivateIpsResponse */ func (a *NicApiService) LinkPrivateIps(ctx _context.Context, localVarOptionals *LinkPrivateIpsOpts) (LinkPrivateIpsResponse, *_nethttp.Response, error) { @@ -592,14 +592,14 @@ func (a *NicApiService) LinkPrivateIps(ctx _context.Context, localVarOptionals * // ReadNicsOpts Optional parameters for the method 'ReadNics' type ReadNicsOpts struct { - ReadNicsRequest optional.Interface + ReadNicsRequest optional.Interface } /* ReadNics Method for ReadNics * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadNicsOpts - Optional Parameters: - * @param "ReadNicsRequest" (optional.Interface of ReadNicsRequest) - + * @param "ReadNicsRequest" (optional.Interface of ReadNicsRequest) - @return ReadNicsResponse */ func (a *NicApiService) ReadNics(ctx _context.Context, localVarOptionals *ReadNicsOpts) (ReadNicsResponse, *_nethttp.Response, error) { @@ -733,14 +733,14 @@ func (a *NicApiService) ReadNics(ctx _context.Context, localVarOptionals *ReadNi // UnlinkNicOpts Optional parameters for the method 'UnlinkNic' type UnlinkNicOpts struct { - UnlinkNicRequest optional.Interface + UnlinkNicRequest optional.Interface } /* UnlinkNic Method for UnlinkNic * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkNicOpts - Optional Parameters: - * @param "UnlinkNicRequest" (optional.Interface of UnlinkNicRequest) - + * @param "UnlinkNicRequest" (optional.Interface of UnlinkNicRequest) - @return UnlinkNicResponse */ func (a *NicApiService) UnlinkNic(ctx _context.Context, localVarOptionals *UnlinkNicOpts) (UnlinkNicResponse, *_nethttp.Response, error) { @@ -874,14 +874,14 @@ func (a *NicApiService) UnlinkNic(ctx _context.Context, localVarOptionals *Unlin // UnlinkPrivateIpsOpts Optional parameters for the method 'UnlinkPrivateIps' type UnlinkPrivateIpsOpts struct { - UnlinkPrivateIpsRequest optional.Interface + UnlinkPrivateIpsRequest optional.Interface } /* UnlinkPrivateIps Method for UnlinkPrivateIps * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkPrivateIpsOpts - Optional Parameters: - * @param "UnlinkPrivateIpsRequest" (optional.Interface of UnlinkPrivateIpsRequest) - + * @param "UnlinkPrivateIpsRequest" (optional.Interface of UnlinkPrivateIpsRequest) - @return UnlinkPrivateIpsResponse */ func (a *NicApiService) UnlinkPrivateIps(ctx _context.Context, localVarOptionals *UnlinkPrivateIpsOpts) (UnlinkPrivateIpsResponse, *_nethttp.Response, error) { @@ -1015,14 +1015,14 @@ func (a *NicApiService) UnlinkPrivateIps(ctx _context.Context, localVarOptionals // UpdateNicOpts Optional parameters for the method 'UpdateNic' type UpdateNicOpts struct { - UpdateNicRequest optional.Interface + UpdateNicRequest optional.Interface } /* UpdateNic Method for UpdateNic * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateNicOpts - Optional Parameters: - * @param "UpdateNicRequest" (optional.Interface of UpdateNicRequest) - + * @param "UpdateNicRequest" (optional.Interface of UpdateNicRequest) - @return UpdateNicResponse */ func (a *NicApiService) UpdateNic(ctx _context.Context, localVarOptionals *UpdateNicOpts) (UpdateNicResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_product_type.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_product_type.go index 6be91b995..a524d0243 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_product_type.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_product_type.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type ProductTypeApiService service // ReadProductTypesOpts Optional parameters for the method 'ReadProductTypes' type ReadProductTypesOpts struct { - ReadProductTypesRequest optional.Interface + ReadProductTypesRequest optional.Interface } /* ReadProductTypes Method for ReadProductTypes * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadProductTypesOpts - Optional Parameters: - * @param "ReadProductTypesRequest" (optional.Interface of ReadProductTypesRequest) - + * @param "ReadProductTypesRequest" (optional.Interface of ReadProductTypesRequest) - @return ReadProductTypesResponse */ func (a *ProductTypeApiService) ReadProductTypes(ctx _context.Context, localVarOptionals *ReadProductTypesOpts) (ReadProductTypesResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_public_ip.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_public_ip.go index 747d6b512..ae242126a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_public_ip.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_public_ip.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type PublicIpApiService service // CreatePublicIpOpts Optional parameters for the method 'CreatePublicIp' type CreatePublicIpOpts struct { - CreatePublicIpRequest optional.Interface + CreatePublicIpRequest optional.Interface } /* CreatePublicIp Method for CreatePublicIp * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreatePublicIpOpts - Optional Parameters: - * @param "CreatePublicIpRequest" (optional.Interface of CreatePublicIpRequest) - + * @param "CreatePublicIpRequest" (optional.Interface of CreatePublicIpRequest) - @return CreatePublicIpResponse */ func (a *PublicIpApiService) CreatePublicIp(ctx _context.Context, localVarOptionals *CreatePublicIpOpts) (CreatePublicIpResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *PublicIpApiService) CreatePublicIp(ctx _context.Context, localVarOption // DeletePublicIpOpts Optional parameters for the method 'DeletePublicIp' type DeletePublicIpOpts struct { - DeletePublicIpRequest optional.Interface + DeletePublicIpRequest optional.Interface } /* DeletePublicIp Method for DeletePublicIp * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeletePublicIpOpts - Optional Parameters: - * @param "DeletePublicIpRequest" (optional.Interface of DeletePublicIpRequest) - + * @param "DeletePublicIpRequest" (optional.Interface of DeletePublicIpRequest) - @return DeletePublicIpResponse */ func (a *PublicIpApiService) DeletePublicIp(ctx _context.Context, localVarOptionals *DeletePublicIpOpts) (DeletePublicIpResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *PublicIpApiService) DeletePublicIp(ctx _context.Context, localVarOption // LinkPublicIpOpts Optional parameters for the method 'LinkPublicIp' type LinkPublicIpOpts struct { - LinkPublicIpRequest optional.Interface + LinkPublicIpRequest optional.Interface } /* LinkPublicIp Method for LinkPublicIp * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkPublicIpOpts - Optional Parameters: - * @param "LinkPublicIpRequest" (optional.Interface of LinkPublicIpRequest) - + * @param "LinkPublicIpRequest" (optional.Interface of LinkPublicIpRequest) - @return LinkPublicIpResponse */ func (a *PublicIpApiService) LinkPublicIp(ctx _context.Context, localVarOptionals *LinkPublicIpOpts) (LinkPublicIpResponse, *_nethttp.Response, error) { @@ -451,14 +451,14 @@ func (a *PublicIpApiService) LinkPublicIp(ctx _context.Context, localVarOptional // ReadPublicIpRangesOpts Optional parameters for the method 'ReadPublicIpRanges' type ReadPublicIpRangesOpts struct { - ReadPublicIpRangesRequest optional.Interface + ReadPublicIpRangesRequest optional.Interface } /* ReadPublicIpRanges Method for ReadPublicIpRanges * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadPublicIpRangesOpts - Optional Parameters: - * @param "ReadPublicIpRangesRequest" (optional.Interface of ReadPublicIpRangesRequest) - + * @param "ReadPublicIpRangesRequest" (optional.Interface of ReadPublicIpRangesRequest) - @return ReadPublicIpRangesResponse */ func (a *PublicIpApiService) ReadPublicIpRanges(ctx _context.Context, localVarOptionals *ReadPublicIpRangesOpts) (ReadPublicIpRangesResponse, *_nethttp.Response, error) { @@ -550,14 +550,14 @@ func (a *PublicIpApiService) ReadPublicIpRanges(ctx _context.Context, localVarOp // ReadPublicIpsOpts Optional parameters for the method 'ReadPublicIps' type ReadPublicIpsOpts struct { - ReadPublicIpsRequest optional.Interface + ReadPublicIpsRequest optional.Interface } /* ReadPublicIps Method for ReadPublicIps * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadPublicIpsOpts - Optional Parameters: - * @param "ReadPublicIpsRequest" (optional.Interface of ReadPublicIpsRequest) - + * @param "ReadPublicIpsRequest" (optional.Interface of ReadPublicIpsRequest) - @return ReadPublicIpsResponse */ func (a *PublicIpApiService) ReadPublicIps(ctx _context.Context, localVarOptionals *ReadPublicIpsOpts) (ReadPublicIpsResponse, *_nethttp.Response, error) { @@ -691,14 +691,14 @@ func (a *PublicIpApiService) ReadPublicIps(ctx _context.Context, localVarOptiona // UnlinkPublicIpOpts Optional parameters for the method 'UnlinkPublicIp' type UnlinkPublicIpOpts struct { - UnlinkPublicIpRequest optional.Interface + UnlinkPublicIpRequest optional.Interface } /* UnlinkPublicIp Method for UnlinkPublicIp * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkPublicIpOpts - Optional Parameters: - * @param "UnlinkPublicIpRequest" (optional.Interface of UnlinkPublicIpRequest) - + * @param "UnlinkPublicIpRequest" (optional.Interface of UnlinkPublicIpRequest) - @return UnlinkPublicIpResponse */ func (a *PublicIpApiService) UnlinkPublicIp(ctx _context.Context, localVarOptionals *UnlinkPublicIpOpts) (UnlinkPublicIpResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_quota.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_quota.go index 29a3d0f69..f4d5e2669 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_quota.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_quota.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type QuotaApiService service // ReadQuotasOpts Optional parameters for the method 'ReadQuotas' type ReadQuotasOpts struct { - ReadQuotasRequest optional.Interface + ReadQuotasRequest optional.Interface } /* ReadQuotas Method for ReadQuotas * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadQuotasOpts - Optional Parameters: - * @param "ReadQuotasRequest" (optional.Interface of ReadQuotasRequest) - + * @param "ReadQuotasRequest" (optional.Interface of ReadQuotasRequest) - @return ReadQuotasResponse */ func (a *QuotaApiService) ReadQuotas(ctx _context.Context, localVarOptionals *ReadQuotasOpts) (ReadQuotasResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_region.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_region.go index 24f5e0d34..fe7d3050a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_region.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_region.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type RegionApiService service // ReadRegionsOpts Optional parameters for the method 'ReadRegions' type ReadRegionsOpts struct { - ReadRegionsRequest optional.Interface + ReadRegionsRequest optional.Interface } /* ReadRegions Method for ReadRegions * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadRegionsOpts - Optional Parameters: - * @param "ReadRegionsRequest" (optional.Interface of ReadRegionsRequest) - + * @param "ReadRegionsRequest" (optional.Interface of ReadRegionsRequest) - @return ReadRegionsResponse */ func (a *RegionApiService) ReadRegions(ctx _context.Context, localVarOptionals *ReadRegionsOpts) (ReadRegionsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_route.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_route.go index cff01ac2a..ec6c32a72 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_route.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_route.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type RouteApiService service // CreateRouteOpts Optional parameters for the method 'CreateRoute' type CreateRouteOpts struct { - CreateRouteRequest optional.Interface + CreateRouteRequest optional.Interface } /* CreateRoute Method for CreateRoute * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateRouteOpts - Optional Parameters: - * @param "CreateRouteRequest" (optional.Interface of CreateRouteRequest) - + * @param "CreateRouteRequest" (optional.Interface of CreateRouteRequest) - @return CreateRouteResponse */ func (a *RouteApiService) CreateRoute(ctx _context.Context, localVarOptionals *CreateRouteOpts) (CreateRouteResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *RouteApiService) CreateRoute(ctx _context.Context, localVarOptionals *C // DeleteRouteOpts Optional parameters for the method 'DeleteRoute' type DeleteRouteOpts struct { - DeleteRouteRequest optional.Interface + DeleteRouteRequest optional.Interface } /* DeleteRoute Method for DeleteRoute * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteRouteOpts - Optional Parameters: - * @param "DeleteRouteRequest" (optional.Interface of DeleteRouteRequest) - + * @param "DeleteRouteRequest" (optional.Interface of DeleteRouteRequest) - @return DeleteRouteResponse */ func (a *RouteApiService) DeleteRoute(ctx _context.Context, localVarOptionals *DeleteRouteOpts) (DeleteRouteResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *RouteApiService) DeleteRoute(ctx _context.Context, localVarOptionals *D // UpdateRouteOpts Optional parameters for the method 'UpdateRoute' type UpdateRouteOpts struct { - UpdateRouteRequest optional.Interface + UpdateRouteRequest optional.Interface } /* UpdateRoute Method for UpdateRoute * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateRouteOpts - Optional Parameters: - * @param "UpdateRouteRequest" (optional.Interface of UpdateRouteRequest) - + * @param "UpdateRouteRequest" (optional.Interface of UpdateRouteRequest) - @return UpdateRouteResponse */ func (a *RouteApiService) UpdateRoute(ctx _context.Context, localVarOptionals *UpdateRouteOpts) (UpdateRouteResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_route_table.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_route_table.go index 544c38add..520987695 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_route_table.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_route_table.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type RouteTableApiService service // CreateRouteTableOpts Optional parameters for the method 'CreateRouteTable' type CreateRouteTableOpts struct { - CreateRouteTableRequest optional.Interface + CreateRouteTableRequest optional.Interface } /* CreateRouteTable Method for CreateRouteTable * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateRouteTableOpts - Optional Parameters: - * @param "CreateRouteTableRequest" (optional.Interface of CreateRouteTableRequest) - + * @param "CreateRouteTableRequest" (optional.Interface of CreateRouteTableRequest) - @return CreateRouteTableResponse */ func (a *RouteTableApiService) CreateRouteTable(ctx _context.Context, localVarOptionals *CreateRouteTableOpts) (CreateRouteTableResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *RouteTableApiService) CreateRouteTable(ctx _context.Context, localVarOp // DeleteRouteTableOpts Optional parameters for the method 'DeleteRouteTable' type DeleteRouteTableOpts struct { - DeleteRouteTableRequest optional.Interface + DeleteRouteTableRequest optional.Interface } /* DeleteRouteTable Method for DeleteRouteTable * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteRouteTableOpts - Optional Parameters: - * @param "DeleteRouteTableRequest" (optional.Interface of DeleteRouteTableRequest) - + * @param "DeleteRouteTableRequest" (optional.Interface of DeleteRouteTableRequest) - @return DeleteRouteTableResponse */ func (a *RouteTableApiService) DeleteRouteTable(ctx _context.Context, localVarOptionals *DeleteRouteTableOpts) (DeleteRouteTableResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *RouteTableApiService) DeleteRouteTable(ctx _context.Context, localVarOp // LinkRouteTableOpts Optional parameters for the method 'LinkRouteTable' type LinkRouteTableOpts struct { - LinkRouteTableRequest optional.Interface + LinkRouteTableRequest optional.Interface } /* LinkRouteTable Method for LinkRouteTable * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkRouteTableOpts - Optional Parameters: - * @param "LinkRouteTableRequest" (optional.Interface of LinkRouteTableRequest) - + * @param "LinkRouteTableRequest" (optional.Interface of LinkRouteTableRequest) - @return LinkRouteTableResponse */ func (a *RouteTableApiService) LinkRouteTable(ctx _context.Context, localVarOptionals *LinkRouteTableOpts) (LinkRouteTableResponse, *_nethttp.Response, error) { @@ -451,14 +451,14 @@ func (a *RouteTableApiService) LinkRouteTable(ctx _context.Context, localVarOpti // ReadRouteTablesOpts Optional parameters for the method 'ReadRouteTables' type ReadRouteTablesOpts struct { - ReadRouteTablesRequest optional.Interface + ReadRouteTablesRequest optional.Interface } /* ReadRouteTables Method for ReadRouteTables * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadRouteTablesOpts - Optional Parameters: - * @param "ReadRouteTablesRequest" (optional.Interface of ReadRouteTablesRequest) - + * @param "ReadRouteTablesRequest" (optional.Interface of ReadRouteTablesRequest) - @return ReadRouteTablesResponse */ func (a *RouteTableApiService) ReadRouteTables(ctx _context.Context, localVarOptionals *ReadRouteTablesOpts) (ReadRouteTablesResponse, *_nethttp.Response, error) { @@ -592,14 +592,14 @@ func (a *RouteTableApiService) ReadRouteTables(ctx _context.Context, localVarOpt // UnlinkRouteTableOpts Optional parameters for the method 'UnlinkRouteTable' type UnlinkRouteTableOpts struct { - UnlinkRouteTableRequest optional.Interface + UnlinkRouteTableRequest optional.Interface } /* UnlinkRouteTable Method for UnlinkRouteTable * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkRouteTableOpts - Optional Parameters: - * @param "UnlinkRouteTableRequest" (optional.Interface of UnlinkRouteTableRequest) - + * @param "UnlinkRouteTableRequest" (optional.Interface of UnlinkRouteTableRequest) - @return UnlinkRouteTableResponse */ func (a *RouteTableApiService) UnlinkRouteTable(ctx _context.Context, localVarOptionals *UnlinkRouteTableOpts) (UnlinkRouteTableResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group.go index c368ee2e9..fbb51be9d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type SecurityGroupApiService service // CreateSecurityGroupOpts Optional parameters for the method 'CreateSecurityGroup' type CreateSecurityGroupOpts struct { - CreateSecurityGroupRequest optional.Interface + CreateSecurityGroupRequest optional.Interface } /* CreateSecurityGroup Method for CreateSecurityGroup * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateSecurityGroupOpts - Optional Parameters: - * @param "CreateSecurityGroupRequest" (optional.Interface of CreateSecurityGroupRequest) - + * @param "CreateSecurityGroupRequest" (optional.Interface of CreateSecurityGroupRequest) - @return CreateSecurityGroupResponse */ func (a *SecurityGroupApiService) CreateSecurityGroup(ctx _context.Context, localVarOptionals *CreateSecurityGroupOpts) (CreateSecurityGroupResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *SecurityGroupApiService) CreateSecurityGroup(ctx _context.Context, loca // DeleteSecurityGroupOpts Optional parameters for the method 'DeleteSecurityGroup' type DeleteSecurityGroupOpts struct { - DeleteSecurityGroupRequest optional.Interface + DeleteSecurityGroupRequest optional.Interface } /* DeleteSecurityGroup Method for DeleteSecurityGroup * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteSecurityGroupOpts - Optional Parameters: - * @param "DeleteSecurityGroupRequest" (optional.Interface of DeleteSecurityGroupRequest) - + * @param "DeleteSecurityGroupRequest" (optional.Interface of DeleteSecurityGroupRequest) - @return DeleteSecurityGroupResponse */ func (a *SecurityGroupApiService) DeleteSecurityGroup(ctx _context.Context, localVarOptionals *DeleteSecurityGroupOpts) (DeleteSecurityGroupResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *SecurityGroupApiService) DeleteSecurityGroup(ctx _context.Context, loca // ReadSecurityGroupsOpts Optional parameters for the method 'ReadSecurityGroups' type ReadSecurityGroupsOpts struct { - ReadSecurityGroupsRequest optional.Interface + ReadSecurityGroupsRequest optional.Interface } /* ReadSecurityGroups Method for ReadSecurityGroups * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadSecurityGroupsOpts - Optional Parameters: - * @param "ReadSecurityGroupsRequest" (optional.Interface of ReadSecurityGroupsRequest) - + * @param "ReadSecurityGroupsRequest" (optional.Interface of ReadSecurityGroupsRequest) - @return ReadSecurityGroupsResponse */ func (a *SecurityGroupApiService) ReadSecurityGroups(ctx _context.Context, localVarOptionals *ReadSecurityGroupsOpts) (ReadSecurityGroupsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group_rule.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group_rule.go index 38a570e92..2acf7a106 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group_rule.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_security_group_rule.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type SecurityGroupRuleApiService service // CreateSecurityGroupRuleOpts Optional parameters for the method 'CreateSecurityGroupRule' type CreateSecurityGroupRuleOpts struct { - CreateSecurityGroupRuleRequest optional.Interface + CreateSecurityGroupRuleRequest optional.Interface } /* CreateSecurityGroupRule Method for CreateSecurityGroupRule * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateSecurityGroupRuleOpts - Optional Parameters: - * @param "CreateSecurityGroupRuleRequest" (optional.Interface of CreateSecurityGroupRuleRequest) - + * @param "CreateSecurityGroupRuleRequest" (optional.Interface of CreateSecurityGroupRuleRequest) - @return CreateSecurityGroupRuleResponse */ func (a *SecurityGroupRuleApiService) CreateSecurityGroupRule(ctx _context.Context, localVarOptionals *CreateSecurityGroupRuleOpts) (CreateSecurityGroupRuleResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *SecurityGroupRuleApiService) CreateSecurityGroupRule(ctx _context.Conte // DeleteSecurityGroupRuleOpts Optional parameters for the method 'DeleteSecurityGroupRule' type DeleteSecurityGroupRuleOpts struct { - DeleteSecurityGroupRuleRequest optional.Interface + DeleteSecurityGroupRuleRequest optional.Interface } /* DeleteSecurityGroupRule Method for DeleteSecurityGroupRule * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteSecurityGroupRuleOpts - Optional Parameters: - * @param "DeleteSecurityGroupRuleRequest" (optional.Interface of DeleteSecurityGroupRuleRequest) - + * @param "DeleteSecurityGroupRuleRequest" (optional.Interface of DeleteSecurityGroupRuleRequest) - @return DeleteSecurityGroupRuleResponse */ func (a *SecurityGroupRuleApiService) DeleteSecurityGroupRule(ctx _context.Context, localVarOptionals *DeleteSecurityGroupRuleOpts) (DeleteSecurityGroupRuleResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_server_certificate.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_server_certificate.go index fc0c32b5b..12aabc4a5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_server_certificate.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_server_certificate.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type ServerCertificateApiService service // CreateServerCertificateOpts Optional parameters for the method 'CreateServerCertificate' type CreateServerCertificateOpts struct { - CreateServerCertificateRequest optional.Interface + CreateServerCertificateRequest optional.Interface } /* CreateServerCertificate Method for CreateServerCertificate * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateServerCertificateOpts - Optional Parameters: - * @param "CreateServerCertificateRequest" (optional.Interface of CreateServerCertificateRequest) - + * @param "CreateServerCertificateRequest" (optional.Interface of CreateServerCertificateRequest) - @return CreateServerCertificateResponse */ func (a *ServerCertificateApiService) CreateServerCertificate(ctx _context.Context, localVarOptionals *CreateServerCertificateOpts) (CreateServerCertificateResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *ServerCertificateApiService) CreateServerCertificate(ctx _context.Conte // DeleteServerCertificateOpts Optional parameters for the method 'DeleteServerCertificate' type DeleteServerCertificateOpts struct { - DeleteServerCertificateRequest optional.Interface + DeleteServerCertificateRequest optional.Interface } /* DeleteServerCertificate Method for DeleteServerCertificate * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteServerCertificateOpts - Optional Parameters: - * @param "DeleteServerCertificateRequest" (optional.Interface of DeleteServerCertificateRequest) - + * @param "DeleteServerCertificateRequest" (optional.Interface of DeleteServerCertificateRequest) - @return DeleteServerCertificateResponse */ func (a *ServerCertificateApiService) DeleteServerCertificate(ctx _context.Context, localVarOptionals *DeleteServerCertificateOpts) (DeleteServerCertificateResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *ServerCertificateApiService) DeleteServerCertificate(ctx _context.Conte // ReadServerCertificatesOpts Optional parameters for the method 'ReadServerCertificates' type ReadServerCertificatesOpts struct { - ReadServerCertificatesRequest optional.Interface + ReadServerCertificatesRequest optional.Interface } /* ReadServerCertificates Method for ReadServerCertificates * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadServerCertificatesOpts - Optional Parameters: - * @param "ReadServerCertificatesRequest" (optional.Interface of ReadServerCertificatesRequest) - + * @param "ReadServerCertificatesRequest" (optional.Interface of ReadServerCertificatesRequest) - @return ReadServerCertificatesResponse */ func (a *ServerCertificateApiService) ReadServerCertificates(ctx _context.Context, localVarOptionals *ReadServerCertificatesOpts) (ReadServerCertificatesResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *ServerCertificateApiService) ReadServerCertificates(ctx _context.Contex // UpdateServerCertificateOpts Optional parameters for the method 'UpdateServerCertificate' type UpdateServerCertificateOpts struct { - UpdateServerCertificateRequest optional.Interface + UpdateServerCertificateRequest optional.Interface } /* UpdateServerCertificate Method for UpdateServerCertificate * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateServerCertificateOpts - Optional Parameters: - * @param "UpdateServerCertificateRequest" (optional.Interface of UpdateServerCertificateRequest) - + * @param "UpdateServerCertificateRequest" (optional.Interface of UpdateServerCertificateRequest) - @return UpdateServerCertificateResponse */ func (a *ServerCertificateApiService) UpdateServerCertificate(ctx _context.Context, localVarOptionals *UpdateServerCertificateOpts) (UpdateServerCertificateResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_snapshot.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_snapshot.go index 0600c23ba..425f82bb4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_snapshot.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_snapshot.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type SnapshotApiService service // CreateSnapshotOpts Optional parameters for the method 'CreateSnapshot' type CreateSnapshotOpts struct { - CreateSnapshotRequest optional.Interface + CreateSnapshotRequest optional.Interface } /* CreateSnapshot Method for CreateSnapshot * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateSnapshotOpts - Optional Parameters: - * @param "CreateSnapshotRequest" (optional.Interface of CreateSnapshotRequest) - + * @param "CreateSnapshotRequest" (optional.Interface of CreateSnapshotRequest) - @return CreateSnapshotResponse */ func (a *SnapshotApiService) CreateSnapshot(ctx _context.Context, localVarOptionals *CreateSnapshotOpts) (CreateSnapshotResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *SnapshotApiService) CreateSnapshot(ctx _context.Context, localVarOption // CreateSnapshotExportTaskOpts Optional parameters for the method 'CreateSnapshotExportTask' type CreateSnapshotExportTaskOpts struct { - CreateSnapshotExportTaskRequest optional.Interface + CreateSnapshotExportTaskRequest optional.Interface } /* CreateSnapshotExportTask Method for CreateSnapshotExportTask * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateSnapshotExportTaskOpts - Optional Parameters: - * @param "CreateSnapshotExportTaskRequest" (optional.Interface of CreateSnapshotExportTaskRequest) - + * @param "CreateSnapshotExportTaskRequest" (optional.Interface of CreateSnapshotExportTaskRequest) - @return CreateSnapshotExportTaskResponse */ func (a *SnapshotApiService) CreateSnapshotExportTask(ctx _context.Context, localVarOptionals *CreateSnapshotExportTaskOpts) (CreateSnapshotExportTaskResponse, *_nethttp.Response, error) { @@ -280,14 +280,14 @@ func (a *SnapshotApiService) CreateSnapshotExportTask(ctx _context.Context, loca // DeleteSnapshotOpts Optional parameters for the method 'DeleteSnapshot' type DeleteSnapshotOpts struct { - DeleteSnapshotRequest optional.Interface + DeleteSnapshotRequest optional.Interface } /* DeleteSnapshot Method for DeleteSnapshot * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteSnapshotOpts - Optional Parameters: - * @param "DeleteSnapshotRequest" (optional.Interface of DeleteSnapshotRequest) - + * @param "DeleteSnapshotRequest" (optional.Interface of DeleteSnapshotRequest) - @return DeleteSnapshotResponse */ func (a *SnapshotApiService) DeleteSnapshot(ctx _context.Context, localVarOptionals *DeleteSnapshotOpts) (DeleteSnapshotResponse, *_nethttp.Response, error) { @@ -421,14 +421,14 @@ func (a *SnapshotApiService) DeleteSnapshot(ctx _context.Context, localVarOption // ReadSnapshotExportTasksOpts Optional parameters for the method 'ReadSnapshotExportTasks' type ReadSnapshotExportTasksOpts struct { - ReadSnapshotExportTasksRequest optional.Interface + ReadSnapshotExportTasksRequest optional.Interface } /* ReadSnapshotExportTasks Method for ReadSnapshotExportTasks * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadSnapshotExportTasksOpts - Optional Parameters: - * @param "ReadSnapshotExportTasksRequest" (optional.Interface of ReadSnapshotExportTasksRequest) - + * @param "ReadSnapshotExportTasksRequest" (optional.Interface of ReadSnapshotExportTasksRequest) - @return ReadSnapshotExportTasksResponse */ func (a *SnapshotApiService) ReadSnapshotExportTasks(ctx _context.Context, localVarOptionals *ReadSnapshotExportTasksOpts) (ReadSnapshotExportTasksResponse, *_nethttp.Response, error) { @@ -532,14 +532,14 @@ func (a *SnapshotApiService) ReadSnapshotExportTasks(ctx _context.Context, local // ReadSnapshotsOpts Optional parameters for the method 'ReadSnapshots' type ReadSnapshotsOpts struct { - ReadSnapshotsRequest optional.Interface + ReadSnapshotsRequest optional.Interface } /* ReadSnapshots Method for ReadSnapshots * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadSnapshotsOpts - Optional Parameters: - * @param "ReadSnapshotsRequest" (optional.Interface of ReadSnapshotsRequest) - + * @param "ReadSnapshotsRequest" (optional.Interface of ReadSnapshotsRequest) - @return ReadSnapshotsResponse */ func (a *SnapshotApiService) ReadSnapshots(ctx _context.Context, localVarOptionals *ReadSnapshotsOpts) (ReadSnapshotsResponse, *_nethttp.Response, error) { @@ -673,14 +673,14 @@ func (a *SnapshotApiService) ReadSnapshots(ctx _context.Context, localVarOptiona // UpdateSnapshotOpts Optional parameters for the method 'UpdateSnapshot' type UpdateSnapshotOpts struct { - UpdateSnapshotRequest optional.Interface + UpdateSnapshotRequest optional.Interface } /* UpdateSnapshot Method for UpdateSnapshot * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateSnapshotOpts - Optional Parameters: - * @param "UpdateSnapshotRequest" (optional.Interface of UpdateSnapshotRequest) - + * @param "UpdateSnapshotRequest" (optional.Interface of UpdateSnapshotRequest) - @return UpdateSnapshotResponse */ func (a *SnapshotApiService) UpdateSnapshot(ctx _context.Context, localVarOptionals *UpdateSnapshotOpts) (UpdateSnapshotResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_subnet.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_subnet.go index 424d3ead7..46b0f1e74 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_subnet.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_subnet.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type SubnetApiService service // CreateSubnetOpts Optional parameters for the method 'CreateSubnet' type CreateSubnetOpts struct { - CreateSubnetRequest optional.Interface + CreateSubnetRequest optional.Interface } /* CreateSubnet Method for CreateSubnet * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateSubnetOpts - Optional Parameters: - * @param "CreateSubnetRequest" (optional.Interface of CreateSubnetRequest) - + * @param "CreateSubnetRequest" (optional.Interface of CreateSubnetRequest) - @return CreateSubnetResponse */ func (a *SubnetApiService) CreateSubnet(ctx _context.Context, localVarOptionals *CreateSubnetOpts) (CreateSubnetResponse, *_nethttp.Response, error) { @@ -179,14 +179,14 @@ func (a *SubnetApiService) CreateSubnet(ctx _context.Context, localVarOptionals // DeleteSubnetOpts Optional parameters for the method 'DeleteSubnet' type DeleteSubnetOpts struct { - DeleteSubnetRequest optional.Interface + DeleteSubnetRequest optional.Interface } /* DeleteSubnet Method for DeleteSubnet * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteSubnetOpts - Optional Parameters: - * @param "DeleteSubnetRequest" (optional.Interface of DeleteSubnetRequest) - + * @param "DeleteSubnetRequest" (optional.Interface of DeleteSubnetRequest) - @return DeleteSubnetResponse */ func (a *SubnetApiService) DeleteSubnet(ctx _context.Context, localVarOptionals *DeleteSubnetOpts) (DeleteSubnetResponse, *_nethttp.Response, error) { @@ -320,14 +320,14 @@ func (a *SubnetApiService) DeleteSubnet(ctx _context.Context, localVarOptionals // ReadSubnetsOpts Optional parameters for the method 'ReadSubnets' type ReadSubnetsOpts struct { - ReadSubnetsRequest optional.Interface + ReadSubnetsRequest optional.Interface } /* ReadSubnets Method for ReadSubnets * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadSubnetsOpts - Optional Parameters: - * @param "ReadSubnetsRequest" (optional.Interface of ReadSubnetsRequest) - + * @param "ReadSubnetsRequest" (optional.Interface of ReadSubnetsRequest) - @return ReadSubnetsResponse */ func (a *SubnetApiService) ReadSubnets(ctx _context.Context, localVarOptionals *ReadSubnetsOpts) (ReadSubnetsResponse, *_nethttp.Response, error) { @@ -461,14 +461,14 @@ func (a *SubnetApiService) ReadSubnets(ctx _context.Context, localVarOptionals * // UpdateSubnetOpts Optional parameters for the method 'UpdateSubnet' type UpdateSubnetOpts struct { - UpdateSubnetRequest optional.Interface + UpdateSubnetRequest optional.Interface } /* UpdateSubnet Method for UpdateSubnet * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateSubnetOpts - Optional Parameters: - * @param "UpdateSubnetRequest" (optional.Interface of UpdateSubnetRequest) - + * @param "UpdateSubnetRequest" (optional.Interface of UpdateSubnetRequest) - @return UpdateSubnetResponse */ func (a *SubnetApiService) UpdateSubnet(ctx _context.Context, localVarOptionals *UpdateSubnetOpts) (UpdateSubnetResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_subregion.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_subregion.go index 872c7521d..beeb86718 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_subregion.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_subregion.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type SubregionApiService service // ReadSubregionsOpts Optional parameters for the method 'ReadSubregions' type ReadSubregionsOpts struct { - ReadSubregionsRequest optional.Interface + ReadSubregionsRequest optional.Interface } /* ReadSubregions Method for ReadSubregions * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadSubregionsOpts - Optional Parameters: - * @param "ReadSubregionsRequest" (optional.Interface of ReadSubregionsRequest) - + * @param "ReadSubregionsRequest" (optional.Interface of ReadSubregionsRequest) - @return ReadSubregionsResponse */ func (a *SubregionApiService) ReadSubregions(ctx _context.Context, localVarOptionals *ReadSubregionsOpts) (ReadSubregionsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_tag.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_tag.go index b50567b02..a27c17c0a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_tag.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_tag.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type TagApiService service // CreateTagsOpts Optional parameters for the method 'CreateTags' type CreateTagsOpts struct { - CreateTagsRequest optional.Interface + CreateTagsRequest optional.Interface } /* CreateTags Method for CreateTags * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateTagsOpts - Optional Parameters: - * @param "CreateTagsRequest" (optional.Interface of CreateTagsRequest) - + * @param "CreateTagsRequest" (optional.Interface of CreateTagsRequest) - @return CreateTagsResponse */ func (a *TagApiService) CreateTags(ctx _context.Context, localVarOptionals *CreateTagsOpts) (CreateTagsResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *TagApiService) CreateTags(ctx _context.Context, localVarOptionals *Crea // DeleteTagsOpts Optional parameters for the method 'DeleteTags' type DeleteTagsOpts struct { - DeleteTagsRequest optional.Interface + DeleteTagsRequest optional.Interface } /* DeleteTags Method for DeleteTags * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteTagsOpts - Optional Parameters: - * @param "DeleteTagsRequest" (optional.Interface of DeleteTagsRequest) - + * @param "DeleteTagsRequest" (optional.Interface of DeleteTagsRequest) - @return DeleteTagsResponse */ func (a *TagApiService) DeleteTags(ctx _context.Context, localVarOptionals *DeleteTagsOpts) (DeleteTagsResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *TagApiService) DeleteTags(ctx _context.Context, localVarOptionals *Dele // ReadTagsOpts Optional parameters for the method 'ReadTags' type ReadTagsOpts struct { - ReadTagsRequest optional.Interface + ReadTagsRequest optional.Interface } /* ReadTags Method for ReadTags * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadTagsOpts - Optional Parameters: - * @param "ReadTagsRequest" (optional.Interface of ReadTagsRequest) - + * @param "ReadTagsRequest" (optional.Interface of ReadTagsRequest) - @return ReadTagsResponse */ func (a *TagApiService) ReadTags(ctx _context.Context, localVarOptionals *ReadTagsOpts) (ReadTagsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_task.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_task.go index 3ec9d557a..7fb415f4f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_task.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_task.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type TaskApiService service // DeleteExportTaskOpts Optional parameters for the method 'DeleteExportTask' type DeleteExportTaskOpts struct { - DeleteExportTaskRequest optional.Interface + DeleteExportTaskRequest optional.Interface } /* DeleteExportTask Method for DeleteExportTask * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteExportTaskOpts - Optional Parameters: - * @param "DeleteExportTaskRequest" (optional.Interface of DeleteExportTaskRequest) - + * @param "DeleteExportTaskRequest" (optional.Interface of DeleteExportTaskRequest) - @return DeleteExportTaskResponse */ func (a *TaskApiService) DeleteExportTask(ctx _context.Context, localVarOptionals *DeleteExportTaskOpts) (DeleteExportTaskResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_virtual_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_virtual_gateway.go index 87f11ea48..72bbeee8e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_virtual_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_virtual_gateway.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type VirtualGatewayApiService service // CreateVirtualGatewayOpts Optional parameters for the method 'CreateVirtualGateway' type CreateVirtualGatewayOpts struct { - CreateVirtualGatewayRequest optional.Interface + CreateVirtualGatewayRequest optional.Interface } /* CreateVirtualGateway Method for CreateVirtualGateway * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateVirtualGatewayOpts - Optional Parameters: - * @param "CreateVirtualGatewayRequest" (optional.Interface of CreateVirtualGatewayRequest) - + * @param "CreateVirtualGatewayRequest" (optional.Interface of CreateVirtualGatewayRequest) - @return CreateVirtualGatewayResponse */ func (a *VirtualGatewayApiService) CreateVirtualGateway(ctx _context.Context, localVarOptionals *CreateVirtualGatewayOpts) (CreateVirtualGatewayResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *VirtualGatewayApiService) CreateVirtualGateway(ctx _context.Context, lo // DeleteVirtualGatewayOpts Optional parameters for the method 'DeleteVirtualGateway' type DeleteVirtualGatewayOpts struct { - DeleteVirtualGatewayRequest optional.Interface + DeleteVirtualGatewayRequest optional.Interface } /* DeleteVirtualGateway Method for DeleteVirtualGateway * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteVirtualGatewayOpts - Optional Parameters: - * @param "DeleteVirtualGatewayRequest" (optional.Interface of DeleteVirtualGatewayRequest) - + * @param "DeleteVirtualGatewayRequest" (optional.Interface of DeleteVirtualGatewayRequest) - @return DeleteVirtualGatewayResponse */ func (a *VirtualGatewayApiService) DeleteVirtualGateway(ctx _context.Context, localVarOptionals *DeleteVirtualGatewayOpts) (DeleteVirtualGatewayResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *VirtualGatewayApiService) DeleteVirtualGateway(ctx _context.Context, lo // LinkVirtualGatewayOpts Optional parameters for the method 'LinkVirtualGateway' type LinkVirtualGatewayOpts struct { - LinkVirtualGatewayRequest optional.Interface + LinkVirtualGatewayRequest optional.Interface } /* LinkVirtualGateway Method for LinkVirtualGateway * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkVirtualGatewayOpts - Optional Parameters: - * @param "LinkVirtualGatewayRequest" (optional.Interface of LinkVirtualGatewayRequest) - + * @param "LinkVirtualGatewayRequest" (optional.Interface of LinkVirtualGatewayRequest) - @return LinkVirtualGatewayResponse */ func (a *VirtualGatewayApiService) LinkVirtualGateway(ctx _context.Context, localVarOptionals *LinkVirtualGatewayOpts) (LinkVirtualGatewayResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *VirtualGatewayApiService) LinkVirtualGateway(ctx _context.Context, loca // ReadVirtualGatewaysOpts Optional parameters for the method 'ReadVirtualGateways' type ReadVirtualGatewaysOpts struct { - ReadVirtualGatewaysRequest optional.Interface + ReadVirtualGatewaysRequest optional.Interface } /* ReadVirtualGateways Method for ReadVirtualGateways * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVirtualGatewaysOpts - Optional Parameters: - * @param "ReadVirtualGatewaysRequest" (optional.Interface of ReadVirtualGatewaysRequest) - + * @param "ReadVirtualGatewaysRequest" (optional.Interface of ReadVirtualGatewaysRequest) - @return ReadVirtualGatewaysResponse */ func (a *VirtualGatewayApiService) ReadVirtualGateways(ctx _context.Context, localVarOptionals *ReadVirtualGatewaysOpts) (ReadVirtualGatewaysResponse, *_nethttp.Response, error) { @@ -472,14 +472,14 @@ func (a *VirtualGatewayApiService) ReadVirtualGateways(ctx _context.Context, loc // UnlinkVirtualGatewayOpts Optional parameters for the method 'UnlinkVirtualGateway' type UnlinkVirtualGatewayOpts struct { - UnlinkVirtualGatewayRequest optional.Interface + UnlinkVirtualGatewayRequest optional.Interface } /* UnlinkVirtualGateway Method for UnlinkVirtualGateway * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkVirtualGatewayOpts - Optional Parameters: - * @param "UnlinkVirtualGatewayRequest" (optional.Interface of UnlinkVirtualGatewayRequest) - + * @param "UnlinkVirtualGatewayRequest" (optional.Interface of UnlinkVirtualGatewayRequest) - @return UnlinkVirtualGatewayResponse */ func (a *VirtualGatewayApiService) UnlinkVirtualGateway(ctx _context.Context, localVarOptionals *UnlinkVirtualGatewayOpts) (UnlinkVirtualGatewayResponse, *_nethttp.Response, error) { @@ -583,14 +583,14 @@ func (a *VirtualGatewayApiService) UnlinkVirtualGateway(ctx _context.Context, lo // UpdateRoutePropagationOpts Optional parameters for the method 'UpdateRoutePropagation' type UpdateRoutePropagationOpts struct { - UpdateRoutePropagationRequest optional.Interface + UpdateRoutePropagationRequest optional.Interface } /* UpdateRoutePropagation Method for UpdateRoutePropagation * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateRoutePropagationOpts - Optional Parameters: - * @param "UpdateRoutePropagationRequest" (optional.Interface of UpdateRoutePropagationRequest) - + * @param "UpdateRoutePropagationRequest" (optional.Interface of UpdateRoutePropagationRequest) - @return UpdateRoutePropagationResponse */ func (a *VirtualGatewayApiService) UpdateRoutePropagation(ctx _context.Context, localVarOptionals *UpdateRoutePropagationOpts) (UpdateRoutePropagationResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_vm.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_vm.go index 8ad85136d..a64fcef23 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_vm.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_vm.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type VmApiService service // CreateVmsOpts Optional parameters for the method 'CreateVms' type CreateVmsOpts struct { - CreateVmsRequest optional.Interface + CreateVmsRequest optional.Interface } /* CreateVms Method for CreateVms * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateVmsOpts - Optional Parameters: - * @param "CreateVmsRequest" (optional.Interface of CreateVmsRequest) - + * @param "CreateVmsRequest" (optional.Interface of CreateVmsRequest) - @return CreateVmsResponse */ func (a *VmApiService) CreateVms(ctx _context.Context, localVarOptionals *CreateVmsOpts) (CreateVmsResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *VmApiService) CreateVms(ctx _context.Context, localVarOptionals *Create // DeleteVmsOpts Optional parameters for the method 'DeleteVms' type DeleteVmsOpts struct { - DeleteVmsRequest optional.Interface + DeleteVmsRequest optional.Interface } /* DeleteVms Method for DeleteVms * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteVmsOpts - Optional Parameters: - * @param "DeleteVmsRequest" (optional.Interface of DeleteVmsRequest) - + * @param "DeleteVmsRequest" (optional.Interface of DeleteVmsRequest) - @return DeleteVmsResponse */ func (a *VmApiService) DeleteVms(ctx _context.Context, localVarOptionals *DeleteVmsOpts) (DeleteVmsResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *VmApiService) DeleteVms(ctx _context.Context, localVarOptionals *Delete // ReadAdminPasswordOpts Optional parameters for the method 'ReadAdminPassword' type ReadAdminPasswordOpts struct { - ReadAdminPasswordRequest optional.Interface + ReadAdminPasswordRequest optional.Interface } /* ReadAdminPassword Method for ReadAdminPassword * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadAdminPasswordOpts - Optional Parameters: - * @param "ReadAdminPasswordRequest" (optional.Interface of ReadAdminPasswordRequest) - + * @param "ReadAdminPasswordRequest" (optional.Interface of ReadAdminPasswordRequest) - @return ReadAdminPasswordResponse */ func (a *VmApiService) ReadAdminPassword(ctx _context.Context, localVarOptionals *ReadAdminPasswordOpts) (ReadAdminPasswordResponse, *_nethttp.Response, error) { @@ -451,14 +451,14 @@ func (a *VmApiService) ReadAdminPassword(ctx _context.Context, localVarOptionals // ReadConsoleOutputOpts Optional parameters for the method 'ReadConsoleOutput' type ReadConsoleOutputOpts struct { - ReadConsoleOutputRequest optional.Interface + ReadConsoleOutputRequest optional.Interface } /* ReadConsoleOutput Method for ReadConsoleOutput * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadConsoleOutputOpts - Optional Parameters: - * @param "ReadConsoleOutputRequest" (optional.Interface of ReadConsoleOutputRequest) - + * @param "ReadConsoleOutputRequest" (optional.Interface of ReadConsoleOutputRequest) - @return ReadConsoleOutputResponse */ func (a *VmApiService) ReadConsoleOutput(ctx _context.Context, localVarOptionals *ReadConsoleOutputOpts) (ReadConsoleOutputResponse, *_nethttp.Response, error) { @@ -592,14 +592,14 @@ func (a *VmApiService) ReadConsoleOutput(ctx _context.Context, localVarOptionals // ReadVmTypesOpts Optional parameters for the method 'ReadVmTypes' type ReadVmTypesOpts struct { - ReadVmTypesRequest optional.Interface + ReadVmTypesRequest optional.Interface } /* ReadVmTypes Method for ReadVmTypes * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVmTypesOpts - Optional Parameters: - * @param "ReadVmTypesRequest" (optional.Interface of ReadVmTypesRequest) - + * @param "ReadVmTypesRequest" (optional.Interface of ReadVmTypesRequest) - @return ReadVmTypesResponse */ func (a *VmApiService) ReadVmTypes(ctx _context.Context, localVarOptionals *ReadVmTypesOpts) (ReadVmTypesResponse, *_nethttp.Response, error) { @@ -691,14 +691,14 @@ func (a *VmApiService) ReadVmTypes(ctx _context.Context, localVarOptionals *Read // ReadVmsOpts Optional parameters for the method 'ReadVms' type ReadVmsOpts struct { - ReadVmsRequest optional.Interface + ReadVmsRequest optional.Interface } /* ReadVms Method for ReadVms * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVmsOpts - Optional Parameters: - * @param "ReadVmsRequest" (optional.Interface of ReadVmsRequest) - + * @param "ReadVmsRequest" (optional.Interface of ReadVmsRequest) - @return ReadVmsResponse */ func (a *VmApiService) ReadVms(ctx _context.Context, localVarOptionals *ReadVmsOpts) (ReadVmsResponse, *_nethttp.Response, error) { @@ -832,14 +832,14 @@ func (a *VmApiService) ReadVms(ctx _context.Context, localVarOptionals *ReadVmsO // ReadVmsStateOpts Optional parameters for the method 'ReadVmsState' type ReadVmsStateOpts struct { - ReadVmsStateRequest optional.Interface + ReadVmsStateRequest optional.Interface } /* ReadVmsState Method for ReadVmsState * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVmsStateOpts - Optional Parameters: - * @param "ReadVmsStateRequest" (optional.Interface of ReadVmsStateRequest) - + * @param "ReadVmsStateRequest" (optional.Interface of ReadVmsStateRequest) - @return ReadVmsStateResponse */ func (a *VmApiService) ReadVmsState(ctx _context.Context, localVarOptionals *ReadVmsStateOpts) (ReadVmsStateResponse, *_nethttp.Response, error) { @@ -973,14 +973,14 @@ func (a *VmApiService) ReadVmsState(ctx _context.Context, localVarOptionals *Rea // RebootVmsOpts Optional parameters for the method 'RebootVms' type RebootVmsOpts struct { - RebootVmsRequest optional.Interface + RebootVmsRequest optional.Interface } /* RebootVms Method for RebootVms * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *RebootVmsOpts - Optional Parameters: - * @param "RebootVmsRequest" (optional.Interface of RebootVmsRequest) - + * @param "RebootVmsRequest" (optional.Interface of RebootVmsRequest) - @return RebootVmsResponse */ func (a *VmApiService) RebootVms(ctx _context.Context, localVarOptionals *RebootVmsOpts) (RebootVmsResponse, *_nethttp.Response, error) { @@ -1114,14 +1114,14 @@ func (a *VmApiService) RebootVms(ctx _context.Context, localVarOptionals *Reboot // StartVmsOpts Optional parameters for the method 'StartVms' type StartVmsOpts struct { - StartVmsRequest optional.Interface + StartVmsRequest optional.Interface } /* StartVms Method for StartVms * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *StartVmsOpts - Optional Parameters: - * @param "StartVmsRequest" (optional.Interface of StartVmsRequest) - + * @param "StartVmsRequest" (optional.Interface of StartVmsRequest) - @return StartVmsResponse */ func (a *VmApiService) StartVms(ctx _context.Context, localVarOptionals *StartVmsOpts) (StartVmsResponse, *_nethttp.Response, error) { @@ -1255,14 +1255,14 @@ func (a *VmApiService) StartVms(ctx _context.Context, localVarOptionals *StartVm // StopVmsOpts Optional parameters for the method 'StopVms' type StopVmsOpts struct { - StopVmsRequest optional.Interface + StopVmsRequest optional.Interface } /* StopVms Method for StopVms * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *StopVmsOpts - Optional Parameters: - * @param "StopVmsRequest" (optional.Interface of StopVmsRequest) - + * @param "StopVmsRequest" (optional.Interface of StopVmsRequest) - @return StopVmsResponse */ func (a *VmApiService) StopVms(ctx _context.Context, localVarOptionals *StopVmsOpts) (StopVmsResponse, *_nethttp.Response, error) { @@ -1396,14 +1396,14 @@ func (a *VmApiService) StopVms(ctx _context.Context, localVarOptionals *StopVmsO // UpdateVmOpts Optional parameters for the method 'UpdateVm' type UpdateVmOpts struct { - UpdateVmRequest optional.Interface + UpdateVmRequest optional.Interface } /* UpdateVm Method for UpdateVm * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UpdateVmOpts - Optional Parameters: - * @param "UpdateVmRequest" (optional.Interface of UpdateVmRequest) - + * @param "UpdateVmRequest" (optional.Interface of UpdateVmRequest) - @return UpdateVmResponse */ func (a *VmApiService) UpdateVm(ctx _context.Context, localVarOptionals *UpdateVmOpts) (UpdateVmResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_volume.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_volume.go index 47d352cda..3de2dff76 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_volume.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_volume.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type VolumeApiService service // CreateVolumeOpts Optional parameters for the method 'CreateVolume' type CreateVolumeOpts struct { - CreateVolumeRequest optional.Interface + CreateVolumeRequest optional.Interface } /* CreateVolume Method for CreateVolume * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateVolumeOpts - Optional Parameters: - * @param "CreateVolumeRequest" (optional.Interface of CreateVolumeRequest) - + * @param "CreateVolumeRequest" (optional.Interface of CreateVolumeRequest) - @return CreateVolumeResponse */ func (a *VolumeApiService) CreateVolume(ctx _context.Context, localVarOptionals *CreateVolumeOpts) (CreateVolumeResponse, *_nethttp.Response, error) { @@ -169,14 +169,14 @@ func (a *VolumeApiService) CreateVolume(ctx _context.Context, localVarOptionals // DeleteVolumeOpts Optional parameters for the method 'DeleteVolume' type DeleteVolumeOpts struct { - DeleteVolumeRequest optional.Interface + DeleteVolumeRequest optional.Interface } /* DeleteVolume Method for DeleteVolume * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteVolumeOpts - Optional Parameters: - * @param "DeleteVolumeRequest" (optional.Interface of DeleteVolumeRequest) - + * @param "DeleteVolumeRequest" (optional.Interface of DeleteVolumeRequest) - @return DeleteVolumeResponse */ func (a *VolumeApiService) DeleteVolume(ctx _context.Context, localVarOptionals *DeleteVolumeOpts) (DeleteVolumeResponse, *_nethttp.Response, error) { @@ -310,14 +310,14 @@ func (a *VolumeApiService) DeleteVolume(ctx _context.Context, localVarOptionals // LinkVolumeOpts Optional parameters for the method 'LinkVolume' type LinkVolumeOpts struct { - LinkVolumeRequest optional.Interface + LinkVolumeRequest optional.Interface } /* LinkVolume Method for LinkVolume * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *LinkVolumeOpts - Optional Parameters: - * @param "LinkVolumeRequest" (optional.Interface of LinkVolumeRequest) - + * @param "LinkVolumeRequest" (optional.Interface of LinkVolumeRequest) - @return LinkVolumeResponse */ func (a *VolumeApiService) LinkVolume(ctx _context.Context, localVarOptionals *LinkVolumeOpts) (LinkVolumeResponse, *_nethttp.Response, error) { @@ -451,14 +451,14 @@ func (a *VolumeApiService) LinkVolume(ctx _context.Context, localVarOptionals *L // ReadVolumesOpts Optional parameters for the method 'ReadVolumes' type ReadVolumesOpts struct { - ReadVolumesRequest optional.Interface + ReadVolumesRequest optional.Interface } /* ReadVolumes Method for ReadVolumes * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVolumesOpts - Optional Parameters: - * @param "ReadVolumesRequest" (optional.Interface of ReadVolumesRequest) - + * @param "ReadVolumesRequest" (optional.Interface of ReadVolumesRequest) - @return ReadVolumesResponse */ func (a *VolumeApiService) ReadVolumes(ctx _context.Context, localVarOptionals *ReadVolumesOpts) (ReadVolumesResponse, *_nethttp.Response, error) { @@ -592,14 +592,14 @@ func (a *VolumeApiService) ReadVolumes(ctx _context.Context, localVarOptionals * // UnlinkVolumeOpts Optional parameters for the method 'UnlinkVolume' type UnlinkVolumeOpts struct { - UnlinkVolumeRequest optional.Interface + UnlinkVolumeRequest optional.Interface } /* UnlinkVolume Method for UnlinkVolume * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *UnlinkVolumeOpts - Optional Parameters: - * @param "UnlinkVolumeRequest" (optional.Interface of UnlinkVolumeRequest) - + * @param "UnlinkVolumeRequest" (optional.Interface of UnlinkVolumeRequest) - @return UnlinkVolumeResponse */ func (a *VolumeApiService) UnlinkVolume(ctx _context.Context, localVarOptionals *UnlinkVolumeOpts) (UnlinkVolumeResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/api_vpn_connection.go b/vendor/github.com/outscale/osc-sdk-go/osc/api_vpn_connection.go index f6bc2f5ed..82e77ce62 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/api_vpn_connection.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/api_vpn_connection.go @@ -12,10 +12,10 @@ package osc import ( _context "context" - "github.com/antihax/optional" _ioutil "io/ioutil" _nethttp "net/http" _neturl "net/url" + "github.com/antihax/optional" ) // Linger please @@ -28,14 +28,14 @@ type VpnConnectionApiService service // CreateVpnConnectionOpts Optional parameters for the method 'CreateVpnConnection' type CreateVpnConnectionOpts struct { - CreateVpnConnectionRequest optional.Interface + CreateVpnConnectionRequest optional.Interface } /* CreateVpnConnection Method for CreateVpnConnection * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateVpnConnectionOpts - Optional Parameters: - * @param "CreateVpnConnectionRequest" (optional.Interface of CreateVpnConnectionRequest) - + * @param "CreateVpnConnectionRequest" (optional.Interface of CreateVpnConnectionRequest) - @return CreateVpnConnectionResponse */ func (a *VpnConnectionApiService) CreateVpnConnection(ctx _context.Context, localVarOptionals *CreateVpnConnectionOpts) (CreateVpnConnectionResponse, *_nethttp.Response, error) { @@ -139,14 +139,14 @@ func (a *VpnConnectionApiService) CreateVpnConnection(ctx _context.Context, loca // CreateVpnConnectionRouteOpts Optional parameters for the method 'CreateVpnConnectionRoute' type CreateVpnConnectionRouteOpts struct { - CreateVpnConnectionRouteRequest optional.Interface + CreateVpnConnectionRouteRequest optional.Interface } /* CreateVpnConnectionRoute Method for CreateVpnConnectionRoute * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *CreateVpnConnectionRouteOpts - Optional Parameters: - * @param "CreateVpnConnectionRouteRequest" (optional.Interface of CreateVpnConnectionRouteRequest) - + * @param "CreateVpnConnectionRouteRequest" (optional.Interface of CreateVpnConnectionRouteRequest) - @return CreateVpnConnectionRouteResponse */ func (a *VpnConnectionApiService) CreateVpnConnectionRoute(ctx _context.Context, localVarOptionals *CreateVpnConnectionRouteOpts) (CreateVpnConnectionRouteResponse, *_nethttp.Response, error) { @@ -250,14 +250,14 @@ func (a *VpnConnectionApiService) CreateVpnConnectionRoute(ctx _context.Context, // DeleteVpnConnectionOpts Optional parameters for the method 'DeleteVpnConnection' type DeleteVpnConnectionOpts struct { - DeleteVpnConnectionRequest optional.Interface + DeleteVpnConnectionRequest optional.Interface } /* DeleteVpnConnection Method for DeleteVpnConnection * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteVpnConnectionOpts - Optional Parameters: - * @param "DeleteVpnConnectionRequest" (optional.Interface of DeleteVpnConnectionRequest) - + * @param "DeleteVpnConnectionRequest" (optional.Interface of DeleteVpnConnectionRequest) - @return DeleteVpnConnectionResponse */ func (a *VpnConnectionApiService) DeleteVpnConnection(ctx _context.Context, localVarOptionals *DeleteVpnConnectionOpts) (DeleteVpnConnectionResponse, *_nethttp.Response, error) { @@ -361,14 +361,14 @@ func (a *VpnConnectionApiService) DeleteVpnConnection(ctx _context.Context, loca // DeleteVpnConnectionRouteOpts Optional parameters for the method 'DeleteVpnConnectionRoute' type DeleteVpnConnectionRouteOpts struct { - DeleteVpnConnectionRouteRequest optional.Interface + DeleteVpnConnectionRouteRequest optional.Interface } /* DeleteVpnConnectionRoute Method for DeleteVpnConnectionRoute * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *DeleteVpnConnectionRouteOpts - Optional Parameters: - * @param "DeleteVpnConnectionRouteRequest" (optional.Interface of DeleteVpnConnectionRouteRequest) - + * @param "DeleteVpnConnectionRouteRequest" (optional.Interface of DeleteVpnConnectionRouteRequest) - @return DeleteVpnConnectionRouteResponse */ func (a *VpnConnectionApiService) DeleteVpnConnectionRoute(ctx _context.Context, localVarOptionals *DeleteVpnConnectionRouteOpts) (DeleteVpnConnectionRouteResponse, *_nethttp.Response, error) { @@ -472,14 +472,14 @@ func (a *VpnConnectionApiService) DeleteVpnConnectionRoute(ctx _context.Context, // ReadVpnConnectionsOpts Optional parameters for the method 'ReadVpnConnections' type ReadVpnConnectionsOpts struct { - ReadVpnConnectionsRequest optional.Interface + ReadVpnConnectionsRequest optional.Interface } /* ReadVpnConnections Method for ReadVpnConnections * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ReadVpnConnectionsOpts - Optional Parameters: - * @param "ReadVpnConnectionsRequest" (optional.Interface of ReadVpnConnectionsRequest) - + * @param "ReadVpnConnectionsRequest" (optional.Interface of ReadVpnConnectionsRequest) - @return ReadVpnConnectionsResponse */ func (a *VpnConnectionApiService) ReadVpnConnections(ctx _context.Context, localVarOptionals *ReadVpnConnectionsOpts) (ReadVpnConnectionsResponse, *_nethttp.Response, error) { diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/client.go b/vendor/github.com/outscale/osc-sdk-go/osc/client.go index 2780a67e3..9215de2aa 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/client.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/client.go @@ -32,9 +32,9 @@ import ( "time" "unicode/utf8" - awscredentials "github.com/aws/aws-sdk-go/aws/credentials" - awsv4 "github.com/aws/aws-sdk-go/aws/signer/v4" "golang.org/x/oauth2" + awsv4 "github.com/aws/aws-sdk-go/aws/signer/v4" + awscredentials "github.com/aws/aws-sdk-go/aws/credentials" ) var ( @@ -273,12 +273,13 @@ func parameterToJson(obj interface{}) (string, error) { return string(jsonBuf), err } + // callAPI do the request. func (c *APIClient) callAPI(request *http.Request) (*http.Response, error) { if c.cfg.Debug { - dump, err := httputil.DumpRequestOut(request, true) + dump, err := httputil.DumpRequestOut(request, true) if err != nil { - return nil, err + return nil, err } log.Printf("\n%s\n", string(dump)) } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/configuration.go b/vendor/github.com/outscale/osc-sdk-go/osc/configuration.go index aa455dec7..3c805f2cc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/configuration.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/configuration.go @@ -58,8 +58,8 @@ type APIKey struct { // AWSv4 provides AWS Signature to a request passed via context using ContextAWSv4 // https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html type AWSv4 struct { - AccessKey string - SecretKey string + AccessKey string + SecretKey string } // ServerVariable stores the information about a server variable @@ -71,9 +71,9 @@ type ServerVariable struct { // ServerConfiguration stores the information about a server type ServerConfiguration struct { - Url string + Url string Description string - Variables map[string]ServerVariable + Variables map[string]ServerVariable } // Configuration stores the configuration of the API client @@ -95,13 +95,13 @@ func NewConfiguration() *Configuration { DefaultHeader: make(map[string]string), UserAgent: "OpenAPI-Generator/1.0.0/go", Debug: false, - Servers: []ServerConfiguration{ + Servers: []ServerConfiguration{ { - Url: "https://api.{region}.outscale.com/api/v1", + Url: "https://api.{region}.outscale.com/api/v1", Description: "No description provided", Variables: map[string]ServerVariable{ "region": ServerVariable{ - Description: "No description provided", + Description: "No description provided", DefaultValue: "eu-west-2", EnumValues: []string{ "eu-west-2", @@ -112,11 +112,11 @@ func NewConfiguration() *Configuration { }, }, { - Url: "https://api.{region}.outscale.hk/api/v1", + Url: "https://api.{region}.outscale.hk/api/v1", Description: "No description provided", Variables: map[string]ServerVariable{ "region": ServerVariable{ - Description: "No description provided", + Description: "No description provided", DefaultValue: "cn-southeast-1", EnumValues: []string{ "cn-southeast-1", @@ -137,7 +137,7 @@ func (c *Configuration) AddDefaultHeader(key string, value string) { // ServerUrl returns URL based on server settings func (c *Configuration) ServerUrl(index int, variables map[string]string) (string, error) { if index < 0 || len(c.Servers) <= index { - return "", fmt.Errorf("Index %v out of range %v", index, len(c.Servers)-1) + return "", fmt.Errorf("Index %v out of range %v", index, len(c.Servers) - 1) } server := c.Servers[index] url := server.Url diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_request.go index 9868d6b83..0d15eb937 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_request.go @@ -9,7 +9,6 @@ */ package osc - // AcceptNetPeeringRequest struct for AcceptNetPeeringRequest type AcceptNetPeeringRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_response.go index 20c913967..528d1c6f1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_accept_net_peering_response.go @@ -9,9 +9,8 @@ */ package osc - // AcceptNetPeeringResponse struct for AcceptNetPeeringResponse type AcceptNetPeeringResponse struct { - NetPeering NetPeering `json:"NetPeering,omitempty"` + NetPeering NetPeering `json:"NetPeering,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_accepter_net.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_accepter_net.go index 01dbfec2b..cfcbb5c17 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_accepter_net.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_accepter_net.go @@ -9,7 +9,6 @@ */ package osc - // AccepterNet Information about the accepter Net. type AccepterNet struct { // The account ID of the owner of the accepter Net. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key.go index 421e0db2d..712cbdea9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key.go @@ -9,7 +9,6 @@ */ package osc - // AccessKey Information about the access key. type AccessKey struct { // The ID of the access key. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key_secret_key.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key_secret_key.go index ca541ab20..4d0d5b0c8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key_secret_key.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_access_key_secret_key.go @@ -9,7 +9,6 @@ */ package osc - // AccessKeySecretKey Information about the secret access key. type AccessKeySecretKey struct { // The ID of the secret access key. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_access_log.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_access_log.go index 30eb632eb..4a975e903 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_access_log.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_access_log.go @@ -9,7 +9,6 @@ */ package osc - // AccessLog Information about access logs. type AccessLog struct { // If `true`, access logs are enabled for your load balancer. If `false`, they are not. If you set this to `true` in your request, the `OsuBucketName` parameter is required. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_account.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_account.go index edfc316bf..a3257231f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_account.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_account.go @@ -9,7 +9,6 @@ */ package osc - // Account Information about the account. type Account struct { // The ID of the account. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_application_sticky_cookie_policy.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_application_sticky_cookie_policy.go index 35541353c..784e6f62a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_application_sticky_cookie_policy.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_application_sticky_cookie_policy.go @@ -9,7 +9,6 @@ */ package osc - // ApplicationStickyCookiePolicy Information about the stickiness policy. type ApplicationStickyCookiePolicy struct { // The name of the application cookie used for stickiness. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_backend_vm_health.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_backend_vm_health.go index 50e772df8..ccea28f0e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_backend_vm_health.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_backend_vm_health.go @@ -9,7 +9,6 @@ */ package osc - // BackendVmHealth Information about the health of a back-end VM. type BackendVmHealth struct { // The description of the state of the back-end VM. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_created.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_created.go index d7edb6fa7..8c50aad87 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_created.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_created.go @@ -9,7 +9,6 @@ */ package osc - // BlockDeviceMappingCreated Information about the created block device mapping. type BlockDeviceMappingCreated struct { Bsu BsuCreated `json:"Bsu,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_image.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_image.go index b8099b564..19022c8f1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_image.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_image.go @@ -9,7 +9,6 @@ */ package osc - // BlockDeviceMappingImage One or more parameters used to automatically set up volumes when the VM is created. type BlockDeviceMappingImage struct { Bsu BsuToCreate `json:"Bsu,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_creation.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_creation.go index 0b2ac2ef2..cf94c343e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_creation.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_creation.go @@ -9,7 +9,6 @@ */ package osc - // BlockDeviceMappingVmCreation Information about the block device mapping. type BlockDeviceMappingVmCreation struct { Bsu BsuToCreate `json:"Bsu,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_update.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_update.go index 294276709..9826946fe 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_update.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_block_device_mapping_vm_update.go @@ -9,7 +9,6 @@ */ package osc - // BlockDeviceMappingVmUpdate Information about the block device mapping. type BlockDeviceMappingVmUpdate struct { Bsu BsuToUpdateVm `json:"Bsu,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_created.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_created.go index d78e06753..eec864400 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_created.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_created.go @@ -9,7 +9,6 @@ */ package osc - // BsuCreated Information about the created BSU volume. type BsuCreated struct { // Set to `true` by default, which means that the volume is deleted when the VM is terminated. If set to `false`, the volume is not deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_create.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_create.go index 2fdd0a64e..01efd3ca6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_create.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_create.go @@ -9,7 +9,6 @@ */ package osc - // BsuToCreate Information about the BSU volume to create. type BsuToCreate struct { // Set to `true` by default, which means that the volume is deleted when the VM is terminated. If set to `false`, the volume is not deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_update_vm.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_update_vm.go index 10e29dccf..0cf108bd0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_update_vm.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_bsu_to_update_vm.go @@ -9,7 +9,6 @@ */ package osc - // BsuToUpdateVm Information about the BSU volume. type BsuToUpdateVm struct { // If `true`, the volume is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_request.go index 45349a428..1fb388941 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_request.go @@ -9,7 +9,6 @@ */ package osc - // CheckAuthenticationRequest struct for CheckAuthenticationRequest type CheckAuthenticationRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_response.go index aa03886d1..88f391e54 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_check_authentication_response.go @@ -9,7 +9,6 @@ */ package osc - // CheckAuthenticationResponse struct for CheckAuthenticationResponse type CheckAuthenticationResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_client_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_client_gateway.go index 82e380d70..239e8729b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_client_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_client_gateway.go @@ -9,7 +9,6 @@ */ package osc - // ClientGateway Information about the client gateway. type ClientGateway struct { // An Autonomous System Number (ASN) used by the Border Gateway Protocol (BGP) to find the path to your client gateway through the Internet. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_consumption_entry.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_consumption_entry.go index 09a5f6884..27b00fd7b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_consumption_entry.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_consumption_entry.go @@ -9,7 +9,6 @@ */ package osc - // ConsumptionEntry Information about the resources consumed during the specified time period. type ConsumptionEntry struct { // The category of the resource (for example, `network`). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_request.go index d48ba615f..af959341c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateAccessKeyRequest struct for CreateAccessKeyRequest type CreateAccessKeyRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_response.go index 8647f2d8c..1f4ff06d3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_access_key_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateAccessKeyResponse struct for CreateAccessKeyResponse type CreateAccessKeyResponse struct { - AccessKey AccessKeySecretKey `json:"AccessKey,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + AccessKey AccessKeySecretKey `json:"AccessKey,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_request.go index e3c4fbf1a..9415bcd0f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateAccountRequest struct for CreateAccountRequest type CreateAccountRequest struct { // The city of the account owner. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_response.go index ef38f9140..54bbe3855 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_account_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateAccountResponse struct for CreateAccountResponse type CreateAccountResponse struct { - Account Account `json:"Account,omitempty"` + Account Account `json:"Account,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_request.go index 9cfddf13f..f6c5f8567 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateClientGatewayRequest struct for CreateClientGatewayRequest type CreateClientGatewayRequest struct { // An Autonomous System Number (ASN) used by the Border Gateway Protocol (BGP) to find the path to your client gateway through the Internet. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_response.go index c69615df8..5902b3150 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_client_gateway_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateClientGatewayResponse struct for CreateClientGatewayResponse type CreateClientGatewayResponse struct { - ClientGateway ClientGateway `json:"ClientGateway,omitempty"` + ClientGateway ClientGateway `json:"ClientGateway,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_request.go index 64bb22288..99976a536 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateDhcpOptionsRequest struct for CreateDhcpOptionsRequest type CreateDhcpOptionsRequest struct { // Specify a domain name (for example, MyCompany.com). You can specify only one domain name. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_response.go index ae9a83b16..473617ef4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_dhcp_options_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateDhcpOptionsResponse struct for CreateDhcpOptionsResponse type CreateDhcpOptionsResponse struct { - DhcpOptionsSet DhcpOptionsSet `json:"DhcpOptionsSet,omitempty"` + DhcpOptionsSet DhcpOptionsSet `json:"DhcpOptionsSet,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_request.go index 228db9163..fe8db75bd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_request.go @@ -9,11 +9,10 @@ */ package osc - // CreateDirectLinkInterfaceRequest struct for CreateDirectLinkInterfaceRequest type CreateDirectLinkInterfaceRequest struct { // The ID of the existing DirectLink for which you want to create the DirectLink interface. - DirectLinkId string `json:"DirectLinkId"` + DirectLinkId string `json:"DirectLinkId"` DirectLinkInterface DirectLinkInterface `json:"DirectLinkInterface"` // If `true`, checks whether you have the required permissions to perform the action. DryRun bool `json:"DryRun,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_response.go index 8e5168de4..fdd0f8832 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_interface_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateDirectLinkInterfaceResponse struct for CreateDirectLinkInterfaceResponse type CreateDirectLinkInterfaceResponse struct { DirectLinkInterface DirectLinkInterfaces `json:"DirectLinkInterface,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_request.go index cd6205001..e43e61c1b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateDirectLinkRequest struct for CreateDirectLinkRequest type CreateDirectLinkRequest struct { // The bandwidth of the DirectLink (`1Gbps` \\| `10Gbps`). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_response.go index 32c15c64c..f14c4e864 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_direct_link_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateDirectLinkResponse struct for CreateDirectLinkResponse type CreateDirectLinkResponse struct { - DirectLink DirectLink `json:"DirectLink,omitempty"` + DirectLink DirectLink `json:"DirectLink,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_request.go index 80aa22c0b..9c07974bd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateFlexibleGpuRequest struct for CreateFlexibleGpuRequest type CreateFlexibleGpuRequest struct { // If `true`, the fGPU is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_response.go index 0307bd2be..827c1ded4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_flexible_gpu_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateFlexibleGpuResponse struct for CreateFlexibleGpuResponse type CreateFlexibleGpuResponse struct { - FlexibleGpu FlexibleGpu `json:"FlexibleGpu,omitempty"` + FlexibleGpu FlexibleGpu `json:"FlexibleGpu,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_request.go index 9d185ec18..7b22f1f29 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_request.go @@ -9,12 +9,11 @@ */ package osc - // CreateImageExportTaskRequest struct for CreateImageExportTaskRequest type CreateImageExportTaskRequest struct { // If `true`, checks whether you have the required permissions to perform the action. DryRun bool `json:"DryRun,omitempty"` // The ID of the OMI to export. - ImageId string `json:"ImageId"` + ImageId string `json:"ImageId"` OsuExport OsuExport `json:"OsuExport"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_response.go index 142de276c..beb5e698a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_export_task_response.go @@ -9,7 +9,6 @@ */ package osc - // CreateImageExportTaskResponse struct for CreateImageExportTaskResponse type CreateImageExportTaskResponse struct { ImageExportTask ImageExportTask `json:"ImageExportTask,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_request.go index 9b32c2f29..2bed38490 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateImageRequest struct for CreateImageRequest type CreateImageRequest struct { // The architecture of the OMI (by default, `i386`). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_response.go index c54bd7cbf..1739ed62b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_image_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateImageResponse struct for CreateImageResponse type CreateImageResponse struct { - Image Image `json:"Image,omitempty"` + Image Image `json:"Image,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_request.go index be67cf957..949a9e193 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateInternetServiceRequest struct for CreateInternetServiceRequest type CreateInternetServiceRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_response.go index ddd55366f..41dbf8ab8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_internet_service_response.go @@ -9,7 +9,6 @@ */ package osc - // CreateInternetServiceResponse struct for CreateInternetServiceResponse type CreateInternetServiceResponse struct { InternetService InternetService `json:"InternetService,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_request.go index 4b3be79a8..daebb80bc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateKeypairRequest struct for CreateKeypairRequest type CreateKeypairRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_response.go index 8da997651..0d159ba3b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_keypair_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateKeypairResponse struct for CreateKeypairResponse type CreateKeypairResponse struct { - Keypair KeypairCreated `json:"Keypair,omitempty"` + Keypair KeypairCreated `json:"Keypair,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_request.go index b20421b67..a4b0c28c6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_request.go @@ -9,12 +9,11 @@ */ package osc - // CreateListenerRuleRequest struct for CreateListenerRuleRequest type CreateListenerRuleRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` - Listener LoadBalancerLight `json:"Listener"` + DryRun bool `json:"DryRun,omitempty"` + Listener LoadBalancerLight `json:"Listener"` ListenerRule ListenerRuleForCreation `json:"ListenerRule"` // The IDs of the backend VMs. VmIds []string `json:"VmIds"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_response.go index 2405e2ef6..835b9c96c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_listener_rule_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateListenerRuleResponse struct for CreateListenerRuleResponse type CreateListenerRuleResponse struct { - ListenerRule ListenerRule `json:"ListenerRule,omitempty"` + ListenerRule ListenerRule `json:"ListenerRule,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_request.go index fe40a3796..c63ba97a4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateLoadBalancerListenersRequest struct for CreateLoadBalancerListenersRequest type CreateLoadBalancerListenersRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_response.go index f04880bec..ef74adc8e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_listeners_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateLoadBalancerListenersResponse struct for CreateLoadBalancerListenersResponse type CreateLoadBalancerListenersResponse struct { - LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` + LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_request.go index 2b0e55751..9c85ca467 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateLoadBalancerPolicyRequest struct for CreateLoadBalancerPolicyRequest type CreateLoadBalancerPolicyRequest struct { // The name of the application cookie used for stickiness. This parameter is required if you create a stickiness policy based on an application-generated cookie. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_response.go index 78a05bf85..3c4df543f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_policy_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateLoadBalancerPolicyResponse struct for CreateLoadBalancerPolicyResponse type CreateLoadBalancerPolicyResponse struct { - LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` + LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_request.go index c05619770..3265cee83 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateLoadBalancerRequest struct for CreateLoadBalancerRequest type CreateLoadBalancerRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_response.go index 9a4cbc6d7..d14bda34b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateLoadBalancerResponse struct for CreateLoadBalancerResponse type CreateLoadBalancerResponse struct { - LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` + LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_request.go index 5aac1ac3e..f0ec7c1be 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateLoadBalancerTagsRequest struct for CreateLoadBalancerTagsRequest type CreateLoadBalancerTagsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_response.go index adc5303d7..244ca999a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_load_balancer_tags_response.go @@ -9,7 +9,6 @@ */ package osc - // CreateLoadBalancerTagsResponse struct for CreateLoadBalancerTagsResponse type CreateLoadBalancerTagsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_request.go index f8d71f3ce..c0605e147 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateNatServiceRequest struct for CreateNatServiceRequest type CreateNatServiceRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_response.go index 760649f73..8dc10b983 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nat_service_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateNatServiceResponse struct for CreateNatServiceResponse type CreateNatServiceResponse struct { - NatService NatService `json:"NatService,omitempty"` + NatService NatService `json:"NatService,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_request.go index 5bf8e1334..dd6a75255 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateNetAccessPointRequest struct for CreateNetAccessPointRequest type CreateNetAccessPointRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_response.go index 7a688e7f4..a39569024 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_access_point_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateNetAccessPointResponse struct for CreateNetAccessPointResponse type CreateNetAccessPointResponse struct { - NetAccessPoint NetAccessPoint `json:"NetAccessPoint,omitempty"` + NetAccessPoint NetAccessPoint `json:"NetAccessPoint,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_request.go index 56f96026c..ffad16ce6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateNetPeeringRequest struct for CreateNetPeeringRequest type CreateNetPeeringRequest struct { // The ID of the Net you want to connect with. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_response.go index cd393be7a..b9973efa6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_peering_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateNetPeeringResponse struct for CreateNetPeeringResponse type CreateNetPeeringResponse struct { - NetPeering NetPeering `json:"NetPeering,omitempty"` + NetPeering NetPeering `json:"NetPeering,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_request.go index b915b70ff..a490e8858 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateNetRequest struct for CreateNetRequest type CreateNetRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_response.go index e2014495c..ff6b8555e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_net_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateNetResponse struct for CreateNetResponse type CreateNetResponse struct { - Net Net `json:"Net,omitempty"` + Net Net `json:"Net,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_request.go index 21b9117cf..af0295f4f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateNicRequest struct for CreateNicRequest type CreateNicRequest struct { // A description for the NIC. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_response.go index 339b0e4f1..b5838f677 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_nic_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateNicResponse struct for CreateNicResponse type CreateNicResponse struct { - Nic Nic `json:"Nic,omitempty"` + Nic Nic `json:"Nic,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_request.go index db2697007..81c51cf06 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_request.go @@ -9,7 +9,6 @@ */ package osc - // CreatePublicIpRequest struct for CreatePublicIpRequest type CreatePublicIpRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_response.go index e8c0307a1..da0b34a0b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_public_ip_response.go @@ -9,9 +9,8 @@ */ package osc - // CreatePublicIpResponse struct for CreatePublicIpResponse type CreatePublicIpResponse struct { - PublicIp PublicIp `json:"PublicIp,omitempty"` + PublicIp PublicIp `json:"PublicIp,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_request.go index 92c2e2040..b0052bdc4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateRouteRequest struct for CreateRouteRequest type CreateRouteRequest struct { // The IP range used for the destination match, in CIDR notation (for example, 10.0.0.0/24). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_response.go index 5a6ebd9ab..3fa1fc52a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateRouteResponse struct for CreateRouteResponse type CreateRouteResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - RouteTable RouteTable `json:"RouteTable,omitempty"` + RouteTable RouteTable `json:"RouteTable,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_request.go index 22277ebc3..10cff5e4f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateRouteTableRequest struct for CreateRouteTableRequest type CreateRouteTableRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_response.go index 23dca7026..eeaa66e0d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_route_table_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateRouteTableResponse struct for CreateRouteTableResponse type CreateRouteTableResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - RouteTable RouteTable `json:"RouteTable,omitempty"` + RouteTable RouteTable `json:"RouteTable,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_request.go index 86b23122c..e710c4b61 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateSecurityGroupRequest struct for CreateSecurityGroupRequest type CreateSecurityGroupRequest struct { // A description for the security group, with a maximum length of 255 [ASCII printable characters](https://en.wikipedia.org/wiki/ASCII#Printable_characters). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_response.go index b90dbec4f..531d79135 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateSecurityGroupResponse struct for CreateSecurityGroupResponse type CreateSecurityGroupResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - SecurityGroup SecurityGroup `json:"SecurityGroup,omitempty"` + SecurityGroup SecurityGroup `json:"SecurityGroup,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_request.go index 7044c0eea..d15eab5c6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateSecurityGroupRuleRequest struct for CreateSecurityGroupRuleRequest type CreateSecurityGroupRuleRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_response.go index 2a50744d6..b65525365 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_security_group_rule_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateSecurityGroupRuleResponse struct for CreateSecurityGroupRuleResponse type CreateSecurityGroupRuleResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - SecurityGroup SecurityGroup `json:"SecurityGroup,omitempty"` + SecurityGroup SecurityGroup `json:"SecurityGroup,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_request.go index 9c1c86f3e..00749d1a6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateServerCertificateRequest struct for CreateServerCertificateRequest type CreateServerCertificateRequest struct { // The PEM-encoded X509 certificate. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_response.go index 7aef1ffd7..fdf33ad53 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_server_certificate_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateServerCertificateResponse struct for CreateServerCertificateResponse type CreateServerCertificateResponse struct { - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` ServerCertificate ServerCertificate `json:"ServerCertificate,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_request.go index fd1f8aab0..90a3baacd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_request.go @@ -9,11 +9,10 @@ */ package osc - // CreateSnapshotExportTaskRequest struct for CreateSnapshotExportTaskRequest type CreateSnapshotExportTaskRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` OsuExport OsuExport `json:"OsuExport"` // The ID of the snapshot to export. SnapshotId string `json:"SnapshotId"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_response.go index d3d0a681b..c161e6f68 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_export_task_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateSnapshotExportTaskResponse struct for CreateSnapshotExportTaskResponse type CreateSnapshotExportTaskResponse struct { - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` SnapshotExportTask SnapshotExportTask `json:"SnapshotExportTask,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_request.go index dbb262419..61051edac 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateSnapshotRequest struct for CreateSnapshotRequest type CreateSnapshotRequest struct { // A description for the snapshot. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_response.go index a4c3800c9..5a8be9f4d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_snapshot_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateSnapshotResponse struct for CreateSnapshotResponse type CreateSnapshotResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - Snapshot Snapshot `json:"Snapshot,omitempty"` + Snapshot Snapshot `json:"Snapshot,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_request.go index be32f3ced..2c2a651b8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateSubnetRequest struct for CreateSubnetRequest type CreateSubnetRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_response.go index 4eef1c987..ff6b9c4f7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_subnet_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateSubnetResponse struct for CreateSubnetResponse type CreateSubnetResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - Subnet Subnet `json:"Subnet,omitempty"` + Subnet Subnet `json:"Subnet,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_request.go index 96c3f7d17..d35314659 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateTagsRequest struct for CreateTagsRequest type CreateTagsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_response.go index 3972ca092..94561dc09 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_tags_response.go @@ -9,7 +9,6 @@ */ package osc - // CreateTagsResponse struct for CreateTagsResponse type CreateTagsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_request.go index 00104f34d..7a5a2cb68 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateVirtualGatewayRequest struct for CreateVirtualGatewayRequest type CreateVirtualGatewayRequest struct { // The type of VPN connection supported by the virtual gateway (only `ipsec.1` is supported). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_response.go index 8823e46c9..f03a7f47a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_virtual_gateway_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateVirtualGatewayResponse struct for CreateVirtualGatewayResponse type CreateVirtualGatewayResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - VirtualGateway VirtualGateway `json:"VirtualGateway,omitempty"` + VirtualGateway VirtualGateway `json:"VirtualGateway,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_request.go index 5a4c1f99d..2b2706599 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateVmsRequest struct for CreateVmsRequest type CreateVmsRequest struct { // One or more block device mappings. @@ -35,8 +34,8 @@ type CreateVmsRequest struct { // One or more NICs. If you specify this parameter, you must define one NIC as the primary network interface of the VM with `0` as its device number. Nics []NicForVmCreation `json:"Nics,omitempty"` // The performance of the VM (`standard` \\| `high` \\| `highest`). - Performance string `json:"Performance,omitempty"` - Placement Placement `json:"Placement,omitempty"` + Performance string `json:"Performance,omitempty"` + Placement Placement `json:"Placement,omitempty"` // One or more private IP addresses of the VM. PrivateIps []string `json:"PrivateIps,omitempty"` // One or more IDs of security group for the VMs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_response.go index 92f66c4a0..4f7d09ac6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vms_response.go @@ -9,7 +9,6 @@ */ package osc - // CreateVmsResponse struct for CreateVmsResponse type CreateVmsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_request.go index 11f6b16a7..ba49f2fdc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_request.go @@ -9,14 +9,13 @@ */ package osc - // CreateVolumeRequest struct for CreateVolumeRequest type CreateVolumeRequest struct { // If `true`, checks whether you have the required permissions to perform the action. DryRun bool `json:"DryRun,omitempty"` // The number of I/O operations per second (IOPS). This parameter must be specified only if you create an `io1` volume. The maximum number of IOPS allowed for `io1` volumes is `13000`. Iops int32 `json:"Iops,omitempty"` - // The size of the volume, in gibibytes (GiB). The maximum allowed size for a volume is 14,901 GiB. This parameter is required if the volume is not created from a snapshot (`SnapshotId` unspecified). + // The size of the volume, in gibibytes (GiB). The maximum allowed size for a volume is 14,901 GiB. This parameter is required if the volume is not created from a snapshot (`SnapshotId` unspecified). Size int32 `json:"Size,omitempty"` // The ID of the snapshot from which you want to create the volume. SnapshotId string `json:"SnapshotId,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_response.go index 0af0f1c88..e93991d65 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_volume_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateVolumeResponse struct for CreateVolumeResponse type CreateVolumeResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - Volume Volume `json:"Volume,omitempty"` + Volume Volume `json:"Volume,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_request.go index b764148e4..43192e11d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateVpnConnectionRequest struct for CreateVpnConnectionRequest type CreateVpnConnectionRequest struct { // The ID of the client gateway. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_response.go index fafd91c1f..edc880b27 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_response.go @@ -9,9 +9,8 @@ */ package osc - // CreateVpnConnectionResponse struct for CreateVpnConnectionResponse type CreateVpnConnectionResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - VpnConnection VpnConnection `json:"VpnConnection,omitempty"` + VpnConnection VpnConnection `json:"VpnConnection,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_request.go index bfdd3a7ca..8c1b49a4d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_request.go @@ -9,7 +9,6 @@ */ package osc - // CreateVpnConnectionRouteRequest struct for CreateVpnConnectionRouteRequest type CreateVpnConnectionRouteRequest struct { // The network prefix of the route, in CIDR notation (for example, 10.12.0.0/16). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_response.go index 1e8b0e54a..e8dc059af 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_create_vpn_connection_route_response.go @@ -9,7 +9,6 @@ */ package osc - // CreateVpnConnectionRouteResponse struct for CreateVpnConnectionRouteResponse type CreateVpnConnectionRouteResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_request.go index dd5df9a61..99553ffb7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteAccessKeyRequest struct for DeleteAccessKeyRequest type DeleteAccessKeyRequest struct { // The ID of the access key you want to delete. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_response.go index 450599c1f..2d50c9662 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_access_key_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteAccessKeyResponse struct for DeleteAccessKeyResponse type DeleteAccessKeyResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_request.go index 09895776a..309b076c4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteClientGatewayRequest struct for DeleteClientGatewayRequest type DeleteClientGatewayRequest struct { // The ID of the client gateway you want to delete. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_response.go index 5187a0604..319c16231 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_client_gateway_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteClientGatewayResponse struct for DeleteClientGatewayResponse type DeleteClientGatewayResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_request.go index ebf6271a3..75581c7ba 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteDhcpOptionsRequest struct for DeleteDhcpOptionsRequest type DeleteDhcpOptionsRequest struct { // The ID of the DHCP options set you want to delete. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_response.go index cc89a6045..ffefbbc47 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_dhcp_options_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteDhcpOptionsResponse struct for DeleteDhcpOptionsResponse type DeleteDhcpOptionsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_request.go index 89713f11e..1c65e6aee 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteDirectLinkInterfaceRequest struct for DeleteDirectLinkInterfaceRequest type DeleteDirectLinkInterfaceRequest struct { // The ID of the DirectLink interface you want to delete. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_response.go index 6e561f5e5..b9ae1f0e2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_interface_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteDirectLinkInterfaceResponse struct for DeleteDirectLinkInterfaceResponse type DeleteDirectLinkInterfaceResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_request.go index dafd54f58..dd009eeb5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteDirectLinkRequest struct for DeleteDirectLinkRequest type DeleteDirectLinkRequest struct { // The ID of the DirectLink you want to delete. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_response.go index 139200c7b..47187438a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_direct_link_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteDirectLinkResponse struct for DeleteDirectLinkResponse type DeleteDirectLinkResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_request.go index e81af97aa..b1215b918 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteExportTaskRequest struct for DeleteExportTaskRequest type DeleteExportTaskRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_response.go index f1942edee..f7e7b338d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_export_task_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteExportTaskResponse struct for DeleteExportTaskResponse type DeleteExportTaskResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_request.go index 2239c81c5..28e1fb8f6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteFlexibleGpuRequest struct for DeleteFlexibleGpuRequest type DeleteFlexibleGpuRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_response.go index b4d85f964..ef1e03324 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_flexible_gpu_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteFlexibleGpuResponse struct for DeleteFlexibleGpuResponse type DeleteFlexibleGpuResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_request.go index d434d7499..7c6ee45c8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteImageRequest struct for DeleteImageRequest type DeleteImageRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_response.go index 2baa022d9..4e29417ff 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_image_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteImageResponse struct for DeleteImageResponse type DeleteImageResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_request.go index 5bd148893..226ed22e9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteInternetServiceRequest struct for DeleteInternetServiceRequest type DeleteInternetServiceRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_response.go index 22bb5ad89..c07193626 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_internet_service_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteInternetServiceResponse struct for DeleteInternetServiceResponse type DeleteInternetServiceResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_request.go index dfaff10b9..7dd851641 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteKeypairRequest struct for DeleteKeypairRequest type DeleteKeypairRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_response.go index a1bba53fc..b20f180d7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_keypair_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteKeypairResponse struct for DeleteKeypairResponse type DeleteKeypairResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_request.go index 90e9adea2..1d7b4c287 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteListenerRuleRequest struct for DeleteListenerRuleRequest type DeleteListenerRuleRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_response.go index 6d502401b..9a23d5f28 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_listener_rule_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteListenerRuleResponse struct for DeleteListenerRuleResponse type DeleteListenerRuleResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_request.go index e84cfae10..40573dc43 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteLoadBalancerListenersRequest struct for DeleteLoadBalancerListenersRequest type DeleteLoadBalancerListenersRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_response.go index 36cbf9831..10ea0e571 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_listeners_response.go @@ -9,9 +9,8 @@ */ package osc - // DeleteLoadBalancerListenersResponse struct for DeleteLoadBalancerListenersResponse type DeleteLoadBalancerListenersResponse struct { - LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` + LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_request.go index 3f0627add..ecfb4e386 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteLoadBalancerPolicyRequest struct for DeleteLoadBalancerPolicyRequest type DeleteLoadBalancerPolicyRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_response.go index fefba3719..0c28364a5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_policy_response.go @@ -9,9 +9,8 @@ */ package osc - // DeleteLoadBalancerPolicyResponse struct for DeleteLoadBalancerPolicyResponse type DeleteLoadBalancerPolicyResponse struct { - LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` + LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_request.go index 3a8e3aee9..1e2d6939c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteLoadBalancerRequest struct for DeleteLoadBalancerRequest type DeleteLoadBalancerRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_response.go index dab6476c7..b7054838d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteLoadBalancerResponse struct for DeleteLoadBalancerResponse type DeleteLoadBalancerResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_request.go index 95aea7791..a409b268f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteLoadBalancerTagsRequest struct for DeleteLoadBalancerTagsRequest type DeleteLoadBalancerTagsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_response.go index 403e3a35d..eedd85a98 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_load_balancer_tags_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteLoadBalancerTagsResponse struct for DeleteLoadBalancerTagsResponse type DeleteLoadBalancerTagsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_request.go index 0cc4a27ca..143759494 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteNatServiceRequest struct for DeleteNatServiceRequest type DeleteNatServiceRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_response.go index cc878d647..c151dac60 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nat_service_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteNatServiceResponse struct for DeleteNatServiceResponse type DeleteNatServiceResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_request.go index d1426bb52..f9ea156fa 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteNetAccessPointRequest struct for DeleteNetAccessPointRequest type DeleteNetAccessPointRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_response.go index 04a3a2bc0..e3b147c99 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_access_point_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteNetAccessPointResponse struct for DeleteNetAccessPointResponse type DeleteNetAccessPointResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_request.go index 75d4bd1d9..5ac93be99 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteNetPeeringRequest struct for DeleteNetPeeringRequest type DeleteNetPeeringRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_response.go index 8e3c73028..159bbc1d8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_peering_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteNetPeeringResponse struct for DeleteNetPeeringResponse type DeleteNetPeeringResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_request.go index 6d5f5ae42..950b866a4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteNetRequest struct for DeleteNetRequest type DeleteNetRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_response.go index d5ce257db..b7bfe6c3e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_net_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteNetResponse struct for DeleteNetResponse type DeleteNetResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_request.go index 1480783c6..ad5b3d582 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteNicRequest struct for DeleteNicRequest type DeleteNicRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_response.go index 1e91242f4..d711a0e91 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_nic_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteNicResponse struct for DeleteNicResponse type DeleteNicResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_request.go index 520add590..cb9718ee8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_request.go @@ -9,7 +9,6 @@ */ package osc - // DeletePublicIpRequest struct for DeletePublicIpRequest type DeletePublicIpRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_response.go index 8a925a26b..7c4b7af21 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_public_ip_response.go @@ -9,7 +9,6 @@ */ package osc - // DeletePublicIpResponse struct for DeletePublicIpResponse type DeletePublicIpResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_request.go index 1a902d1fb..2a463b88a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteRouteRequest struct for DeleteRouteRequest type DeleteRouteRequest struct { // The exact IP range for the route. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_response.go index 87638f505..ec04f297d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_response.go @@ -9,9 +9,8 @@ */ package osc - // DeleteRouteResponse struct for DeleteRouteResponse type DeleteRouteResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - RouteTable RouteTable `json:"RouteTable,omitempty"` + RouteTable RouteTable `json:"RouteTable,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_request.go index c90cad99f..e8d76f9d5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteRouteTableRequest struct for DeleteRouteTableRequest type DeleteRouteTableRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_response.go index 9ac983827..d754c800a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_route_table_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteRouteTableResponse struct for DeleteRouteTableResponse type DeleteRouteTableResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_request.go index 52027b48b..c2edb84b7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteSecurityGroupRequest struct for DeleteSecurityGroupRequest type DeleteSecurityGroupRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_response.go index d285e56f1..c35c0c283 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteSecurityGroupResponse struct for DeleteSecurityGroupResponse type DeleteSecurityGroupResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_request.go index 258d5ca84..91db2207b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteSecurityGroupRuleRequest struct for DeleteSecurityGroupRuleRequest type DeleteSecurityGroupRuleRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_response.go index 5b943cb73..d3d2d93ed 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_security_group_rule_response.go @@ -9,9 +9,8 @@ */ package osc - // DeleteSecurityGroupRuleResponse struct for DeleteSecurityGroupRuleResponse type DeleteSecurityGroupRuleResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - SecurityGroup SecurityGroup `json:"SecurityGroup,omitempty"` + SecurityGroup SecurityGroup `json:"SecurityGroup,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_request.go index 5e76da1f6..538779b32 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteServerCertificateRequest struct for DeleteServerCertificateRequest type DeleteServerCertificateRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_response.go index 45459ea68..75c26bfd0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_server_certificate_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteServerCertificateResponse struct for DeleteServerCertificateResponse type DeleteServerCertificateResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_request.go index c59bd55de..459cf8a6b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteSnapshotRequest struct for DeleteSnapshotRequest type DeleteSnapshotRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_response.go index 8d165507b..ac983ec16 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_snapshot_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteSnapshotResponse struct for DeleteSnapshotResponse type DeleteSnapshotResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_request.go index cf1d1f2d9..143a6d158 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteSubnetRequest struct for DeleteSubnetRequest type DeleteSubnetRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_response.go index 1edc3c945..1b5fdc7da 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_subnet_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteSubnetResponse struct for DeleteSubnetResponse type DeleteSubnetResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_request.go index 989b8db80..874b8ceea 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteTagsRequest struct for DeleteTagsRequest type DeleteTagsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_response.go index 924bc720d..2734559ac 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_tags_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteTagsResponse struct for DeleteTagsResponse type DeleteTagsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_request.go index 020b5f0b2..b888be624 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteVirtualGatewayRequest struct for DeleteVirtualGatewayRequest type DeleteVirtualGatewayRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_response.go index 750f2c091..cf01e5d1c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_virtual_gateway_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteVirtualGatewayResponse struct for DeleteVirtualGatewayResponse type DeleteVirtualGatewayResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_request.go index bcd603ee8..f50ee3c81 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteVmsRequest struct for DeleteVmsRequest type DeleteVmsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_response.go index 472eda75c..ccc18e15e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vms_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteVmsResponse struct for DeleteVmsResponse type DeleteVmsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_request.go index 8c125a6b4..cca6ba82f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteVolumeRequest struct for DeleteVolumeRequest type DeleteVolumeRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_response.go index c41612e50..0c47d60f2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_volume_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteVolumeResponse struct for DeleteVolumeResponse type DeleteVolumeResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_request.go index 8267d85d7..c3d9cb01a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteVpnConnectionRequest struct for DeleteVpnConnectionRequest type DeleteVpnConnectionRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_response.go index 58665983d..e5e20226a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteVpnConnectionResponse struct for DeleteVpnConnectionResponse type DeleteVpnConnectionResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_request.go index dd0165fe0..666f6fece 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_request.go @@ -9,7 +9,6 @@ */ package osc - // DeleteVpnConnectionRouteRequest struct for DeleteVpnConnectionRouteRequest type DeleteVpnConnectionRouteRequest struct { // The network prefix of the route to delete, in CIDR notation (for example, 10.12.0.0/16). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_response.go index d5a323041..bdabdd069 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_delete_vpn_connection_route_response.go @@ -9,7 +9,6 @@ */ package osc - // DeleteVpnConnectionRouteResponse struct for DeleteVpnConnectionRouteResponse type DeleteVpnConnectionRouteResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_request.go index 082bd440b..7afef29af 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_request.go @@ -9,7 +9,6 @@ */ package osc - // DeregisterVmsInLoadBalancerRequest struct for DeregisterVmsInLoadBalancerRequest type DeregisterVmsInLoadBalancerRequest struct { // One or more IDs of back-end VMs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_response.go index 4fd34afa9..9ae642da4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_deregister_vms_in_load_balancer_response.go @@ -9,7 +9,6 @@ */ package osc - // DeregisterVmsInLoadBalancerResponse struct for DeregisterVmsInLoadBalancerResponse type DeregisterVmsInLoadBalancerResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_dhcp_options_set.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_dhcp_options_set.go index db243dfaf..09869d17f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_dhcp_options_set.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_dhcp_options_set.go @@ -9,7 +9,6 @@ */ package osc - // DhcpOptionsSet Information about the DHCP options set. type DhcpOptionsSet struct { // If `true`, the DHCP options set is a default one. If `false`, it is not. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link.go index 6ff7b969b..bb603d95e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link.go @@ -9,7 +9,6 @@ */ package osc - // DirectLink Information about the DirectLink. type DirectLink struct { // The account ID of the owner of the DirectLink. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interface.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interface.go index 76af141f9..bef2c2c2d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interface.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interface.go @@ -9,7 +9,6 @@ */ package osc - // DirectLinkInterface Information about the DirectLink interface. type DirectLinkInterface struct { // The BGP (Border Gateway Protocol) ASN (Autonomous System Number) on the customer's side of the DirectLink interface. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interfaces.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interfaces.go index f4a473029..a0f5de011 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interfaces.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_direct_link_interfaces.go @@ -9,7 +9,6 @@ */ package osc - // DirectLinkInterfaces Information about the DirectLink interfaces. type DirectLinkInterfaces struct { // The account ID of the owner of the DirectLink interface. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_error_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_error_response.go index 66a4f7d3a..43b8ac32a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_error_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_error_response.go @@ -9,10 +9,9 @@ */ package osc - // ErrorResponse struct for ErrorResponse type ErrorResponse struct { // One or more errors. - Errors []Errors `json:"Errors,omitempty"` + Errors []Errors `json:"Errors,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_errors.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_errors.go index 296e85db2..b5ed8c3ee 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_errors.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_errors.go @@ -9,7 +9,6 @@ */ package osc - // Errors Information about the errors. type Errors struct { // The code of the error. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_access_keys.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_access_keys.go index 856e6ce92..d8117cc26 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_access_keys.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_access_keys.go @@ -9,7 +9,6 @@ */ package osc - // FiltersAccessKeys One or more filters. type FiltersAccessKeys struct { // The IDs of the access keys. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_api_log.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_api_log.go index e0ba75ca6..0466f6ebd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_api_log.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_api_log.go @@ -9,7 +9,6 @@ */ package osc - // FiltersApiLog One or more filters. type FiltersApiLog struct { // One or more API keys used for the query. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_client_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_client_gateway.go index 0ef52a39e..a09ce2bf6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_client_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_client_gateway.go @@ -9,7 +9,6 @@ */ package osc - // FiltersClientGateway One or more filters. type FiltersClientGateway struct { // The Border Gateway Protocol (BGP) Autonomous System Numbers (ASNs) of the connections. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_dhcp_options.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_dhcp_options.go index aa8da6f41..8fd0189ab 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_dhcp_options.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_dhcp_options.go @@ -9,7 +9,6 @@ */ package osc - // FiltersDhcpOptions One or more filters. type FiltersDhcpOptions struct { // If `true`, lists all default DHCP options set. If `false`, lists all non-default DHCP options set. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link.go index 60e1c8df7..e1222851f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link.go @@ -9,7 +9,6 @@ */ package osc - // FiltersDirectLink One or more filters. type FiltersDirectLink struct { // The IDs of the DirectLinks. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link_interface.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link_interface.go index b0f6feceb..2599daf85 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link_interface.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_direct_link_interface.go @@ -9,7 +9,6 @@ */ package osc - // FiltersDirectLinkInterface One or more filters. type FiltersDirectLinkInterface struct { // The IDs of the DirectLinks. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_export_task.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_export_task.go index 97e110b70..75f8a96bc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_export_task.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_export_task.go @@ -9,7 +9,6 @@ */ package osc - // FiltersExportTask One or more filters. type FiltersExportTask struct { // The keys of the tags associated with the export tasks. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_flexible_gpu.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_flexible_gpu.go index 5fbe791ff..483b52417 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_flexible_gpu.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_flexible_gpu.go @@ -9,7 +9,6 @@ */ package osc - // FiltersFlexibleGpu One or more filters. type FiltersFlexibleGpu struct { // Indicates whether the fGPU is deleted when terminating the VM. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_image.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_image.go index d249bf9b9..7e786c91f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_image.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_image.go @@ -9,7 +9,6 @@ */ package osc - // FiltersImage One or more filters. type FiltersImage struct { // The account aliases of the owners of the OMIs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_internet_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_internet_service.go index b2e0b09ae..841d6f91f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_internet_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_internet_service.go @@ -9,7 +9,6 @@ */ package osc - // FiltersInternetService One or more filters. type FiltersInternetService struct { // The IDs of the Internet services. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_keypair.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_keypair.go index 4bcca3435..e2eaf4ba5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_keypair.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_keypair.go @@ -9,7 +9,6 @@ */ package osc - // FiltersKeypair One or more filters. type FiltersKeypair struct { // The fingerprints of the keypairs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_listener_rule.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_listener_rule.go index a0571ecca..1db3cf9c9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_listener_rule.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_listener_rule.go @@ -9,7 +9,6 @@ */ package osc - // FiltersListenerRule One or more filters. type FiltersListenerRule struct { // The names of the listener rules. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_load_balancer.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_load_balancer.go index 9bbbc7a38..2252a10a5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_load_balancer.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_load_balancer.go @@ -9,7 +9,6 @@ */ package osc - // FiltersLoadBalancer One or more filters. type FiltersLoadBalancer struct { // The names of the load balancers. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nat_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nat_service.go index 0c2b6bafc..ade73e775 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nat_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nat_service.go @@ -9,7 +9,6 @@ */ package osc - // FiltersNatService One or more filters. type FiltersNatService struct { // The IDs of the NAT services. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net.go index bb976eb40..66d1ec7ba 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net.go @@ -9,7 +9,6 @@ */ package osc - // FiltersNet One or more filters. type FiltersNet struct { // The IDs of the DHCP options sets. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_access_point.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_access_point.go index 1fdddfb43..44d7b8259 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_access_point.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_access_point.go @@ -9,7 +9,6 @@ */ package osc - // FiltersNetAccessPoint One or more filters. type FiltersNetAccessPoint struct { // The IDs of the Net access points. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_peering.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_peering.go index 9b7e92ecd..4fa0f330a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_peering.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_net_peering.go @@ -9,7 +9,6 @@ */ package osc - // FiltersNetPeering One or more filters. type FiltersNetPeering struct { // The account IDs of the owners of the peer Nets. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nic.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nic.go index 3461f4538..843badb36 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nic.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_nic.go @@ -9,7 +9,6 @@ */ package osc - // FiltersNic One or more filters. type FiltersNic struct { // The device numbers the NICs are attached to. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_product_type.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_product_type.go index 0e5a35590..79087b3cd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_product_type.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_product_type.go @@ -9,7 +9,6 @@ */ package osc - // FiltersProductType One or more filters. type FiltersProductType struct { // The IDs of the product types. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_public_ip.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_public_ip.go index 5d711c6f3..7b7b1f2d0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_public_ip.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_public_ip.go @@ -9,7 +9,6 @@ */ package osc - // FiltersPublicIp One or more filters. type FiltersPublicIp struct { // The IDs representing the associations of EIPs with VMs or NICs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_quota.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_quota.go index e9ec5461f..dbc8a8248 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_quota.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_quota.go @@ -9,7 +9,6 @@ */ package osc - // FiltersQuota One or more filters. type FiltersQuota struct { // The group names of the quotas. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_route_table.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_route_table.go index 21efba812..5a94ea3c6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_route_table.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_route_table.go @@ -9,7 +9,6 @@ */ package osc - // FiltersRouteTable One or more filters. type FiltersRouteTable struct { // The IDs of the route tables involved in the associations. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_security_group.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_security_group.go index 4184013ac..3a6f8b608 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_security_group.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_security_group.go @@ -9,7 +9,6 @@ */ package osc - // FiltersSecurityGroup One or more filters. type FiltersSecurityGroup struct { // The account IDs of the owners of the security groups. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_server_certificate.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_server_certificate.go index 70b80249b..5c0a0f02a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_server_certificate.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_server_certificate.go @@ -9,7 +9,6 @@ */ package osc - // FiltersServerCertificate One or more filters. type FiltersServerCertificate struct { // The path to the server certificate. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_service.go index 1a02926d7..87fd79a30 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_service.go @@ -9,7 +9,6 @@ */ package osc - // FiltersService One or more filters. type FiltersService struct { // The IDs of the services. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_snapshot.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_snapshot.go index 8797bdcb0..03640ee12 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_snapshot.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_snapshot.go @@ -9,7 +9,6 @@ */ package osc - // FiltersSnapshot One or more filters. type FiltersSnapshot struct { // The account aliases of the owners of the snapshots. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subnet.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subnet.go index 86dfd0441..96a941927 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subnet.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subnet.go @@ -9,7 +9,6 @@ */ package osc - // FiltersSubnet One or more filters. type FiltersSubnet struct { // The number of available IPs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subregion.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subregion.go index 5dccb27ed..a1092e32a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subregion.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_subregion.go @@ -9,7 +9,6 @@ */ package osc - // FiltersSubregion One or more filters. type FiltersSubregion struct { // The names of the Subregions. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_tag.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_tag.go index 843167a66..8df7bd600 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_tag.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_tag.go @@ -9,7 +9,6 @@ */ package osc - // FiltersTag One or more filters. type FiltersTag struct { // The keys of the tags that are assigned to the resources. You can use this filter alongside the `Values` filter. In that case, you filter the resources corresponding to each tag, regardless of the other filter. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_virtual_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_virtual_gateway.go index aecce6712..1132543b0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_virtual_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_virtual_gateway.go @@ -9,7 +9,6 @@ */ package osc - // FiltersVirtualGateway One or more filters. type FiltersVirtualGateway struct { // The types of the virtual gateways (only `ipsec.1` is supported). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm.go index 4e4d277f2..7b869ba81 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm.go @@ -9,7 +9,6 @@ */ package osc - // FiltersVm One or more filters. type FiltersVm struct { // The keys of the tags associated with the VMs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm_type.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm_type.go index 373bc355a..0612f5a35 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm_type.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vm_type.go @@ -9,7 +9,6 @@ */ package osc - // FiltersVmType One or more filters. type FiltersVmType struct { // Indicates whether the VM is optimized for BSU I/O. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vms_state.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vms_state.go index 52bc3e3ca..944ff76a7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vms_state.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vms_state.go @@ -9,7 +9,6 @@ */ package osc - // FiltersVmsState One or more filters. type FiltersVmsState struct { // The names of the Subregions of the VMs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_volume.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_volume.go index 96041d2f6..3d5f0b954 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_volume.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_volume.go @@ -9,7 +9,6 @@ */ package osc - // FiltersVolume One or more filters. type FiltersVolume struct { // The dates and times at which the volumes were created. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vpn_connection.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vpn_connection.go index cf09cc44a..d5c5c8577 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vpn_connection.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_filters_vpn_connection.go @@ -9,7 +9,6 @@ */ package osc - // FiltersVpnConnection One or more filters. type FiltersVpnConnection struct { // The Border Gateway Protocol (BGP) Autonomous System Numbers (ASNs) of the connections. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu.go index 8e5a03911..6a4b7d3e9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu.go @@ -9,7 +9,6 @@ */ package osc - // FlexibleGpu Information about the flexible GPU (fGPU). type FlexibleGpu struct { // If `true`, the fGPU is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu_catalog.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu_catalog.go index ad902f4e6..80ec6c799 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu_catalog.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_flexible_gpu_catalog.go @@ -9,7 +9,6 @@ */ package osc - // FlexibleGpuCatalog Information about the flexible GPU (fGPU) that is available in the public catalog. type FlexibleGpuCatalog struct { // The generations of VMs that the fGPU is compatible with. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_health_check.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_health_check.go index 33521a03d..bcf742a49 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_health_check.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_health_check.go @@ -9,7 +9,6 @@ */ package osc - // HealthCheck Information about the health check configuration. type HealthCheck struct { // The number of seconds between two pings (between `5` and `600` both included). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_image.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_image.go index 6e406ad89..848263a02 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_image.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_image.go @@ -9,7 +9,6 @@ */ package osc - // Image Information about the OMI. type Image struct { // The account alias of the owner of the OMI. @@ -31,7 +30,7 @@ type Image struct { // The name of the OMI. ImageName string `json:"ImageName,omitempty"` // The type of the OMI. - ImageType string `json:"ImageType,omitempty"` + ImageType string `json:"ImageType,omitempty"` PermissionsToLaunch PermissionsOnResource `json:"PermissionsToLaunch,omitempty"` // The product code associated with the OMI (`0001` Linux/Unix \\| `0002` Windows \\| `0004` Linux/Oracle \\| `0005` Windows 10). ProductCodes []string `json:"ProductCodes,omitempty"` @@ -40,7 +39,7 @@ type Image struct { // The type of root device used by the OMI (always `bsu`). RootDeviceType string `json:"RootDeviceType,omitempty"` // The state of the OMI (`pending` \\| `available` \\| `failed`). - State string `json:"State,omitempty"` + State string `json:"State,omitempty"` StateComment StateComment `json:"StateComment,omitempty"` // One or more tags associated with the OMI. Tags []ResourceTag `json:"Tags,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_image_export_task.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_image_export_task.go index 4abf7ad52..d4f8b2a72 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_image_export_task.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_image_export_task.go @@ -9,13 +9,12 @@ */ package osc - // ImageExportTask Information about the OMI export task. type ImageExportTask struct { // If the OMI export task fails, an error message appears. Comment string `json:"Comment,omitempty"` // The ID of the OMI to be exported. - ImageId string `json:"ImageId,omitempty"` + ImageId string `json:"ImageId,omitempty"` OsuExport OsuExport `json:"OsuExport,omitempty"` // The progress of the OMI export task, as a percentage. Progress int32 `json:"Progress,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_internet_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_internet_service.go index e65e1f3d5..b91df98f7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_internet_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_internet_service.go @@ -9,7 +9,6 @@ */ package osc - // InternetService Information about the Internet service. type InternetService struct { // The ID of the Internet service. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair.go index aed14dc68..e0e4dc9c3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair.go @@ -9,7 +9,6 @@ */ package osc - // Keypair Information about the keypair. type Keypair struct { // If you create a keypair, the SHA-1 digest of the DER encoded private key.
    If you import a keypair, the MD5 public key fingerprint as specified in section 4 of RFC 4716. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair_created.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair_created.go index 7b06394d2..63a470f19 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair_created.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_keypair_created.go @@ -9,7 +9,6 @@ */ package osc - // KeypairCreated Information about the created keypair. type KeypairCreated struct { // If you create a keypair, the SHA-1 digest of the DER encoded private key.
    If you import a keypair, the MD5 public key fingerprint as specified in section 4 of RFC 4716. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_request.go index d9e4514ad..5d6292648 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_request.go @@ -9,7 +9,6 @@ */ package osc - // LinkFlexibleGpuRequest struct for LinkFlexibleGpuRequest type LinkFlexibleGpuRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_response.go index 4cd0d6c15..fd8a2ad7e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_flexible_gpu_response.go @@ -9,7 +9,6 @@ */ package osc - // LinkFlexibleGpuResponse struct for LinkFlexibleGpuResponse type LinkFlexibleGpuResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_request.go index fda038a04..8afa27971 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_request.go @@ -9,7 +9,6 @@ */ package osc - // LinkInternetServiceRequest struct for LinkInternetServiceRequest type LinkInternetServiceRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_response.go index c5d3dd007..687a974e5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_internet_service_response.go @@ -9,7 +9,6 @@ */ package osc - // LinkInternetServiceResponse struct for LinkInternetServiceResponse type LinkInternetServiceResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic.go index 9e71b6843..5fbf239d8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic.go @@ -9,7 +9,6 @@ */ package osc - // LinkNic Information about the NIC attachment. type LinkNic struct { // If `true`, the volume is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_light.go index 74855d07a..f64cfffc4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_light.go @@ -9,7 +9,6 @@ */ package osc - // LinkNicLight Information about the network interface card (NIC). type LinkNicLight struct { // If `true`, the volume is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_request.go index 65dbcc55a..95debcd66 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_request.go @@ -9,7 +9,6 @@ */ package osc - // LinkNicRequest struct for LinkNicRequest type LinkNicRequest struct { // The index of the VM device for the NIC attachment (between 1 and 7, both included). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_response.go index 4073d84f8..c8646f162 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_response.go @@ -9,10 +9,9 @@ */ package osc - // LinkNicResponse struct for LinkNicResponse type LinkNicResponse struct { // The ID of the NIC attachment. - LinkNicId string `json:"LinkNicId,omitempty"` + LinkNicId string `json:"LinkNicId,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_to_update.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_to_update.go index 4f5999dfc..16949cd36 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_to_update.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_nic_to_update.go @@ -9,7 +9,6 @@ */ package osc - // LinkNicToUpdate Information about the NIC attachment. If you are modifying the `DeleteOnVmDeletion` attribute, you must specify the ID of the NIC attachment. type LinkNicToUpdate struct { // If `true`, the NIC is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_request.go index 5d49959d6..6524fc4fb 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_request.go @@ -9,7 +9,6 @@ */ package osc - // LinkPrivateIpsRequest struct for LinkPrivateIpsRequest type LinkPrivateIpsRequest struct { // If `true`, allows an IP address that is already assigned to another NIC in the same Subnet to be assigned to the NIC you specified. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_response.go index b76960932..60a588d1e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_private_ips_response.go @@ -9,7 +9,6 @@ */ package osc - // LinkPrivateIpsResponse struct for LinkPrivateIpsResponse type LinkPrivateIpsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip.go index c5c5d6fc1..acfae2040 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip.go @@ -9,7 +9,6 @@ */ package osc - // LinkPublicIp Information about the EIP association. type LinkPublicIp struct { // (Required in a Net) The ID representing the association of the EIP with the VM or the NIC. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_light_for_vm.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_light_for_vm.go index 2e48deab4..7a462c402 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_light_for_vm.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_light_for_vm.go @@ -9,7 +9,6 @@ */ package osc - // LinkPublicIpLightForVm Information about the EIP associated with the NIC. type LinkPublicIpLightForVm struct { // The name of the public DNS. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_request.go index 73494dda8..a649669a9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_request.go @@ -9,7 +9,6 @@ */ package osc - // LinkPublicIpRequest struct for LinkPublicIpRequest type LinkPublicIpRequest struct { // - If `true`, allows the EIP to be associated with the VM or NIC that you specify even if it is already associated with another VM or NIC.
    - If `false`, prevents the EIP from being associated with the VM or NIC that you specify if it is already associated with another VM or NIC.

    (By default, `true` in the public Cloud, `false` in a Net.) diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_response.go index 38e6f29e0..b9eadf074 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_public_ip_response.go @@ -9,10 +9,9 @@ */ package osc - // LinkPublicIpResponse struct for LinkPublicIpResponse type LinkPublicIpResponse struct { // (Net only) The ID representing the association of the EIP with the VM or the NIC. - LinkPublicIpId string `json:"LinkPublicIpId,omitempty"` + LinkPublicIpId string `json:"LinkPublicIpId,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table.go index be327e09e..4afb63e82 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table.go @@ -9,7 +9,6 @@ */ package osc - // LinkRouteTable One or more associations between the route table and the Subnets. type LinkRouteTable struct { // The ID of the association between the route table and the Subnet. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_request.go index 80082017e..0f27ec754 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_request.go @@ -9,7 +9,6 @@ */ package osc - // LinkRouteTableRequest struct for LinkRouteTableRequest type LinkRouteTableRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_response.go index bce8df88d..aadc31e97 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_route_table_response.go @@ -9,10 +9,9 @@ */ package osc - // LinkRouteTableResponse struct for LinkRouteTableResponse type LinkRouteTableResponse struct { // The ID of the association between the route table and the Subnet. - LinkRouteTableId string `json:"LinkRouteTableId,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + LinkRouteTableId string `json:"LinkRouteTableId,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_request.go index dd07a1e60..974e030aa 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_request.go @@ -9,7 +9,6 @@ */ package osc - // LinkVirtualGatewayRequest struct for LinkVirtualGatewayRequest type LinkVirtualGatewayRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_response.go index 1b8ca2c92..52a10fdd3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_virtual_gateway_response.go @@ -9,9 +9,8 @@ */ package osc - // LinkVirtualGatewayResponse struct for LinkVirtualGatewayResponse type LinkVirtualGatewayResponse struct { NetToVirtualGatewayLink NetToVirtualGatewayLink `json:"NetToVirtualGatewayLink,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_request.go index 7236f918f..47389d70d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_request.go @@ -9,7 +9,6 @@ */ package osc - // LinkVolumeRequest struct for LinkVolumeRequest type LinkVolumeRequest struct { // The name of the device. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_response.go index 9450b718b..3e2c84228 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_link_volume_response.go @@ -9,7 +9,6 @@ */ package osc - // LinkVolumeResponse struct for LinkVolumeResponse type LinkVolumeResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_linked_volume.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_linked_volume.go index ca7b82300..85197c519 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_linked_volume.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_linked_volume.go @@ -9,7 +9,6 @@ */ package osc - // LinkedVolume Information about volume attachment. type LinkedVolume struct { // If `true`, the volume is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener.go index c7f748876..f4300651c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener.go @@ -9,7 +9,6 @@ */ package osc - // Listener Information about the listener. type Listener struct { // The port on which the back-end VM is listening (between `1` and `65535`, both included). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_for_creation.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_for_creation.go index 1ee9debca..be9873327 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_for_creation.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_for_creation.go @@ -9,7 +9,6 @@ */ package osc - // ListenerForCreation Information about the listener to create. type ListenerForCreation struct { // The port on which the back-end VM is listening (between `1` and `65535`, both included). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule.go index 8a6220c96..0680a441c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule.go @@ -9,7 +9,6 @@ */ package osc - // ListenerRule Information about the listener rule. type ListenerRule struct { // The type of action for the rule (always `forward`). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule_for_creation.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule_for_creation.go index 3ad4ceec9..c2e101dd4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule_for_creation.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_listener_rule_for_creation.go @@ -9,12 +9,11 @@ */ package osc - // ListenerRuleForCreation Information about the listener rule. type ListenerRuleForCreation struct { // The type of action for the rule (always `forward`). Action string `json:"Action,omitempty"` - // A host-name pattern for the rule, with a maximum length of 128 characters. This host-name pattern supports maximum three wildcards, and must not contain any special characters except [-.?]. + // A host-name pattern for the rule, with a maximum length of 128 characters. This host-name pattern supports maximum three wildcards, and must not contain any special characters except [-.?]. HostNamePattern string `json:"HostNamePattern,omitempty"` // The ID of the listener. ListenerRuleId string `json:"ListenerRuleId,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer.go index bf0a3e640..4d630f911 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer.go @@ -9,7 +9,6 @@ */ package osc - // LoadBalancer Information about the load balancer. type LoadBalancer struct { AccessLog AccessLog `json:"AccessLog,omitempty"` @@ -18,7 +17,7 @@ type LoadBalancer struct { // One or more IDs of back-end VMs for the load balancer. BackendVmIds []string `json:"BackendVmIds,omitempty"` // The DNS name of the load balancer. - DnsName string `json:"DnsName,omitempty"` + DnsName string `json:"DnsName,omitempty"` HealthCheck HealthCheck `json:"HealthCheck,omitempty"` // The listeners for the load balancer. Listeners []Listener `json:"Listeners,omitempty"` @@ -31,7 +30,7 @@ type LoadBalancer struct { // The ID of the Net for the load balancer. NetId string `json:"NetId,omitempty"` // One or more IDs of security groups for the load balancers. Valid only for load balancers in a Net. - SecurityGroups []string `json:"SecurityGroups,omitempty"` + SecurityGroups []string `json:"SecurityGroups,omitempty"` SourceSecurityGroup SourceSecurityGroup `json:"SourceSecurityGroup,omitempty"` // The IDs of the Subnets for the load balancer. Subnets []string `json:"Subnets,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_light.go index 4178165bf..4e26a7837 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_light.go @@ -9,7 +9,6 @@ */ package osc - // LoadBalancerLight Information about the load balancer. type LoadBalancerLight struct { // The name of the load balancer to which the listener is attached. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_sticky_cookie_policy.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_sticky_cookie_policy.go index 5ea9c2d5c..b2ddce319 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_sticky_cookie_policy.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_sticky_cookie_policy.go @@ -9,7 +9,6 @@ */ package osc - // LoadBalancerStickyCookiePolicy Information about the stickiness policy. type LoadBalancerStickyCookiePolicy struct { // The name of the stickiness policy. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_tag.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_tag.go index 70810f19d..a3e7f1a77 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_tag.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_load_balancer_tag.go @@ -9,7 +9,6 @@ */ package osc - // LoadBalancerTag Information about the load balancer tag. type LoadBalancerTag struct { // The key of the tag. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_location.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_location.go index 7aba46725..c313c307f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_location.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_location.go @@ -9,7 +9,6 @@ */ package osc - // Location Information about the DirectLink location. type Location struct { // The location code, to be set as the `Location` parameter of the *CreateDirectLink* method when creating a DirectLink. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_log.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_log.go index 460ec11e6..c66ab68c5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_log.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_log.go @@ -9,7 +9,6 @@ */ package osc - // Log Information about the log. type Log struct { // The account ID. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_maintenance_event.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_maintenance_event.go index e8622bf1d..45f28272c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_maintenance_event.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_maintenance_event.go @@ -9,7 +9,6 @@ */ package osc - // MaintenanceEvent Information about the maintenance event. type MaintenanceEvent struct { // The code of the event (`system-reboot` \\| `system-maintenance`). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_nat_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_nat_service.go index 0113ce414..585c802dc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_nat_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_nat_service.go @@ -9,7 +9,6 @@ */ package osc - // NatService Information about the NAT service. type NatService struct { // The ID of the NAT service. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_net.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_net.go index 71cef5918..cf1a00de5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_net.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_net.go @@ -9,7 +9,6 @@ */ package osc - // Net Information about the Net. type Net struct { // The ID of the DHCP options set (or `default` if you want to associate the default one). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_access_point.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_access_point.go index f92db31ba..43e4bda18 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_access_point.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_access_point.go @@ -9,7 +9,6 @@ */ package osc - // NetAccessPoint Information about the Net access point. type NetAccessPoint struct { // The ID of the Net access point. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering.go index 36c52f75e..793090927 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering.go @@ -9,14 +9,13 @@ */ package osc - // NetPeering Information about the Net peering connection. type NetPeering struct { AccepterNet AccepterNet `json:"AccepterNet,omitempty"` // The ID of the Net peering connection. - NetPeeringId string `json:"NetPeeringId,omitempty"` - SourceNet SourceNet `json:"SourceNet,omitempty"` - State NetPeeringState `json:"State,omitempty"` + NetPeeringId string `json:"NetPeeringId,omitempty"` + SourceNet SourceNet `json:"SourceNet,omitempty"` + State NetPeeringState `json:"State,omitempty"` // One or more tags associated with the Net peering connection. Tags []ResourceTag `json:"Tags,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering_state.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering_state.go index 71716e2fd..d0a2127d7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering_state.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_peering_state.go @@ -9,7 +9,6 @@ */ package osc - // NetPeeringState Information about the state of the Net peering connection. type NetPeeringState struct { // Additional information about the state of the Net peering connection. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_to_virtual_gateway_link.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_to_virtual_gateway_link.go index 82912a601..8d763657d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_net_to_virtual_gateway_link.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_net_to_virtual_gateway_link.go @@ -9,7 +9,6 @@ */ package osc - // NetToVirtualGatewayLink Information about the attachment. type NetToVirtualGatewayLink struct { // The ID of the Net to which the virtual gateway is attached. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_nic.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_nic.go index c74d045e7..ad30cfabd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_nic.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_nic.go @@ -9,7 +9,6 @@ */ package osc - // Nic Information about the NIC. type Nic struct { // The account ID of the owner of the NIC. @@ -17,9 +16,9 @@ type Nic struct { // The description of the NIC. Description string `json:"Description,omitempty"` // (Net only) If `true`, the source/destination check is enabled. If `false`, it is disabled. This value must be `false` for a NAT VM to perform network address translation (NAT) in a Net. - IsSourceDestChecked bool `json:"IsSourceDestChecked,omitempty"` - LinkNic LinkNic `json:"LinkNic,omitempty"` - LinkPublicIp LinkPublicIp `json:"LinkPublicIp,omitempty"` + IsSourceDestChecked bool `json:"IsSourceDestChecked,omitempty"` + LinkNic LinkNic `json:"LinkNic,omitempty"` + LinkPublicIp LinkPublicIp `json:"LinkPublicIp,omitempty"` // The Media Access Control (MAC) address of the NIC. MacAddress string `json:"MacAddress,omitempty"` // The ID of the Net for the NIC. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_for_vm_creation.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_for_vm_creation.go index cee61867b..85072cade 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_for_vm_creation.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_for_vm_creation.go @@ -9,7 +9,6 @@ */ package osc - // NicForVmCreation Information about the network interface card (NIC) when creating a virtual machine (VM). type NicForVmCreation struct { // If `true`, the NIC is deleted when the VM is terminated. You can specify `true` only if you create a NIC when creating a VM. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_light.go index 2f02f6296..c6579b177 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_nic_light.go @@ -9,7 +9,6 @@ */ package osc - // NicLight Information about the network interface card (NIC). type NicLight struct { // The account ID of the owner of the NIC. @@ -17,9 +16,9 @@ type NicLight struct { // The description of the NIC. Description string `json:"Description,omitempty"` // (Net only) If `true`, the source/destination check is enabled. If `false`, it is disabled. This value must be `false` for a NAT VM to perform network address translation (NAT) in a Net. - IsSourceDestChecked bool `json:"IsSourceDestChecked,omitempty"` - LinkNic LinkNicLight `json:"LinkNic,omitempty"` - LinkPublicIp LinkPublicIpLightForVm `json:"LinkPublicIp,omitempty"` + IsSourceDestChecked bool `json:"IsSourceDestChecked,omitempty"` + LinkNic LinkNicLight `json:"LinkNic,omitempty"` + LinkPublicIp LinkPublicIpLightForVm `json:"LinkPublicIp,omitempty"` // The Media Access Control (MAC) address of the NIC. MacAddress string `json:"MacAddress,omitempty"` // The ID of the Net for the NIC. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_api_key.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_api_key.go index 2118dc251..804dddb2a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_api_key.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_api_key.go @@ -9,7 +9,6 @@ */ package osc - // OsuApiKey Information about the OSU API key. type OsuApiKey struct { // The API key of the OSU account that enables you to access the bucket. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_export.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_export.go index 718c575fd..13fd23a99 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_export.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_osu_export.go @@ -9,12 +9,11 @@ */ package osc - // OsuExport Information about the OSU export. type OsuExport struct { // The format of the export disk (`qcow2` \\| `vdi` \\| `vmdk`). - DiskImageFormat string `json:"DiskImageFormat"` - OsuApiKey OsuApiKey `json:"OsuApiKey,omitempty"` + DiskImageFormat string `json:"DiskImageFormat"` + OsuApiKey OsuApiKey `json:"OsuApiKey,omitempty"` // The name of the OSU bucket you want to export the object to. OsuBucket string `json:"OsuBucket"` // The URL of the manifest file. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource.go index 538a1d393..1ec0c4ed7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource.go @@ -9,7 +9,6 @@ */ package osc - // PermissionsOnResource Information about the users who have permissions for the resource. type PermissionsOnResource struct { // The account ID of one or more users who have permissions for the resource. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource_creation.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource_creation.go index 68b9cbd7c..d92aafc9d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource_creation.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_permissions_on_resource_creation.go @@ -9,9 +9,8 @@ */ package osc - // PermissionsOnResourceCreation Information about the permissions for the resource. type PermissionsOnResourceCreation struct { Additions PermissionsOnResource `json:"Additions,omitempty"` - Removals PermissionsOnResource `json:"Removals,omitempty"` + Removals PermissionsOnResource `json:"Removals,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_placement.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_placement.go index d440d5de8..7ef98b8ca 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_placement.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_placement.go @@ -9,7 +9,6 @@ */ package osc - // Placement Information about the placement of the VM. type Placement struct { // The name of the Subregion. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip.go index 9ddd2a27a..363c7944f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip.go @@ -9,11 +9,10 @@ */ package osc - // PrivateIp Information about the private IP. type PrivateIp struct { // If `true`, the IP address is the primary private IP address of the NIC. - IsPrimary bool `json:"IsPrimary,omitempty"` + IsPrimary bool `json:"IsPrimary,omitempty"` LinkPublicIp LinkPublicIp `json:"LinkPublicIp,omitempty"` // The name of the private DNS. PrivateDnsName string `json:"PrivateDnsName,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light.go index ee553ed97..b5d56ec2a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light.go @@ -9,7 +9,6 @@ */ package osc - // PrivateIpLight Information about the private IP. type PrivateIpLight struct { // If `true`, the IP address is the primary private IP address of the NIC. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light_for_vm.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light_for_vm.go index 119fd4a6a..a7882c9e9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light_for_vm.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_private_ip_light_for_vm.go @@ -9,11 +9,10 @@ */ package osc - // PrivateIpLightForVm Information about the private IP of the NIC. type PrivateIpLightForVm struct { // If `true`, the IP address is the primary private IP address of the NIC. - IsPrimary bool `json:"IsPrimary,omitempty"` + IsPrimary bool `json:"IsPrimary,omitempty"` LinkPublicIp LinkPublicIpLightForVm `json:"LinkPublicIp,omitempty"` // The name of the private DNS. PrivateDnsName string `json:"PrivateDnsName,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_product_type.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_product_type.go index aeeedac0b..71ba02af3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_product_type.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_product_type.go @@ -9,7 +9,6 @@ */ package osc - // ProductType Information about the product type. type ProductType struct { // The description of the product type. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip.go index bfb7472d4..b0faefea8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip.go @@ -9,7 +9,6 @@ */ package osc - // PublicIp Information about the public IP. type PublicIp struct { // (Required in a Net) The ID representing the association of the EIP with the VM or the NIC. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip_light.go index e2296e535..6de057037 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_public_ip_light.go @@ -9,7 +9,6 @@ */ package osc - // PublicIpLight Information about the public IP. type PublicIpLight struct { // The External IP address (EIP) associated with the NAT service. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_quota.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_quota.go index 4e9af3b23..c17176799 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_quota.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_quota.go @@ -9,7 +9,6 @@ */ package osc - // Quota Information about the quota. type Quota struct { // The account ID of the owner of the quotas. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_quota_types.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_quota_types.go index 8d58eed1f..0e16c8b75 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_quota_types.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_quota_types.go @@ -9,7 +9,6 @@ */ package osc - // QuotaTypes One or more quotas. type QuotaTypes struct { // The resource ID if it is a resource-specific quota, `global` if it is not. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_request.go index 2e5d6501d..6fc2df8bc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadAccessKeysRequest struct for ReadAccessKeysRequest type ReadAccessKeysRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersAccessKeys `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_response.go index eced4fe2a..af5f4e15d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_access_keys_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadAccessKeysResponse struct for ReadAccessKeysResponse type ReadAccessKeysResponse struct { // A list of access keys. - AccessKeys []AccessKey `json:"AccessKeys,omitempty"` + AccessKeys []AccessKey `json:"AccessKeys,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_request.go index 31f161bed..3346eaf73 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_request.go @@ -9,7 +9,6 @@ */ package osc - // ReadAccountsRequest struct for ReadAccountsRequest type ReadAccountsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_response.go index 7b1367607..3eef8e3ad 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_accounts_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadAccountsResponse struct for ReadAccountsResponse type ReadAccountsResponse struct { // The list of the accounts. - Accounts []Account `json:"Accounts,omitempty"` + Accounts []Account `json:"Accounts,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_request.go index 14e9d8fd0..1346b78a9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_request.go @@ -9,7 +9,6 @@ */ package osc - // ReadAdminPasswordRequest struct for ReadAdminPasswordRequest type ReadAdminPasswordRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_response.go index 1004538b1..d7bfae9f0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_admin_password_response.go @@ -9,11 +9,10 @@ */ package osc - // ReadAdminPasswordResponse struct for ReadAdminPasswordResponse type ReadAdminPasswordResponse struct { // The password of the VM. After the first boot, returns an empty string. - AdminPassword string `json:"AdminPassword,omitempty"` + AdminPassword string `json:"AdminPassword,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` // The ID of the VM. VmId string `json:"VmId,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_request.go index aa9949e61..25456ff18 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_request.go @@ -9,15 +9,14 @@ */ package osc - // ReadApiLogsRequest struct for ReadApiLogsRequest type ReadApiLogsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersApiLog `json:"Filters,omitempty"` // The token to request the next page of results. NextPageToken string `json:"NextPageToken,omitempty"` // The maximum number of items returned in a single page. By default, 100. ResultsPerPage int32 `json:"ResultsPerPage,omitempty"` - With With `json:"With,omitempty"` + With With `json:"With,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_response.go index 4bb33f1cf..691a29138 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_api_logs_response.go @@ -9,12 +9,11 @@ */ package osc - // ReadApiLogsResponse struct for ReadApiLogsResponse type ReadApiLogsResponse struct { // Information displayed in one or more API logs. Logs []Log `json:"Logs,omitempty"` // The token to request the next page of results. - NextPageToken string `json:"NextPageToken,omitempty"` + NextPageToken string `json:"NextPageToken,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_request.go index f3e385e8c..b2368754b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadClientGatewaysRequest struct for ReadClientGatewaysRequest type ReadClientGatewaysRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersClientGateway `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_response.go index 7a22a5f83..9d226d352 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_client_gateways_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadClientGatewaysResponse struct for ReadClientGatewaysResponse type ReadClientGatewaysResponse struct { // Information about one or more client gateways. - ClientGateways []ClientGateway `json:"ClientGateways,omitempty"` + ClientGateways []ClientGateway `json:"ClientGateways,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_request.go index d14a41a5f..8d543a76e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_request.go @@ -9,7 +9,6 @@ */ package osc - // ReadConsoleOutputRequest struct for ReadConsoleOutputRequest type ReadConsoleOutputRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_response.go index d399756f0..4889c3baa 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_console_output_response.go @@ -9,11 +9,10 @@ */ package osc - // ReadConsoleOutputResponse struct for ReadConsoleOutputResponse type ReadConsoleOutputResponse struct { // The Base64-encoded output of the console. If a command line tool is used, the output is decoded by the tool. - ConsoleOutput string `json:"ConsoleOutput,omitempty"` + ConsoleOutput string `json:"ConsoleOutput,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` // The ID of the VM. VmId string `json:"VmId,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_request.go index a33d66ae4..33b4d673e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_request.go @@ -9,7 +9,6 @@ */ package osc - // ReadConsumptionAccountRequest struct for ReadConsumptionAccountRequest type ReadConsumptionAccountRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_response.go index 598eae0bb..44de767f9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_consumption_account_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadConsumptionAccountResponse struct for ReadConsumptionAccountResponse type ReadConsumptionAccountResponse struct { // Information about the resources consumed during the specified time period. ConsumptionEntries []ConsumptionEntry `json:"ConsumptionEntries,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_request.go index 35a8b2351..f429878c8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadDhcpOptionsRequest struct for ReadDhcpOptionsRequest type ReadDhcpOptionsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersDhcpOptions `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_response.go index d5d68b11c..efed6445e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_dhcp_options_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadDhcpOptionsResponse struct for ReadDhcpOptionsResponse type ReadDhcpOptionsResponse struct { // Information about one or more DHCP options sets. DhcpOptionsSets []DhcpOptionsSet `json:"DhcpOptionsSets,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_request.go index 3ea290f94..9bf2f177f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadDirectLinkInterfacesRequest struct for ReadDirectLinkInterfacesRequest type ReadDirectLinkInterfacesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersDirectLinkInterface `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_response.go index 2bc6d4fb4..22ea50a6a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_link_interfaces_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadDirectLinkInterfacesResponse struct for ReadDirectLinkInterfacesResponse type ReadDirectLinkInterfacesResponse struct { // Information about one or more DirectLink interfaces. DirectLinkInterfaces []DirectLinkInterfaces `json:"DirectLinkInterfaces,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_request.go index 27a145503..f032be38c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadDirectLinksRequest struct for ReadDirectLinksRequest type ReadDirectLinksRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersDirectLink `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_response.go index 848d425c6..5f65a6c62 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_direct_links_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadDirectLinksResponse struct for ReadDirectLinksResponse type ReadDirectLinksResponse struct { // Information about one or more DirectLinks. - DirectLinks []DirectLink `json:"DirectLinks,omitempty"` + DirectLinks []DirectLink `json:"DirectLinks,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_request.go index b2b3b0b58..b00e6a540 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_request.go @@ -9,7 +9,6 @@ */ package osc - // ReadFlexibleGpuCatalogRequest struct for ReadFlexibleGpuCatalogRequest type ReadFlexibleGpuCatalogRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_response.go index 718f1d665..e23385976 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpu_catalog_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadFlexibleGpuCatalogResponse struct for ReadFlexibleGpuCatalogResponse type ReadFlexibleGpuCatalogResponse struct { // Information about one or more fGPUs available in the public catalog. FlexibleGpuCatalog []FlexibleGpuCatalog `json:"FlexibleGpuCatalog,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_request.go index 6eb1f6d6e..70403a755 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadFlexibleGpusRequest struct for ReadFlexibleGpusRequest type ReadFlexibleGpusRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersFlexibleGpu `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_response.go index 941d8c4b6..158b0c591 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_flexible_gpus_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadFlexibleGpusResponse struct for ReadFlexibleGpusResponse type ReadFlexibleGpusResponse struct { // Information about one or more fGPUs. - FlexibleGpus []FlexibleGpu `json:"FlexibleGpus,omitempty"` + FlexibleGpus []FlexibleGpu `json:"FlexibleGpus,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_request.go index d9ecd36bd..e65f0312c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadImageExportTasksRequest struct for ReadImageExportTasksRequest type ReadImageExportTasksRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersExportTask `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_response.go index f5bd118cc..534578442 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_image_export_tasks_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadImageExportTasksResponse struct for ReadImageExportTasksResponse type ReadImageExportTasksResponse struct { // Information about one or more image export tasks. ImageExportTasks []ImageExportTask `json:"ImageExportTasks,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_request.go index cea571687..2e73f8c26 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadImagesRequest struct for ReadImagesRequest type ReadImagesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersImage `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_response.go index b568b65a4..6afd36125 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_images_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadImagesResponse struct for ReadImagesResponse type ReadImagesResponse struct { // Information about one or more OMIs. - Images []Image `json:"Images,omitempty"` + Images []Image `json:"Images,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_request.go index 9e702c7ae..07a0ef1c7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadInternetServicesRequest struct for ReadInternetServicesRequest type ReadInternetServicesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersInternetService `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_response.go index ab993ee71..b15201d46 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_internet_services_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadInternetServicesResponse struct for ReadInternetServicesResponse type ReadInternetServicesResponse struct { // Information about one or more Internet services. InternetServices []InternetService `json:"InternetServices,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_request.go index bcb88848b..322b85ca2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadKeypairsRequest struct for ReadKeypairsRequest type ReadKeypairsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersKeypair `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_response.go index 861d1f21f..bc1065e5c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_keypairs_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadKeypairsResponse struct for ReadKeypairsResponse type ReadKeypairsResponse struct { // Information about one or more keypairs. - Keypairs []Keypair `json:"Keypairs,omitempty"` + Keypairs []Keypair `json:"Keypairs,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_request.go index 7d20fd16c..5f4652416 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadListenerRulesRequest struct for ReadListenerRulesRequest type ReadListenerRulesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersListenerRule `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_response.go index f7723063b..6d12c4b3d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_listener_rules_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadListenerRulesResponse struct for ReadListenerRulesResponse type ReadListenerRulesResponse struct { // The list of the rules to describe. - ListenerRules []ListenerRule `json:"ListenerRules,omitempty"` + ListenerRules []ListenerRule `json:"ListenerRules,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_request.go index 419b80e8a..9819214db 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_request.go @@ -9,7 +9,6 @@ */ package osc - // ReadLoadBalancerTagsRequest struct for ReadLoadBalancerTagsRequest type ReadLoadBalancerTagsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_response.go index 00f7594c5..a1f27aca8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancer_tags_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadLoadBalancerTagsResponse struct for ReadLoadBalancerTagsResponse type ReadLoadBalancerTagsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_request.go index c462cf3cd..6540d3dc2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadLoadBalancersRequest struct for ReadLoadBalancersRequest type ReadLoadBalancersRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersLoadBalancer `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_response.go index e8f427511..f58f851d1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_load_balancers_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadLoadBalancersResponse struct for ReadLoadBalancersResponse type ReadLoadBalancersResponse struct { // Information about one or more load balancers. - LoadBalancers []LoadBalancer `json:"LoadBalancers,omitempty"` + LoadBalancers []LoadBalancer `json:"LoadBalancers,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_request.go index 206f8128a..082f71b0f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_request.go @@ -9,7 +9,6 @@ */ package osc - // ReadLocationsRequest struct for ReadLocationsRequest type ReadLocationsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_response.go index a8e6239dd..13d36ff01 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_locations_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadLocationsResponse struct for ReadLocationsResponse type ReadLocationsResponse struct { // Information about one or more locations. - Locations []Location `json:"Locations,omitempty"` + Locations []Location `json:"Locations,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_request.go index 98baeaa96..691547cdb 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadNatServicesRequest struct for ReadNatServicesRequest type ReadNatServicesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersNatService `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_response.go index 8396d322c..5e29e9d76 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nat_services_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadNatServicesResponse struct for ReadNatServicesResponse type ReadNatServicesResponse struct { // Information about one or more NAT services. - NatServices []NatService `json:"NatServices,omitempty"` + NatServices []NatService `json:"NatServices,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_request.go index 2059825a7..cf85b68c0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadNetAccessPointServicesRequest struct for ReadNetAccessPointServicesRequest type ReadNetAccessPointServicesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersService `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_response.go index be78bf62e..a231d1206 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_point_services_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadNetAccessPointServicesResponse struct for ReadNetAccessPointServicesResponse type ReadNetAccessPointServicesResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_request.go index 015dfd6a1..41fb30b78 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadNetAccessPointsRequest struct for ReadNetAccessPointsRequest type ReadNetAccessPointsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersNetAccessPoint `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_response.go index 5b1715afa..590c59491 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_access_points_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadNetAccessPointsResponse struct for ReadNetAccessPointsResponse type ReadNetAccessPointsResponse struct { // One or more Net access points. NetAccessPoints []NetAccessPoint `json:"NetAccessPoints,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_request.go index 5b9d6dd4b..3d450b64e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadNetPeeringsRequest struct for ReadNetPeeringsRequest type ReadNetPeeringsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersNetPeering `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_response.go index bff8a40e9..f50fba5da 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_net_peerings_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadNetPeeringsResponse struct for ReadNetPeeringsResponse type ReadNetPeeringsResponse struct { // Information about one or more Net peering connections. - NetPeerings []NetPeering `json:"NetPeerings,omitempty"` + NetPeerings []NetPeering `json:"NetPeerings,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_request.go index 46605fa7d..673a9dcc4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadNetsRequest struct for ReadNetsRequest type ReadNetsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersNet `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_response.go index 17297638c..e90011024 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nets_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadNetsResponse struct for ReadNetsResponse type ReadNetsResponse struct { // Information about the described Nets. - Nets []Net `json:"Nets,omitempty"` + Nets []Net `json:"Nets,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_request.go index bcfcaf639..2c5d7623c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadNicsRequest struct for ReadNicsRequest type ReadNicsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersNic `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_response.go index 221127308..5013cf15b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_nics_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadNicsResponse struct for ReadNicsResponse type ReadNicsResponse struct { // Information about one or more NICs. - Nics []Nic `json:"Nics,omitempty"` + Nics []Nic `json:"Nics,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_request.go index ace76bc3e..9aef3c83a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadProductTypesRequest struct for ReadProductTypesRequest type ReadProductTypesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersProductType `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_response.go index 7eca9acdb..43bb09278 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_product_types_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadProductTypesResponse struct for ReadProductTypesResponse type ReadProductTypesResponse struct { // Information about one or more product types. - ProductTypes []ProductType `json:"ProductTypes,omitempty"` + ProductTypes []ProductType `json:"ProductTypes,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_request.go index 10c5bd714..ed4102c75 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_request.go @@ -9,7 +9,6 @@ */ package osc - // ReadPublicIpRangesRequest struct for ReadPublicIpRangesRequest type ReadPublicIpRangesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_response.go index b0dd0d91e..5d9838e43 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ip_ranges_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadPublicIpRangesResponse struct for ReadPublicIpRangesResponse type ReadPublicIpRangesResponse struct { // The list of public IPv4 addresses used in the Region, in CIDR notation. - PublicIps []string `json:"PublicIps,omitempty"` + PublicIps []string `json:"PublicIps,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_request.go index 5e75f7f8e..a50d40fc1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadPublicIpsRequest struct for ReadPublicIpsRequest type ReadPublicIpsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersPublicIp `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_response.go index 196dd0dd9..6901d6988 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_public_ips_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadPublicIpsResponse struct for ReadPublicIpsResponse type ReadPublicIpsResponse struct { // Information about one or more EIPs. - PublicIps []PublicIp `json:"PublicIps,omitempty"` + PublicIps []PublicIp `json:"PublicIps,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_request.go index 4739ade7c..92497585d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadQuotasRequest struct for ReadQuotasRequest type ReadQuotasRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersQuota `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_response.go index 5bffc1de8..7d522dfc6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_quotas_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadQuotasResponse struct for ReadQuotasResponse type ReadQuotasResponse struct { // Information about one or more quotas. - QuotaTypes []QuotaTypes `json:"QuotaTypes,omitempty"` + QuotaTypes []QuotaTypes `json:"QuotaTypes,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_request.go index 1aa0fe23f..194146925 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_request.go @@ -9,7 +9,6 @@ */ package osc - // ReadRegionsRequest struct for ReadRegionsRequest type ReadRegionsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_response.go index a39be1b85..355093223 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_regions_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadRegionsResponse struct for ReadRegionsResponse type ReadRegionsResponse struct { // Information about one or more Regions. - Regions []Region `json:"Regions,omitempty"` + Regions []Region `json:"Regions,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_request.go index 50c962841..31a506c5c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadRouteTablesRequest struct for ReadRouteTablesRequest type ReadRouteTablesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersRouteTable `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_response.go index 399d863de..eeee80bb4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_route_tables_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadRouteTablesResponse struct for ReadRouteTablesResponse type ReadRouteTablesResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_request.go index 127f01d8d..3fe92be33 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_request.go @@ -9,7 +9,6 @@ */ package osc - // ReadSecretAccessKeyRequest struct for ReadSecretAccessKeyRequest type ReadSecretAccessKeyRequest struct { // The ID of the access key. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_response.go index 9e5d7c07c..40840c07c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_secret_access_key_response.go @@ -9,9 +9,8 @@ */ package osc - // ReadSecretAccessKeyResponse struct for ReadSecretAccessKeyResponse type ReadSecretAccessKeyResponse struct { - AccessKey AccessKeySecretKey `json:"AccessKey,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + AccessKey AccessKeySecretKey `json:"AccessKey,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_request.go index 17dae1b4d..7f604f458 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadSecurityGroupsRequest struct for ReadSecurityGroupsRequest type ReadSecurityGroupsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersSecurityGroup `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_response.go index bb3b714ca..0cc0c2d5c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_security_groups_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadSecurityGroupsResponse struct for ReadSecurityGroupsResponse type ReadSecurityGroupsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_request.go index 8b59b8bd9..4f7f2db0c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadServerCertificatesRequest struct for ReadServerCertificatesRequest type ReadServerCertificatesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersServerCertificate `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_response.go index 967d67035..5596a5d7e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_server_certificates_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadServerCertificatesResponse struct for ReadServerCertificatesResponse type ReadServerCertificatesResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_request.go index 79e2cd6bd..e922fcaa3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadSnapshotExportTasksRequest struct for ReadSnapshotExportTasksRequest type ReadSnapshotExportTasksRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersExportTask `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_response.go index 7d08b5dec..fd851527f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshot_export_tasks_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadSnapshotExportTasksResponse struct for ReadSnapshotExportTasksResponse type ReadSnapshotExportTasksResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_request.go index 3fd2c64c1..a92806009 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadSnapshotsRequest struct for ReadSnapshotsRequest type ReadSnapshotsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersSnapshot `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_response.go index 0dd47b73a..2b65bb8cd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_snapshots_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadSnapshotsResponse struct for ReadSnapshotsResponse type ReadSnapshotsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_request.go index a56a8c14b..6b1553a76 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadSubnetsRequest struct for ReadSubnetsRequest type ReadSubnetsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersSubnet `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_response.go index 2dd32e77b..e9b847431 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subnets_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadSubnetsResponse struct for ReadSubnetsResponse type ReadSubnetsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_request.go index 62528299a..4f2cdfc34 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadSubregionsRequest struct for ReadSubregionsRequest type ReadSubregionsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersSubregion `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_response.go index 9d8c4d87b..5531552fc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_subregions_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadSubregionsResponse struct for ReadSubregionsResponse type ReadSubregionsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_request.go index 66b6ac885..d460d7da4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadTagsRequest struct for ReadTagsRequest type ReadTagsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersTag `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_response.go index 3250c0fab..e06c60d7f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_tags_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadTagsResponse struct for ReadTagsResponse type ReadTagsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_request.go index 32ff8cb1b..d809d2837 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadVirtualGatewaysRequest struct for ReadVirtualGatewaysRequest type ReadVirtualGatewaysRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersVirtualGateway `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_response.go index c47631878..8dd105f4b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_virtual_gateways_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadVirtualGatewaysResponse struct for ReadVirtualGatewaysResponse type ReadVirtualGatewaysResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_request.go index 4aebe51af..197fb489d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadVmTypesRequest struct for ReadVmTypesRequest type ReadVmTypesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersVmType `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_response.go index c934335ad..a7b3e416a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vm_types_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadVmTypesResponse struct for ReadVmTypesResponse type ReadVmTypesResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_request.go index 8da0b1bb3..8ccbcaac7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_request.go @@ -9,7 +9,6 @@ */ package osc - // ReadVmsHealthRequest struct for ReadVmsHealthRequest type ReadVmsHealthRequest struct { // One or more IDs of back-end VMs. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_response.go index 65905cfd3..55b6c8d30 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_health_response.go @@ -9,10 +9,9 @@ */ package osc - // ReadVmsHealthResponse struct for ReadVmsHealthResponse type ReadVmsHealthResponse struct { // Information about the health of one or more back-end VMs. BackendVmHealth []BackendVmHealth `json:"BackendVmHealth,omitempty"` - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_request.go index 60535d913..add0cc566 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadVmsRequest struct for ReadVmsRequest type ReadVmsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersVm `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_response.go index bbfaa70bb..2df86700b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadVmsResponse struct for ReadVmsResponse type ReadVmsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_request.go index 85f663cfd..99575900e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_request.go @@ -9,12 +9,11 @@ */ package osc - // ReadVmsStateRequest struct for ReadVmsStateRequest type ReadVmsStateRequest struct { // If `true`, includes the status of all VMs. By default or if set to `false`, only includes the status of running VMs. AllVms bool `json:"AllVms,omitempty"` // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersVmsState `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_response.go index c53a5e823..3df7274ce 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vms_state_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadVmsStateResponse struct for ReadVmsStateResponse type ReadVmsStateResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_request.go index 188e687af..158f7be3a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadVolumesRequest struct for ReadVolumesRequest type ReadVolumesRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersVolume `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_response.go index 59b3db56a..c0ba63fd1 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_volumes_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadVolumesResponse struct for ReadVolumesResponse type ReadVolumesResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_request.go index eea7ed515..6164410dd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_request.go @@ -9,10 +9,9 @@ */ package osc - // ReadVpnConnectionsRequest struct for ReadVpnConnectionsRequest type ReadVpnConnectionsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` Filters FiltersVpnConnection `json:"Filters,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_response.go index eb9b81c19..0b23c3a40 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_read_vpn_connections_response.go @@ -9,7 +9,6 @@ */ package osc - // ReadVpnConnectionsResponse struct for ReadVpnConnectionsResponse type ReadVpnConnectionsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_request.go index ab5bd1f83..82d90d551 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_request.go @@ -9,7 +9,6 @@ */ package osc - // RebootVmsRequest struct for RebootVmsRequest type RebootVmsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_response.go index 57ec5b839..e5a9d523b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_reboot_vms_response.go @@ -9,7 +9,6 @@ */ package osc - // RebootVmsResponse struct for RebootVmsResponse type RebootVmsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_region.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_region.go index f331ad290..2de558c38 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_region.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_region.go @@ -9,7 +9,6 @@ */ package osc - // Region Information about the Region. type Region struct { // The hostname of the gateway to access the Region. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_request.go index c33b93946..b4c9ce25d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_request.go @@ -9,7 +9,6 @@ */ package osc - // RegisterVmsInLoadBalancerRequest struct for RegisterVmsInLoadBalancerRequest type RegisterVmsInLoadBalancerRequest struct { // One or more IDs of back-end VMs.
    Specifying the same ID several times has no effect as each back-end VM has equal weight. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_response.go index 71e12397f..ddaed0248 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_register_vms_in_load_balancer_response.go @@ -9,7 +9,6 @@ */ package osc - // RegisterVmsInLoadBalancerResponse struct for RegisterVmsInLoadBalancerResponse type RegisterVmsInLoadBalancerResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_request.go index d161582ba..3573c99ed 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_request.go @@ -9,7 +9,6 @@ */ package osc - // RejectNetPeeringRequest struct for RejectNetPeeringRequest type RejectNetPeeringRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_response.go index e4f195980..e4f46aace 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_reject_net_peering_response.go @@ -9,7 +9,6 @@ */ package osc - // RejectNetPeeringResponse struct for RejectNetPeeringResponse type RejectNetPeeringResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_request.go index cb2ff1668..f78314843 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_request.go @@ -9,7 +9,6 @@ */ package osc - // ResetAccountPasswordRequest struct for ResetAccountPasswordRequest type ResetAccountPasswordRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_response.go index 6d4109102..60629ecb7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_reset_account_password_response.go @@ -9,7 +9,6 @@ */ package osc - // ResetAccountPasswordResponse struct for ResetAccountPasswordResponse type ResetAccountPasswordResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_load_balancer_tag.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_load_balancer_tag.go index d42825e07..56c35ed0c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_load_balancer_tag.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_load_balancer_tag.go @@ -9,7 +9,6 @@ */ package osc - // ResourceLoadBalancerTag Information about the tag. type ResourceLoadBalancerTag struct { // The key of the tag, with a minimum of 1 character. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_tag.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_tag.go index 19949ae3b..6ce6e9b6c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_tag.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_resource_tag.go @@ -9,7 +9,6 @@ */ package osc - // ResourceTag Information about the tag. type ResourceTag struct { // The key of the tag, with a minimum of 1 character. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_response_context.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_response_context.go index 0d5e787e7..46dc375a7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_response_context.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_response_context.go @@ -9,7 +9,6 @@ */ package osc - // ResponseContext Information about the context of the response. type ResponseContext struct { // The ID of the request. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_route.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_route.go index cea2c469c..562c017cf 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_route.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_route.go @@ -9,7 +9,6 @@ */ package osc - // Route Information about the route. type Route struct { // The method used to create the route. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_route_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_route_light.go index b32b90a33..59e0644f2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_route_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_route_light.go @@ -9,7 +9,6 @@ */ package osc - // RouteLight Information about the route. type RouteLight struct { // The IP range used for the destination match, in CIDR notation (for example, 10.0.0.0/24). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_route_propagating_virtual_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_route_propagating_virtual_gateway.go index dcc9a9aac..224f62146 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_route_propagating_virtual_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_route_propagating_virtual_gateway.go @@ -9,7 +9,6 @@ */ package osc - // RoutePropagatingVirtualGateway Information about the route propagating virtual gateway. type RoutePropagatingVirtualGateway struct { // The ID of the virtual gateway. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_route_table.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_route_table.go index 44fc78832..2ea0b2759 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_route_table.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_route_table.go @@ -9,7 +9,6 @@ */ package osc - // RouteTable Information about the route table. type RouteTable struct { // One or more associations between the route table and Subnets. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group.go index d8e495435..d0aefbbd3 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group.go @@ -9,7 +9,6 @@ */ package osc - // SecurityGroup Information about the security group. type SecurityGroup struct { // The account ID of a user that has been granted permission. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_light.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_light.go index 767012794..5a7cb0fc2 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_light.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_light.go @@ -9,7 +9,6 @@ */ package osc - // SecurityGroupLight Information about the security group. type SecurityGroupLight struct { // The ID of the security group. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_rule.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_rule.go index 1f733ba3e..6d975108d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_rule.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_group_rule.go @@ -9,7 +9,6 @@ */ package osc - // SecurityGroupRule Information about the security group rule. type SecurityGroupRule struct { // The beginning of the port range for the TCP and UDP protocols, or an ICMP type number. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_groups_member.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_groups_member.go index 5a78406c1..9eca329e0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_security_groups_member.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_security_groups_member.go @@ -9,7 +9,6 @@ */ package osc - // SecurityGroupsMember Information about the member of a security group. type SecurityGroupsMember struct { // The account ID of a user. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_request.go index 3e217f079..0459cd77a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_request.go @@ -9,7 +9,6 @@ */ package osc - // SendResetPasswordEmailRequest struct for SendResetPasswordEmailRequest type SendResetPasswordEmailRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_response.go index f07d52e9a..625e58a38 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_send_reset_password_email_response.go @@ -9,7 +9,6 @@ */ package osc - // SendResetPasswordEmailResponse struct for SendResetPasswordEmailResponse type SendResetPasswordEmailResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_server_certificate.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_server_certificate.go index cb1b63e20..1f61a246c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_server_certificate.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_server_certificate.go @@ -9,7 +9,6 @@ */ package osc - // ServerCertificate Information about the server certificate. type ServerCertificate struct { // The date at which the server certificate expires. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_service.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_service.go index 0c2ce505b..504cf3239 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_service.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_service.go @@ -9,7 +9,6 @@ */ package osc - // Service Information about the service. type Service struct { // The list of network prefixes used by the service, in CIDR notation. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot.go index 28d8267db..665d84b2b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot.go @@ -9,7 +9,6 @@ */ package osc - // Snapshot Information about the snapshot. type Snapshot struct { // The account alias of the owner of the snapshot. @@ -17,7 +16,7 @@ type Snapshot struct { // The account ID of the owner of the snapshot. AccountId string `json:"AccountId,omitempty"` // The description of the snapshot. - Description string `json:"Description,omitempty"` + Description string `json:"Description,omitempty"` PermissionsToCreateVolume PermissionsOnResource `json:"PermissionsToCreateVolume,omitempty"` // The progress of the snapshot, as a percentage. Progress int32 `json:"Progress,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot_export_task.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot_export_task.go index dd0f87c35..ebf594750 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot_export_task.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_snapshot_export_task.go @@ -9,11 +9,10 @@ */ package osc - // SnapshotExportTask Information about the snapshot export task. type SnapshotExportTask struct { // If the snapshot export task fails, an error message appears. - Comment string `json:"Comment,omitempty"` + Comment string `json:"Comment,omitempty"` OsuExport OsuExport `json:"OsuExport,omitempty"` // The progress of the snapshot export task, as a percentage. Progress int32 `json:"Progress,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_source_net.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_source_net.go index 5616aac50..79aa9e5bc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_source_net.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_source_net.go @@ -9,7 +9,6 @@ */ package osc - // SourceNet Information about the source Net. type SourceNet struct { // The account ID of the owner of the source Net. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_source_security_group.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_source_security_group.go index bda00cbe9..f5a1adf35 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_source_security_group.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_source_security_group.go @@ -9,7 +9,6 @@ */ package osc - // SourceSecurityGroup Information about the source security group of the load balancer, which you can use as part of your inbound rules for your registered VMs.
    To only allow traffic from load balancers, add a security group rule that specifies this source security group as the inbound source. type SourceSecurityGroup struct { // The account ID of the owner of the security group. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_request.go index 5f91fd202..0cf05367f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_request.go @@ -9,7 +9,6 @@ */ package osc - // StartVmsRequest struct for StartVmsRequest type StartVmsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_response.go index 8fe1adc14..e6440ed58 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_start_vms_response.go @@ -9,7 +9,6 @@ */ package osc - // StartVmsResponse struct for StartVmsResponse type StartVmsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_state_comment.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_state_comment.go index 8d1b4fa5f..05254a9b8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_state_comment.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_state_comment.go @@ -9,7 +9,6 @@ */ package osc - // StateComment Information about the change of state. type StateComment struct { // The code of the change of state. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_request.go index 01538d175..0532ec13c 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_request.go @@ -9,7 +9,6 @@ */ package osc - // StopVmsRequest struct for StopVmsRequest type StopVmsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_response.go index 9262f994f..2ac9ef674 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_stop_vms_response.go @@ -9,7 +9,6 @@ */ package osc - // StopVmsResponse struct for StopVmsResponse type StopVmsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_subnet.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_subnet.go index 8316f9445..989fa39fc 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_subnet.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_subnet.go @@ -9,7 +9,6 @@ */ package osc - // Subnet Information about the Subnet. type Subnet struct { // The number of available IP addresses in the Subnets. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_subregion.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_subregion.go index fe606f03a..d92460d1f 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_subregion.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_subregion.go @@ -9,7 +9,6 @@ */ package osc - // Subregion Information about the Subregion. type Subregion struct { // The name of the Region containing the Subregion. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_tag.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_tag.go index 8e15c66f9..c0ba9f64b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_tag.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_tag.go @@ -9,7 +9,6 @@ */ package osc - // Tag Information about the tag. type Tag struct { // The key of the tag, with a minimum of 1 character. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_request.go index bac1b783e..cf15ac076 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_request.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkFlexibleGpuRequest struct for UnlinkFlexibleGpuRequest type UnlinkFlexibleGpuRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_response.go index 388243f68..bf7340332 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_flexible_gpu_response.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkFlexibleGpuResponse struct for UnlinkFlexibleGpuResponse type UnlinkFlexibleGpuResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_request.go index b52c446e1..d39a88974 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_request.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkInternetServiceRequest struct for UnlinkInternetServiceRequest type UnlinkInternetServiceRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_response.go index 670ef18f6..7d2561bb8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_internet_service_response.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkInternetServiceResponse struct for UnlinkInternetServiceResponse type UnlinkInternetServiceResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_request.go index 7bc07b1ca..e6306b312 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_request.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkNicRequest struct for UnlinkNicRequest type UnlinkNicRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_response.go index ac9709bd7..6cf3ebe2a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_nic_response.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkNicResponse struct for UnlinkNicResponse type UnlinkNicResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_request.go index 20935e014..0e98f8701 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_request.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkPrivateIpsRequest struct for UnlinkPrivateIpsRequest type UnlinkPrivateIpsRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_response.go index b72bbdc3f..8b12bc8a0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_private_ips_response.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkPrivateIpsResponse struct for UnlinkPrivateIpsResponse type UnlinkPrivateIpsResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_request.go index c96f25118..8dd31165d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_request.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkPublicIpRequest struct for UnlinkPublicIpRequest type UnlinkPublicIpRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_response.go index c9348940f..8b662f59e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_public_ip_response.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkPublicIpResponse struct for UnlinkPublicIpResponse type UnlinkPublicIpResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_request.go index 7afe02b63..1848a2cf0 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_request.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkRouteTableRequest struct for UnlinkRouteTableRequest type UnlinkRouteTableRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_response.go index 2754f92e2..ea613e509 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_route_table_response.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkRouteTableResponse struct for UnlinkRouteTableResponse type UnlinkRouteTableResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_request.go index 35bd6de17..4f652c677 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_request.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkVirtualGatewayRequest struct for UnlinkVirtualGatewayRequest type UnlinkVirtualGatewayRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_response.go index 8687aff24..6c0dc45d5 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_virtual_gateway_response.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkVirtualGatewayResponse struct for UnlinkVirtualGatewayResponse type UnlinkVirtualGatewayResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_request.go index cdb04f3ab..862e69a10 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_request.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkVolumeRequest struct for UnlinkVolumeRequest type UnlinkVolumeRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_response.go index 17ca5e494..8a2d35a35 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_unlink_volume_response.go @@ -9,7 +9,6 @@ */ package osc - // UnlinkVolumeResponse struct for UnlinkVolumeResponse type UnlinkVolumeResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_request.go index bf032be3a..3f9eb863a 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_request.go @@ -9,7 +9,6 @@ */ package osc - // UpdateAccessKeyRequest struct for UpdateAccessKeyRequest type UpdateAccessKeyRequest struct { // The ID of the access key. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_response.go index 4d9328269..1a1e2f39b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_access_key_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateAccessKeyResponse struct for UpdateAccessKeyResponse type UpdateAccessKeyResponse struct { - AccessKey AccessKey `json:"AccessKey,omitempty"` + AccessKey AccessKey `json:"AccessKey,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_request.go index 449b38d0f..ec245c5ab 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_request.go @@ -9,7 +9,6 @@ */ package osc - // UpdateAccountRequest struct for UpdateAccountRequest type UpdateAccountRequest struct { // The new city of the account owner. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_response.go index d34c782be..55dfd88f7 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_account_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateAccountResponse struct for UpdateAccountResponse type UpdateAccountResponse struct { - Account Account `json:"Account,omitempty"` + Account Account `json:"Account,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_request.go index d4e25db4d..41f354920 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_request.go @@ -9,7 +9,6 @@ */ package osc - // UpdateFlexibleGpuRequest struct for UpdateFlexibleGpuRequest type UpdateFlexibleGpuRequest struct { // If `true`, the fGPU is deleted when the VM is terminated. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_response.go index 6d81bad1a..57a830636 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_flexible_gpu_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateFlexibleGpuResponse struct for UpdateFlexibleGpuResponse type UpdateFlexibleGpuResponse struct { - FlexibleGpu FlexibleGpu `json:"FlexibleGpu,omitempty"` + FlexibleGpu FlexibleGpu `json:"FlexibleGpu,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_request.go index e6ebcc6dc..23628b6b8 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_request.go @@ -9,12 +9,11 @@ */ package osc - // UpdateImageRequest struct for UpdateImageRequest type UpdateImageRequest struct { // If `true`, checks whether you have the required permissions to perform the action. DryRun bool `json:"DryRun,omitempty"` // The ID of the OMI you want to modify. - ImageId string `json:"ImageId"` + ImageId string `json:"ImageId"` PermissionsToLaunch PermissionsOnResourceCreation `json:"PermissionsToLaunch"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_response.go index d6400dff4..b7f27eae4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_image_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateImageResponse struct for UpdateImageResponse type UpdateImageResponse struct { - Image Image `json:"Image,omitempty"` + Image Image `json:"Image,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_request.go index 65d5527eb..e7c13976e 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_request.go @@ -9,7 +9,6 @@ */ package osc - // UpdateListenerRuleRequest struct for UpdateListenerRuleRequest type UpdateListenerRuleRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_response.go index 29a2b437f..636346522 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_listener_rule_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateListenerRuleResponse struct for UpdateListenerRuleResponse type UpdateListenerRuleResponse struct { - ListenerRule ListenerRule `json:"ListenerRule,omitempty"` + ListenerRule ListenerRule `json:"ListenerRule,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_request.go index d1bbb3aa8..ae36181dd 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_request.go @@ -9,12 +9,11 @@ */ package osc - // UpdateLoadBalancerRequest struct for UpdateLoadBalancerRequest type UpdateLoadBalancerRequest struct { AccessLog AccessLog `json:"AccessLog,omitempty"` // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` HealthCheck HealthCheck `json:"HealthCheck,omitempty"` // The name of the load balancer. LoadBalancerName string `json:"LoadBalancerName"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_response.go index 234c38306..ddaa5d153 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_load_balancer_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateLoadBalancerResponse struct for UpdateLoadBalancerResponse type UpdateLoadBalancerResponse struct { - LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` + LoadBalancer LoadBalancer `json:"LoadBalancer,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_request.go index f870f0698..7b6231bec 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_request.go @@ -9,7 +9,6 @@ */ package osc - // UpdateNetAccessPointRequest struct for UpdateNetAccessPointRequest type UpdateNetAccessPointRequest struct { // One or more IDs of route tables to associate with the specified Net access point. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_response.go index 1c3b2b79e..15280daa9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_access_point_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateNetAccessPointResponse struct for UpdateNetAccessPointResponse type UpdateNetAccessPointResponse struct { - NetAccessPoint NetAccessPoint `json:"NetAccessPoint,omitempty"` + NetAccessPoint NetAccessPoint `json:"NetAccessPoint,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_request.go index f84b59053..65e37fc08 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_request.go @@ -9,7 +9,6 @@ */ package osc - // UpdateNetRequest struct for UpdateNetRequest type UpdateNetRequest struct { // The ID of the DHCP options set (or `default` if you want to associate the default one). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_response.go index 57b7ac129..be3e226ec 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_net_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateNetResponse struct for UpdateNetResponse type UpdateNetResponse struct { - Net Net `json:"Net,omitempty"` + Net Net `json:"Net,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_request.go index b0a007397..4a6c6f7ce 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_request.go @@ -9,13 +9,12 @@ */ package osc - // UpdateNicRequest struct for UpdateNicRequest type UpdateNicRequest struct { // A new description for the NIC. Description string `json:"Description,omitempty"` // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` LinkNic LinkNicToUpdate `json:"LinkNic,omitempty"` // The ID of the NIC you want to modify. NicId string `json:"NicId"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_response.go index 9dcedde65..6d7e5971d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_nic_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateNicResponse struct for UpdateNicResponse type UpdateNicResponse struct { - Nic Nic `json:"Nic,omitempty"` + Nic Nic `json:"Nic,omitempty"` ResponseContext ResponseContext `json:"ResponseContext,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_request.go index cb5543291..25e5b25ff 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_request.go @@ -9,7 +9,6 @@ */ package osc - // UpdateRoutePropagationRequest struct for UpdateRoutePropagationRequest type UpdateRoutePropagationRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_response.go index ae658abac..a9ef91872 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_propagation_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateRoutePropagationResponse struct for UpdateRoutePropagationResponse type UpdateRoutePropagationResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - RouteTable RouteTable `json:"RouteTable,omitempty"` + RouteTable RouteTable `json:"RouteTable,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_request.go index ef7867f88..a7dc16806 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_request.go @@ -9,7 +9,6 @@ */ package osc - // UpdateRouteRequest struct for UpdateRouteRequest type UpdateRouteRequest struct { // The IP range used for the destination match, in CIDR notation (for example, 10.0.0.0/24). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_response.go index 8e42af410..54c67e46d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_route_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateRouteResponse struct for UpdateRouteResponse type UpdateRouteResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - RouteTable RouteTable `json:"RouteTable,omitempty"` + RouteTable RouteTable `json:"RouteTable,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_request.go index c662d8506..8b0db0f68 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_request.go @@ -9,7 +9,6 @@ */ package osc - // UpdateServerCertificateRequest struct for UpdateServerCertificateRequest type UpdateServerCertificateRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_response.go index b8e0d7afe..4cc6789ff 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_server_certificate_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateServerCertificateResponse struct for UpdateServerCertificateResponse type UpdateServerCertificateResponse struct { - ResponseContext ResponseContext `json:"ResponseContext,omitempty"` + ResponseContext ResponseContext `json:"ResponseContext,omitempty"` ServerCertificate ServerCertificate `json:"ServerCertificate,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_request.go index 4b2b4fc65..fd1bd2b25 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_request.go @@ -9,11 +9,10 @@ */ package osc - // UpdateSnapshotRequest struct for UpdateSnapshotRequest type UpdateSnapshotRequest struct { // If `true`, checks whether you have the required permissions to perform the action. - DryRun bool `json:"DryRun,omitempty"` + DryRun bool `json:"DryRun,omitempty"` PermissionsToCreateVolume PermissionsOnResourceCreation `json:"PermissionsToCreateVolume"` // The ID of the snapshot. SnapshotId string `json:"SnapshotId"` diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_response.go index a1b59522f..f0deee996 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_snapshot_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateSnapshotResponse struct for UpdateSnapshotResponse type UpdateSnapshotResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - Snapshot Snapshot `json:"Snapshot,omitempty"` + Snapshot Snapshot `json:"Snapshot,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_request.go index 2aaf1af91..29487039b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_request.go @@ -9,7 +9,6 @@ */ package osc - // UpdateSubnetRequest struct for UpdateSubnetRequest type UpdateSubnetRequest struct { // If `true`, checks whether you have the required permissions to perform the action. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_response.go index d429dcb34..bb426dd95 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_subnet_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateSubnetResponse struct for UpdateSubnetResponse type UpdateSubnetResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - Subnet Subnet `json:"Subnet,omitempty"` + Subnet Subnet `json:"Subnet,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_request.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_request.go index 9f1ff13c8..c677f3324 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_request.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_request.go @@ -9,7 +9,6 @@ */ package osc - // UpdateVmRequest struct for UpdateVmRequest type UpdateVmRequest struct { // One or more block device mappings of the VM. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_response.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_response.go index 37c980fd7..ac92999e4 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_response.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_update_vm_response.go @@ -9,9 +9,8 @@ */ package osc - // UpdateVmResponse struct for UpdateVmResponse type UpdateVmResponse struct { ResponseContext ResponseContext `json:"ResponseContext,omitempty"` - Vm Vm `json:"Vm,omitempty"` + Vm Vm `json:"Vm,omitempty"` } diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_virtual_gateway.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_virtual_gateway.go index 15e38061c..7673bc72b 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_virtual_gateway.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_virtual_gateway.go @@ -9,7 +9,6 @@ */ package osc - // VirtualGateway Information about the virtual gateway. type VirtualGateway struct { // The type of VPN connection supported by the virtual gateway (only `ipsec.1` is supported). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm.go index d4d631e98..d048a8b67 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm.go @@ -9,7 +9,6 @@ */ package osc - // Vm Information about the VM. type Vm struct { // The architecture of the VM (`i386` \\| `x86_64`). @@ -39,8 +38,8 @@ type Vm struct { // Indicates the operating system (OS) of the VM. OsFamily string `json:"OsFamily,omitempty"` // The performance of the VM (`standard` \\| `high` \\| `highest`). - Performance string `json:"Performance,omitempty"` - Placement Placement `json:"Placement,omitempty"` + Performance string `json:"Performance,omitempty"` + Placement Placement `json:"Placement,omitempty"` // The name of the private DNS. PrivateDnsName string `json:"PrivateDnsName,omitempty"` // The primary private IP address of the VM. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_state.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_state.go index 3a609db19..1d056af11 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_state.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_state.go @@ -9,7 +9,6 @@ */ package osc - // VmState Information about the state of the VM. type VmState struct { // The current state of the VM (`InService` \\| `OutOfService` \\| `Unknown`). diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_states.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_states.go index 5c72c1b83..961d63a67 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_states.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_states.go @@ -9,7 +9,6 @@ */ package osc - // VmStates Information about the states of the VMs. type VmStates struct { // One or more scheduled events associated with the VM. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_type.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_type.go index 554b034ca..5d8c2ff2d 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_type.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_vm_type.go @@ -9,7 +9,6 @@ */ package osc - // VmType Information about the VM type. type VmType struct { // Indicates whether the VM is optimized for BSU I/O. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_volume.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_volume.go index 12d033b9e..d9d1ac294 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_volume.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_volume.go @@ -9,7 +9,6 @@ */ package osc - // Volume Information about the volume. type Volume struct { // The number of I/O operations per second (IOPS):
    - For `io1` volumes, the number of provisioned IOPS
    - For `gp2` volumes, the baseline performance of the volume diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_vpn_connection.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_vpn_connection.go index 5a26c520a..88863c7a9 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_vpn_connection.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_vpn_connection.go @@ -9,7 +9,6 @@ */ package osc - // VpnConnection Information about a VPN connection. type VpnConnection struct { // The configuration to apply to the client gateway to establish the VPN connection, in XML format. diff --git a/vendor/github.com/outscale/osc-sdk-go/osc/model_with.go b/vendor/github.com/outscale/osc-sdk-go/osc/model_with.go index 8456d4d78..8654e3ec6 100644 --- a/vendor/github.com/outscale/osc-sdk-go/osc/model_with.go +++ b/vendor/github.com/outscale/osc-sdk-go/osc/model_with.go @@ -9,7 +9,6 @@ */ package osc - // With The information to be displayed in the API logs to retrieve. type With struct { // If set to `true`, the account ID is displayed in the logs. diff --git a/vendor/github.com/shirou/w32/constants.go b/vendor/github.com/shirou/w32/constants.go index b83ff14c2..62d2d4b31 100644 --- a/vendor/github.com/shirou/w32/constants.go +++ b/vendor/github.com/shirou/w32/constants.go @@ -131,27 +131,27 @@ const ( BS_AUTOCHECKBOX = 3 BS_AUTORADIOBUTTON = 9 BS_BITMAP = 128 - BS_BOTTOM = 0x800 - BS_CENTER = 0x300 + BS_BOTTOM = 0X800 + BS_CENTER = 0X300 BS_CHECKBOX = 2 BS_DEFPUSHBUTTON = 1 BS_GROUPBOX = 7 BS_ICON = 64 BS_LEFT = 256 BS_LEFTTEXT = 32 - BS_MULTILINE = 0x2000 - BS_NOTIFY = 0x4000 - BS_OWNERDRAW = 0xB + BS_MULTILINE = 0X2000 + BS_NOTIFY = 0X4000 + BS_OWNERDRAW = 0XB BS_PUSHBUTTON = 0 BS_PUSHLIKE = 4096 BS_RADIOBUTTON = 4 BS_RIGHT = 512 BS_RIGHTBUTTON = 32 BS_TEXT = 0 - BS_TOP = 0x400 + BS_TOP = 0X400 BS_USERBUTTON = 8 - BS_VCENTER = 0xC00 - BS_FLAT = 0x8000 + BS_VCENTER = 0XC00 + BS_FLAT = 0X8000 ) // Button state constants @@ -246,61 +246,61 @@ const ( // Window style constants const ( - WS_OVERLAPPED = 0x00000000 - WS_POPUP = 0x80000000 - WS_CHILD = 0x40000000 - WS_MINIMIZE = 0x20000000 - WS_VISIBLE = 0x10000000 - WS_DISABLED = 0x08000000 - WS_CLIPSIBLINGS = 0x04000000 - WS_CLIPCHILDREN = 0x02000000 - WS_MAXIMIZE = 0x01000000 - WS_CAPTION = 0x00C00000 - WS_BORDER = 0x00800000 - WS_DLGFRAME = 0x00400000 - WS_VSCROLL = 0x00200000 - WS_HSCROLL = 0x00100000 - WS_SYSMENU = 0x00080000 - WS_THICKFRAME = 0x00040000 - WS_GROUP = 0x00020000 - WS_TABSTOP = 0x00010000 - WS_MINIMIZEBOX = 0x00020000 - WS_MAXIMIZEBOX = 0x00010000 - WS_TILED = 0x00000000 - WS_ICONIC = 0x20000000 - WS_SIZEBOX = 0x00040000 - WS_OVERLAPPEDWINDOW = 0x00000000 | 0x00C00000 | 0x00080000 | 0x00040000 | 0x00020000 | 0x00010000 - WS_POPUPWINDOW = 0x80000000 | 0x00800000 | 0x00080000 - WS_CHILDWINDOW = 0x40000000 + WS_OVERLAPPED = 0X00000000 + WS_POPUP = 0X80000000 + WS_CHILD = 0X40000000 + WS_MINIMIZE = 0X20000000 + WS_VISIBLE = 0X10000000 + WS_DISABLED = 0X08000000 + WS_CLIPSIBLINGS = 0X04000000 + WS_CLIPCHILDREN = 0X02000000 + WS_MAXIMIZE = 0X01000000 + WS_CAPTION = 0X00C00000 + WS_BORDER = 0X00800000 + WS_DLGFRAME = 0X00400000 + WS_VSCROLL = 0X00200000 + WS_HSCROLL = 0X00100000 + WS_SYSMENU = 0X00080000 + WS_THICKFRAME = 0X00040000 + WS_GROUP = 0X00020000 + WS_TABSTOP = 0X00010000 + WS_MINIMIZEBOX = 0X00020000 + WS_MAXIMIZEBOX = 0X00010000 + WS_TILED = 0X00000000 + WS_ICONIC = 0X20000000 + WS_SIZEBOX = 0X00040000 + WS_OVERLAPPEDWINDOW = 0X00000000 | 0X00C00000 | 0X00080000 | 0X00040000 | 0X00020000 | 0X00010000 + WS_POPUPWINDOW = 0X80000000 | 0X00800000 | 0X00080000 + WS_CHILDWINDOW = 0X40000000 ) // Extended window style constants const ( - WS_EX_DLGMODALFRAME = 0x00000001 - WS_EX_NOPARENTNOTIFY = 0x00000004 - WS_EX_TOPMOST = 0x00000008 - WS_EX_ACCEPTFILES = 0x00000010 - WS_EX_TRANSPARENT = 0x00000020 - WS_EX_MDICHILD = 0x00000040 - WS_EX_TOOLWINDOW = 0x00000080 - WS_EX_WINDOWEDGE = 0x00000100 - WS_EX_CLIENTEDGE = 0x00000200 - WS_EX_CONTEXTHELP = 0x00000400 - WS_EX_RIGHT = 0x00001000 - WS_EX_LEFT = 0x00000000 - WS_EX_RTLREADING = 0x00002000 - WS_EX_LTRREADING = 0x00000000 - WS_EX_LEFTSCROLLBAR = 0x00004000 - WS_EX_RIGHTSCROLLBAR = 0x00000000 - WS_EX_CONTROLPARENT = 0x00010000 - WS_EX_STATICEDGE = 0x00020000 - WS_EX_APPWINDOW = 0x00040000 - WS_EX_OVERLAPPEDWINDOW = 0x00000100 | 0x00000200 - WS_EX_PALETTEWINDOW = 0x00000100 | 0x00000080 | 0x00000008 - WS_EX_LAYERED = 0x00080000 - WS_EX_NOINHERITLAYOUT = 0x00100000 - WS_EX_LAYOUTRTL = 0x00400000 - WS_EX_NOACTIVATE = 0x08000000 + WS_EX_DLGMODALFRAME = 0X00000001 + WS_EX_NOPARENTNOTIFY = 0X00000004 + WS_EX_TOPMOST = 0X00000008 + WS_EX_ACCEPTFILES = 0X00000010 + WS_EX_TRANSPARENT = 0X00000020 + WS_EX_MDICHILD = 0X00000040 + WS_EX_TOOLWINDOW = 0X00000080 + WS_EX_WINDOWEDGE = 0X00000100 + WS_EX_CLIENTEDGE = 0X00000200 + WS_EX_CONTEXTHELP = 0X00000400 + WS_EX_RIGHT = 0X00001000 + WS_EX_LEFT = 0X00000000 + WS_EX_RTLREADING = 0X00002000 + WS_EX_LTRREADING = 0X00000000 + WS_EX_LEFTSCROLLBAR = 0X00004000 + WS_EX_RIGHTSCROLLBAR = 0X00000000 + WS_EX_CONTROLPARENT = 0X00010000 + WS_EX_STATICEDGE = 0X00020000 + WS_EX_APPWINDOW = 0X00040000 + WS_EX_OVERLAPPEDWINDOW = 0X00000100 | 0X00000200 + WS_EX_PALETTEWINDOW = 0X00000100 | 0X00000080 | 0X00000008 + WS_EX_LAYERED = 0X00080000 + WS_EX_NOINHERITLAYOUT = 0X00100000 + WS_EX_LAYOUTRTL = 0X00400000 + WS_EX_NOACTIVATE = 0X08000000 ) // Window message constants @@ -372,7 +372,7 @@ const ( WM_INITDIALOG = 272 WM_INITMENU = 278 WM_INITMENUPOPUP = 279 - WM_INPUT = 0x00FF + WM_INPUT = 0X00FF WM_INPUTLANGCHANGE = 81 WM_INPUTLANGCHANGEREQUEST = 80 WM_KEYDOWN = 256 @@ -391,16 +391,16 @@ const ( WM_MDISETMENU = 560 WM_MDITILE = 550 WM_MEASUREITEM = 44 - WM_GETOBJECT = 0x003D - WM_CHANGEUISTATE = 0x0127 - WM_UPDATEUISTATE = 0x0128 - WM_QUERYUISTATE = 0x0129 - WM_UNINITMENUPOPUP = 0x0125 + WM_GETOBJECT = 0X003D + WM_CHANGEUISTATE = 0X0127 + WM_UPDATEUISTATE = 0X0128 + WM_QUERYUISTATE = 0X0129 + WM_UNINITMENUPOPUP = 0X0125 WM_MENURBUTTONUP = 290 - WM_MENUCOMMAND = 0x0126 - WM_MENUGETOBJECT = 0x0124 - WM_MENUDRAG = 0x0123 - WM_APPCOMMAND = 0x0319 + WM_MENUCOMMAND = 0X0126 + WM_MENUGETOBJECT = 0X0124 + WM_MENUDRAG = 0X0123 + WM_APPCOMMAND = 0X0319 WM_MENUCHAR = 288 WM_MENUSELECT = 287 WM_MOVE = 3 @@ -419,8 +419,8 @@ const ( WM_NCXBUTTONDOWN = 171 WM_NCXBUTTONUP = 172 WM_NCXBUTTONDBLCLK = 173 - WM_NCMOUSEHOVER = 0x02A0 - WM_NCMOUSELEAVE = 0x02A2 + WM_NCMOUSEHOVER = 0X02A0 + WM_NCMOUSELEAVE = 0X02A2 WM_NCMOUSEMOVE = 160 WM_NCPAINT = 133 WM_NCRBUTTONDBLCLK = 166 @@ -506,8 +506,8 @@ const ( WM_XBUTTONUP = 524 WM_XBUTTONDBLCLK = 525 WM_MOUSELAST = 525 - WM_MOUSEHOVER = 0x2A1 - WM_MOUSELEAVE = 0x2A3 + WM_MOUSEHOVER = 0X2A1 + WM_MOUSELEAVE = 0X2A3 WM_CLIPBOARDUPDATE = 0x031D ) diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_bsd.go b/vendor/github.com/sirupsen/logrus/terminal_check_bsd.go index ff6ff7b99..3c4f43f91 100644 --- a/vendor/github.com/sirupsen/logrus/terminal_check_bsd.go +++ b/vendor/github.com/sirupsen/logrus/terminal_check_bsd.go @@ -10,3 +10,4 @@ func isTerminal(fd int) bool { _, err := unix.IoctlGetTermios(fd, ioctlReadTermios) return err == nil } + diff --git a/vendor/github.com/sirupsen/logrus/terminal_check_unix.go b/vendor/github.com/sirupsen/logrus/terminal_check_unix.go index 163c468d5..355dc966f 100644 --- a/vendor/github.com/sirupsen/logrus/terminal_check_unix.go +++ b/vendor/github.com/sirupsen/logrus/terminal_check_unix.go @@ -10,3 +10,4 @@ func isTerminal(fd int) bool { _, err := unix.IoctlGetTermios(fd, ioctlReadTermios) return err == nil } + diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/client.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/client.go index 6924ea46f..a5078a567 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/client.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/client.go @@ -15,1047 +15,1048 @@ package v20170312 import ( - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" + tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" ) const APIVersion = "2017-03-12" type Client struct { - common.Client + common.Client } // Deprecated func NewClientWithSecretId(secretId, secretKey, region string) (client *Client, err error) { - cpf := profile.NewClientProfile() - client = &Client{} - client.Init(region).WithSecretId(secretId, secretKey).WithProfile(cpf) - return + cpf := profile.NewClientProfile() + client = &Client{} + client.Init(region).WithSecretId(secretId, secretKey).WithProfile(cpf) + return } func NewClient(credential *common.Credential, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { - client = &Client{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return + client = &Client{} + client.Init(region). + WithCredential(credential). + WithProfile(clientProfile) + return } + func NewAllocateHostsRequest() (request *AllocateHostsRequest) { - request = &AllocateHostsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "AllocateHosts") - return + request = &AllocateHostsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "AllocateHosts") + return } func NewAllocateHostsResponse() (response *AllocateHostsResponse) { - response = &AllocateHostsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AllocateHostsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (AllocateHosts) 用于创建一个或多个指定配置的CDH实例。 // * 当HostChargeType为PREPAID时，必须指定HostChargePrepaid参数。 func (c *Client) AllocateHosts(request *AllocateHostsRequest) (response *AllocateHostsResponse, err error) { - if request == nil { - request = NewAllocateHostsRequest() - } - response = NewAllocateHostsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAllocateHostsRequest() + } + response = NewAllocateHostsResponse() + err = c.Send(request, response) + return } func NewAssociateInstancesKeyPairsRequest() (request *AssociateInstancesKeyPairsRequest) { - request = &AssociateInstancesKeyPairsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "AssociateInstancesKeyPairs") - return + request = &AssociateInstancesKeyPairsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "AssociateInstancesKeyPairs") + return } func NewAssociateInstancesKeyPairsResponse() (response *AssociateInstancesKeyPairsResponse) { - response = &AssociateInstancesKeyPairsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateInstancesKeyPairsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (AssociateInstancesKeyPairs) 用于将密钥绑定到实例上。 -// +// // * 将密钥的公钥写入到实例的`SSH`配置当中，用户就可以通过该密钥的私钥来登录实例。 // * 如果实例原来绑定过密钥，那么原来的密钥将失效。 // * 如果实例原来是通过密码登录，绑定密钥后无法使用密码登录。 // * 支持批量操作。每次请求批量实例的上限为100。如果批量实例存在不允许操作的实例，操作会以特定错误码返回。 func (c *Client) AssociateInstancesKeyPairs(request *AssociateInstancesKeyPairsRequest) (response *AssociateInstancesKeyPairsResponse, err error) { - if request == nil { - request = NewAssociateInstancesKeyPairsRequest() - } - response = NewAssociateInstancesKeyPairsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateInstancesKeyPairsRequest() + } + response = NewAssociateInstancesKeyPairsResponse() + err = c.Send(request, response) + return } func NewAssociateSecurityGroupsRequest() (request *AssociateSecurityGroupsRequest) { - request = &AssociateSecurityGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "AssociateSecurityGroups") - return + request = &AssociateSecurityGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "AssociateSecurityGroups") + return } func NewAssociateSecurityGroupsResponse() (response *AssociateSecurityGroupsResponse) { - response = &AssociateSecurityGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateSecurityGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (AssociateSecurityGroups) 用于绑定安全组到指定实例。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) AssociateSecurityGroups(request *AssociateSecurityGroupsRequest) (response *AssociateSecurityGroupsResponse, err error) { - if request == nil { - request = NewAssociateSecurityGroupsRequest() - } - response = NewAssociateSecurityGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateSecurityGroupsRequest() + } + response = NewAssociateSecurityGroupsResponse() + err = c.Send(request, response) + return } func NewCreateDisasterRecoverGroupRequest() (request *CreateDisasterRecoverGroupRequest) { - request = &CreateDisasterRecoverGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "CreateDisasterRecoverGroup") - return + request = &CreateDisasterRecoverGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "CreateDisasterRecoverGroup") + return } func NewCreateDisasterRecoverGroupResponse() (response *CreateDisasterRecoverGroupResponse) { - response = &CreateDisasterRecoverGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateDisasterRecoverGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (CreateDisasterRecoverGroup)用于创建[分散置放群组](https://cloud.tencent.com/document/product/213/15486)。创建好的置放群组，可在[创建实例](https://cloud.tencent.com/document/api/213/15730)时指定。 func (c *Client) CreateDisasterRecoverGroup(request *CreateDisasterRecoverGroupRequest) (response *CreateDisasterRecoverGroupResponse, err error) { - if request == nil { - request = NewCreateDisasterRecoverGroupRequest() - } - response = NewCreateDisasterRecoverGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateDisasterRecoverGroupRequest() + } + response = NewCreateDisasterRecoverGroupResponse() + err = c.Send(request, response) + return } func NewCreateImageRequest() (request *CreateImageRequest) { - request = &CreateImageRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "CreateImage") - return + request = &CreateImageRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "CreateImage") + return } func NewCreateImageResponse() (response *CreateImageResponse) { - response = &CreateImageResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateImageResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateImage)用于将实例的系统盘制作为新镜像，创建后的镜像可以用于创建实例。 func (c *Client) CreateImage(request *CreateImageRequest) (response *CreateImageResponse, err error) { - if request == nil { - request = NewCreateImageRequest() - } - response = NewCreateImageResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateImageRequest() + } + response = NewCreateImageResponse() + err = c.Send(request, response) + return } func NewCreateKeyPairRequest() (request *CreateKeyPairRequest) { - request = &CreateKeyPairRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "CreateKeyPair") - return + request = &CreateKeyPairRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "CreateKeyPair") + return } func NewCreateKeyPairResponse() (response *CreateKeyPairResponse) { - response = &CreateKeyPairResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateKeyPairResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (CreateKeyPair) 用于创建一个 `OpenSSH RSA` 密钥对，可以用于登录 `Linux` 实例。 -// +// // * 开发者只需指定密钥对名称，即可由系统自动创建密钥对，并返回所生成的密钥对的 `ID` 及其公钥、私钥的内容。 // * 密钥对名称不能和已经存在的密钥对的名称重复。 // * 私钥的内容可以保存到文件中作为 `SSH` 的一种认证方式。 // * 腾讯云不会保存用户的私钥，请妥善保管。 func (c *Client) CreateKeyPair(request *CreateKeyPairRequest) (response *CreateKeyPairResponse, err error) { - if request == nil { - request = NewCreateKeyPairRequest() - } - response = NewCreateKeyPairResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateKeyPairRequest() + } + response = NewCreateKeyPairResponse() + err = c.Send(request, response) + return } func NewDeleteDisasterRecoverGroupsRequest() (request *DeleteDisasterRecoverGroupsRequest) { - request = &DeleteDisasterRecoverGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DeleteDisasterRecoverGroups") - return + request = &DeleteDisasterRecoverGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DeleteDisasterRecoverGroups") + return } func NewDeleteDisasterRecoverGroupsResponse() (response *DeleteDisasterRecoverGroupsResponse) { - response = &DeleteDisasterRecoverGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteDisasterRecoverGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DeleteDisasterRecoverGroups)用于删除[分散置放群组](https://cloud.tencent.com/document/product/213/15486)。只有空的置放群组才能被删除，非空的群组需要先销毁组内所有云服务器，才能执行删除操作，不然会产生删除置放群组失败的错误。 func (c *Client) DeleteDisasterRecoverGroups(request *DeleteDisasterRecoverGroupsRequest) (response *DeleteDisasterRecoverGroupsResponse, err error) { - if request == nil { - request = NewDeleteDisasterRecoverGroupsRequest() - } - response = NewDeleteDisasterRecoverGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteDisasterRecoverGroupsRequest() + } + response = NewDeleteDisasterRecoverGroupsResponse() + err = c.Send(request, response) + return } func NewDeleteImagesRequest() (request *DeleteImagesRequest) { - request = &DeleteImagesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DeleteImages") - return + request = &DeleteImagesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DeleteImages") + return } func NewDeleteImagesResponse() (response *DeleteImagesResponse) { - response = &DeleteImagesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteImagesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteImages）用于删除一个或多个镜像。 -// +// // * 当[镜像状态](https://cloud.tencent.com/document/product/213/15753#Image)为`创建中`和`使用中`时, 不允许删除。镜像状态可以通过[DescribeImages](https://cloud.tencent.com/document/api/213/9418)获取。 // * 每个地域最多只支持创建10个自定义镜像，删除镜像可以释放账户的配额。 // * 当镜像正在被其它账户分享时，不允许删除。 func (c *Client) DeleteImages(request *DeleteImagesRequest) (response *DeleteImagesResponse, err error) { - if request == nil { - request = NewDeleteImagesRequest() - } - response = NewDeleteImagesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteImagesRequest() + } + response = NewDeleteImagesResponse() + err = c.Send(request, response) + return } func NewDeleteKeyPairsRequest() (request *DeleteKeyPairsRequest) { - request = &DeleteKeyPairsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DeleteKeyPairs") - return + request = &DeleteKeyPairsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DeleteKeyPairs") + return } func NewDeleteKeyPairsResponse() (response *DeleteKeyPairsResponse) { - response = &DeleteKeyPairsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteKeyPairsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DeleteKeyPairs) 用于删除已在腾讯云托管的密钥对。 -// +// // * 可以同时删除多个密钥对。 // * 不能删除已被实例或镜像引用的密钥对，所以需要独立判断是否所有密钥对都被成功删除。 func (c *Client) DeleteKeyPairs(request *DeleteKeyPairsRequest) (response *DeleteKeyPairsResponse, err error) { - if request == nil { - request = NewDeleteKeyPairsRequest() - } - response = NewDeleteKeyPairsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteKeyPairsRequest() + } + response = NewDeleteKeyPairsResponse() + err = c.Send(request, response) + return } func NewDescribeDisasterRecoverGroupQuotaRequest() (request *DescribeDisasterRecoverGroupQuotaRequest) { - request = &DescribeDisasterRecoverGroupQuotaRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeDisasterRecoverGroupQuota") - return + request = &DescribeDisasterRecoverGroupQuotaRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeDisasterRecoverGroupQuota") + return } func NewDescribeDisasterRecoverGroupQuotaResponse() (response *DescribeDisasterRecoverGroupQuotaResponse) { - response = &DescribeDisasterRecoverGroupQuotaResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeDisasterRecoverGroupQuotaResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeDisasterRecoverGroupQuota)用于查询[分散置放群组](https://cloud.tencent.com/document/product/213/15486)配额。 func (c *Client) DescribeDisasterRecoverGroupQuota(request *DescribeDisasterRecoverGroupQuotaRequest) (response *DescribeDisasterRecoverGroupQuotaResponse, err error) { - if request == nil { - request = NewDescribeDisasterRecoverGroupQuotaRequest() - } - response = NewDescribeDisasterRecoverGroupQuotaResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeDisasterRecoverGroupQuotaRequest() + } + response = NewDescribeDisasterRecoverGroupQuotaResponse() + err = c.Send(request, response) + return } func NewDescribeDisasterRecoverGroupsRequest() (request *DescribeDisasterRecoverGroupsRequest) { - request = &DescribeDisasterRecoverGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeDisasterRecoverGroups") - return + request = &DescribeDisasterRecoverGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeDisasterRecoverGroups") + return } func NewDescribeDisasterRecoverGroupsResponse() (response *DescribeDisasterRecoverGroupsResponse) { - response = &DescribeDisasterRecoverGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeDisasterRecoverGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeDisasterRecoverGroups)用于查询[分散置放群组](https://cloud.tencent.com/document/product/213/15486)信息。 func (c *Client) DescribeDisasterRecoverGroups(request *DescribeDisasterRecoverGroupsRequest) (response *DescribeDisasterRecoverGroupsResponse, err error) { - if request == nil { - request = NewDescribeDisasterRecoverGroupsRequest() - } - response = NewDescribeDisasterRecoverGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeDisasterRecoverGroupsRequest() + } + response = NewDescribeDisasterRecoverGroupsResponse() + err = c.Send(request, response) + return } func NewDescribeHostsRequest() (request *DescribeHostsRequest) { - request = &DescribeHostsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeHosts") - return + request = &DescribeHostsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeHosts") + return } func NewDescribeHostsResponse() (response *DescribeHostsResponse) { - response = &DescribeHostsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeHostsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeHosts) 用于获取一个或多个CDH实例的详细信息。 func (c *Client) DescribeHosts(request *DescribeHostsRequest) (response *DescribeHostsResponse, err error) { - if request == nil { - request = NewDescribeHostsRequest() - } - response = NewDescribeHostsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeHostsRequest() + } + response = NewDescribeHostsResponse() + err = c.Send(request, response) + return } func NewDescribeImageQuotaRequest() (request *DescribeImageQuotaRequest) { - request = &DescribeImageQuotaRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeImageQuota") - return + request = &DescribeImageQuotaRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeImageQuota") + return } func NewDescribeImageQuotaResponse() (response *DescribeImageQuotaResponse) { - response = &DescribeImageQuotaResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeImageQuotaResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeImageQuota)用于查询用户帐号的镜像配额。 func (c *Client) DescribeImageQuota(request *DescribeImageQuotaRequest) (response *DescribeImageQuotaResponse, err error) { - if request == nil { - request = NewDescribeImageQuotaRequest() - } - response = NewDescribeImageQuotaResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeImageQuotaRequest() + } + response = NewDescribeImageQuotaResponse() + err = c.Send(request, response) + return } func NewDescribeImageSharePermissionRequest() (request *DescribeImageSharePermissionRequest) { - request = &DescribeImageSharePermissionRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeImageSharePermission") - return + request = &DescribeImageSharePermissionRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeImageSharePermission") + return } func NewDescribeImageSharePermissionResponse() (response *DescribeImageSharePermissionResponse) { - response = &DescribeImageSharePermissionResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeImageSharePermissionResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeImageSharePermission）用于查询镜像分享信息。 func (c *Client) DescribeImageSharePermission(request *DescribeImageSharePermissionRequest) (response *DescribeImageSharePermissionResponse, err error) { - if request == nil { - request = NewDescribeImageSharePermissionRequest() - } - response = NewDescribeImageSharePermissionResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeImageSharePermissionRequest() + } + response = NewDescribeImageSharePermissionResponse() + err = c.Send(request, response) + return } func NewDescribeImagesRequest() (request *DescribeImagesRequest) { - request = &DescribeImagesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeImages") - return + request = &DescribeImagesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeImages") + return } func NewDescribeImagesResponse() (response *DescribeImagesResponse) { - response = &DescribeImagesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeImagesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeImages) 用于查看镜像列表。 -// +// // * 可以通过指定镜像ID来查询指定镜像的详细信息，或通过设定过滤器来查询满足过滤条件的镜像的详细信息。 // * 指定偏移(Offset)和限制(Limit)来选择结果中的一部分，默认返回满足条件的前20个镜像信息。 func (c *Client) DescribeImages(request *DescribeImagesRequest) (response *DescribeImagesResponse, err error) { - if request == nil { - request = NewDescribeImagesRequest() - } - response = NewDescribeImagesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeImagesRequest() + } + response = NewDescribeImagesResponse() + err = c.Send(request, response) + return } func NewDescribeImportImageOsRequest() (request *DescribeImportImageOsRequest) { - request = &DescribeImportImageOsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeImportImageOs") - return + request = &DescribeImportImageOsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeImportImageOs") + return } func NewDescribeImportImageOsResponse() (response *DescribeImportImageOsResponse) { - response = &DescribeImportImageOsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeImportImageOsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 查看可以导入的镜像操作系统信息。 func (c *Client) DescribeImportImageOs(request *DescribeImportImageOsRequest) (response *DescribeImportImageOsResponse, err error) { - if request == nil { - request = NewDescribeImportImageOsRequest() - } - response = NewDescribeImportImageOsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeImportImageOsRequest() + } + response = NewDescribeImportImageOsResponse() + err = c.Send(request, response) + return } func NewDescribeInstanceFamilyConfigsRequest() (request *DescribeInstanceFamilyConfigsRequest) { - request = &DescribeInstanceFamilyConfigsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceFamilyConfigs") - return + request = &DescribeInstanceFamilyConfigsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceFamilyConfigs") + return } func NewDescribeInstanceFamilyConfigsResponse() (response *DescribeInstanceFamilyConfigsResponse) { - response = &DescribeInstanceFamilyConfigsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstanceFamilyConfigsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeInstanceFamilyConfigs）查询当前用户和地域所支持的机型族列表信息。 func (c *Client) DescribeInstanceFamilyConfigs(request *DescribeInstanceFamilyConfigsRequest) (response *DescribeInstanceFamilyConfigsResponse, err error) { - if request == nil { - request = NewDescribeInstanceFamilyConfigsRequest() - } - response = NewDescribeInstanceFamilyConfigsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstanceFamilyConfigsRequest() + } + response = NewDescribeInstanceFamilyConfigsResponse() + err = c.Send(request, response) + return } func NewDescribeInstanceInternetBandwidthConfigsRequest() (request *DescribeInstanceInternetBandwidthConfigsRequest) { - request = &DescribeInstanceInternetBandwidthConfigsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceInternetBandwidthConfigs") - return + request = &DescribeInstanceInternetBandwidthConfigsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceInternetBandwidthConfigs") + return } func NewDescribeInstanceInternetBandwidthConfigsResponse() (response *DescribeInstanceInternetBandwidthConfigsResponse) { - response = &DescribeInstanceInternetBandwidthConfigsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstanceInternetBandwidthConfigsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeInstanceInternetBandwidthConfigs) 用于查询实例带宽配置。 -// +// // * 只支持查询`BANDWIDTH_PREPAID`（ 预付费按带宽结算 ）计费模式的带宽配置。 // * 接口返回实例的所有带宽配置信息（包含历史的带宽配置信息）。 func (c *Client) DescribeInstanceInternetBandwidthConfigs(request *DescribeInstanceInternetBandwidthConfigsRequest) (response *DescribeInstanceInternetBandwidthConfigsResponse, err error) { - if request == nil { - request = NewDescribeInstanceInternetBandwidthConfigsRequest() - } - response = NewDescribeInstanceInternetBandwidthConfigsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstanceInternetBandwidthConfigsRequest() + } + response = NewDescribeInstanceInternetBandwidthConfigsResponse() + err = c.Send(request, response) + return } func NewDescribeInstanceTypeConfigsRequest() (request *DescribeInstanceTypeConfigsRequest) { - request = &DescribeInstanceTypeConfigsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceTypeConfigs") - return + request = &DescribeInstanceTypeConfigsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceTypeConfigs") + return } func NewDescribeInstanceTypeConfigsResponse() (response *DescribeInstanceTypeConfigsResponse) { - response = &DescribeInstanceTypeConfigsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstanceTypeConfigsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeInstanceTypeConfigs) 用于查询实例机型配置。 -// +// // * 可以根据`zone`、`instance-family`来查询实例机型配置。过滤条件详见过滤器[`Filter`](https://cloud.tencent.com/document/api/213/15753#Filter)。 // * 如果参数为空，返回指定地域的所有实例机型配置。 func (c *Client) DescribeInstanceTypeConfigs(request *DescribeInstanceTypeConfigsRequest) (response *DescribeInstanceTypeConfigsResponse, err error) { - if request == nil { - request = NewDescribeInstanceTypeConfigsRequest() - } - response = NewDescribeInstanceTypeConfigsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstanceTypeConfigsRequest() + } + response = NewDescribeInstanceTypeConfigsResponse() + err = c.Send(request, response) + return } func NewDescribeInstanceVncUrlRequest() (request *DescribeInstanceVncUrlRequest) { - request = &DescribeInstanceVncUrlRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceVncUrl") - return + request = &DescribeInstanceVncUrlRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstanceVncUrl") + return } func NewDescribeInstanceVncUrlResponse() (response *DescribeInstanceVncUrlResponse) { - response = &DescribeInstanceVncUrlResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstanceVncUrlResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 ( DescribeInstanceVncUrl ) 用于查询实例管理终端地址，获取的地址可用于实例的 VNC 登录。 -// +// // * 处于 `STOPPED` 状态的机器无法使用此功能。 // * 管理终端地址的有效期为 15 秒，调用接口成功后如果 15 秒内不使用该链接进行访问，管理终端地址自动失效，您需要重新查询。 // * 管理终端地址一旦被访问，将自动失效，您需要重新查询。 // * 如果连接断开，每分钟内重新连接的次数不能超过 30 次。 // * 获取到 `InstanceVncUrl` 后，您需要在链接 末尾加上参数 `InstanceVncUrl=xxxx` 。 -// +// // - 参数 `InstanceVncUrl` ：调用接口成功后会返回的 `InstanceVncUrl` 的值。 -// +// // 最后组成的 URL 格式如下： -// +// // ``` // https://img.qcloud.com/qcloud/app/active_vnc/index.html?InstanceVncUrl=wss%3A%2F%2Fbjvnc.qcloud.com%3A26789%2Fvnc%3Fs%3DaHpjWnRVMFNhYmxKdDM5MjRHNlVTSVQwajNUSW0wb2tBbmFtREFCTmFrcy8vUUNPMG0wSHZNOUUxRm5PMmUzWmFDcWlOdDJIbUJxSTZDL0RXcHZxYnZZMmRkWWZWcEZia2lyb09XMzdKNmM9 // ``` func (c *Client) DescribeInstanceVncUrl(request *DescribeInstanceVncUrlRequest) (response *DescribeInstanceVncUrlResponse, err error) { - if request == nil { - request = NewDescribeInstanceVncUrlRequest() - } - response = NewDescribeInstanceVncUrlResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstanceVncUrlRequest() + } + response = NewDescribeInstanceVncUrlResponse() + err = c.Send(request, response) + return } func NewDescribeInstancesRequest() (request *DescribeInstancesRequest) { - request = &DescribeInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstances") - return + request = &DescribeInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstances") + return } func NewDescribeInstancesResponse() (response *DescribeInstancesResponse) { - response = &DescribeInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeInstances) 用于查询一个或多个实例的详细信息。 -// +// // * 可以根据实例`ID`、实例名称或者实例计费模式等信息来查询实例的详细信息。过滤信息详细请见过滤器`Filter`。 // * 如果参数为空，返回当前用户一定数量（`Limit`所指定的数量，默认为20）的实例。 // * 支持查询实例的最新操作（LatestOperation）以及最新操作状态(LatestOperationState)。 func (c *Client) DescribeInstances(request *DescribeInstancesRequest) (response *DescribeInstancesResponse, err error) { - if request == nil { - request = NewDescribeInstancesRequest() - } - response = NewDescribeInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstancesRequest() + } + response = NewDescribeInstancesResponse() + err = c.Send(request, response) + return } func NewDescribeInstancesOperationLimitRequest() (request *DescribeInstancesOperationLimitRequest) { - request = &DescribeInstancesOperationLimitRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstancesOperationLimit") - return + request = &DescribeInstancesOperationLimitRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstancesOperationLimit") + return } func NewDescribeInstancesOperationLimitResponse() (response *DescribeInstancesOperationLimitResponse) { - response = &DescribeInstancesOperationLimitResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstancesOperationLimitResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeInstancesOperationLimit）用于查询实例操作限制。 -// +// // * 目前支持调整配置操作限制次数查询。 func (c *Client) DescribeInstancesOperationLimit(request *DescribeInstancesOperationLimitRequest) (response *DescribeInstancesOperationLimitResponse, err error) { - if request == nil { - request = NewDescribeInstancesOperationLimitRequest() - } - response = NewDescribeInstancesOperationLimitResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstancesOperationLimitRequest() + } + response = NewDescribeInstancesOperationLimitResponse() + err = c.Send(request, response) + return } func NewDescribeInstancesStatusRequest() (request *DescribeInstancesStatusRequest) { - request = &DescribeInstancesStatusRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstancesStatus") - return + request = &DescribeInstancesStatusRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInstancesStatus") + return } func NewDescribeInstancesStatusResponse() (response *DescribeInstancesStatusResponse) { - response = &DescribeInstancesStatusResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInstancesStatusResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeInstancesStatus) 用于查询一个或多个实例的状态。 -// +// // * 可以根据实例`ID`来查询实例的状态。 // * 如果参数为空，返回当前用户一定数量（Limit所指定的数量，默认为20）的实例状态。 func (c *Client) DescribeInstancesStatus(request *DescribeInstancesStatusRequest) (response *DescribeInstancesStatusResponse, err error) { - if request == nil { - request = NewDescribeInstancesStatusRequest() - } - response = NewDescribeInstancesStatusResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInstancesStatusRequest() + } + response = NewDescribeInstancesStatusResponse() + err = c.Send(request, response) + return } func NewDescribeInternetChargeTypeConfigsRequest() (request *DescribeInternetChargeTypeConfigsRequest) { - request = &DescribeInternetChargeTypeConfigsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeInternetChargeTypeConfigs") - return + request = &DescribeInternetChargeTypeConfigsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeInternetChargeTypeConfigs") + return } func NewDescribeInternetChargeTypeConfigsResponse() (response *DescribeInternetChargeTypeConfigsResponse) { - response = &DescribeInternetChargeTypeConfigsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeInternetChargeTypeConfigsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeInternetChargeTypeConfigs）用于查询网络的计费类型。 func (c *Client) DescribeInternetChargeTypeConfigs(request *DescribeInternetChargeTypeConfigsRequest) (response *DescribeInternetChargeTypeConfigsResponse, err error) { - if request == nil { - request = NewDescribeInternetChargeTypeConfigsRequest() - } - response = NewDescribeInternetChargeTypeConfigsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeInternetChargeTypeConfigsRequest() + } + response = NewDescribeInternetChargeTypeConfigsResponse() + err = c.Send(request, response) + return } func NewDescribeKeyPairsRequest() (request *DescribeKeyPairsRequest) { - request = &DescribeKeyPairsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeKeyPairs") - return + request = &DescribeKeyPairsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeKeyPairs") + return } func NewDescribeKeyPairsResponse() (response *DescribeKeyPairsResponse) { - response = &DescribeKeyPairsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeKeyPairsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeKeyPairs) 用于查询密钥对信息。 -// +// // * 密钥对是通过一种算法生成的一对密钥，在生成的密钥对中，一个向外界公开，称为公钥；另一个用户自己保留，称为私钥。密钥对的公钥内容可以通过这个接口查询，但私钥内容系统不保留。 func (c *Client) DescribeKeyPairs(request *DescribeKeyPairsRequest) (response *DescribeKeyPairsResponse, err error) { - if request == nil { - request = NewDescribeKeyPairsRequest() - } - response = NewDescribeKeyPairsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeKeyPairsRequest() + } + response = NewDescribeKeyPairsResponse() + err = c.Send(request, response) + return } func NewDescribeRegionsRequest() (request *DescribeRegionsRequest) { - request = &DescribeRegionsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeRegions") - return + request = &DescribeRegionsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeRegions") + return } func NewDescribeRegionsResponse() (response *DescribeRegionsResponse) { - response = &DescribeRegionsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeRegionsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeRegions)用于查询地域信息。 func (c *Client) DescribeRegions(request *DescribeRegionsRequest) (response *DescribeRegionsResponse, err error) { - if request == nil { - request = NewDescribeRegionsRequest() - } - response = NewDescribeRegionsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeRegionsRequest() + } + response = NewDescribeRegionsResponse() + err = c.Send(request, response) + return } func NewDescribeReservedInstancesRequest() (request *DescribeReservedInstancesRequest) { - request = &DescribeReservedInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeReservedInstances") - return + request = &DescribeReservedInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeReservedInstances") + return } func NewDescribeReservedInstancesResponse() (response *DescribeReservedInstancesResponse) { - response = &DescribeReservedInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeReservedInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeReservedInstances)可提供列出用户已购买的预留实例 func (c *Client) DescribeReservedInstances(request *DescribeReservedInstancesRequest) (response *DescribeReservedInstancesResponse, err error) { - if request == nil { - request = NewDescribeReservedInstancesRequest() - } - response = NewDescribeReservedInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeReservedInstancesRequest() + } + response = NewDescribeReservedInstancesResponse() + err = c.Send(request, response) + return } func NewDescribeReservedInstancesOfferingsRequest() (request *DescribeReservedInstancesOfferingsRequest) { - request = &DescribeReservedInstancesOfferingsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeReservedInstancesOfferings") - return + request = &DescribeReservedInstancesOfferingsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeReservedInstancesOfferings") + return } func NewDescribeReservedInstancesOfferingsResponse() (response *DescribeReservedInstancesOfferingsResponse) { - response = &DescribeReservedInstancesOfferingsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeReservedInstancesOfferingsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeReservedInstancesOfferings)供用户列出可购买的预留实例配置 func (c *Client) DescribeReservedInstancesOfferings(request *DescribeReservedInstancesOfferingsRequest) (response *DescribeReservedInstancesOfferingsResponse, err error) { - if request == nil { - request = NewDescribeReservedInstancesOfferingsRequest() - } - response = NewDescribeReservedInstancesOfferingsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeReservedInstancesOfferingsRequest() + } + response = NewDescribeReservedInstancesOfferingsResponse() + err = c.Send(request, response) + return } func NewDescribeZoneInstanceConfigInfosRequest() (request *DescribeZoneInstanceConfigInfosRequest) { - request = &DescribeZoneInstanceConfigInfosRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeZoneInstanceConfigInfos") - return + request = &DescribeZoneInstanceConfigInfosRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeZoneInstanceConfigInfos") + return } func NewDescribeZoneInstanceConfigInfosResponse() (response *DescribeZoneInstanceConfigInfosResponse) { - response = &DescribeZoneInstanceConfigInfosResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeZoneInstanceConfigInfosResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeZoneInstanceConfigInfos) 获取可用区的机型信息。 func (c *Client) DescribeZoneInstanceConfigInfos(request *DescribeZoneInstanceConfigInfosRequest) (response *DescribeZoneInstanceConfigInfosResponse, err error) { - if request == nil { - request = NewDescribeZoneInstanceConfigInfosRequest() - } - response = NewDescribeZoneInstanceConfigInfosResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeZoneInstanceConfigInfosRequest() + } + response = NewDescribeZoneInstanceConfigInfosResponse() + err = c.Send(request, response) + return } func NewDescribeZonesRequest() (request *DescribeZonesRequest) { - request = &DescribeZonesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DescribeZones") - return + request = &DescribeZonesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DescribeZones") + return } func NewDescribeZonesResponse() (response *DescribeZonesResponse) { - response = &DescribeZonesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeZonesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeZones)用于查询可用区信息。 func (c *Client) DescribeZones(request *DescribeZonesRequest) (response *DescribeZonesResponse, err error) { - if request == nil { - request = NewDescribeZonesRequest() - } - response = NewDescribeZonesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeZonesRequest() + } + response = NewDescribeZonesResponse() + err = c.Send(request, response) + return } func NewDisassociateInstancesKeyPairsRequest() (request *DisassociateInstancesKeyPairsRequest) { - request = &DisassociateInstancesKeyPairsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DisassociateInstancesKeyPairs") - return + request = &DisassociateInstancesKeyPairsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DisassociateInstancesKeyPairs") + return } func NewDisassociateInstancesKeyPairsResponse() (response *DisassociateInstancesKeyPairsResponse) { - response = &DisassociateInstancesKeyPairsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateInstancesKeyPairsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DisassociateInstancesKeyPairs) 用于解除实例的密钥绑定关系。 -// +// // * 只支持[`STOPPED`](https://cloud.tencent.com/document/product/213/15753#InstanceStatus)状态的`Linux`操作系统的实例。 // * 解绑密钥后，实例可以通过原来设置的密码登录。 // * 如果原来没有设置密码，解绑后将无法使用 `SSH` 登录。可以调用 [ResetInstancesPassword](https://cloud.tencent.com/document/api/213/15736) 接口来设置登录密码。 // * 支持批量操作。每次请求批量实例的上限为100。如果批量实例存在不允许操作的实例，操作会以特定错误码返回。 func (c *Client) DisassociateInstancesKeyPairs(request *DisassociateInstancesKeyPairsRequest) (response *DisassociateInstancesKeyPairsResponse, err error) { - if request == nil { - request = NewDisassociateInstancesKeyPairsRequest() - } - response = NewDisassociateInstancesKeyPairsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateInstancesKeyPairsRequest() + } + response = NewDisassociateInstancesKeyPairsResponse() + err = c.Send(request, response) + return } func NewDisassociateSecurityGroupsRequest() (request *DisassociateSecurityGroupsRequest) { - request = &DisassociateSecurityGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "DisassociateSecurityGroups") - return + request = &DisassociateSecurityGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "DisassociateSecurityGroups") + return } func NewDisassociateSecurityGroupsResponse() (response *DisassociateSecurityGroupsResponse) { - response = &DisassociateSecurityGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateSecurityGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DisassociateSecurityGroups) 用于解绑实例的指定安全组。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) DisassociateSecurityGroups(request *DisassociateSecurityGroupsRequest) (response *DisassociateSecurityGroupsResponse, err error) { - if request == nil { - request = NewDisassociateSecurityGroupsRequest() - } - response = NewDisassociateSecurityGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateSecurityGroupsRequest() + } + response = NewDisassociateSecurityGroupsResponse() + err = c.Send(request, response) + return } func NewImportImageRequest() (request *ImportImageRequest) { - request = &ImportImageRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ImportImage") - return + request = &ImportImageRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ImportImage") + return } func NewImportImageResponse() (response *ImportImageResponse) { - response = &ImportImageResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ImportImageResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } -// 本接口(ImportImage)用于导入镜像，导入后的镜像可用于创建实例。 +// 本接口(ImportImage)用于导入镜像，导入后的镜像可用于创建实例。 func (c *Client) ImportImage(request *ImportImageRequest) (response *ImportImageResponse, err error) { - if request == nil { - request = NewImportImageRequest() - } - response = NewImportImageResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewImportImageRequest() + } + response = NewImportImageResponse() + err = c.Send(request, response) + return } func NewImportKeyPairRequest() (request *ImportKeyPairRequest) { - request = &ImportKeyPairRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ImportKeyPair") - return + request = &ImportKeyPairRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ImportKeyPair") + return } func NewImportKeyPairResponse() (response *ImportKeyPairResponse) { - response = &ImportKeyPairResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ImportKeyPairResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ImportKeyPair) 用于导入密钥对。 -// +// // * 本接口的功能是将密钥对导入到用户账户，并不会自动绑定到实例。如需绑定可以使用[AssociasteInstancesKeyPair](https://cloud.tencent.com/document/api/213/9404)接口。 // * 需指定密钥对名称以及该密钥对的公钥文本。 // * 如果用户只有私钥，可以通过 `SSL` 工具将私钥转换成公钥后再导入。 func (c *Client) ImportKeyPair(request *ImportKeyPairRequest) (response *ImportKeyPairResponse, err error) { - if request == nil { - request = NewImportKeyPairRequest() - } - response = NewImportKeyPairResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewImportKeyPairRequest() + } + response = NewImportKeyPairResponse() + err = c.Send(request, response) + return } func NewInquiryPriceModifyInstancesChargeTypeRequest() (request *InquiryPriceModifyInstancesChargeTypeRequest) { - request = &InquiryPriceModifyInstancesChargeTypeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceModifyInstancesChargeType") - return + request = &InquiryPriceModifyInstancesChargeTypeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceModifyInstancesChargeType") + return } func NewInquiryPriceModifyInstancesChargeTypeResponse() (response *InquiryPriceModifyInstancesChargeTypeResponse) { - response = &InquiryPriceModifyInstancesChargeTypeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceModifyInstancesChargeTypeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (InquiryPriceModifyInstancesChargeType) 用于切换实例的计费模式询价。 -// +// // * 只支持从 `POSTPAID_BY_HOUR` 计费模式切换为`PREPAID`计费模式。 // * 关机不收费的实例、`BC1`和`BS1`机型族的实例、设置定时销毁的实例、竞价实例不支持该操作。 func (c *Client) InquiryPriceModifyInstancesChargeType(request *InquiryPriceModifyInstancesChargeTypeRequest) (response *InquiryPriceModifyInstancesChargeTypeResponse, err error) { - if request == nil { - request = NewInquiryPriceModifyInstancesChargeTypeRequest() - } - response = NewInquiryPriceModifyInstancesChargeTypeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceModifyInstancesChargeTypeRequest() + } + response = NewInquiryPriceModifyInstancesChargeTypeResponse() + err = c.Send(request, response) + return } func NewInquiryPriceRenewInstancesRequest() (request *InquiryPriceRenewInstancesRequest) { - request = &InquiryPriceRenewInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceRenewInstances") - return + request = &InquiryPriceRenewInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceRenewInstances") + return } func NewInquiryPriceRenewInstancesResponse() (response *InquiryPriceRenewInstancesResponse) { - response = &InquiryPriceRenewInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceRenewInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (InquiryPriceRenewInstances) 用于续费包年包月实例询价。 -// +// // * 只支持查询包年包月实例的续费价格。 func (c *Client) InquiryPriceRenewInstances(request *InquiryPriceRenewInstancesRequest) (response *InquiryPriceRenewInstancesResponse, err error) { - if request == nil { - request = NewInquiryPriceRenewInstancesRequest() - } - response = NewInquiryPriceRenewInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceRenewInstancesRequest() + } + response = NewInquiryPriceRenewInstancesResponse() + err = c.Send(request, response) + return } func NewInquiryPriceResetInstanceRequest() (request *InquiryPriceResetInstanceRequest) { - request = &InquiryPriceResetInstanceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResetInstance") - return + request = &InquiryPriceResetInstanceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResetInstance") + return } func NewInquiryPriceResetInstanceResponse() (response *InquiryPriceResetInstanceResponse) { - response = &InquiryPriceResetInstanceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceResetInstanceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (InquiryPriceResetInstance) 用于重装实例询价。 -// +// // * 如果指定了`ImageId`参数，则使用指定的镜像进行重装询价；否则按照当前实例使用的镜像进行重装询价。 // * 目前只支持[系统盘类型](https://cloud.tencent.com/document/api/213/15753#SystemDisk)是`CLOUD_BASIC`、`CLOUD_PREMIUM`、`CLOUD_SSD`类型的实例使用该接口实现`Linux`和`Windows`操作系统切换的重装询价。 // * 目前不支持境外地域的实例使用该接口实现`Linux`和`Windows`操作系统切换的重装询价。 func (c *Client) InquiryPriceResetInstance(request *InquiryPriceResetInstanceRequest) (response *InquiryPriceResetInstanceResponse, err error) { - if request == nil { - request = NewInquiryPriceResetInstanceRequest() - } - response = NewInquiryPriceResetInstanceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceResetInstanceRequest() + } + response = NewInquiryPriceResetInstanceResponse() + err = c.Send(request, response) + return } func NewInquiryPriceResetInstancesInternetMaxBandwidthRequest() (request *InquiryPriceResetInstancesInternetMaxBandwidthRequest) { - request = &InquiryPriceResetInstancesInternetMaxBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResetInstancesInternetMaxBandwidth") - return + request = &InquiryPriceResetInstancesInternetMaxBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResetInstancesInternetMaxBandwidth") + return } func NewInquiryPriceResetInstancesInternetMaxBandwidthResponse() (response *InquiryPriceResetInstancesInternetMaxBandwidthResponse) { - response = &InquiryPriceResetInstancesInternetMaxBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceResetInstancesInternetMaxBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (InquiryPriceResetInstancesInternetMaxBandwidth) 用于调整实例公网带宽上限询价。 -// +// // * 不同机型带宽上限范围不一致，具体限制详见[公网带宽上限](https://cloud.tencent.com/document/product/213/12523)。 // * 对于`BANDWIDTH_PREPAID`计费方式的带宽，目前不支持调小带宽，且需要输入参数`StartTime`和`EndTime`，指定调整后的带宽的生效时间段。在这种场景下会涉及扣费，请确保账户余额充足。可通过[`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253)接口查询账户余额。 // * 对于 `TRAFFIC_POSTPAID_BY_HOUR`、 `BANDWIDTH_POSTPAID_BY_HOUR` 和 `BANDWIDTH_PACKAGE` 计费方式的带宽，使用该接口调整带宽上限是实时生效的，可以在带宽允许的范围内调大或者调小带宽，不支持输入参数 `StartTime` 和 `EndTime` 。 @@ -1063,335 +1064,335 @@ func NewInquiryPriceResetInstancesInternetMaxBandwidthResponse() (response *Inqu // * 接口不支持批量调整 `BANDWIDTH_PREPAID` 和 `BANDWIDTH_POSTPAID_BY_HOUR` 计费方式的带宽。 // * 接口不支持批量调整混合计费方式的带宽。例如不支持同时调整`TRAFFIC_POSTPAID_BY_HOUR`和`BANDWIDTH_PACKAGE`计费方式的带宽。 func (c *Client) InquiryPriceResetInstancesInternetMaxBandwidth(request *InquiryPriceResetInstancesInternetMaxBandwidthRequest) (response *InquiryPriceResetInstancesInternetMaxBandwidthResponse, err error) { - if request == nil { - request = NewInquiryPriceResetInstancesInternetMaxBandwidthRequest() - } - response = NewInquiryPriceResetInstancesInternetMaxBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceResetInstancesInternetMaxBandwidthRequest() + } + response = NewInquiryPriceResetInstancesInternetMaxBandwidthResponse() + err = c.Send(request, response) + return } func NewInquiryPriceResetInstancesTypeRequest() (request *InquiryPriceResetInstancesTypeRequest) { - request = &InquiryPriceResetInstancesTypeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResetInstancesType") - return + request = &InquiryPriceResetInstancesTypeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResetInstancesType") + return } func NewInquiryPriceResetInstancesTypeResponse() (response *InquiryPriceResetInstancesTypeResponse) { - response = &InquiryPriceResetInstancesTypeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceResetInstancesTypeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (InquiryPriceResetInstancesType) 用于调整实例的机型询价。 -// +// // * 目前只支持[系统盘类型](https://cloud.tencent.com/document/product/213/15753#SystemDisk)是`CLOUD_BASIC`、`CLOUD_PREMIUM`、`CLOUD_SSD`类型的实例使用该接口进行调整机型询价。 // * 目前不支持[CDH](https://cloud.tencent.com/document/product/416)实例使用该接口调整机型询价。 // * 对于包年包月实例，使用该接口会涉及扣费，请确保账户余额充足。可通过[`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253)接口查询账户余额。 func (c *Client) InquiryPriceResetInstancesType(request *InquiryPriceResetInstancesTypeRequest) (response *InquiryPriceResetInstancesTypeResponse, err error) { - if request == nil { - request = NewInquiryPriceResetInstancesTypeRequest() - } - response = NewInquiryPriceResetInstancesTypeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceResetInstancesTypeRequest() + } + response = NewInquiryPriceResetInstancesTypeResponse() + err = c.Send(request, response) + return } func NewInquiryPriceResizeInstanceDisksRequest() (request *InquiryPriceResizeInstanceDisksRequest) { - request = &InquiryPriceResizeInstanceDisksRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResizeInstanceDisks") - return + request = &InquiryPriceResizeInstanceDisksRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceResizeInstanceDisks") + return } func NewInquiryPriceResizeInstanceDisksResponse() (response *InquiryPriceResizeInstanceDisksResponse) { - response = &InquiryPriceResizeInstanceDisksResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceResizeInstanceDisksResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (InquiryPriceResizeInstanceDisks) 用于扩容实例的数据盘询价。 -// +// // * 目前只支持扩容非弹性数据盘（[`DescribeDisks`](https://cloud.tencent.com/document/api/362/16315)接口返回值中的`Portable`为`false`表示非弹性）询价，且[数据盘类型](https://cloud.tencent.com/document/product/213/15753#DataDisk)为：`CLOUD_BASIC`、`CLOUD_PREMIUM`、`CLOUD_SSD`。 // * 目前不支持[CDH](https://cloud.tencent.com/document/product/416)实例使用该接口扩容数据盘询价。* 仅支持包年包月实例随机器购买的数据盘。* 目前只支持扩容一块数据盘询价。 func (c *Client) InquiryPriceResizeInstanceDisks(request *InquiryPriceResizeInstanceDisksRequest) (response *InquiryPriceResizeInstanceDisksResponse, err error) { - if request == nil { - request = NewInquiryPriceResizeInstanceDisksRequest() - } - response = NewInquiryPriceResizeInstanceDisksResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceResizeInstanceDisksRequest() + } + response = NewInquiryPriceResizeInstanceDisksResponse() + err = c.Send(request, response) + return } func NewInquiryPriceRunInstancesRequest() (request *InquiryPriceRunInstancesRequest) { - request = &InquiryPriceRunInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceRunInstances") - return + request = &InquiryPriceRunInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "InquiryPriceRunInstances") + return } func NewInquiryPriceRunInstancesResponse() (response *InquiryPriceRunInstancesResponse) { - response = &InquiryPriceRunInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceRunInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(InquiryPriceRunInstances)用于创建实例询价。本接口仅允许针对购买限制范围内的实例配置进行询价, 详见：[创建实例](https://cloud.tencent.com/document/api/213/15730)。 func (c *Client) InquiryPriceRunInstances(request *InquiryPriceRunInstancesRequest) (response *InquiryPriceRunInstancesResponse, err error) { - if request == nil { - request = NewInquiryPriceRunInstancesRequest() - } - response = NewInquiryPriceRunInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceRunInstancesRequest() + } + response = NewInquiryPriceRunInstancesResponse() + err = c.Send(request, response) + return } func NewModifyDisasterRecoverGroupAttributeRequest() (request *ModifyDisasterRecoverGroupAttributeRequest) { - request = &ModifyDisasterRecoverGroupAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyDisasterRecoverGroupAttribute") - return + request = &ModifyDisasterRecoverGroupAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyDisasterRecoverGroupAttribute") + return } func NewModifyDisasterRecoverGroupAttributeResponse() (response *ModifyDisasterRecoverGroupAttributeResponse) { - response = &ModifyDisasterRecoverGroupAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyDisasterRecoverGroupAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyDisasterRecoverGroupAttribute)用于修改[分散置放群组](https://cloud.tencent.com/document/product/213/15486)属性。 func (c *Client) ModifyDisasterRecoverGroupAttribute(request *ModifyDisasterRecoverGroupAttributeRequest) (response *ModifyDisasterRecoverGroupAttributeResponse, err error) { - if request == nil { - request = NewModifyDisasterRecoverGroupAttributeRequest() - } - response = NewModifyDisasterRecoverGroupAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyDisasterRecoverGroupAttributeRequest() + } + response = NewModifyDisasterRecoverGroupAttributeResponse() + err = c.Send(request, response) + return } func NewModifyHostsAttributeRequest() (request *ModifyHostsAttributeRequest) { - request = &ModifyHostsAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyHostsAttribute") - return + request = &ModifyHostsAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyHostsAttribute") + return } func NewModifyHostsAttributeResponse() (response *ModifyHostsAttributeResponse) { - response = &ModifyHostsAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyHostsAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyHostsAttribute）用于修改CDH实例的属性，如实例名称和续费标记等。参数HostName和RenewFlag必须设置其中一个，但不能同时设置。 func (c *Client) ModifyHostsAttribute(request *ModifyHostsAttributeRequest) (response *ModifyHostsAttributeResponse, err error) { - if request == nil { - request = NewModifyHostsAttributeRequest() - } - response = NewModifyHostsAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyHostsAttributeRequest() + } + response = NewModifyHostsAttributeResponse() + err = c.Send(request, response) + return } func NewModifyImageAttributeRequest() (request *ModifyImageAttributeRequest) { - request = &ModifyImageAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyImageAttribute") - return + request = &ModifyImageAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyImageAttribute") + return } func NewModifyImageAttributeResponse() (response *ModifyImageAttributeResponse) { - response = &ModifyImageAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyImageAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyImageAttribute）用于修改镜像属性。 -// +// // * 已分享的镜像无法修改属性。 func (c *Client) ModifyImageAttribute(request *ModifyImageAttributeRequest) (response *ModifyImageAttributeResponse, err error) { - if request == nil { - request = NewModifyImageAttributeRequest() - } - response = NewModifyImageAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyImageAttributeRequest() + } + response = NewModifyImageAttributeResponse() + err = c.Send(request, response) + return } func NewModifyImageSharePermissionRequest() (request *ModifyImageSharePermissionRequest) { - request = &ModifyImageSharePermissionRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyImageSharePermission") - return + request = &ModifyImageSharePermissionRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyImageSharePermission") + return } func NewModifyImageSharePermissionResponse() (response *ModifyImageSharePermissionResponse) { - response = &ModifyImageSharePermissionResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyImageSharePermissionResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyImageSharePermission）用于修改镜像分享信息。 -// +// // * 分享镜像后，被分享账户可以通过该镜像创建实例。 // * 每个自定义镜像最多可共享给50个账户。 // * 分享镜像无法更改名称，描述，仅可用于创建实例。 // * 只支持分享到对方账户相同地域。 func (c *Client) ModifyImageSharePermission(request *ModifyImageSharePermissionRequest) (response *ModifyImageSharePermissionResponse, err error) { - if request == nil { - request = NewModifyImageSharePermissionRequest() - } - response = NewModifyImageSharePermissionResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyImageSharePermissionRequest() + } + response = NewModifyImageSharePermissionResponse() + err = c.Send(request, response) + return } func NewModifyInstancesAttributeRequest() (request *ModifyInstancesAttributeRequest) { - request = &ModifyInstancesAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesAttribute") - return + request = &ModifyInstancesAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesAttribute") + return } func NewModifyInstancesAttributeResponse() (response *ModifyInstancesAttributeResponse) { - response = &ModifyInstancesAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyInstancesAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyInstancesAttribute) 用于修改实例的属性（目前只支持修改实例的名称和关联的安全组）。 -// +// // * “实例名称”仅为方便用户自己管理之用，腾讯云并不以此名称作为提交工单或是进行实例管理操作的依据。 // * 支持批量操作。每次请求批量实例的上限为100。 // * 修改关联安全组时，子机原来关联的安全组会被解绑。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ModifyInstancesAttribute(request *ModifyInstancesAttributeRequest) (response *ModifyInstancesAttributeResponse, err error) { - if request == nil { - request = NewModifyInstancesAttributeRequest() - } - response = NewModifyInstancesAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyInstancesAttributeRequest() + } + response = NewModifyInstancesAttributeResponse() + err = c.Send(request, response) + return } func NewModifyInstancesChargeTypeRequest() (request *ModifyInstancesChargeTypeRequest) { - request = &ModifyInstancesChargeTypeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesChargeType") - return + request = &ModifyInstancesChargeTypeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesChargeType") + return } func NewModifyInstancesChargeTypeResponse() (response *ModifyInstancesChargeTypeResponse) { - response = &ModifyInstancesChargeTypeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyInstancesChargeTypeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyInstancesChargeType) 用于切换实例的计费模式。 -// +// // * 只支持从 `POSTPAID_BY_HOUR` 计费模式切换为`PREPAID`计费模式。 // * 关机不收费的实例、`BC1`和`BS1`机型族的实例、设置定时销毁的实例不支持该操作。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ModifyInstancesChargeType(request *ModifyInstancesChargeTypeRequest) (response *ModifyInstancesChargeTypeResponse, err error) { - if request == nil { - request = NewModifyInstancesChargeTypeRequest() - } - response = NewModifyInstancesChargeTypeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyInstancesChargeTypeRequest() + } + response = NewModifyInstancesChargeTypeResponse() + err = c.Send(request, response) + return } func NewModifyInstancesProjectRequest() (request *ModifyInstancesProjectRequest) { - request = &ModifyInstancesProjectRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesProject") - return + request = &ModifyInstancesProjectRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesProject") + return } func NewModifyInstancesProjectResponse() (response *ModifyInstancesProjectResponse) { - response = &ModifyInstancesProjectResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyInstancesProjectResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyInstancesProject) 用于修改实例所属项目。 -// +// // * 项目为一个虚拟概念，用户可以在一个账户下面建立多个项目，每个项目中管理不同的资源；将多个不同实例分属到不同项目中，后续使用 [`DescribeInstances`](https://cloud.tencent.com/document/api/213/15728)接口查询实例，项目ID可用于过滤结果。 // * 绑定负载均衡的实例不支持修改实例所属项目，请先使用[`DeregisterInstancesFromLoadBalancer`](https://cloud.tencent.com/document/api/214/1258)接口解绑负载均衡。 // [^_^]: # ( 修改实例所属项目会自动解关联实例原来关联的安全组，修改完成后可使用[`ModifyInstancesAttribute`](https://cloud.tencent.com/document/api/213/15739)接口关联安全组。) // * 支持批量操作。每次请求批量实例的上限为100。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ModifyInstancesProject(request *ModifyInstancesProjectRequest) (response *ModifyInstancesProjectResponse, err error) { - if request == nil { - request = NewModifyInstancesProjectRequest() - } - response = NewModifyInstancesProjectResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyInstancesProjectRequest() + } + response = NewModifyInstancesProjectResponse() + err = c.Send(request, response) + return } func NewModifyInstancesRenewFlagRequest() (request *ModifyInstancesRenewFlagRequest) { - request = &ModifyInstancesRenewFlagRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesRenewFlag") - return + request = &ModifyInstancesRenewFlagRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesRenewFlag") + return } func NewModifyInstancesRenewFlagResponse() (response *ModifyInstancesRenewFlagResponse) { - response = &ModifyInstancesRenewFlagResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyInstancesRenewFlagResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyInstancesRenewFlag) 用于修改包年包月实例续费标识。 -// +// // * 实例被标识为自动续费后，每次在实例到期时，会自动续费一个月。 // * 支持批量操作。每次请求批量实例的上限为100。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ModifyInstancesRenewFlag(request *ModifyInstancesRenewFlagRequest) (response *ModifyInstancesRenewFlagResponse, err error) { - if request == nil { - request = NewModifyInstancesRenewFlagRequest() - } - response = NewModifyInstancesRenewFlagResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyInstancesRenewFlagRequest() + } + response = NewModifyInstancesRenewFlagResponse() + err = c.Send(request, response) + return } func NewModifyInstancesVpcAttributeRequest() (request *ModifyInstancesVpcAttributeRequest) { - request = &ModifyInstancesVpcAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesVpcAttribute") - return + request = &ModifyInstancesVpcAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyInstancesVpcAttribute") + return } func NewModifyInstancesVpcAttributeResponse() (response *ModifyInstancesVpcAttributeResponse) { - response = &ModifyInstancesVpcAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyInstancesVpcAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(ModifyInstancesVpcAttribute)用于修改实例vpc属性，如私有网络ip。 @@ -1399,173 +1400,173 @@ func NewModifyInstancesVpcAttributeResponse() (response *ModifyInstancesVpcAttri // * 当指定私有网络ID和子网ID（子网必须在实例所在的可用区）与指定实例所在私有网络不一致时，会将实例迁移至指定的私有网络的子网下。执行此操作前请确保指定的实例上没有绑定[弹性网卡](https://cloud.tencent.com/document/product/576)和[负载均衡](https://cloud.tencent.com/document/product/214)。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ModifyInstancesVpcAttribute(request *ModifyInstancesVpcAttributeRequest) (response *ModifyInstancesVpcAttributeResponse, err error) { - if request == nil { - request = NewModifyInstancesVpcAttributeRequest() - } - response = NewModifyInstancesVpcAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyInstancesVpcAttributeRequest() + } + response = NewModifyInstancesVpcAttributeResponse() + err = c.Send(request, response) + return } func NewModifyKeyPairAttributeRequest() (request *ModifyKeyPairAttributeRequest) { - request = &ModifyKeyPairAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ModifyKeyPairAttribute") - return + request = &ModifyKeyPairAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ModifyKeyPairAttribute") + return } func NewModifyKeyPairAttributeResponse() (response *ModifyKeyPairAttributeResponse) { - response = &ModifyKeyPairAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyKeyPairAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyKeyPairAttribute) 用于修改密钥对属性。 -// +// // * 修改密钥对ID所指定的密钥对的名称和描述信息。 // * 密钥对名称不能和已经存在的密钥对的名称重复。 // * 密钥对ID是密钥对的唯一标识，不可修改。 func (c *Client) ModifyKeyPairAttribute(request *ModifyKeyPairAttributeRequest) (response *ModifyKeyPairAttributeResponse, err error) { - if request == nil { - request = NewModifyKeyPairAttributeRequest() - } - response = NewModifyKeyPairAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyKeyPairAttributeRequest() + } + response = NewModifyKeyPairAttributeResponse() + err = c.Send(request, response) + return } func NewPurchaseReservedInstancesOfferingRequest() (request *PurchaseReservedInstancesOfferingRequest) { - request = &PurchaseReservedInstancesOfferingRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "PurchaseReservedInstancesOffering") - return + request = &PurchaseReservedInstancesOfferingRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "PurchaseReservedInstancesOffering") + return } func NewPurchaseReservedInstancesOfferingResponse() (response *PurchaseReservedInstancesOfferingResponse) { - response = &PurchaseReservedInstancesOfferingResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &PurchaseReservedInstancesOfferingResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(PurchaseReservedInstancesOffering)用于用户购买一个或者多个指定配置的预留实例 func (c *Client) PurchaseReservedInstancesOffering(request *PurchaseReservedInstancesOfferingRequest) (response *PurchaseReservedInstancesOfferingResponse, err error) { - if request == nil { - request = NewPurchaseReservedInstancesOfferingRequest() - } - response = NewPurchaseReservedInstancesOfferingResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewPurchaseReservedInstancesOfferingRequest() + } + response = NewPurchaseReservedInstancesOfferingResponse() + err = c.Send(request, response) + return } func NewRebootInstancesRequest() (request *RebootInstancesRequest) { - request = &RebootInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "RebootInstances") - return + request = &RebootInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "RebootInstances") + return } func NewRebootInstancesResponse() (response *RebootInstancesResponse) { - response = &RebootInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RebootInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (RebootInstances) 用于重启实例。 -// +// // * 只有状态为`RUNNING`的实例才可以进行此操作。 // * 接口调用成功时，实例会进入`REBOOTING`状态；重启实例成功时，实例会进入`RUNNING`状态。 // * 支持强制重启。强制重启的效果等同于关闭物理计算机的电源开关再重新启动。强制重启可能会导致数据丢失或文件系统损坏，请仅在服务器不能正常重启时使用。 // * 支持批量操作，每次请求批量实例的上限为100。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) RebootInstances(request *RebootInstancesRequest) (response *RebootInstancesResponse, err error) { - if request == nil { - request = NewRebootInstancesRequest() - } - response = NewRebootInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRebootInstancesRequest() + } + response = NewRebootInstancesResponse() + err = c.Send(request, response) + return } func NewRenewHostsRequest() (request *RenewHostsRequest) { - request = &RenewHostsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "RenewHosts") - return + request = &RenewHostsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "RenewHosts") + return } func NewRenewHostsResponse() (response *RenewHostsResponse) { - response = &RenewHostsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RenewHostsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (RenewHosts) 用于续费包年包月CDH实例。 -// +// // * 只支持操作包年包月实例，否则操作会以特定[错误码](#6.-.E9.94.99.E8.AF.AF.E7.A0.81)返回。 // * 续费时请确保账户余额充足。可通过[`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253)接口查询账户余额。 func (c *Client) RenewHosts(request *RenewHostsRequest) (response *RenewHostsResponse, err error) { - if request == nil { - request = NewRenewHostsRequest() - } - response = NewRenewHostsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRenewHostsRequest() + } + response = NewRenewHostsResponse() + err = c.Send(request, response) + return } func NewRenewInstancesRequest() (request *RenewInstancesRequest) { - request = &RenewInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "RenewInstances") - return + request = &RenewInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "RenewInstances") + return } func NewRenewInstancesResponse() (response *RenewInstancesResponse) { - response = &RenewInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RenewInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (RenewInstances) 用于续费包年包月实例。 -// +// // * 只支持操作包年包月实例。 // * 续费时请确保账户余额充足。可通过[`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253)接口查询账户余额。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) RenewInstances(request *RenewInstancesRequest) (response *RenewInstancesResponse, err error) { - if request == nil { - request = NewRenewInstancesRequest() - } - response = NewRenewInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRenewInstancesRequest() + } + response = NewRenewInstancesResponse() + err = c.Send(request, response) + return } func NewResetInstanceRequest() (request *ResetInstanceRequest) { - request = &ResetInstanceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ResetInstance") - return + request = &ResetInstanceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ResetInstance") + return } func NewResetInstanceResponse() (response *ResetInstanceResponse) { - response = &ResetInstanceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetInstanceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ResetInstance) 用于重装指定实例上的操作系统。 -// +// // * 如果指定了`ImageId`参数，则使用指定的镜像重装；否则按照当前实例使用的镜像进行重装。 // * 系统盘将会被格式化，并重置；请确保系统盘中无重要文件。 // * `Linux`和`Windows`系统互相切换时，该实例系统盘`ID`将发生变化，系统盘关联快照将无法回滚、恢复数据。 @@ -1574,31 +1575,31 @@ func NewResetInstanceResponse() (response *ResetInstanceResponse) { // * 目前不支持境外地域的实例使用该接口实现`Linux`和`Windows`操作系统切换。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ResetInstance(request *ResetInstanceRequest) (response *ResetInstanceResponse, err error) { - if request == nil { - request = NewResetInstanceRequest() - } - response = NewResetInstanceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetInstanceRequest() + } + response = NewResetInstanceResponse() + err = c.Send(request, response) + return } func NewResetInstancesInternetMaxBandwidthRequest() (request *ResetInstancesInternetMaxBandwidthRequest) { - request = &ResetInstancesInternetMaxBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ResetInstancesInternetMaxBandwidth") - return + request = &ResetInstancesInternetMaxBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ResetInstancesInternetMaxBandwidth") + return } func NewResetInstancesInternetMaxBandwidthResponse() (response *ResetInstancesInternetMaxBandwidthResponse) { - response = &ResetInstancesInternetMaxBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetInstancesInternetMaxBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ResetInstancesInternetMaxBandwidth) 用于调整实例公网带宽上限。 -// +// // * 不同机型带宽上限范围不一致，具体限制详见[公网带宽上限](https://cloud.tencent.com/document/product/213/12523)。 // * 对于 `BANDWIDTH_PREPAID` 计费方式的带宽，需要输入参数 `StartTime` 和 `EndTime` ，指定调整后的带宽的生效时间段。在这种场景下目前不支持调小带宽，会涉及扣费，请确保账户余额充足。可通过 [`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253) 接口查询账户余额。 // * 对于 `TRAFFIC_POSTPAID_BY_HOUR` 、 `BANDWIDTH_POSTPAID_BY_HOUR` 和 `BANDWIDTH_PACKAGE` 计费方式的带宽，使用该接口调整带宽上限是实时生效的，可以在带宽允许的范围内调大或者调小带宽，不支持输入参数 `StartTime` 和 `EndTime` 。 @@ -1607,57 +1608,57 @@ func NewResetInstancesInternetMaxBandwidthResponse() (response *ResetInstancesIn // * 接口不支持批量调整混合计费方式的带宽。例如不支持同时调整 `TRAFFIC_POSTPAID_BY_HOUR` 和 `BANDWIDTH_PACKAGE` 计费方式的带宽。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ResetInstancesInternetMaxBandwidth(request *ResetInstancesInternetMaxBandwidthRequest) (response *ResetInstancesInternetMaxBandwidthResponse, err error) { - if request == nil { - request = NewResetInstancesInternetMaxBandwidthRequest() - } - response = NewResetInstancesInternetMaxBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetInstancesInternetMaxBandwidthRequest() + } + response = NewResetInstancesInternetMaxBandwidthResponse() + err = c.Send(request, response) + return } func NewResetInstancesPasswordRequest() (request *ResetInstancesPasswordRequest) { - request = &ResetInstancesPasswordRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ResetInstancesPassword") - return + request = &ResetInstancesPasswordRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ResetInstancesPassword") + return } func NewResetInstancesPasswordResponse() (response *ResetInstancesPasswordResponse) { - response = &ResetInstancesPasswordResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetInstancesPasswordResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ResetInstancesPassword) 用于将实例操作系统的密码重置为用户指定的密码。 -// +// // *如果是修改系统管理云密码：实例的操作系统不同，管理员帐号也会不一样(`Windows`为`Administrator`，`Ubuntu`为`ubuntu`，其它系统为`root`)。 // * 重置处于运行中状态的实例密码，需要设置关机参数`ForceStop`为`TRUE`。如果没有显式指定强制关机参数，则只有处于关机状态的实例才允许执行重置密码操作。 // * 支持批量操作。将多个实例操作系统的密码重置为相同的密码。每次请求批量实例的上限为100。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ResetInstancesPassword(request *ResetInstancesPasswordRequest) (response *ResetInstancesPasswordResponse, err error) { - if request == nil { - request = NewResetInstancesPasswordRequest() - } - response = NewResetInstancesPasswordResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetInstancesPasswordRequest() + } + response = NewResetInstancesPasswordResponse() + err = c.Send(request, response) + return } func NewResetInstancesTypeRequest() (request *ResetInstancesTypeRequest) { - request = &ResetInstancesTypeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ResetInstancesType") - return + request = &ResetInstancesTypeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ResetInstancesType") + return } func NewResetInstancesTypeResponse() (response *ResetInstancesTypeResponse) { - response = &ResetInstancesTypeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetInstancesTypeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ResetInstancesType) 用于调整实例的机型。 @@ -1665,190 +1666,190 @@ func NewResetInstancesTypeResponse() (response *ResetInstancesTypeResponse) { // * 目前不支持[CDH](https://cloud.tencent.com/document/product/416)实例使用该接口调整机型。对于包年包月实例，使用该接口会涉及扣费，请确保账户余额充足。可通过[`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253)接口查询账户余额。 // * 本接口为异步接口，调整实例配置请求发送成功后会返回一个RequestId，此时操作并未立即完成。实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表调整实例配置操作成功。 func (c *Client) ResetInstancesType(request *ResetInstancesTypeRequest) (response *ResetInstancesTypeResponse, err error) { - if request == nil { - request = NewResetInstancesTypeRequest() - } - response = NewResetInstancesTypeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetInstancesTypeRequest() + } + response = NewResetInstancesTypeResponse() + err = c.Send(request, response) + return } func NewResizeInstanceDisksRequest() (request *ResizeInstanceDisksRequest) { - request = &ResizeInstanceDisksRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "ResizeInstanceDisks") - return + request = &ResizeInstanceDisksRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "ResizeInstanceDisks") + return } func NewResizeInstanceDisksResponse() (response *ResizeInstanceDisksResponse) { - response = &ResizeInstanceDisksResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResizeInstanceDisksResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ResizeInstanceDisks) 用于扩容实例的数据盘。 -// +// // * 目前只支持扩容非弹性数据盘（[`DescribeDisks`](https://cloud.tencent.com/document/api/362/16315)接口返回值中的`Portable`为`false`表示非弹性），且[数据盘类型](https://cloud.tencent.com/document/api/213/15753#DataDisk)为：`CLOUD_BASIC`、`CLOUD_PREMIUM`、`CLOUD_SSD`和[CDH](https://cloud.tencent.com/document/product/416)实例的`LOCAL_BASIC`、`LOCAL_SSD`类型数据盘。 // * 对于包年包月实例，使用该接口会涉及扣费，请确保账户余额充足。可通过[`DescribeAccountBalance`](https://cloud.tencent.com/document/product/555/20253)接口查询账户余额。 // * 目前只支持扩容一块数据盘。 // * 实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表操作成功。 func (c *Client) ResizeInstanceDisks(request *ResizeInstanceDisksRequest) (response *ResizeInstanceDisksResponse, err error) { - if request == nil { - request = NewResizeInstanceDisksRequest() - } - response = NewResizeInstanceDisksResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResizeInstanceDisksRequest() + } + response = NewResizeInstanceDisksResponse() + err = c.Send(request, response) + return } func NewRunInstancesRequest() (request *RunInstancesRequest) { - request = &RunInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "RunInstances") - return + request = &RunInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "RunInstances") + return } func NewRunInstancesResponse() (response *RunInstancesResponse) { - response = &RunInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RunInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (RunInstances) 用于创建一个或多个指定配置的实例。 -// +// // * 实例创建成功后将自动开机启动，[实例状态](https://cloud.tencent.com/document/product/213/15753#InstanceStatus)变为“运行中”。 // * 预付费实例的购买会预先扣除本次实例购买所需金额，按小时后付费实例购买会预先冻结本次实例购买一小时内所需金额，在调用本接口前请确保账户余额充足。 // * 本接口允许购买的实例数量遵循[CVM实例购买限制](https://cloud.tencent.com/document/product/213/2664)，所创建的实例和官网入口创建的实例共用配额。 // * 本接口为异步接口，当创建实例请求下发成功后会返回一个实例`ID`列表和一个`RequestId`，此时创建实例操作并未立即完成。在此期间实例的状态将会处于“PENDING”，实例创建结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728) 接口查询，如果实例状态(InstanceState)由“PENDING”变为“RUNNING”，则代表实例创建成功，“LAUNCH_FAILED”代表实例创建失败。 func (c *Client) RunInstances(request *RunInstancesRequest) (response *RunInstancesResponse, err error) { - if request == nil { - request = NewRunInstancesRequest() - } - response = NewRunInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRunInstancesRequest() + } + response = NewRunInstancesResponse() + err = c.Send(request, response) + return } func NewStartInstancesRequest() (request *StartInstancesRequest) { - request = &StartInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "StartInstances") - return + request = &StartInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "StartInstances") + return } func NewStartInstancesResponse() (response *StartInstancesResponse) { - response = &StartInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &StartInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (StartInstances) 用于启动一个或多个实例。 -// +// // * 只有状态为`STOPPED`的实例才可以进行此操作。 // * 接口调用成功时，实例会进入`STARTING`状态；启动实例成功时，实例会进入`RUNNING`状态。 // * 支持批量操作。每次请求批量实例的上限为100。 // * 本接口为异步接口，启动实例请求发送成功后会返回一个RequestId，此时操作并未立即完成。实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表启动实例操作成功。 func (c *Client) StartInstances(request *StartInstancesRequest) (response *StartInstancesResponse, err error) { - if request == nil { - request = NewStartInstancesRequest() - } - response = NewStartInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewStartInstancesRequest() + } + response = NewStartInstancesResponse() + err = c.Send(request, response) + return } func NewStopInstancesRequest() (request *StopInstancesRequest) { - request = &StopInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "StopInstances") - return + request = &StopInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "StopInstances") + return } func NewStopInstancesResponse() (response *StopInstancesResponse) { - response = &StopInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &StopInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (StopInstances) 用于关闭一个或多个实例。 -// +// // * 只有状态为`RUNNING`的实例才可以进行此操作。 // * 接口调用成功时，实例会进入`STOPPING`状态；关闭实例成功时，实例会进入`STOPPED`状态。 // * 支持强制关闭。强制关机的效果等同于关闭物理计算机的电源开关。强制关机可能会导致数据丢失或文件系统损坏，请仅在服务器不能正常关机时使用。 // * 支持批量操作。每次请求批量实例的上限为100。 // * 本接口为异步接口，关闭实例请求发送成功后会返回一个RequestId，此时操作并未立即完成。实例操作结果可以通过调用 [DescribeInstances](https://cloud.tencent.com/document/api/213/15728#.E7.A4.BA.E4.BE.8B3-.E6.9F.A5.E8.AF.A2.E5.AE.9E.E4.BE.8B.E7.9A.84.E6.9C.80.E6.96.B0.E6.93.8D.E4.BD.9C.E6.83.85.E5.86.B5) 接口查询，如果实例的最新操作状态(LatestOperationState)为“SUCCESS”，则代表关闭实例操作成功。 func (c *Client) StopInstances(request *StopInstancesRequest) (response *StopInstancesResponse, err error) { - if request == nil { - request = NewStopInstancesRequest() - } - response = NewStopInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewStopInstancesRequest() + } + response = NewStopInstancesResponse() + err = c.Send(request, response) + return } func NewSyncImagesRequest() (request *SyncImagesRequest) { - request = &SyncImagesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "SyncImages") - return + request = &SyncImagesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "SyncImages") + return } func NewSyncImagesResponse() (response *SyncImagesResponse) { - response = &SyncImagesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &SyncImagesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（SyncImages）用于将自定义镜像同步到其它地区。 -// +// // * 该接口每次调用只支持同步一个镜像。 // * 该接口支持多个同步地域。 // * 单个帐号在每个地域最多支持存在10个自定义镜像。 func (c *Client) SyncImages(request *SyncImagesRequest) (response *SyncImagesResponse, err error) { - if request == nil { - request = NewSyncImagesRequest() - } - response = NewSyncImagesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewSyncImagesRequest() + } + response = NewSyncImagesResponse() + err = c.Send(request, response) + return } func NewTerminateInstancesRequest() (request *TerminateInstancesRequest) { - request = &TerminateInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("cvm", APIVersion, "TerminateInstances") - return + request = &TerminateInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("cvm", APIVersion, "TerminateInstances") + return } func NewTerminateInstancesResponse() (response *TerminateInstancesResponse) { - response = &TerminateInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &TerminateInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (TerminateInstances) 用于主动退还实例。 -// +// // * 不再使用的实例，可通过本接口主动退还。 // * 按量计费的实例通过本接口可直接退还；包年包月实例如符合[退还规则](https://cloud.tencent.com/document/product/213/9711)，也可通过本接口主动退还。 // * 包年包月实例首次调用本接口，实例将被移至回收站，再次调用本接口，实例将被销毁，且不可恢复。按量计费实例调用本接口将被直接销毁 // * 支持批量操作，每次请求批量实例的上限为100。 func (c *Client) TerminateInstances(request *TerminateInstancesRequest) (response *TerminateInstancesResponse, err error) { - if request == nil { - request = NewTerminateInstancesRequest() - } - response = NewTerminateInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewTerminateInstancesRequest() + } + response = NewTerminateInstancesResponse() + err = c.Send(request, response) + return } diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/models.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/models.go index 6fed1d3dd..34b6c7683 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/models.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312/models.go @@ -15,9 +15,9 @@ package v20170312 import ( - "encoding/json" + "encoding/json" - tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" + tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" ) type ActionTimer struct { @@ -58,12 +58,12 @@ type AllocateHostsRequest struct { } func (r *AllocateHostsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AllocateHostsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AllocateHostsResponse struct { @@ -79,12 +79,12 @@ type AllocateHostsResponse struct { } func (r *AllocateHostsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AllocateHostsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateInstancesKeyPairsRequest struct { @@ -101,12 +101,12 @@ type AssociateInstancesKeyPairsRequest struct { } func (r *AssociateInstancesKeyPairsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateInstancesKeyPairsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateInstancesKeyPairsResponse struct { @@ -119,12 +119,12 @@ type AssociateInstancesKeyPairsResponse struct { } func (r *AssociateInstancesKeyPairsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateInstancesKeyPairsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateSecurityGroupsRequest struct { @@ -138,12 +138,12 @@ type AssociateSecurityGroupsRequest struct { } func (r *AssociateSecurityGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateSecurityGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateSecurityGroupsResponse struct { @@ -156,12 +156,12 @@ type AssociateSecurityGroupsResponse struct { } func (r *AssociateSecurityGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateSecurityGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ChargePrepaid struct { @@ -187,12 +187,12 @@ type CreateDisasterRecoverGroupRequest struct { } func (r *CreateDisasterRecoverGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDisasterRecoverGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDisasterRecoverGroupResponse struct { @@ -223,12 +223,12 @@ type CreateDisasterRecoverGroupResponse struct { } func (r *CreateDisasterRecoverGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDisasterRecoverGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateImageRequest struct { @@ -261,12 +261,12 @@ type CreateImageRequest struct { } func (r *CreateImageRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateImageRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateImageResponse struct { @@ -274,7 +274,7 @@ type CreateImageResponse struct { Response *struct { // 镜像ID - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 ImageId *string `json:"ImageId,omitempty" name:"ImageId"` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -283,12 +283,12 @@ type CreateImageResponse struct { } func (r *CreateImageResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateImageResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateKeyPairRequest struct { @@ -305,12 +305,12 @@ type CreateKeyPairRequest struct { } func (r *CreateKeyPairRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateKeyPairRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateKeyPairResponse struct { @@ -326,12 +326,12 @@ type CreateKeyPairResponse struct { } func (r *CreateKeyPairResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateKeyPairResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DataDisk struct { @@ -366,7 +366,7 @@ type DataDisk struct { Encrypt *bool `json:"Encrypt,omitempty" name:"Encrypt"` // 自定义CMK对应的ID，取值为UUID或者类似kms-abcd1234。用于加密云盘。 - // + // // 该参数目前仅用于 `RunInstances` 接口。 // 注意：此字段可能返回 null，表示取不到有效值。 KmsKeyId *string `json:"KmsKeyId,omitempty" name:"KmsKeyId"` @@ -380,12 +380,12 @@ type DeleteDisasterRecoverGroupsRequest struct { } func (r *DeleteDisasterRecoverGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDisasterRecoverGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDisasterRecoverGroupsResponse struct { @@ -398,12 +398,12 @@ type DeleteDisasterRecoverGroupsResponse struct { } func (r *DeleteDisasterRecoverGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDisasterRecoverGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteImagesRequest struct { @@ -414,12 +414,12 @@ type DeleteImagesRequest struct { } func (r *DeleteImagesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteImagesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteImagesResponse struct { @@ -432,12 +432,12 @@ type DeleteImagesResponse struct { } func (r *DeleteImagesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteImagesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteKeyPairsRequest struct { @@ -448,12 +448,12 @@ type DeleteKeyPairsRequest struct { } func (r *DeleteKeyPairsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteKeyPairsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteKeyPairsResponse struct { @@ -466,12 +466,12 @@ type DeleteKeyPairsResponse struct { } func (r *DeleteKeyPairsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteKeyPairsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDisasterRecoverGroupQuotaRequest struct { @@ -479,12 +479,12 @@ type DescribeDisasterRecoverGroupQuotaRequest struct { } func (r *DescribeDisasterRecoverGroupQuotaRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDisasterRecoverGroupQuotaRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDisasterRecoverGroupQuotaResponse struct { @@ -512,12 +512,12 @@ type DescribeDisasterRecoverGroupQuotaResponse struct { } func (r *DescribeDisasterRecoverGroupQuotaResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDisasterRecoverGroupQuotaResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDisasterRecoverGroupsRequest struct { @@ -537,12 +537,12 @@ type DescribeDisasterRecoverGroupsRequest struct { } func (r *DescribeDisasterRecoverGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDisasterRecoverGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDisasterRecoverGroupsResponse struct { @@ -561,12 +561,12 @@ type DescribeDisasterRecoverGroupsResponse struct { } func (r *DescribeDisasterRecoverGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDisasterRecoverGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeHostsRequest struct { @@ -593,12 +593,12 @@ type DescribeHostsRequest struct { } func (r *DescribeHostsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeHostsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeHostsResponse struct { @@ -617,12 +617,12 @@ type DescribeHostsResponse struct { } func (r *DescribeHostsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeHostsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImageQuotaRequest struct { @@ -630,12 +630,12 @@ type DescribeImageQuotaRequest struct { } func (r *DescribeImageQuotaRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImageQuotaRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImageQuotaResponse struct { @@ -651,12 +651,12 @@ type DescribeImageQuotaResponse struct { } func (r *DescribeImageQuotaResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImageQuotaResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImageSharePermissionRequest struct { @@ -667,12 +667,12 @@ type DescribeImageSharePermissionRequest struct { } func (r *DescribeImageSharePermissionRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImageSharePermissionRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImageSharePermissionResponse struct { @@ -688,12 +688,12 @@ type DescribeImageSharePermissionResponse struct { } func (r *DescribeImageSharePermissionResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImageSharePermissionResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImagesRequest struct { @@ -705,7 +705,7 @@ type DescribeImagesRequest struct { // 过滤条件，每次请求的`Filters`的上限为0，`Filters.Values`的上限为5。参数不可以同时指定`ImageIds`和`Filters`。详细的过滤条件如下： //
  • image-id - String - 是否必填： 否 - （过滤条件）按照镜像ID进行过滤
    • //
  • image-type - String - 是否必填： 否 - （过滤条件）按照镜像类型进行过滤。取值范围： - // PRIVATE_IMAGE: 私有镜像 (本账户创建的镜像) + // PRIVATE_IMAGE: 私有镜像 (本账户创建的镜像) // PUBLIC_IMAGE: 公共镜像 (腾讯云官方镜像) // SHARED_IMAGE: 共享镜像(其他账户共享给本账户的镜像) 。
    • Filters []*Filter `json:"Filters,omitempty" name:"Filters" list` @@ -721,12 +721,12 @@ type DescribeImagesRequest struct { } func (r *DescribeImagesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImagesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImagesResponse struct { @@ -745,12 +745,12 @@ type DescribeImagesResponse struct { } func (r *DescribeImagesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImagesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImportImageOsRequest struct { @@ -758,12 +758,12 @@ type DescribeImportImageOsRequest struct { } func (r *DescribeImportImageOsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImportImageOsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeImportImageOsResponse struct { @@ -782,12 +782,12 @@ type DescribeImportImageOsResponse struct { } func (r *DescribeImportImageOsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeImportImageOsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceFamilyConfigsRequest struct { @@ -795,12 +795,12 @@ type DescribeInstanceFamilyConfigsRequest struct { } func (r *DescribeInstanceFamilyConfigsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceFamilyConfigsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceFamilyConfigsResponse struct { @@ -816,12 +816,12 @@ type DescribeInstanceFamilyConfigsResponse struct { } func (r *DescribeInstanceFamilyConfigsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceFamilyConfigsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceInternetBandwidthConfigsRequest struct { @@ -832,12 +832,12 @@ type DescribeInstanceInternetBandwidthConfigsRequest struct { } func (r *DescribeInstanceInternetBandwidthConfigsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceInternetBandwidthConfigsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceInternetBandwidthConfigsResponse struct { @@ -853,12 +853,12 @@ type DescribeInstanceInternetBandwidthConfigsResponse struct { } func (r *DescribeInstanceInternetBandwidthConfigsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceInternetBandwidthConfigsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceTypeConfigsRequest struct { @@ -873,12 +873,12 @@ type DescribeInstanceTypeConfigsRequest struct { } func (r *DescribeInstanceTypeConfigsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceTypeConfigsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceTypeConfigsResponse struct { @@ -894,12 +894,12 @@ type DescribeInstanceTypeConfigsResponse struct { } func (r *DescribeInstanceTypeConfigsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceTypeConfigsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceVncUrlRequest struct { @@ -910,12 +910,12 @@ type DescribeInstanceVncUrlRequest struct { } func (r *DescribeInstanceVncUrlRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceVncUrlRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstanceVncUrlResponse struct { @@ -931,12 +931,12 @@ type DescribeInstanceVncUrlResponse struct { } func (r *DescribeInstanceVncUrlResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstanceVncUrlResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstancesOperationLimitRequest struct { @@ -951,12 +951,12 @@ type DescribeInstancesOperationLimitRequest struct { } func (r *DescribeInstancesOperationLimitRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstancesOperationLimitRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstancesOperationLimitResponse struct { @@ -972,12 +972,12 @@ type DescribeInstancesOperationLimitResponse struct { } func (r *DescribeInstancesOperationLimitResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstancesOperationLimitResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstancesRequest struct { @@ -1025,12 +1025,12 @@ type DescribeInstancesRequest struct { } func (r *DescribeInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstancesResponse struct { @@ -1049,12 +1049,12 @@ type DescribeInstancesResponse struct { } func (r *DescribeInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstancesStatusRequest struct { @@ -1071,12 +1071,12 @@ type DescribeInstancesStatusRequest struct { } func (r *DescribeInstancesStatusRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstancesStatusRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInstancesStatusResponse struct { @@ -1095,12 +1095,12 @@ type DescribeInstancesStatusResponse struct { } func (r *DescribeInstancesStatusResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInstancesStatusResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInternetChargeTypeConfigsRequest struct { @@ -1108,12 +1108,12 @@ type DescribeInternetChargeTypeConfigsRequest struct { } func (r *DescribeInternetChargeTypeConfigsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInternetChargeTypeConfigsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeInternetChargeTypeConfigsResponse struct { @@ -1129,12 +1129,12 @@ type DescribeInternetChargeTypeConfigsResponse struct { } func (r *DescribeInternetChargeTypeConfigsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeInternetChargeTypeConfigsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeKeyPairsRequest struct { @@ -1156,12 +1156,12 @@ type DescribeKeyPairsRequest struct { } func (r *DescribeKeyPairsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeKeyPairsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeKeyPairsResponse struct { @@ -1180,12 +1180,12 @@ type DescribeKeyPairsResponse struct { } func (r *DescribeKeyPairsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeKeyPairsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeRegionsRequest struct { @@ -1193,12 +1193,12 @@ type DescribeRegionsRequest struct { } func (r *DescribeRegionsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeRegionsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeRegionsResponse struct { @@ -1217,12 +1217,12 @@ type DescribeRegionsResponse struct { } func (r *DescribeRegionsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeRegionsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeReservedInstancesOfferingsRequest struct { @@ -1264,12 +1264,12 @@ type DescribeReservedInstancesOfferingsRequest struct { } func (r *DescribeReservedInstancesOfferingsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeReservedInstancesOfferingsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeReservedInstancesOfferingsResponse struct { @@ -1288,12 +1288,12 @@ type DescribeReservedInstancesOfferingsResponse struct { } func (r *DescribeReservedInstancesOfferingsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeReservedInstancesOfferingsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeReservedInstancesRequest struct { @@ -1327,12 +1327,12 @@ type DescribeReservedInstancesRequest struct { } func (r *DescribeReservedInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeReservedInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeReservedInstancesResponse struct { @@ -1351,12 +1351,12 @@ type DescribeReservedInstancesResponse struct { } func (r *DescribeReservedInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeReservedInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeZoneInstanceConfigInfosRequest struct { @@ -1375,12 +1375,12 @@ type DescribeZoneInstanceConfigInfosRequest struct { } func (r *DescribeZoneInstanceConfigInfosRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeZoneInstanceConfigInfosRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeZoneInstanceConfigInfosResponse struct { @@ -1396,12 +1396,12 @@ type DescribeZoneInstanceConfigInfosResponse struct { } func (r *DescribeZoneInstanceConfigInfosResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeZoneInstanceConfigInfosResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeZonesRequest struct { @@ -1409,12 +1409,12 @@ type DescribeZonesRequest struct { } func (r *DescribeZonesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeZonesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeZonesResponse struct { @@ -1433,12 +1433,12 @@ type DescribeZonesResponse struct { } func (r *DescribeZonesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeZonesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateInstancesKeyPairsRequest struct { @@ -1455,12 +1455,12 @@ type DisassociateInstancesKeyPairsRequest struct { } func (r *DisassociateInstancesKeyPairsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateInstancesKeyPairsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateInstancesKeyPairsResponse struct { @@ -1473,12 +1473,12 @@ type DisassociateInstancesKeyPairsResponse struct { } func (r *DisassociateInstancesKeyPairsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateInstancesKeyPairsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateSecurityGroupsRequest struct { @@ -1492,12 +1492,12 @@ type DisassociateSecurityGroupsRequest struct { } func (r *DisassociateSecurityGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateSecurityGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateSecurityGroupsResponse struct { @@ -1510,12 +1510,12 @@ type DisassociateSecurityGroupsResponse struct { } func (r *DisassociateSecurityGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateSecurityGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisasterRecoverGroup struct { @@ -1742,12 +1742,12 @@ type ImportImageRequest struct { } func (r *ImportImageRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ImportImageRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ImportImageResponse struct { @@ -1760,12 +1760,12 @@ type ImportImageResponse struct { } func (r *ImportImageResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ImportImageResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ImportKeyPairRequest struct { @@ -1775,7 +1775,7 @@ type ImportKeyPairRequest struct { KeyName *string `json:"KeyName,omitempty" name:"KeyName"` // 密钥对创建后所属的[项目](https://cloud.tencent.com/document/product/378/10861)ID。

    可以通过以下方式获取项目ID：
  • 通过[项目列表](https://console.cloud.tencent.com/project)查询项目ID。
  • 通过调用接口 [DescribeProject](https://cloud.tencent.com/document/api/378/4400)，取返回信息中的 `projectId ` 获取项目ID。 - // + // // 如果是默认项目，直接填0就可以。 ProjectId *int64 `json:"ProjectId,omitempty" name:"ProjectId"` @@ -1784,12 +1784,12 @@ type ImportKeyPairRequest struct { } func (r *ImportKeyPairRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ImportKeyPairRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ImportKeyPairResponse struct { @@ -1805,12 +1805,12 @@ type ImportKeyPairResponse struct { } func (r *ImportKeyPairResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ImportKeyPairResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceModifyInstancesChargeTypeRequest struct { @@ -1827,12 +1827,12 @@ type InquiryPriceModifyInstancesChargeTypeRequest struct { } func (r *InquiryPriceModifyInstancesChargeTypeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceModifyInstancesChargeTypeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceModifyInstancesChargeTypeResponse struct { @@ -1848,12 +1848,12 @@ type InquiryPriceModifyInstancesChargeTypeResponse struct { } func (r *InquiryPriceModifyInstancesChargeTypeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceModifyInstancesChargeTypeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceRenewInstancesRequest struct { @@ -1873,12 +1873,12 @@ type InquiryPriceRenewInstancesRequest struct { } func (r *InquiryPriceRenewInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceRenewInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceRenewInstancesResponse struct { @@ -1894,12 +1894,12 @@ type InquiryPriceRenewInstancesResponse struct { } func (r *InquiryPriceRenewInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceRenewInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetInstanceRequest struct { @@ -1922,12 +1922,12 @@ type InquiryPriceResetInstanceRequest struct { } func (r *InquiryPriceResetInstanceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetInstanceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetInstanceResponse struct { @@ -1943,12 +1943,12 @@ type InquiryPriceResetInstanceResponse struct { } func (r *InquiryPriceResetInstanceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetInstanceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetInstancesInternetMaxBandwidthRequest struct { @@ -1968,12 +1968,12 @@ type InquiryPriceResetInstancesInternetMaxBandwidthRequest struct { } func (r *InquiryPriceResetInstancesInternetMaxBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetInstancesInternetMaxBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetInstancesInternetMaxBandwidthResponse struct { @@ -1989,12 +1989,12 @@ type InquiryPriceResetInstancesInternetMaxBandwidthResponse struct { } func (r *InquiryPriceResetInstancesInternetMaxBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetInstancesInternetMaxBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetInstancesTypeRequest struct { @@ -2008,12 +2008,12 @@ type InquiryPriceResetInstancesTypeRequest struct { } func (r *InquiryPriceResetInstancesTypeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetInstancesTypeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetInstancesTypeResponse struct { @@ -2029,12 +2029,12 @@ type InquiryPriceResetInstancesTypeResponse struct { } func (r *InquiryPriceResetInstancesTypeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetInstancesTypeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResizeInstanceDisksRequest struct { @@ -2051,12 +2051,12 @@ type InquiryPriceResizeInstanceDisksRequest struct { } func (r *InquiryPriceResizeInstanceDisksRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResizeInstanceDisksRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResizeInstanceDisksResponse struct { @@ -2072,12 +2072,12 @@ type InquiryPriceResizeInstanceDisksResponse struct { } func (r *InquiryPriceResizeInstanceDisksResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResizeInstanceDisksResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceRunInstancesRequest struct { @@ -2139,12 +2139,12 @@ type InquiryPriceRunInstancesRequest struct { } func (r *InquiryPriceRunInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceRunInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceRunInstancesResponse struct { @@ -2160,12 +2160,12 @@ type InquiryPriceRunInstancesResponse struct { } func (r *InquiryPriceRunInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceRunInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type Instance struct { @@ -2548,12 +2548,12 @@ type ModifyDisasterRecoverGroupAttributeRequest struct { } func (r *ModifyDisasterRecoverGroupAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyDisasterRecoverGroupAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyDisasterRecoverGroupAttributeResponse struct { @@ -2566,12 +2566,12 @@ type ModifyDisasterRecoverGroupAttributeResponse struct { } func (r *ModifyDisasterRecoverGroupAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyDisasterRecoverGroupAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyHostsAttributeRequest struct { @@ -2591,12 +2591,12 @@ type ModifyHostsAttributeRequest struct { } func (r *ModifyHostsAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyHostsAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyHostsAttributeResponse struct { @@ -2609,12 +2609,12 @@ type ModifyHostsAttributeResponse struct { } func (r *ModifyHostsAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyHostsAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyImageAttributeRequest struct { @@ -2631,12 +2631,12 @@ type ModifyImageAttributeRequest struct { } func (r *ModifyImageAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyImageAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyImageAttributeResponse struct { @@ -2649,12 +2649,12 @@ type ModifyImageAttributeResponse struct { } func (r *ModifyImageAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyImageAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyImageSharePermissionRequest struct { @@ -2671,12 +2671,12 @@ type ModifyImageSharePermissionRequest struct { } func (r *ModifyImageSharePermissionRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyImageSharePermissionRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyImageSharePermissionResponse struct { @@ -2689,12 +2689,12 @@ type ModifyImageSharePermissionResponse struct { } func (r *ModifyImageSharePermissionResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyImageSharePermissionResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesAttributeRequest struct { @@ -2711,12 +2711,12 @@ type ModifyInstancesAttributeRequest struct { } func (r *ModifyInstancesAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesAttributeResponse struct { @@ -2729,12 +2729,12 @@ type ModifyInstancesAttributeResponse struct { } func (r *ModifyInstancesAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesChargeTypeRequest struct { @@ -2751,12 +2751,12 @@ type ModifyInstancesChargeTypeRequest struct { } func (r *ModifyInstancesChargeTypeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesChargeTypeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesChargeTypeResponse struct { @@ -2769,12 +2769,12 @@ type ModifyInstancesChargeTypeResponse struct { } func (r *ModifyInstancesChargeTypeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesChargeTypeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesProjectRequest struct { @@ -2788,12 +2788,12 @@ type ModifyInstancesProjectRequest struct { } func (r *ModifyInstancesProjectRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesProjectRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesProjectResponse struct { @@ -2806,12 +2806,12 @@ type ModifyInstancesProjectResponse struct { } func (r *ModifyInstancesProjectResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesProjectResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesRenewFlagRequest struct { @@ -2825,12 +2825,12 @@ type ModifyInstancesRenewFlagRequest struct { } func (r *ModifyInstancesRenewFlagRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesRenewFlagRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesRenewFlagResponse struct { @@ -2843,12 +2843,12 @@ type ModifyInstancesRenewFlagResponse struct { } func (r *ModifyInstancesRenewFlagResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesRenewFlagResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesVpcAttributeRequest struct { @@ -2868,12 +2868,12 @@ type ModifyInstancesVpcAttributeRequest struct { } func (r *ModifyInstancesVpcAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesVpcAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyInstancesVpcAttributeResponse struct { @@ -2886,12 +2886,12 @@ type ModifyInstancesVpcAttributeResponse struct { } func (r *ModifyInstancesVpcAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyInstancesVpcAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyKeyPairAttributeRequest struct { @@ -2908,12 +2908,12 @@ type ModifyKeyPairAttributeRequest struct { } func (r *ModifyKeyPairAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyKeyPairAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyKeyPairAttributeResponse struct { @@ -2926,12 +2926,12 @@ type ModifyKeyPairAttributeResponse struct { } func (r *ModifyKeyPairAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyKeyPairAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type OperationCountLimit struct { @@ -3005,12 +3005,12 @@ type PurchaseReservedInstancesOfferingRequest struct { } func (r *PurchaseReservedInstancesOfferingRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *PurchaseReservedInstancesOfferingRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type PurchaseReservedInstancesOfferingResponse struct { @@ -3026,12 +3026,12 @@ type PurchaseReservedInstancesOfferingResponse struct { } func (r *PurchaseReservedInstancesOfferingResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *PurchaseReservedInstancesOfferingResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RebootInstancesRequest struct { @@ -3048,12 +3048,12 @@ type RebootInstancesRequest struct { } func (r *RebootInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RebootInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RebootInstancesResponse struct { @@ -3066,12 +3066,12 @@ type RebootInstancesResponse struct { } func (r *RebootInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RebootInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RegionInfo struct { @@ -3097,12 +3097,12 @@ type RenewHostsRequest struct { } func (r *RenewHostsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RenewHostsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RenewHostsResponse struct { @@ -3115,12 +3115,12 @@ type RenewHostsResponse struct { } func (r *RenewHostsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RenewHostsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RenewInstancesRequest struct { @@ -3137,12 +3137,12 @@ type RenewInstancesRequest struct { } func (r *RenewInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RenewInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RenewInstancesResponse struct { @@ -3155,12 +3155,12 @@ type RenewInstancesResponse struct { } func (r *RenewInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RenewInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReservedInstances struct { @@ -3269,12 +3269,12 @@ type ResetInstanceRequest struct { } func (r *ResetInstanceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstanceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstanceResponse struct { @@ -3287,12 +3287,12 @@ type ResetInstanceResponse struct { } func (r *ResetInstanceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstanceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstancesInternetMaxBandwidthRequest struct { @@ -3312,12 +3312,12 @@ type ResetInstancesInternetMaxBandwidthRequest struct { } func (r *ResetInstancesInternetMaxBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstancesInternetMaxBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstancesInternetMaxBandwidthResponse struct { @@ -3330,12 +3330,12 @@ type ResetInstancesInternetMaxBandwidthResponse struct { } func (r *ResetInstancesInternetMaxBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstancesInternetMaxBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstancesPasswordRequest struct { @@ -3357,12 +3357,12 @@ type ResetInstancesPasswordRequest struct { } func (r *ResetInstancesPasswordRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstancesPasswordRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstancesPasswordResponse struct { @@ -3375,12 +3375,12 @@ type ResetInstancesPasswordResponse struct { } func (r *ResetInstancesPasswordResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstancesPasswordResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstancesTypeRequest struct { @@ -3397,12 +3397,12 @@ type ResetInstancesTypeRequest struct { } func (r *ResetInstancesTypeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstancesTypeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetInstancesTypeResponse struct { @@ -3415,12 +3415,12 @@ type ResetInstancesTypeResponse struct { } func (r *ResetInstancesTypeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetInstancesTypeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResizeInstanceDisksRequest struct { @@ -3437,12 +3437,12 @@ type ResizeInstanceDisksRequest struct { } func (r *ResizeInstanceDisksRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResizeInstanceDisksRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResizeInstanceDisksResponse struct { @@ -3455,12 +3455,12 @@ type ResizeInstanceDisksResponse struct { } func (r *ResizeInstanceDisksResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResizeInstanceDisksResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RunInstancesRequest struct { @@ -3539,12 +3539,12 @@ type RunInstancesRequest struct { } func (r *RunInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RunInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RunInstancesResponse struct { @@ -3560,12 +3560,12 @@ type RunInstancesResponse struct { } func (r *RunInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RunInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RunMonitorServiceEnabled struct { @@ -3620,12 +3620,12 @@ type StartInstancesRequest struct { } func (r *StartInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *StartInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type StartInstancesResponse struct { @@ -3638,12 +3638,12 @@ type StartInstancesResponse struct { } func (r *StartInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *StartInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type StopInstancesRequest struct { @@ -3665,12 +3665,12 @@ type StopInstancesRequest struct { } func (r *StopInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *StopInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type StopInstancesResponse struct { @@ -3683,12 +3683,12 @@ type StopInstancesResponse struct { } func (r *StopInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *StopInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type StorageBlock struct { @@ -3717,12 +3717,12 @@ type SyncImagesRequest struct { } func (r *SyncImagesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *SyncImagesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type SyncImagesResponse struct { @@ -3735,12 +3735,12 @@ type SyncImagesResponse struct { } func (r *SyncImagesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *SyncImagesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type SystemDisk struct { @@ -3781,12 +3781,12 @@ type TerminateInstancesRequest struct { } func (r *TerminateInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *TerminateInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type TerminateInstancesResponse struct { @@ -3799,12 +3799,12 @@ type TerminateInstancesResponse struct { } func (r *TerminateInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *TerminateInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type VirtualPrivateCloud struct { diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/client.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/client.go index 706c0aa2c..34c5595e5 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/client.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/client.go @@ -15,123 +15,124 @@ package v20170312 import ( - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" + tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" ) const APIVersion = "2017-03-12" type Client struct { - common.Client + common.Client } // Deprecated func NewClientWithSecretId(secretId, secretKey, region string) (client *Client, err error) { - cpf := profile.NewClientProfile() - client = &Client{} - client.Init(region).WithSecretId(secretId, secretKey).WithProfile(cpf) - return + cpf := profile.NewClientProfile() + client = &Client{} + client.Init(region).WithSecretId(secretId, secretKey).WithProfile(cpf) + return } func NewClient(credential *common.Credential, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { - client = &Client{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return + client = &Client{} + client.Init(region). + WithCredential(credential). + WithProfile(clientProfile) + return } + func NewAcceptAttachCcnInstancesRequest() (request *AcceptAttachCcnInstancesRequest) { - request = &AcceptAttachCcnInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AcceptAttachCcnInstances") - return + request = &AcceptAttachCcnInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AcceptAttachCcnInstances") + return } func NewAcceptAttachCcnInstancesResponse() (response *AcceptAttachCcnInstancesResponse) { - response = &AcceptAttachCcnInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AcceptAttachCcnInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AcceptAttachCcnInstances）用于跨账号关联实例时，云联网所有者接受并同意关联操作。 func (c *Client) AcceptAttachCcnInstances(request *AcceptAttachCcnInstancesRequest) (response *AcceptAttachCcnInstancesResponse, err error) { - if request == nil { - request = NewAcceptAttachCcnInstancesRequest() - } - response = NewAcceptAttachCcnInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAcceptAttachCcnInstancesRequest() + } + response = NewAcceptAttachCcnInstancesResponse() + err = c.Send(request, response) + return } func NewAddBandwidthPackageResourcesRequest() (request *AddBandwidthPackageResourcesRequest) { - request = &AddBandwidthPackageResourcesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AddBandwidthPackageResources") - return + request = &AddBandwidthPackageResourcesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AddBandwidthPackageResources") + return } func NewAddBandwidthPackageResourcesResponse() (response *AddBandwidthPackageResourcesResponse) { - response = &AddBandwidthPackageResourcesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AddBandwidthPackageResourcesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口用于添加带宽包资源，包括[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)和[负载均衡](https://cloud.tencent.com/document/product/214/517)等 func (c *Client) AddBandwidthPackageResources(request *AddBandwidthPackageResourcesRequest) (response *AddBandwidthPackageResourcesResponse, err error) { - if request == nil { - request = NewAddBandwidthPackageResourcesRequest() - } - response = NewAddBandwidthPackageResourcesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAddBandwidthPackageResourcesRequest() + } + response = NewAddBandwidthPackageResourcesResponse() + err = c.Send(request, response) + return } func NewAddIp6RulesRequest() (request *AddIp6RulesRequest) { - request = &AddIp6RulesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AddIp6Rules") - return + request = &AddIp6RulesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AddIp6Rules") + return } func NewAddIp6RulesResponse() (response *AddIp6RulesResponse) { - response = &AddIp6RulesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AddIp6RulesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 1. 该接口用于在转换实例下添加IPV6转换规则。 // 2. 支持在同一个转换实例下批量添加转换规则，一个账户在一个地域最多50个。 // 3. 一个完整的转换规则包括vip6:vport6:protocol:vip:vport，其中vip6:vport6:protocol必须是唯一。 func (c *Client) AddIp6Rules(request *AddIp6RulesRequest) (response *AddIp6RulesResponse, err error) { - if request == nil { - request = NewAddIp6RulesRequest() - } - response = NewAddIp6RulesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAddIp6RulesRequest() + } + response = NewAddIp6RulesResponse() + err = c.Send(request, response) + return } func NewAllocateAddressesRequest() (request *AllocateAddressesRequest) { - request = &AllocateAddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AllocateAddresses") - return + request = &AllocateAddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AllocateAddresses") + return } func NewAllocateAddressesResponse() (response *AllocateAddressesResponse) { - response = &AllocateAddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AllocateAddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (AllocateAddresses) 用于申请一个或多个[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）。 @@ -139,52 +140,52 @@ func NewAllocateAddressesResponse() (response *AllocateAddressesResponse) { // * 您的 EIP 与腾讯云账户相关联，而不是与某个实例相关联。在您选择显式释放该地址，或欠费超过24小时之前，它会一直与您的腾讯云账户保持关联。 // * 一个腾讯云账户在每个地域能申请的 EIP 最大配额有所限制，可参见 [EIP 产品简介](https://cloud.tencent.com/document/product/213/5733)，上述配额可通过 DescribeAddressQuota 接口获取。 func (c *Client) AllocateAddresses(request *AllocateAddressesRequest) (response *AllocateAddressesResponse, err error) { - if request == nil { - request = NewAllocateAddressesRequest() - } - response = NewAllocateAddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAllocateAddressesRequest() + } + response = NewAllocateAddressesResponse() + err = c.Send(request, response) + return } func NewAllocateIp6AddressesBandwidthRequest() (request *AllocateIp6AddressesBandwidthRequest) { - request = &AllocateIp6AddressesBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AllocateIp6AddressesBandwidth") - return + request = &AllocateIp6AddressesBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AllocateIp6AddressesBandwidth") + return } func NewAllocateIp6AddressesBandwidthResponse() (response *AllocateIp6AddressesBandwidthResponse) { - response = &AllocateIp6AddressesBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AllocateIp6AddressesBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于给IPv6地址初次分配公网带宽 func (c *Client) AllocateIp6AddressesBandwidth(request *AllocateIp6AddressesBandwidthRequest) (response *AllocateIp6AddressesBandwidthResponse, err error) { - if request == nil { - request = NewAllocateIp6AddressesBandwidthRequest() - } - response = NewAllocateIp6AddressesBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAllocateIp6AddressesBandwidthRequest() + } + response = NewAllocateIp6AddressesBandwidthResponse() + err = c.Send(request, response) + return } func NewAssignIpv6AddressesRequest() (request *AssignIpv6AddressesRequest) { - request = &AssignIpv6AddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssignIpv6Addresses") - return + request = &AssignIpv6AddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssignIpv6Addresses") + return } func NewAssignIpv6AddressesResponse() (response *AssignIpv6AddressesResponse) { - response = &AssignIpv6AddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssignIpv6AddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssignIpv6Addresses）用于弹性网卡申请`IPv6`地址。
    @@ -194,81 +195,81 @@ func NewAssignIpv6AddressesResponse() (response *AssignIpv6AddressesResponse) { // * 地址必须要在弹性网卡所在子网内，而且不能被占用。 // * 在弹性网卡上申请一个到多个辅助`IPv6`地址，接口会在弹性网卡所在子网段内返回指定数量的辅助`IPv6`地址。 func (c *Client) AssignIpv6Addresses(request *AssignIpv6AddressesRequest) (response *AssignIpv6AddressesResponse, err error) { - if request == nil { - request = NewAssignIpv6AddressesRequest() - } - response = NewAssignIpv6AddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssignIpv6AddressesRequest() + } + response = NewAssignIpv6AddressesResponse() + err = c.Send(request, response) + return } func NewAssignIpv6CidrBlockRequest() (request *AssignIpv6CidrBlockRequest) { - request = &AssignIpv6CidrBlockRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssignIpv6CidrBlock") - return + request = &AssignIpv6CidrBlockRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssignIpv6CidrBlock") + return } func NewAssignIpv6CidrBlockResponse() (response *AssignIpv6CidrBlockResponse) { - response = &AssignIpv6CidrBlockResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssignIpv6CidrBlockResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssignIpv6CidrBlock）用于分配IPv6网段。 // * 使用本接口前，您需要已有VPC实例，如果没有可通过接口CreateVpc创建。 // * 每个VPC只能申请一个IPv6网段 func (c *Client) AssignIpv6CidrBlock(request *AssignIpv6CidrBlockRequest) (response *AssignIpv6CidrBlockResponse, err error) { - if request == nil { - request = NewAssignIpv6CidrBlockRequest() - } - response = NewAssignIpv6CidrBlockResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssignIpv6CidrBlockRequest() + } + response = NewAssignIpv6CidrBlockResponse() + err = c.Send(request, response) + return } func NewAssignIpv6SubnetCidrBlockRequest() (request *AssignIpv6SubnetCidrBlockRequest) { - request = &AssignIpv6SubnetCidrBlockRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssignIpv6SubnetCidrBlock") - return + request = &AssignIpv6SubnetCidrBlockRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssignIpv6SubnetCidrBlock") + return } func NewAssignIpv6SubnetCidrBlockResponse() (response *AssignIpv6SubnetCidrBlockResponse) { - response = &AssignIpv6SubnetCidrBlockResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssignIpv6SubnetCidrBlockResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssignIpv6SubnetCidrBlock）用于分配IPv6子网段。 // * 给子网分配 `IPv6` 网段，要求子网所属 `VPC` 已获得 `IPv6` 网段。如果尚未分配，请先通过接口 `AssignIpv6CidrBlock` 给子网所属 `VPC` 分配一个 `IPv6` 网段。否则无法分配 `IPv6` 子网段。 // * 每个子网只能分配一个IPv6网段。 func (c *Client) AssignIpv6SubnetCidrBlock(request *AssignIpv6SubnetCidrBlockRequest) (response *AssignIpv6SubnetCidrBlockResponse, err error) { - if request == nil { - request = NewAssignIpv6SubnetCidrBlockRequest() - } - response = NewAssignIpv6SubnetCidrBlockResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssignIpv6SubnetCidrBlockRequest() + } + response = NewAssignIpv6SubnetCidrBlockResponse() + err = c.Send(request, response) + return } func NewAssignPrivateIpAddressesRequest() (request *AssignPrivateIpAddressesRequest) { - request = &AssignPrivateIpAddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssignPrivateIpAddresses") - return + request = &AssignPrivateIpAddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssignPrivateIpAddresses") + return } func NewAssignPrivateIpAddressesResponse() (response *AssignPrivateIpAddressesResponse) { - response = &AssignPrivateIpAddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssignPrivateIpAddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssignPrivateIpAddresses）用于弹性网卡申请内网 IP。 @@ -276,27 +277,27 @@ func NewAssignPrivateIpAddressesResponse() (response *AssignPrivateIpAddressesRe // * 可以指定内网IP地址申请，内网IP地址类型不能为主IP，主IP已存在，不能修改，内网IP必须要弹性网卡所在子网内，而且不能被占用。 // * 在弹性网卡上申请一个到多个辅助内网IP，接口会在弹性网卡所在子网网段内返回指定数量的辅助内网IP。 func (c *Client) AssignPrivateIpAddresses(request *AssignPrivateIpAddressesRequest) (response *AssignPrivateIpAddressesResponse, err error) { - if request == nil { - request = NewAssignPrivateIpAddressesRequest() - } - response = NewAssignPrivateIpAddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssignPrivateIpAddressesRequest() + } + response = NewAssignPrivateIpAddressesResponse() + err = c.Send(request, response) + return } func NewAssociateAddressRequest() (request *AssociateAddressRequest) { - request = &AssociateAddressRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssociateAddress") - return + request = &AssociateAddressRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssociateAddress") + return } func NewAssociateAddressResponse() (response *AssociateAddressResponse) { - response = &AssociateAddressResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateAddressResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (AssociateAddress) 用于将[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）绑定到实例或弹性网卡的指定内网 IP 上。 @@ -307,180 +308,180 @@ func NewAssociateAddressResponse() (response *AssociateAddressResponse) { // * EIP 如果欠费或被封堵，则不能被绑定。 // * 只有状态为 UNBIND 的 EIP 才能够被绑定。 func (c *Client) AssociateAddress(request *AssociateAddressRequest) (response *AssociateAddressResponse, err error) { - if request == nil { - request = NewAssociateAddressRequest() - } - response = NewAssociateAddressResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateAddressRequest() + } + response = NewAssociateAddressResponse() + err = c.Send(request, response) + return } func NewAssociateDhcpIpWithAddressIpRequest() (request *AssociateDhcpIpWithAddressIpRequest) { - request = &AssociateDhcpIpWithAddressIpRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssociateDhcpIpWithAddressIp") - return + request = &AssociateDhcpIpWithAddressIpRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssociateDhcpIpWithAddressIp") + return } func NewAssociateDhcpIpWithAddressIpResponse() (response *AssociateDhcpIpWithAddressIpResponse) { - response = &AssociateDhcpIpWithAddressIpResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateDhcpIpWithAddressIpResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssociateDhcpIpWithAddressIp）用于DhcpIp绑定弹性公网IP（EIP）。
    func (c *Client) AssociateDhcpIpWithAddressIp(request *AssociateDhcpIpWithAddressIpRequest) (response *AssociateDhcpIpWithAddressIpResponse, err error) { - if request == nil { - request = NewAssociateDhcpIpWithAddressIpRequest() - } - response = NewAssociateDhcpIpWithAddressIpResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateDhcpIpWithAddressIpRequest() + } + response = NewAssociateDhcpIpWithAddressIpResponse() + err = c.Send(request, response) + return } func NewAssociateNatGatewayAddressRequest() (request *AssociateNatGatewayAddressRequest) { - request = &AssociateNatGatewayAddressRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssociateNatGatewayAddress") - return + request = &AssociateNatGatewayAddressRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssociateNatGatewayAddress") + return } func NewAssociateNatGatewayAddressResponse() (response *AssociateNatGatewayAddressResponse) { - response = &AssociateNatGatewayAddressResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateNatGatewayAddressResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(AssociateNatGatewayAddress)用于NAT网关绑定弹性IP（EIP）。 func (c *Client) AssociateNatGatewayAddress(request *AssociateNatGatewayAddressRequest) (response *AssociateNatGatewayAddressResponse, err error) { - if request == nil { - request = NewAssociateNatGatewayAddressRequest() - } - response = NewAssociateNatGatewayAddressResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateNatGatewayAddressRequest() + } + response = NewAssociateNatGatewayAddressResponse() + err = c.Send(request, response) + return } func NewAssociateNetworkAclSubnetsRequest() (request *AssociateNetworkAclSubnetsRequest) { - request = &AssociateNetworkAclSubnetsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssociateNetworkAclSubnets") - return + request = &AssociateNetworkAclSubnetsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssociateNetworkAclSubnets") + return } func NewAssociateNetworkAclSubnetsResponse() (response *AssociateNetworkAclSubnetsResponse) { - response = &AssociateNetworkAclSubnetsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateNetworkAclSubnetsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssociateNetworkAclSubnets）用于网络ACL关联vpc下的子网。 func (c *Client) AssociateNetworkAclSubnets(request *AssociateNetworkAclSubnetsRequest) (response *AssociateNetworkAclSubnetsResponse, err error) { - if request == nil { - request = NewAssociateNetworkAclSubnetsRequest() - } - response = NewAssociateNetworkAclSubnetsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateNetworkAclSubnetsRequest() + } + response = NewAssociateNetworkAclSubnetsResponse() + err = c.Send(request, response) + return } func NewAssociateNetworkInterfaceSecurityGroupsRequest() (request *AssociateNetworkInterfaceSecurityGroupsRequest) { - request = &AssociateNetworkInterfaceSecurityGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AssociateNetworkInterfaceSecurityGroups") - return + request = &AssociateNetworkInterfaceSecurityGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AssociateNetworkInterfaceSecurityGroups") + return } func NewAssociateNetworkInterfaceSecurityGroupsResponse() (response *AssociateNetworkInterfaceSecurityGroupsResponse) { - response = &AssociateNetworkInterfaceSecurityGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AssociateNetworkInterfaceSecurityGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AssociateNetworkInterfaceSecurityGroups）用于弹性网卡绑定安全组（SecurityGroup）。 func (c *Client) AssociateNetworkInterfaceSecurityGroups(request *AssociateNetworkInterfaceSecurityGroupsRequest) (response *AssociateNetworkInterfaceSecurityGroupsResponse, err error) { - if request == nil { - request = NewAssociateNetworkInterfaceSecurityGroupsRequest() - } - response = NewAssociateNetworkInterfaceSecurityGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAssociateNetworkInterfaceSecurityGroupsRequest() + } + response = NewAssociateNetworkInterfaceSecurityGroupsResponse() + err = c.Send(request, response) + return } func NewAttachCcnInstancesRequest() (request *AttachCcnInstancesRequest) { - request = &AttachCcnInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AttachCcnInstances") - return + request = &AttachCcnInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AttachCcnInstances") + return } func NewAttachCcnInstancesResponse() (response *AttachCcnInstancesResponse) { - response = &AttachCcnInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AttachCcnInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AttachCcnInstances）用于将网络实例加载到云联网实例中，网络实例包括VPC和专线网关。
    // 每个云联网能够关联的网络实例个数是有限的，详请参考产品文档。如果需要扩充请联系在线客服。 func (c *Client) AttachCcnInstances(request *AttachCcnInstancesRequest) (response *AttachCcnInstancesResponse, err error) { - if request == nil { - request = NewAttachCcnInstancesRequest() - } - response = NewAttachCcnInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAttachCcnInstancesRequest() + } + response = NewAttachCcnInstancesResponse() + err = c.Send(request, response) + return } func NewAttachClassicLinkVpcRequest() (request *AttachClassicLinkVpcRequest) { - request = &AttachClassicLinkVpcRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AttachClassicLinkVpc") - return + request = &AttachClassicLinkVpcRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AttachClassicLinkVpc") + return } func NewAttachClassicLinkVpcResponse() (response *AttachClassicLinkVpcResponse) { - response = &AttachClassicLinkVpcResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AttachClassicLinkVpcResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(AttachClassicLinkVpc)用于创建私有网络和基础网络设备互通。 // * 私有网络和基础网络设备必须在同一个地域。 // * 私有网络和基础网络的区别详见vpc产品文档-私有网络与基础网络。 func (c *Client) AttachClassicLinkVpc(request *AttachClassicLinkVpcRequest) (response *AttachClassicLinkVpcResponse, err error) { - if request == nil { - request = NewAttachClassicLinkVpcRequest() - } - response = NewAttachClassicLinkVpcResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAttachClassicLinkVpcRequest() + } + response = NewAttachClassicLinkVpcResponse() + err = c.Send(request, response) + return } func NewAttachNetworkInterfaceRequest() (request *AttachNetworkInterfaceRequest) { - request = &AttachNetworkInterfaceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "AttachNetworkInterface") - return + request = &AttachNetworkInterfaceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "AttachNetworkInterface") + return } func NewAttachNetworkInterfaceResponse() (response *AttachNetworkInterfaceResponse) { - response = &AttachNetworkInterfaceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &AttachNetworkInterfaceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（AttachNetworkInterface）用于弹性网卡绑定云主机。 @@ -489,27 +490,27 @@ func NewAttachNetworkInterfaceResponse() (response *AttachNetworkInterfaceRespon // * 只有运行中或者已关机状态的云主机才能绑定弹性网卡，查看云主机状态详见腾讯云主机信息。 // * 弹性网卡绑定的云主机必须是私有网络的，而且云主机所在可用区必须和弹性网卡子网的可用区相同。 func (c *Client) AttachNetworkInterface(request *AttachNetworkInterfaceRequest) (response *AttachNetworkInterfaceResponse, err error) { - if request == nil { - request = NewAttachNetworkInterfaceRequest() - } - response = NewAttachNetworkInterfaceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewAttachNetworkInterfaceRequest() + } + response = NewAttachNetworkInterfaceResponse() + err = c.Send(request, response) + return } func NewCheckAssistantCidrRequest() (request *CheckAssistantCidrRequest) { - request = &CheckAssistantCidrRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CheckAssistantCidr") - return + request = &CheckAssistantCidrRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CheckAssistantCidr") + return } func NewCheckAssistantCidrResponse() (response *CheckAssistantCidrResponse) { - response = &CheckAssistantCidrResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CheckAssistantCidrResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CheckAssistantCidr)用于检查辅助CIDR是否与存量路由、对等连接（对端VPC的CIDR）等资源存在冲突。如果存在重叠，则返回重叠的资源。（接口灰度中，如需使用请提工单。） @@ -517,127 +518,127 @@ func NewCheckAssistantCidrResponse() (response *CheckAssistantCidrResponse) { // * 检测辅助CIDR是否与当前VPC的路由的目的端存在重叠。 // * 检测辅助CIDR是否与当前VPC的对等连接，对端VPC下的主CIDR或辅助CIDR存在重叠。 func (c *Client) CheckAssistantCidr(request *CheckAssistantCidrRequest) (response *CheckAssistantCidrResponse, err error) { - if request == nil { - request = NewCheckAssistantCidrRequest() - } - response = NewCheckAssistantCidrResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCheckAssistantCidrRequest() + } + response = NewCheckAssistantCidrResponse() + err = c.Send(request, response) + return } func NewCheckDefaultSubnetRequest() (request *CheckDefaultSubnetRequest) { - request = &CheckDefaultSubnetRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CheckDefaultSubnet") - return + request = &CheckDefaultSubnetRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CheckDefaultSubnet") + return } func NewCheckDefaultSubnetResponse() (response *CheckDefaultSubnetResponse) { - response = &CheckDefaultSubnetResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CheckDefaultSubnetResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CheckDefaultSubnet）用于预判是否可建默认子网。 func (c *Client) CheckDefaultSubnet(request *CheckDefaultSubnetRequest) (response *CheckDefaultSubnetResponse, err error) { - if request == nil { - request = NewCheckDefaultSubnetRequest() - } - response = NewCheckDefaultSubnetResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCheckDefaultSubnetRequest() + } + response = NewCheckDefaultSubnetResponse() + err = c.Send(request, response) + return } func NewCheckNetDetectStateRequest() (request *CheckNetDetectStateRequest) { - request = &CheckNetDetectStateRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CheckNetDetectState") - return + request = &CheckNetDetectStateRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CheckNetDetectState") + return } func NewCheckNetDetectStateResponse() (response *CheckNetDetectStateResponse) { - response = &CheckNetDetectStateResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CheckNetDetectStateResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CheckNetDetectState)用于验证网络探测。 func (c *Client) CheckNetDetectState(request *CheckNetDetectStateRequest) (response *CheckNetDetectStateResponse, err error) { - if request == nil { - request = NewCheckNetDetectStateRequest() - } - response = NewCheckNetDetectStateResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCheckNetDetectStateRequest() + } + response = NewCheckNetDetectStateResponse() + err = c.Send(request, response) + return } func NewCreateAddressTemplateRequest() (request *CreateAddressTemplateRequest) { - request = &CreateAddressTemplateRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateAddressTemplate") - return + request = &CreateAddressTemplateRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateAddressTemplate") + return } func NewCreateAddressTemplateResponse() (response *CreateAddressTemplateResponse) { - response = &CreateAddressTemplateResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateAddressTemplateResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateAddressTemplate）用于创建IP地址模版 func (c *Client) CreateAddressTemplate(request *CreateAddressTemplateRequest) (response *CreateAddressTemplateResponse, err error) { - if request == nil { - request = NewCreateAddressTemplateRequest() - } - response = NewCreateAddressTemplateResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateAddressTemplateRequest() + } + response = NewCreateAddressTemplateResponse() + err = c.Send(request, response) + return } func NewCreateAddressTemplateGroupRequest() (request *CreateAddressTemplateGroupRequest) { - request = &CreateAddressTemplateGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateAddressTemplateGroup") - return + request = &CreateAddressTemplateGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateAddressTemplateGroup") + return } func NewCreateAddressTemplateGroupResponse() (response *CreateAddressTemplateGroupResponse) { - response = &CreateAddressTemplateGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateAddressTemplateGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateAddressTemplateGroup）用于创建IP地址模版集合 func (c *Client) CreateAddressTemplateGroup(request *CreateAddressTemplateGroupRequest) (response *CreateAddressTemplateGroupResponse, err error) { - if request == nil { - request = NewCreateAddressTemplateGroupRequest() - } - response = NewCreateAddressTemplateGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateAddressTemplateGroupRequest() + } + response = NewCreateAddressTemplateGroupResponse() + err = c.Send(request, response) + return } func NewCreateAndAttachNetworkInterfaceRequest() (request *CreateAndAttachNetworkInterfaceRequest) { - request = &CreateAndAttachNetworkInterfaceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateAndAttachNetworkInterface") - return + request = &CreateAndAttachNetworkInterfaceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateAndAttachNetworkInterface") + return } func NewCreateAndAttachNetworkInterfaceResponse() (response *CreateAndAttachNetworkInterfaceResponse) { - response = &CreateAndAttachNetworkInterfaceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateAndAttachNetworkInterfaceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateAndAttachNetworkInterface）用于创建弹性网卡并绑定云主机。 @@ -647,129 +648,129 @@ func NewCreateAndAttachNetworkInterfaceResponse() (response *CreateAndAttachNetw // * 创建弹性网卡同时可以绑定已有安全组。 // * 创建弹性网卡同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateAndAttachNetworkInterface(request *CreateAndAttachNetworkInterfaceRequest) (response *CreateAndAttachNetworkInterfaceResponse, err error) { - if request == nil { - request = NewCreateAndAttachNetworkInterfaceRequest() - } - response = NewCreateAndAttachNetworkInterfaceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateAndAttachNetworkInterfaceRequest() + } + response = NewCreateAndAttachNetworkInterfaceResponse() + err = c.Send(request, response) + return } func NewCreateAssistantCidrRequest() (request *CreateAssistantCidrRequest) { - request = &CreateAssistantCidrRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateAssistantCidr") - return + request = &CreateAssistantCidrRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateAssistantCidr") + return } func NewCreateAssistantCidrResponse() (response *CreateAssistantCidrResponse) { - response = &CreateAssistantCidrResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateAssistantCidrResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateAssistantCidr)用于批量创建辅助CIDR。（接口灰度中，如需使用请提工单。） func (c *Client) CreateAssistantCidr(request *CreateAssistantCidrRequest) (response *CreateAssistantCidrResponse, err error) { - if request == nil { - request = NewCreateAssistantCidrRequest() - } - response = NewCreateAssistantCidrResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateAssistantCidrRequest() + } + response = NewCreateAssistantCidrResponse() + err = c.Send(request, response) + return } func NewCreateBandwidthPackageRequest() (request *CreateBandwidthPackageRequest) { - request = &CreateBandwidthPackageRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateBandwidthPackage") - return + request = &CreateBandwidthPackageRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateBandwidthPackage") + return } func NewCreateBandwidthPackageResponse() (response *CreateBandwidthPackageResponse) { - response = &CreateBandwidthPackageResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateBandwidthPackageResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口支持创建[设备带宽包](https://cloud.tencent.com/document/product/684/15246#.E8.AE.BE.E5.A4.87.E5.B8.A6.E5.AE.BD.E5.8C.85)和[IP带宽包](https://cloud.tencent.com/document/product/684/15246#ip-.E5.B8.A6.E5.AE.BD.E5.8C.85) func (c *Client) CreateBandwidthPackage(request *CreateBandwidthPackageRequest) (response *CreateBandwidthPackageResponse, err error) { - if request == nil { - request = NewCreateBandwidthPackageRequest() - } - response = NewCreateBandwidthPackageResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateBandwidthPackageRequest() + } + response = NewCreateBandwidthPackageResponse() + err = c.Send(request, response) + return } func NewCreateCcnRequest() (request *CreateCcnRequest) { - request = &CreateCcnRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateCcn") - return + request = &CreateCcnRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateCcn") + return } func NewCreateCcnResponse() (response *CreateCcnResponse) { - response = &CreateCcnResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateCcnResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateCcn）用于创建云联网（CCN）。
    // * 创建云联网同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 // 每个账号能创建的云联网实例个数是有限的，详请参考产品文档。如果需要扩充请联系在线客服。 func (c *Client) CreateCcn(request *CreateCcnRequest) (response *CreateCcnResponse, err error) { - if request == nil { - request = NewCreateCcnRequest() - } - response = NewCreateCcnResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateCcnRequest() + } + response = NewCreateCcnResponse() + err = c.Send(request, response) + return } func NewCreateCustomerGatewayRequest() (request *CreateCustomerGatewayRequest) { - request = &CreateCustomerGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateCustomerGateway") - return + request = &CreateCustomerGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateCustomerGateway") + return } func NewCreateCustomerGatewayResponse() (response *CreateCustomerGatewayResponse) { - response = &CreateCustomerGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateCustomerGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateCustomerGateway）用于创建对端网关。 func (c *Client) CreateCustomerGateway(request *CreateCustomerGatewayRequest) (response *CreateCustomerGatewayResponse, err error) { - if request == nil { - request = NewCreateCustomerGatewayRequest() - } - response = NewCreateCustomerGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateCustomerGatewayRequest() + } + response = NewCreateCustomerGatewayResponse() + err = c.Send(request, response) + return } func NewCreateDefaultSecurityGroupRequest() (request *CreateDefaultSecurityGroupRequest) { - request = &CreateDefaultSecurityGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateDefaultSecurityGroup") - return + request = &CreateDefaultSecurityGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateDefaultSecurityGroup") + return } func NewCreateDefaultSecurityGroupResponse() (response *CreateDefaultSecurityGroupResponse) { - response = &CreateDefaultSecurityGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateDefaultSecurityGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateDefaultSecurityGroup）用于创建（如果项目下未存在默认安全组，则创建；已存在则获取。）默认安全组（SecurityGroup）。 @@ -777,312 +778,312 @@ func NewCreateDefaultSecurityGroupResponse() (response *CreateDefaultSecurityGro // * 新建的安全组的入站和出站规则默认都是全部拒绝，在创建后通常您需要再调用CreateSecurityGroupPolicies将安全组的规则设置为需要的规则。 // * 创建安全组同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateDefaultSecurityGroup(request *CreateDefaultSecurityGroupRequest) (response *CreateDefaultSecurityGroupResponse, err error) { - if request == nil { - request = NewCreateDefaultSecurityGroupRequest() - } - response = NewCreateDefaultSecurityGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateDefaultSecurityGroupRequest() + } + response = NewCreateDefaultSecurityGroupResponse() + err = c.Send(request, response) + return } func NewCreateDefaultVpcRequest() (request *CreateDefaultVpcRequest) { - request = &CreateDefaultVpcRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateDefaultVpc") - return + request = &CreateDefaultVpcRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateDefaultVpc") + return } func NewCreateDefaultVpcResponse() (response *CreateDefaultVpcResponse) { - response = &CreateDefaultVpcResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateDefaultVpcResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateDefaultVpc）用于创建默认私有网络(VPC）。 -// +// // 默认VPC适用于快速入门和启动公共实例，您可以像使用任何其他VPC一样使用默认VPC。如果您想创建标准VPC，即指定VPC名称、VPC网段、子网网段、子网可用区，请使用常规创建VPC接口（CreateVpc） -// +// // 正常情况，本接口并不一定生产默认VPC，而是根据用户账号的网络属性（DescribeAccountAttributes）来决定的 // * 支持基础网络、VPC，返回VpcId为0 // * 只支持VPC，返回默认VPC信息 -// +// // 您也可以通过 Force 参数，强制返回默认VPC func (c *Client) CreateDefaultVpc(request *CreateDefaultVpcRequest) (response *CreateDefaultVpcResponse, err error) { - if request == nil { - request = NewCreateDefaultVpcRequest() - } - response = NewCreateDefaultVpcResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateDefaultVpcRequest() + } + response = NewCreateDefaultVpcResponse() + err = c.Send(request, response) + return } func NewCreateDhcpIpRequest() (request *CreateDhcpIpRequest) { - request = &CreateDhcpIpRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateDhcpIp") - return + request = &CreateDhcpIpRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateDhcpIp") + return } func NewCreateDhcpIpResponse() (response *CreateDhcpIpResponse) { - response = &CreateDhcpIpResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateDhcpIpResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateDhcpIp）用于创建DhcpIp func (c *Client) CreateDhcpIp(request *CreateDhcpIpRequest) (response *CreateDhcpIpResponse, err error) { - if request == nil { - request = NewCreateDhcpIpRequest() - } - response = NewCreateDhcpIpResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateDhcpIpRequest() + } + response = NewCreateDhcpIpResponse() + err = c.Send(request, response) + return } func NewCreateDirectConnectGatewayRequest() (request *CreateDirectConnectGatewayRequest) { - request = &CreateDirectConnectGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateDirectConnectGateway") - return + request = &CreateDirectConnectGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateDirectConnectGateway") + return } func NewCreateDirectConnectGatewayResponse() (response *CreateDirectConnectGatewayResponse) { - response = &CreateDirectConnectGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateDirectConnectGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateDirectConnectGateway）用于创建专线网关。 func (c *Client) CreateDirectConnectGateway(request *CreateDirectConnectGatewayRequest) (response *CreateDirectConnectGatewayResponse, err error) { - if request == nil { - request = NewCreateDirectConnectGatewayRequest() - } - response = NewCreateDirectConnectGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateDirectConnectGatewayRequest() + } + response = NewCreateDirectConnectGatewayResponse() + err = c.Send(request, response) + return } func NewCreateDirectConnectGatewayCcnRoutesRequest() (request *CreateDirectConnectGatewayCcnRoutesRequest) { - request = &CreateDirectConnectGatewayCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateDirectConnectGatewayCcnRoutes") - return + request = &CreateDirectConnectGatewayCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateDirectConnectGatewayCcnRoutes") + return } func NewCreateDirectConnectGatewayCcnRoutesResponse() (response *CreateDirectConnectGatewayCcnRoutesResponse) { - response = &CreateDirectConnectGatewayCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateDirectConnectGatewayCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateDirectConnectGatewayCcnRoutes）用于创建专线网关的云联网路由（IDC网段） func (c *Client) CreateDirectConnectGatewayCcnRoutes(request *CreateDirectConnectGatewayCcnRoutesRequest) (response *CreateDirectConnectGatewayCcnRoutesResponse, err error) { - if request == nil { - request = NewCreateDirectConnectGatewayCcnRoutesRequest() - } - response = NewCreateDirectConnectGatewayCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateDirectConnectGatewayCcnRoutesRequest() + } + response = NewCreateDirectConnectGatewayCcnRoutesResponse() + err = c.Send(request, response) + return } func NewCreateFlowLogRequest() (request *CreateFlowLogRequest) { - request = &CreateFlowLogRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateFlowLog") - return + request = &CreateFlowLogRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateFlowLog") + return } func NewCreateFlowLogResponse() (response *CreateFlowLogResponse) { - response = &CreateFlowLogResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateFlowLogResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateFlowLog）用于创建流日志 func (c *Client) CreateFlowLog(request *CreateFlowLogRequest) (response *CreateFlowLogResponse, err error) { - if request == nil { - request = NewCreateFlowLogRequest() - } - response = NewCreateFlowLogResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateFlowLogRequest() + } + response = NewCreateFlowLogResponse() + err = c.Send(request, response) + return } func NewCreateHaVipRequest() (request *CreateHaVipRequest) { - request = &CreateHaVipRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateHaVip") - return + request = &CreateHaVipRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateHaVip") + return } func NewCreateHaVipResponse() (response *CreateHaVipResponse) { - response = &CreateHaVipResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateHaVipResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateHaVip）用于创建高可用虚拟IP（HAVIP） func (c *Client) CreateHaVip(request *CreateHaVipRequest) (response *CreateHaVipResponse, err error) { - if request == nil { - request = NewCreateHaVipRequest() - } - response = NewCreateHaVipResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateHaVipRequest() + } + response = NewCreateHaVipResponse() + err = c.Send(request, response) + return } func NewCreateIp6TranslatorsRequest() (request *CreateIp6TranslatorsRequest) { - request = &CreateIp6TranslatorsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateIp6Translators") - return + request = &CreateIp6TranslatorsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateIp6Translators") + return } func NewCreateIp6TranslatorsResponse() (response *CreateIp6TranslatorsResponse) { - response = &CreateIp6TranslatorsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateIp6TranslatorsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 1. 该接口用于创建IPV6转换IPV4实例，支持批量 // 2. 同一个账户在一个地域最多允许创建10个转换实例 func (c *Client) CreateIp6Translators(request *CreateIp6TranslatorsRequest) (response *CreateIp6TranslatorsResponse, err error) { - if request == nil { - request = NewCreateIp6TranslatorsRequest() - } - response = NewCreateIp6TranslatorsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateIp6TranslatorsRequest() + } + response = NewCreateIp6TranslatorsResponse() + err = c.Send(request, response) + return } func NewCreateNatGatewayRequest() (request *CreateNatGatewayRequest) { - request = &CreateNatGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateNatGateway") - return + request = &CreateNatGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateNatGateway") + return } func NewCreateNatGatewayResponse() (response *CreateNatGatewayResponse) { - response = &CreateNatGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateNatGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateNatGateway)用于创建NAT网关。 func (c *Client) CreateNatGateway(request *CreateNatGatewayRequest) (response *CreateNatGatewayResponse, err error) { - if request == nil { - request = NewCreateNatGatewayRequest() - } - response = NewCreateNatGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateNatGatewayRequest() + } + response = NewCreateNatGatewayResponse() + err = c.Send(request, response) + return } func NewCreateNatGatewayDestinationIpPortTranslationNatRuleRequest() (request *CreateNatGatewayDestinationIpPortTranslationNatRuleRequest) { - request = &CreateNatGatewayDestinationIpPortTranslationNatRuleRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateNatGatewayDestinationIpPortTranslationNatRule") - return + request = &CreateNatGatewayDestinationIpPortTranslationNatRuleRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateNatGatewayDestinationIpPortTranslationNatRule") + return } func NewCreateNatGatewayDestinationIpPortTranslationNatRuleResponse() (response *CreateNatGatewayDestinationIpPortTranslationNatRuleResponse) { - response = &CreateNatGatewayDestinationIpPortTranslationNatRuleResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateNatGatewayDestinationIpPortTranslationNatRuleResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateNatGatewayDestinationIpPortTranslationNatRule)用于创建NAT网关端口转发规则。 func (c *Client) CreateNatGatewayDestinationIpPortTranslationNatRule(request *CreateNatGatewayDestinationIpPortTranslationNatRuleRequest) (response *CreateNatGatewayDestinationIpPortTranslationNatRuleResponse, err error) { - if request == nil { - request = NewCreateNatGatewayDestinationIpPortTranslationNatRuleRequest() - } - response = NewCreateNatGatewayDestinationIpPortTranslationNatRuleResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateNatGatewayDestinationIpPortTranslationNatRuleRequest() + } + response = NewCreateNatGatewayDestinationIpPortTranslationNatRuleResponse() + err = c.Send(request, response) + return } func NewCreateNetDetectRequest() (request *CreateNetDetectRequest) { - request = &CreateNetDetectRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateNetDetect") - return + request = &CreateNetDetectRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateNetDetect") + return } func NewCreateNetDetectResponse() (response *CreateNetDetectResponse) { - response = &CreateNetDetectResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateNetDetectResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateNetDetect)用于创建网络探测。 func (c *Client) CreateNetDetect(request *CreateNetDetectRequest) (response *CreateNetDetectResponse, err error) { - if request == nil { - request = NewCreateNetDetectRequest() - } - response = NewCreateNetDetectResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateNetDetectRequest() + } + response = NewCreateNetDetectResponse() + err = c.Send(request, response) + return } func NewCreateNetworkAclRequest() (request *CreateNetworkAclRequest) { - request = &CreateNetworkAclRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateNetworkAcl") - return + request = &CreateNetworkAclRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateNetworkAcl") + return } func NewCreateNetworkAclResponse() (response *CreateNetworkAclResponse) { - response = &CreateNetworkAclResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateNetworkAclResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateNetworkAcl）用于创建新的网络ACL。 // * 新建的网络ACL的入站和出站规则默认都是全部拒绝，在创建后通常您需要再调用ModifyNetworkAclEntries将网络ACL的规则设置为需要的规则。 func (c *Client) CreateNetworkAcl(request *CreateNetworkAclRequest) (response *CreateNetworkAclResponse, err error) { - if request == nil { - request = NewCreateNetworkAclRequest() - } - response = NewCreateNetworkAclResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateNetworkAclRequest() + } + response = NewCreateNetworkAclResponse() + err = c.Send(request, response) + return } func NewCreateNetworkInterfaceRequest() (request *CreateNetworkInterfaceRequest) { - request = &CreateNetworkInterfaceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateNetworkInterface") - return + request = &CreateNetworkInterfaceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateNetworkInterface") + return } func NewCreateNetworkInterfaceResponse() (response *CreateNetworkInterfaceResponse) { - response = &CreateNetworkInterfaceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateNetworkInterfaceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateNetworkInterface）用于创建弹性网卡。 @@ -1092,80 +1093,80 @@ func NewCreateNetworkInterfaceResponse() (response *CreateNetworkInterfaceRespon // * 创建弹性网卡同时可以绑定已有安全组。 // * 创建弹性网卡同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateNetworkInterface(request *CreateNetworkInterfaceRequest) (response *CreateNetworkInterfaceResponse, err error) { - if request == nil { - request = NewCreateNetworkInterfaceRequest() - } - response = NewCreateNetworkInterfaceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateNetworkInterfaceRequest() + } + response = NewCreateNetworkInterfaceResponse() + err = c.Send(request, response) + return } func NewCreateRouteTableRequest() (request *CreateRouteTableRequest) { - request = &CreateRouteTableRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateRouteTable") - return + request = &CreateRouteTableRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateRouteTable") + return } func NewCreateRouteTableResponse() (response *CreateRouteTableResponse) { - response = &CreateRouteTableResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateRouteTableResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateRouteTable)用于创建路由表。 // * 创建了VPC后，系统会创建一个默认路由表，所有新建的子网都会关联到默认路由表。默认情况下您可以直接使用默认路由表来管理您的路由策略。当您的路由策略较多时，您可以调用创建路由表接口创建更多路由表管理您的路由策略。 // * 创建路由表同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateRouteTable(request *CreateRouteTableRequest) (response *CreateRouteTableResponse, err error) { - if request == nil { - request = NewCreateRouteTableRequest() - } - response = NewCreateRouteTableResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateRouteTableRequest() + } + response = NewCreateRouteTableResponse() + err = c.Send(request, response) + return } func NewCreateRoutesRequest() (request *CreateRoutesRequest) { - request = &CreateRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateRoutes") - return + request = &CreateRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateRoutes") + return } func NewCreateRoutesResponse() (response *CreateRoutesResponse) { - response = &CreateRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateRoutes)用于创建路由策略。 // * 向指定路由表批量新增路由策略。 func (c *Client) CreateRoutes(request *CreateRoutesRequest) (response *CreateRoutesResponse, err error) { - if request == nil { - request = NewCreateRoutesRequest() - } - response = NewCreateRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateRoutesRequest() + } + response = NewCreateRoutesResponse() + err = c.Send(request, response) + return } func NewCreateSecurityGroupRequest() (request *CreateSecurityGroupRequest) { - request = &CreateSecurityGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateSecurityGroup") - return + request = &CreateSecurityGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateSecurityGroup") + return } func NewCreateSecurityGroupResponse() (response *CreateSecurityGroupResponse) { - response = &CreateSecurityGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateSecurityGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateSecurityGroup）用于创建新的安全组（SecurityGroup）。 @@ -1173,31 +1174,31 @@ func NewCreateSecurityGroupResponse() (response *CreateSecurityGroupResponse) { // * 新建的安全组的入站和出站规则默认都是全部拒绝，在创建后通常您需要再调用CreateSecurityGroupPolicies将安全组的规则设置为需要的规则。 // * 创建安全组同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateSecurityGroup(request *CreateSecurityGroupRequest) (response *CreateSecurityGroupResponse, err error) { - if request == nil { - request = NewCreateSecurityGroupRequest() - } - response = NewCreateSecurityGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateSecurityGroupRequest() + } + response = NewCreateSecurityGroupResponse() + err = c.Send(request, response) + return } func NewCreateSecurityGroupPoliciesRequest() (request *CreateSecurityGroupPoliciesRequest) { - request = &CreateSecurityGroupPoliciesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateSecurityGroupPolicies") - return + request = &CreateSecurityGroupPoliciesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateSecurityGroupPolicies") + return } func NewCreateSecurityGroupPoliciesResponse() (response *CreateSecurityGroupPoliciesResponse) { - response = &CreateSecurityGroupPoliciesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateSecurityGroupPoliciesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateSecurityGroupPolicies）用于创建安全组规则（SecurityGroupPolicy）。 -// +// // 在 SecurityGroupPolicySet 参数中： //
      //
    • Version 安全组规则版本号，用户每次更新安全规则版本会自动加1，防止您更新的路由规则已过期，不填不考虑冲突。
      • @@ -1212,33 +1213,33 @@ func NewCreateSecurityGroupPoliciesResponse() (response *CreateSecurityGroupPoli //
    • 一次请求中只能创建单个方向的规则, 如果需要指定索引（PolicyIndex）参数, 多条规则的索引必须一致。
      • //
    • func (c *Client) CreateSecurityGroupPolicies(request *CreateSecurityGroupPoliciesRequest) (response *CreateSecurityGroupPoliciesResponse, err error) { - if request == nil { - request = NewCreateSecurityGroupPoliciesRequest() - } - response = NewCreateSecurityGroupPoliciesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateSecurityGroupPoliciesRequest() + } + response = NewCreateSecurityGroupPoliciesResponse() + err = c.Send(request, response) + return } func NewCreateSecurityGroupWithPoliciesRequest() (request *CreateSecurityGroupWithPoliciesRequest) { - request = &CreateSecurityGroupWithPoliciesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateSecurityGroupWithPolicies") - return + request = &CreateSecurityGroupWithPoliciesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateSecurityGroupWithPolicies") + return } func NewCreateSecurityGroupWithPoliciesResponse() (response *CreateSecurityGroupWithPoliciesResponse) { - response = &CreateSecurityGroupWithPoliciesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateSecurityGroupWithPoliciesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateSecurityGroupWithPolicies）用于创建新的安全组（SecurityGroup），并且可以同时添加安全组规则（SecurityGroupPolicy）。 // * 每个账户下每个地域的每个项目的安全组数量限制。 // * 新建的安全组的入站和出站规则默认都是全部拒绝，在创建后通常您需要再调用CreateSecurityGroupPolicies将安全组的规则设置为需要的规则。 -// +// // 安全组规则说明： // * Version安全组规则版本号，用户每次更新安全规则版本会自动加1，防止您更新的路由规则已过期，不填不考虑冲突。 // * Protocol字段支持输入TCP, UDP, ICMP, ICMPV6, GRE, ALL。 @@ -1250,77 +1251,77 @@ func NewCreateSecurityGroupWithPoliciesResponse() (response *CreateSecurityGroup // * CidrBlock, Ipv6CidrBlock, SecurityGroupId, AddressTemplate四者是排他关系，不允许同时输入，Protocol + Port和ServiceTemplate二者是排他关系，不允许同时输入。 // * 一次请求中只能创建单个方向的规则, 如果需要指定索引（PolicyIndex）参数, 多条规则的索引必须一致。 func (c *Client) CreateSecurityGroupWithPolicies(request *CreateSecurityGroupWithPoliciesRequest) (response *CreateSecurityGroupWithPoliciesResponse, err error) { - if request == nil { - request = NewCreateSecurityGroupWithPoliciesRequest() - } - response = NewCreateSecurityGroupWithPoliciesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateSecurityGroupWithPoliciesRequest() + } + response = NewCreateSecurityGroupWithPoliciesResponse() + err = c.Send(request, response) + return } func NewCreateServiceTemplateRequest() (request *CreateServiceTemplateRequest) { - request = &CreateServiceTemplateRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateServiceTemplate") - return + request = &CreateServiceTemplateRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateServiceTemplate") + return } func NewCreateServiceTemplateResponse() (response *CreateServiceTemplateResponse) { - response = &CreateServiceTemplateResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateServiceTemplateResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateServiceTemplate）用于创建协议端口模板 func (c *Client) CreateServiceTemplate(request *CreateServiceTemplateRequest) (response *CreateServiceTemplateResponse, err error) { - if request == nil { - request = NewCreateServiceTemplateRequest() - } - response = NewCreateServiceTemplateResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateServiceTemplateRequest() + } + response = NewCreateServiceTemplateResponse() + err = c.Send(request, response) + return } func NewCreateServiceTemplateGroupRequest() (request *CreateServiceTemplateGroupRequest) { - request = &CreateServiceTemplateGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateServiceTemplateGroup") - return + request = &CreateServiceTemplateGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateServiceTemplateGroup") + return } func NewCreateServiceTemplateGroupResponse() (response *CreateServiceTemplateGroupResponse) { - response = &CreateServiceTemplateGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateServiceTemplateGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateServiceTemplateGroup）用于创建协议端口模板集合 func (c *Client) CreateServiceTemplateGroup(request *CreateServiceTemplateGroupRequest) (response *CreateServiceTemplateGroupResponse, err error) { - if request == nil { - request = NewCreateServiceTemplateGroupRequest() - } - response = NewCreateServiceTemplateGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateServiceTemplateGroupRequest() + } + response = NewCreateServiceTemplateGroupResponse() + err = c.Send(request, response) + return } func NewCreateSubnetRequest() (request *CreateSubnetRequest) { - request = &CreateSubnetRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateSubnet") - return + request = &CreateSubnetRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateSubnet") + return } func NewCreateSubnetResponse() (response *CreateSubnetResponse) { - response = &CreateSubnetResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateSubnetResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateSubnet)用于创建子网。 @@ -1331,27 +1332,27 @@ func NewCreateSubnetResponse() (response *CreateSubnetResponse) { // * 子网创建后会自动关联到默认路由表。 // * 创建子网同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateSubnet(request *CreateSubnetRequest) (response *CreateSubnetResponse, err error) { - if request == nil { - request = NewCreateSubnetRequest() - } - response = NewCreateSubnetResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateSubnetRequest() + } + response = NewCreateSubnetResponse() + err = c.Send(request, response) + return } func NewCreateSubnetsRequest() (request *CreateSubnetsRequest) { - request = &CreateSubnetsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateSubnets") - return + request = &CreateSubnetsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateSubnets") + return } func NewCreateSubnetsResponse() (response *CreateSubnetsResponse) { - response = &CreateSubnetsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateSubnetsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateSubnets)用于批量创建子网。 @@ -1362,27 +1363,27 @@ func NewCreateSubnetsResponse() (response *CreateSubnetsResponse) { // * 子网创建后会自动关联到默认路由表。 // * 创建子网同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateSubnets(request *CreateSubnetsRequest) (response *CreateSubnetsResponse, err error) { - if request == nil { - request = NewCreateSubnetsRequest() - } - response = NewCreateSubnetsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateSubnetsRequest() + } + response = NewCreateSubnetsResponse() + err = c.Send(request, response) + return } func NewCreateVpcRequest() (request *CreateVpcRequest) { - request = &CreateVpcRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateVpc") - return + request = &CreateVpcRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateVpc") + return } func NewCreateVpcResponse() (response *CreateVpcResponse) { - response = &CreateVpcResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateVpcResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(CreateVpc)用于创建私有网络(VPC)。 @@ -1390,254 +1391,254 @@ func NewCreateVpcResponse() (response *CreateVpcResponse) { // * 同一个地域能创建的VPC资源个数也是有限制的，详见 VPC使用限制,如果需要扩充请联系在线客服。 // * 创建VPC同时可以绑定标签, 应答里的标签列表代表添加成功的标签。 func (c *Client) CreateVpc(request *CreateVpcRequest) (response *CreateVpcResponse, err error) { - if request == nil { - request = NewCreateVpcRequest() - } - response = NewCreateVpcResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateVpcRequest() + } + response = NewCreateVpcResponse() + err = c.Send(request, response) + return } func NewCreateVpnConnectionRequest() (request *CreateVpnConnectionRequest) { - request = &CreateVpnConnectionRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateVpnConnection") - return + request = &CreateVpnConnectionRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateVpnConnection") + return } func NewCreateVpnConnectionResponse() (response *CreateVpnConnectionResponse) { - response = &CreateVpnConnectionResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateVpnConnectionResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateVpnConnection）用于创建VPN通道。 func (c *Client) CreateVpnConnection(request *CreateVpnConnectionRequest) (response *CreateVpnConnectionResponse, err error) { - if request == nil { - request = NewCreateVpnConnectionRequest() - } - response = NewCreateVpnConnectionResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateVpnConnectionRequest() + } + response = NewCreateVpnConnectionResponse() + err = c.Send(request, response) + return } func NewCreateVpnGatewayRequest() (request *CreateVpnGatewayRequest) { - request = &CreateVpnGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "CreateVpnGateway") - return + request = &CreateVpnGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "CreateVpnGateway") + return } func NewCreateVpnGatewayResponse() (response *CreateVpnGatewayResponse) { - response = &CreateVpnGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &CreateVpnGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（CreateVpnGateway）用于创建VPN网关。 func (c *Client) CreateVpnGateway(request *CreateVpnGatewayRequest) (response *CreateVpnGatewayResponse, err error) { - if request == nil { - request = NewCreateVpnGatewayRequest() - } - response = NewCreateVpnGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewCreateVpnGatewayRequest() + } + response = NewCreateVpnGatewayResponse() + err = c.Send(request, response) + return } func NewDeleteAddressTemplateRequest() (request *DeleteAddressTemplateRequest) { - request = &DeleteAddressTemplateRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteAddressTemplate") - return + request = &DeleteAddressTemplateRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteAddressTemplate") + return } func NewDeleteAddressTemplateResponse() (response *DeleteAddressTemplateResponse) { - response = &DeleteAddressTemplateResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteAddressTemplateResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteAddressTemplate）用于删除IP地址模板 func (c *Client) DeleteAddressTemplate(request *DeleteAddressTemplateRequest) (response *DeleteAddressTemplateResponse, err error) { - if request == nil { - request = NewDeleteAddressTemplateRequest() - } - response = NewDeleteAddressTemplateResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteAddressTemplateRequest() + } + response = NewDeleteAddressTemplateResponse() + err = c.Send(request, response) + return } func NewDeleteAddressTemplateGroupRequest() (request *DeleteAddressTemplateGroupRequest) { - request = &DeleteAddressTemplateGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteAddressTemplateGroup") - return + request = &DeleteAddressTemplateGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteAddressTemplateGroup") + return } func NewDeleteAddressTemplateGroupResponse() (response *DeleteAddressTemplateGroupResponse) { - response = &DeleteAddressTemplateGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteAddressTemplateGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteAddressTemplateGroup）用于删除IP地址模板集合 func (c *Client) DeleteAddressTemplateGroup(request *DeleteAddressTemplateGroupRequest) (response *DeleteAddressTemplateGroupResponse, err error) { - if request == nil { - request = NewDeleteAddressTemplateGroupRequest() - } - response = NewDeleteAddressTemplateGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteAddressTemplateGroupRequest() + } + response = NewDeleteAddressTemplateGroupResponse() + err = c.Send(request, response) + return } func NewDeleteAssistantCidrRequest() (request *DeleteAssistantCidrRequest) { - request = &DeleteAssistantCidrRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteAssistantCidr") - return + request = &DeleteAssistantCidrRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteAssistantCidr") + return } func NewDeleteAssistantCidrResponse() (response *DeleteAssistantCidrResponse) { - response = &DeleteAssistantCidrResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteAssistantCidrResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DeleteAssistantCidr)用于删除辅助CIDR。（接口灰度中，如需使用请提工单。） func (c *Client) DeleteAssistantCidr(request *DeleteAssistantCidrRequest) (response *DeleteAssistantCidrResponse, err error) { - if request == nil { - request = NewDeleteAssistantCidrRequest() - } - response = NewDeleteAssistantCidrResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteAssistantCidrRequest() + } + response = NewDeleteAssistantCidrResponse() + err = c.Send(request, response) + return } func NewDeleteBandwidthPackageRequest() (request *DeleteBandwidthPackageRequest) { - request = &DeleteBandwidthPackageRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteBandwidthPackage") - return + request = &DeleteBandwidthPackageRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteBandwidthPackage") + return } func NewDeleteBandwidthPackageResponse() (response *DeleteBandwidthPackageResponse) { - response = &DeleteBandwidthPackageResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteBandwidthPackageResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口支持删除共享带宽包，包括[设备带宽包](https://cloud.tencent.com/document/product/684/15246#.E8.AE.BE.E5.A4.87.E5.B8.A6.E5.AE.BD.E5.8C.85)和[IP带宽包](https://cloud.tencent.com/document/product/684/15246#ip-.E5.B8.A6.E5.AE.BD.E5.8C.85) func (c *Client) DeleteBandwidthPackage(request *DeleteBandwidthPackageRequest) (response *DeleteBandwidthPackageResponse, err error) { - if request == nil { - request = NewDeleteBandwidthPackageRequest() - } - response = NewDeleteBandwidthPackageResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteBandwidthPackageRequest() + } + response = NewDeleteBandwidthPackageResponse() + err = c.Send(request, response) + return } func NewDeleteCcnRequest() (request *DeleteCcnRequest) { - request = &DeleteCcnRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteCcn") - return + request = &DeleteCcnRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteCcn") + return } func NewDeleteCcnResponse() (response *DeleteCcnResponse) { - response = &DeleteCcnResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteCcnResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteCcn）用于删除云联网。 // * 删除后，云联网关联的所有实例间路由将被删除，网络将会中断，请务必确认 // * 删除云联网是不可逆的操作，请谨慎处理。 func (c *Client) DeleteCcn(request *DeleteCcnRequest) (response *DeleteCcnResponse, err error) { - if request == nil { - request = NewDeleteCcnRequest() - } - response = NewDeleteCcnResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteCcnRequest() + } + response = NewDeleteCcnResponse() + err = c.Send(request, response) + return } func NewDeleteCustomerGatewayRequest() (request *DeleteCustomerGatewayRequest) { - request = &DeleteCustomerGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteCustomerGateway") - return + request = &DeleteCustomerGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteCustomerGateway") + return } func NewDeleteCustomerGatewayResponse() (response *DeleteCustomerGatewayResponse) { - response = &DeleteCustomerGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteCustomerGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteCustomerGateway）用于删除对端网关。 func (c *Client) DeleteCustomerGateway(request *DeleteCustomerGatewayRequest) (response *DeleteCustomerGatewayResponse, err error) { - if request == nil { - request = NewDeleteCustomerGatewayRequest() - } - response = NewDeleteCustomerGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteCustomerGatewayRequest() + } + response = NewDeleteCustomerGatewayResponse() + err = c.Send(request, response) + return } func NewDeleteDhcpIpRequest() (request *DeleteDhcpIpRequest) { - request = &DeleteDhcpIpRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteDhcpIp") - return + request = &DeleteDhcpIpRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteDhcpIp") + return } func NewDeleteDhcpIpResponse() (response *DeleteDhcpIpResponse) { - response = &DeleteDhcpIpResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteDhcpIpResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteDhcpIp）用于删除DhcpIp func (c *Client) DeleteDhcpIp(request *DeleteDhcpIpRequest) (response *DeleteDhcpIpResponse, err error) { - if request == nil { - request = NewDeleteDhcpIpRequest() - } - response = NewDeleteDhcpIpResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteDhcpIpRequest() + } + response = NewDeleteDhcpIpResponse() + err = c.Send(request, response) + return } func NewDeleteDirectConnectGatewayRequest() (request *DeleteDirectConnectGatewayRequest) { - request = &DeleteDirectConnectGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteDirectConnectGateway") - return + request = &DeleteDirectConnectGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteDirectConnectGateway") + return } func NewDeleteDirectConnectGatewayResponse() (response *DeleteDirectConnectGatewayResponse) { - response = &DeleteDirectConnectGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteDirectConnectGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteDirectConnectGateway）用于删除专线网关。 @@ -1645,307 +1646,307 @@ func NewDeleteDirectConnectGatewayResponse() (response *DeleteDirectConnectGatew //
  • 删除专线网关后，系统会删除路由表中跟该专线网关相关的路由策略。
    • // 本接口是异步完成，如需查询异步任务执行结果，请使用本接口返回的`RequestId`轮询`QueryTask`接口 func (c *Client) DeleteDirectConnectGateway(request *DeleteDirectConnectGatewayRequest) (response *DeleteDirectConnectGatewayResponse, err error) { - if request == nil { - request = NewDeleteDirectConnectGatewayRequest() - } - response = NewDeleteDirectConnectGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteDirectConnectGatewayRequest() + } + response = NewDeleteDirectConnectGatewayResponse() + err = c.Send(request, response) + return } func NewDeleteDirectConnectGatewayCcnRoutesRequest() (request *DeleteDirectConnectGatewayCcnRoutesRequest) { - request = &DeleteDirectConnectGatewayCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteDirectConnectGatewayCcnRoutes") - return + request = &DeleteDirectConnectGatewayCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteDirectConnectGatewayCcnRoutes") + return } func NewDeleteDirectConnectGatewayCcnRoutesResponse() (response *DeleteDirectConnectGatewayCcnRoutesResponse) { - response = &DeleteDirectConnectGatewayCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteDirectConnectGatewayCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteDirectConnectGatewayCcnRoutes）用于删除专线网关的云联网路由（IDC网段） func (c *Client) DeleteDirectConnectGatewayCcnRoutes(request *DeleteDirectConnectGatewayCcnRoutesRequest) (response *DeleteDirectConnectGatewayCcnRoutesResponse, err error) { - if request == nil { - request = NewDeleteDirectConnectGatewayCcnRoutesRequest() - } - response = NewDeleteDirectConnectGatewayCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteDirectConnectGatewayCcnRoutesRequest() + } + response = NewDeleteDirectConnectGatewayCcnRoutesResponse() + err = c.Send(request, response) + return } func NewDeleteFlowLogRequest() (request *DeleteFlowLogRequest) { - request = &DeleteFlowLogRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteFlowLog") - return + request = &DeleteFlowLogRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteFlowLog") + return } func NewDeleteFlowLogResponse() (response *DeleteFlowLogResponse) { - response = &DeleteFlowLogResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteFlowLogResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteFlowLog）用于删除流日志 func (c *Client) DeleteFlowLog(request *DeleteFlowLogRequest) (response *DeleteFlowLogResponse, err error) { - if request == nil { - request = NewDeleteFlowLogRequest() - } - response = NewDeleteFlowLogResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteFlowLogRequest() + } + response = NewDeleteFlowLogResponse() + err = c.Send(request, response) + return } func NewDeleteHaVipRequest() (request *DeleteHaVipRequest) { - request = &DeleteHaVipRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteHaVip") - return + request = &DeleteHaVipRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteHaVip") + return } func NewDeleteHaVipResponse() (response *DeleteHaVipResponse) { - response = &DeleteHaVipResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteHaVipResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteHaVip）用于删除高可用虚拟IP（HAVIP）
    // 本接口是异步完成，如需查询异步任务执行结果，请使用本接口返回的`RequestId`轮询`QueryTask`接口 func (c *Client) DeleteHaVip(request *DeleteHaVipRequest) (response *DeleteHaVipResponse, err error) { - if request == nil { - request = NewDeleteHaVipRequest() - } - response = NewDeleteHaVipResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteHaVipRequest() + } + response = NewDeleteHaVipResponse() + err = c.Send(request, response) + return } func NewDeleteIp6TranslatorsRequest() (request *DeleteIp6TranslatorsRequest) { - request = &DeleteIp6TranslatorsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteIp6Translators") - return + request = &DeleteIp6TranslatorsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteIp6Translators") + return } func NewDeleteIp6TranslatorsResponse() (response *DeleteIp6TranslatorsResponse) { - response = &DeleteIp6TranslatorsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteIp6TranslatorsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 1. 该接口用于释放IPV6转换实例，支持批量。 // 2. 如果IPV6转换实例建立有转换规则，会一并删除。 func (c *Client) DeleteIp6Translators(request *DeleteIp6TranslatorsRequest) (response *DeleteIp6TranslatorsResponse, err error) { - if request == nil { - request = NewDeleteIp6TranslatorsRequest() - } - response = NewDeleteIp6TranslatorsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteIp6TranslatorsRequest() + } + response = NewDeleteIp6TranslatorsResponse() + err = c.Send(request, response) + return } func NewDeleteNatGatewayRequest() (request *DeleteNatGatewayRequest) { - request = &DeleteNatGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteNatGateway") - return + request = &DeleteNatGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteNatGateway") + return } func NewDeleteNatGatewayResponse() (response *DeleteNatGatewayResponse) { - response = &DeleteNatGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteNatGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteNatGateway）用于删除NAT网关。 // 删除 NAT 网关后，系统会自动删除路由表中包含此 NAT 网关的路由项，同时也会解绑弹性公网IP（EIP）。 func (c *Client) DeleteNatGateway(request *DeleteNatGatewayRequest) (response *DeleteNatGatewayResponse, err error) { - if request == nil { - request = NewDeleteNatGatewayRequest() - } - response = NewDeleteNatGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteNatGatewayRequest() + } + response = NewDeleteNatGatewayResponse() + err = c.Send(request, response) + return } func NewDeleteNatGatewayDestinationIpPortTranslationNatRuleRequest() (request *DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest) { - request = &DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteNatGatewayDestinationIpPortTranslationNatRule") - return + request = &DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteNatGatewayDestinationIpPortTranslationNatRule") + return } func NewDeleteNatGatewayDestinationIpPortTranslationNatRuleResponse() (response *DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse) { - response = &DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteNatGatewayDestinationIpPortTranslationNatRule）用于删除NAT网关端口转发规则。 func (c *Client) DeleteNatGatewayDestinationIpPortTranslationNatRule(request *DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest) (response *DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse, err error) { - if request == nil { - request = NewDeleteNatGatewayDestinationIpPortTranslationNatRuleRequest() - } - response = NewDeleteNatGatewayDestinationIpPortTranslationNatRuleResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteNatGatewayDestinationIpPortTranslationNatRuleRequest() + } + response = NewDeleteNatGatewayDestinationIpPortTranslationNatRuleResponse() + err = c.Send(request, response) + return } func NewDeleteNetDetectRequest() (request *DeleteNetDetectRequest) { - request = &DeleteNetDetectRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteNetDetect") - return + request = &DeleteNetDetectRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteNetDetect") + return } func NewDeleteNetDetectResponse() (response *DeleteNetDetectResponse) { - response = &DeleteNetDetectResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteNetDetectResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DeleteNetDetect)用于删除网络探测实例。 func (c *Client) DeleteNetDetect(request *DeleteNetDetectRequest) (response *DeleteNetDetectResponse, err error) { - if request == nil { - request = NewDeleteNetDetectRequest() - } - response = NewDeleteNetDetectResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteNetDetectRequest() + } + response = NewDeleteNetDetectResponse() + err = c.Send(request, response) + return } func NewDeleteNetworkAclRequest() (request *DeleteNetworkAclRequest) { - request = &DeleteNetworkAclRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteNetworkAcl") - return + request = &DeleteNetworkAclRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteNetworkAcl") + return } func NewDeleteNetworkAclResponse() (response *DeleteNetworkAclResponse) { - response = &DeleteNetworkAclResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteNetworkAclResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteNetworkAcl）用于删除网络ACL。 func (c *Client) DeleteNetworkAcl(request *DeleteNetworkAclRequest) (response *DeleteNetworkAclResponse, err error) { - if request == nil { - request = NewDeleteNetworkAclRequest() - } - response = NewDeleteNetworkAclResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteNetworkAclRequest() + } + response = NewDeleteNetworkAclResponse() + err = c.Send(request, response) + return } func NewDeleteNetworkInterfaceRequest() (request *DeleteNetworkInterfaceRequest) { - request = &DeleteNetworkInterfaceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteNetworkInterface") - return + request = &DeleteNetworkInterfaceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteNetworkInterface") + return } func NewDeleteNetworkInterfaceResponse() (response *DeleteNetworkInterfaceResponse) { - response = &DeleteNetworkInterfaceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteNetworkInterfaceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteNetworkInterface）用于删除弹性网卡。 // * 弹性网卡上绑定了云服务器时，不能被删除。 // * 删除指定弹性网卡，弹性网卡必须先和子机解绑才能删除。删除之后弹性网卡上所有内网IP都将被退还。 func (c *Client) DeleteNetworkInterface(request *DeleteNetworkInterfaceRequest) (response *DeleteNetworkInterfaceResponse, err error) { - if request == nil { - request = NewDeleteNetworkInterfaceRequest() - } - response = NewDeleteNetworkInterfaceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteNetworkInterfaceRequest() + } + response = NewDeleteNetworkInterfaceResponse() + err = c.Send(request, response) + return } func NewDeleteRouteTableRequest() (request *DeleteRouteTableRequest) { - request = &DeleteRouteTableRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteRouteTable") - return + request = &DeleteRouteTableRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteRouteTable") + return } func NewDeleteRouteTableResponse() (response *DeleteRouteTableResponse) { - response = &DeleteRouteTableResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteRouteTableResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 删除路由表 func (c *Client) DeleteRouteTable(request *DeleteRouteTableRequest) (response *DeleteRouteTableResponse, err error) { - if request == nil { - request = NewDeleteRouteTableRequest() - } - response = NewDeleteRouteTableResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteRouteTableRequest() + } + response = NewDeleteRouteTableResponse() + err = c.Send(request, response) + return } func NewDeleteRoutesRequest() (request *DeleteRoutesRequest) { - request = &DeleteRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteRoutes") - return + request = &DeleteRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteRoutes") + return } func NewDeleteRoutesResponse() (response *DeleteRoutesResponse) { - response = &DeleteRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DeleteRoutes)用于对某个路由表批量删除路由策略（Route）。 func (c *Client) DeleteRoutes(request *DeleteRoutesRequest) (response *DeleteRoutesResponse, err error) { - if request == nil { - request = NewDeleteRoutesRequest() - } - response = NewDeleteRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteRoutesRequest() + } + response = NewDeleteRoutesResponse() + err = c.Send(request, response) + return } func NewDeleteSecurityGroupRequest() (request *DeleteSecurityGroupRequest) { - request = &DeleteSecurityGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteSecurityGroup") - return + request = &DeleteSecurityGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteSecurityGroup") + return } func NewDeleteSecurityGroupResponse() (response *DeleteSecurityGroupResponse) { - response = &DeleteSecurityGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteSecurityGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteSecurityGroup）用于删除安全组（SecurityGroup）。 @@ -1953,1386 +1954,1386 @@ func NewDeleteSecurityGroupResponse() (response *DeleteSecurityGroupResponse) { // * 安全组实例ID如果在其他安全组的规则中被引用，则无法直接删除。这种情况下，需要先进行规则修改，再删除安全组。 // * 删除的安全组无法再找回，请谨慎调用。 func (c *Client) DeleteSecurityGroup(request *DeleteSecurityGroupRequest) (response *DeleteSecurityGroupResponse, err error) { - if request == nil { - request = NewDeleteSecurityGroupRequest() - } - response = NewDeleteSecurityGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteSecurityGroupRequest() + } + response = NewDeleteSecurityGroupResponse() + err = c.Send(request, response) + return } func NewDeleteSecurityGroupPoliciesRequest() (request *DeleteSecurityGroupPoliciesRequest) { - request = &DeleteSecurityGroupPoliciesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteSecurityGroupPolicies") - return + request = &DeleteSecurityGroupPoliciesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteSecurityGroupPolicies") + return } func NewDeleteSecurityGroupPoliciesResponse() (response *DeleteSecurityGroupPoliciesResponse) { - response = &DeleteSecurityGroupPoliciesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteSecurityGroupPoliciesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteSecurityGroupPolicies）用于用于删除安全组规则（SecurityGroupPolicy）。 // * SecurityGroupPolicySet.Version 用于指定要操作的安全组的版本。传入 Version 版本号若不等于当前安全组的最新版本，将返回失败；若不传 Version 则直接删除指定PolicyIndex的规则。 func (c *Client) DeleteSecurityGroupPolicies(request *DeleteSecurityGroupPoliciesRequest) (response *DeleteSecurityGroupPoliciesResponse, err error) { - if request == nil { - request = NewDeleteSecurityGroupPoliciesRequest() - } - response = NewDeleteSecurityGroupPoliciesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteSecurityGroupPoliciesRequest() + } + response = NewDeleteSecurityGroupPoliciesResponse() + err = c.Send(request, response) + return } func NewDeleteServiceTemplateRequest() (request *DeleteServiceTemplateRequest) { - request = &DeleteServiceTemplateRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteServiceTemplate") - return + request = &DeleteServiceTemplateRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteServiceTemplate") + return } func NewDeleteServiceTemplateResponse() (response *DeleteServiceTemplateResponse) { - response = &DeleteServiceTemplateResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteServiceTemplateResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteServiceTemplate）用于删除协议端口模板 func (c *Client) DeleteServiceTemplate(request *DeleteServiceTemplateRequest) (response *DeleteServiceTemplateResponse, err error) { - if request == nil { - request = NewDeleteServiceTemplateRequest() - } - response = NewDeleteServiceTemplateResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteServiceTemplateRequest() + } + response = NewDeleteServiceTemplateResponse() + err = c.Send(request, response) + return } func NewDeleteServiceTemplateGroupRequest() (request *DeleteServiceTemplateGroupRequest) { - request = &DeleteServiceTemplateGroupRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteServiceTemplateGroup") - return + request = &DeleteServiceTemplateGroupRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteServiceTemplateGroup") + return } func NewDeleteServiceTemplateGroupResponse() (response *DeleteServiceTemplateGroupResponse) { - response = &DeleteServiceTemplateGroupResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteServiceTemplateGroupResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteServiceTemplateGroup）用于删除协议端口模板集合 func (c *Client) DeleteServiceTemplateGroup(request *DeleteServiceTemplateGroupRequest) (response *DeleteServiceTemplateGroupResponse, err error) { - if request == nil { - request = NewDeleteServiceTemplateGroupRequest() - } - response = NewDeleteServiceTemplateGroupResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteServiceTemplateGroupRequest() + } + response = NewDeleteServiceTemplateGroupResponse() + err = c.Send(request, response) + return } func NewDeleteSubnetRequest() (request *DeleteSubnetRequest) { - request = &DeleteSubnetRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteSubnet") - return + request = &DeleteSubnetRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteSubnet") + return } func NewDeleteSubnetResponse() (response *DeleteSubnetResponse) { - response = &DeleteSubnetResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteSubnetResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteSubnet）用于用于删除子网(Subnet)。 // * 删除子网前，请清理该子网下所有资源，包括云服务器、负载均衡、云数据、noSql、弹性网卡等资源。 func (c *Client) DeleteSubnet(request *DeleteSubnetRequest) (response *DeleteSubnetResponse, err error) { - if request == nil { - request = NewDeleteSubnetRequest() - } - response = NewDeleteSubnetResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteSubnetRequest() + } + response = NewDeleteSubnetResponse() + err = c.Send(request, response) + return } func NewDeleteVpcRequest() (request *DeleteVpcRequest) { - request = &DeleteVpcRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteVpc") - return + request = &DeleteVpcRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteVpc") + return } func NewDeleteVpcResponse() (response *DeleteVpcResponse) { - response = &DeleteVpcResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteVpcResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteVpc）用于删除私有网络。 // * 删除前请确保 VPC 内已经没有相关资源，例如云服务器、云数据库、NoSQL、VPN网关、专线网关、负载均衡、对等连接、与之互通的基础网络设备等。 // * 删除私有网络是不可逆的操作，请谨慎处理。 func (c *Client) DeleteVpc(request *DeleteVpcRequest) (response *DeleteVpcResponse, err error) { - if request == nil { - request = NewDeleteVpcRequest() - } - response = NewDeleteVpcResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteVpcRequest() + } + response = NewDeleteVpcResponse() + err = c.Send(request, response) + return } func NewDeleteVpnConnectionRequest() (request *DeleteVpnConnectionRequest) { - request = &DeleteVpnConnectionRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteVpnConnection") - return + request = &DeleteVpnConnectionRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteVpnConnection") + return } func NewDeleteVpnConnectionResponse() (response *DeleteVpnConnectionResponse) { - response = &DeleteVpnConnectionResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteVpnConnectionResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DeleteVpnConnection)用于删除VPN通道。 func (c *Client) DeleteVpnConnection(request *DeleteVpnConnectionRequest) (response *DeleteVpnConnectionResponse, err error) { - if request == nil { - request = NewDeleteVpnConnectionRequest() - } - response = NewDeleteVpnConnectionResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteVpnConnectionRequest() + } + response = NewDeleteVpnConnectionResponse() + err = c.Send(request, response) + return } func NewDeleteVpnGatewayRequest() (request *DeleteVpnGatewayRequest) { - request = &DeleteVpnGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DeleteVpnGateway") - return + request = &DeleteVpnGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DeleteVpnGateway") + return } func NewDeleteVpnGatewayResponse() (response *DeleteVpnGatewayResponse) { - response = &DeleteVpnGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DeleteVpnGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DeleteVpnGateway）用于删除VPN网关。目前只支持删除运行中的按量计费的IPSEC网关实例。 func (c *Client) DeleteVpnGateway(request *DeleteVpnGatewayRequest) (response *DeleteVpnGatewayResponse, err error) { - if request == nil { - request = NewDeleteVpnGatewayRequest() - } - response = NewDeleteVpnGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDeleteVpnGatewayRequest() + } + response = NewDeleteVpnGatewayResponse() + err = c.Send(request, response) + return } func NewDescribeAccountAttributesRequest() (request *DescribeAccountAttributesRequest) { - request = &DescribeAccountAttributesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeAccountAttributes") - return + request = &DescribeAccountAttributesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeAccountAttributes") + return } func NewDescribeAccountAttributesResponse() (response *DescribeAccountAttributesResponse) { - response = &DescribeAccountAttributesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeAccountAttributesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeAccountAttributes）用于查询用户账号私有属性。 func (c *Client) DescribeAccountAttributes(request *DescribeAccountAttributesRequest) (response *DescribeAccountAttributesResponse, err error) { - if request == nil { - request = NewDescribeAccountAttributesRequest() - } - response = NewDescribeAccountAttributesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeAccountAttributesRequest() + } + response = NewDescribeAccountAttributesResponse() + err = c.Send(request, response) + return } func NewDescribeAddressQuotaRequest() (request *DescribeAddressQuotaRequest) { - request = &DescribeAddressQuotaRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddressQuota") - return + request = &DescribeAddressQuotaRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddressQuota") + return } func NewDescribeAddressQuotaResponse() (response *DescribeAddressQuotaResponse) { - response = &DescribeAddressQuotaResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeAddressQuotaResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeAddressQuota) 用于查询您账户的[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）在当前地域的配额信息。配额详情可参见 [EIP 产品简介](https://cloud.tencent.com/document/product/213/5733)。 func (c *Client) DescribeAddressQuota(request *DescribeAddressQuotaRequest) (response *DescribeAddressQuotaResponse, err error) { - if request == nil { - request = NewDescribeAddressQuotaRequest() - } - response = NewDescribeAddressQuotaResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeAddressQuotaRequest() + } + response = NewDescribeAddressQuotaResponse() + err = c.Send(request, response) + return } func NewDescribeAddressTemplateGroupsRequest() (request *DescribeAddressTemplateGroupsRequest) { - request = &DescribeAddressTemplateGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddressTemplateGroups") - return + request = &DescribeAddressTemplateGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddressTemplateGroups") + return } func NewDescribeAddressTemplateGroupsResponse() (response *DescribeAddressTemplateGroupsResponse) { - response = &DescribeAddressTemplateGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeAddressTemplateGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeAddressTemplateGroups）用于查询IP地址模板集合 func (c *Client) DescribeAddressTemplateGroups(request *DescribeAddressTemplateGroupsRequest) (response *DescribeAddressTemplateGroupsResponse, err error) { - if request == nil { - request = NewDescribeAddressTemplateGroupsRequest() - } - response = NewDescribeAddressTemplateGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeAddressTemplateGroupsRequest() + } + response = NewDescribeAddressTemplateGroupsResponse() + err = c.Send(request, response) + return } func NewDescribeAddressTemplatesRequest() (request *DescribeAddressTemplatesRequest) { - request = &DescribeAddressTemplatesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddressTemplates") - return + request = &DescribeAddressTemplatesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddressTemplates") + return } func NewDescribeAddressTemplatesResponse() (response *DescribeAddressTemplatesResponse) { - response = &DescribeAddressTemplatesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeAddressTemplatesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeAddressTemplates）用于查询IP地址模板 func (c *Client) DescribeAddressTemplates(request *DescribeAddressTemplatesRequest) (response *DescribeAddressTemplatesResponse, err error) { - if request == nil { - request = NewDescribeAddressTemplatesRequest() - } - response = NewDescribeAddressTemplatesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeAddressTemplatesRequest() + } + response = NewDescribeAddressTemplatesResponse() + err = c.Send(request, response) + return } func NewDescribeAddressesRequest() (request *DescribeAddressesRequest) { - request = &DescribeAddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddresses") - return + request = &DescribeAddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeAddresses") + return } func NewDescribeAddressesResponse() (response *DescribeAddressesResponse) { - response = &DescribeAddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeAddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DescribeAddresses) 用于查询一个或多个[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）的详细信息。 // * 如果参数为空，返回当前用户一定数量（Limit所指定的数量，默认为20）的 EIP。 func (c *Client) DescribeAddresses(request *DescribeAddressesRequest) (response *DescribeAddressesResponse, err error) { - if request == nil { - request = NewDescribeAddressesRequest() - } - response = NewDescribeAddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeAddressesRequest() + } + response = NewDescribeAddressesResponse() + err = c.Send(request, response) + return } func NewDescribeAssistantCidrRequest() (request *DescribeAssistantCidrRequest) { - request = &DescribeAssistantCidrRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeAssistantCidr") - return + request = &DescribeAssistantCidrRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeAssistantCidr") + return } func NewDescribeAssistantCidrResponse() (response *DescribeAssistantCidrResponse) { - response = &DescribeAssistantCidrResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeAssistantCidrResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeAssistantCidr）用于查询辅助CIDR列表。（接口灰度中，如需使用请提工单。） func (c *Client) DescribeAssistantCidr(request *DescribeAssistantCidrRequest) (response *DescribeAssistantCidrResponse, err error) { - if request == nil { - request = NewDescribeAssistantCidrRequest() - } - response = NewDescribeAssistantCidrResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeAssistantCidrRequest() + } + response = NewDescribeAssistantCidrResponse() + err = c.Send(request, response) + return } func NewDescribeBandwidthPackageQuotaRequest() (request *DescribeBandwidthPackageQuotaRequest) { - request = &DescribeBandwidthPackageQuotaRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeBandwidthPackageQuota") - return + request = &DescribeBandwidthPackageQuotaRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeBandwidthPackageQuota") + return } func NewDescribeBandwidthPackageQuotaResponse() (response *DescribeBandwidthPackageQuotaResponse) { - response = &DescribeBandwidthPackageQuotaResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeBandwidthPackageQuotaResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口用于查询账户在当前地域的带宽包上限数量以及使用数量 func (c *Client) DescribeBandwidthPackageQuota(request *DescribeBandwidthPackageQuotaRequest) (response *DescribeBandwidthPackageQuotaResponse, err error) { - if request == nil { - request = NewDescribeBandwidthPackageQuotaRequest() - } - response = NewDescribeBandwidthPackageQuotaResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeBandwidthPackageQuotaRequest() + } + response = NewDescribeBandwidthPackageQuotaResponse() + err = c.Send(request, response) + return } func NewDescribeBandwidthPackagesRequest() (request *DescribeBandwidthPackagesRequest) { - request = &DescribeBandwidthPackagesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeBandwidthPackages") - return + request = &DescribeBandwidthPackagesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeBandwidthPackages") + return } func NewDescribeBandwidthPackagesResponse() (response *DescribeBandwidthPackagesResponse) { - response = &DescribeBandwidthPackagesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeBandwidthPackagesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口用于查询带宽包详细信息，包括带宽包唯一标识ID，类型，计费模式，名称，资源信息等 func (c *Client) DescribeBandwidthPackages(request *DescribeBandwidthPackagesRequest) (response *DescribeBandwidthPackagesResponse, err error) { - if request == nil { - request = NewDescribeBandwidthPackagesRequest() - } - response = NewDescribeBandwidthPackagesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeBandwidthPackagesRequest() + } + response = NewDescribeBandwidthPackagesResponse() + err = c.Send(request, response) + return } func NewDescribeCcnAttachedInstancesRequest() (request *DescribeCcnAttachedInstancesRequest) { - request = &DescribeCcnAttachedInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcnAttachedInstances") - return + request = &DescribeCcnAttachedInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcnAttachedInstances") + return } func NewDescribeCcnAttachedInstancesResponse() (response *DescribeCcnAttachedInstancesResponse) { - response = &DescribeCcnAttachedInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeCcnAttachedInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeCcnAttachedInstances）用于查询云联网实例下已关联的网络实例。 func (c *Client) DescribeCcnAttachedInstances(request *DescribeCcnAttachedInstancesRequest) (response *DescribeCcnAttachedInstancesResponse, err error) { - if request == nil { - request = NewDescribeCcnAttachedInstancesRequest() - } - response = NewDescribeCcnAttachedInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeCcnAttachedInstancesRequest() + } + response = NewDescribeCcnAttachedInstancesResponse() + err = c.Send(request, response) + return } func NewDescribeCcnRegionBandwidthLimitsRequest() (request *DescribeCcnRegionBandwidthLimitsRequest) { - request = &DescribeCcnRegionBandwidthLimitsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcnRegionBandwidthLimits") - return + request = &DescribeCcnRegionBandwidthLimitsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcnRegionBandwidthLimits") + return } func NewDescribeCcnRegionBandwidthLimitsResponse() (response *DescribeCcnRegionBandwidthLimitsResponse) { - response = &DescribeCcnRegionBandwidthLimitsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeCcnRegionBandwidthLimitsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeCcnRegionBandwidthLimits）用于查询云联网各地域出带宽上限，该接口只返回已关联网络实例包含的地域 func (c *Client) DescribeCcnRegionBandwidthLimits(request *DescribeCcnRegionBandwidthLimitsRequest) (response *DescribeCcnRegionBandwidthLimitsResponse, err error) { - if request == nil { - request = NewDescribeCcnRegionBandwidthLimitsRequest() - } - response = NewDescribeCcnRegionBandwidthLimitsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeCcnRegionBandwidthLimitsRequest() + } + response = NewDescribeCcnRegionBandwidthLimitsResponse() + err = c.Send(request, response) + return } func NewDescribeCcnRoutesRequest() (request *DescribeCcnRoutesRequest) { - request = &DescribeCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcnRoutes") - return + request = &DescribeCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcnRoutes") + return } func NewDescribeCcnRoutesResponse() (response *DescribeCcnRoutesResponse) { - response = &DescribeCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeCcnRoutes）用于查询已加入云联网（CCN）的路由 func (c *Client) DescribeCcnRoutes(request *DescribeCcnRoutesRequest) (response *DescribeCcnRoutesResponse, err error) { - if request == nil { - request = NewDescribeCcnRoutesRequest() - } - response = NewDescribeCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeCcnRoutesRequest() + } + response = NewDescribeCcnRoutesResponse() + err = c.Send(request, response) + return } func NewDescribeCcnsRequest() (request *DescribeCcnsRequest) { - request = &DescribeCcnsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcns") - return + request = &DescribeCcnsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeCcns") + return } func NewDescribeCcnsResponse() (response *DescribeCcnsResponse) { - response = &DescribeCcnsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeCcnsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeCcns）用于查询云联网（CCN）列表。 func (c *Client) DescribeCcns(request *DescribeCcnsRequest) (response *DescribeCcnsResponse, err error) { - if request == nil { - request = NewDescribeCcnsRequest() - } - response = NewDescribeCcnsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeCcnsRequest() + } + response = NewDescribeCcnsResponse() + err = c.Send(request, response) + return } func NewDescribeClassicLinkInstancesRequest() (request *DescribeClassicLinkInstancesRequest) { - request = &DescribeClassicLinkInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeClassicLinkInstances") - return + request = &DescribeClassicLinkInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeClassicLinkInstances") + return } func NewDescribeClassicLinkInstancesResponse() (response *DescribeClassicLinkInstancesResponse) { - response = &DescribeClassicLinkInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeClassicLinkInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeClassicLinkInstances)用于查询私有网络和基础网络设备互通列表。 func (c *Client) DescribeClassicLinkInstances(request *DescribeClassicLinkInstancesRequest) (response *DescribeClassicLinkInstancesResponse, err error) { - if request == nil { - request = NewDescribeClassicLinkInstancesRequest() - } - response = NewDescribeClassicLinkInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeClassicLinkInstancesRequest() + } + response = NewDescribeClassicLinkInstancesResponse() + err = c.Send(request, response) + return } func NewDescribeCustomerGatewayVendorsRequest() (request *DescribeCustomerGatewayVendorsRequest) { - request = &DescribeCustomerGatewayVendorsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeCustomerGatewayVendors") - return + request = &DescribeCustomerGatewayVendorsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeCustomerGatewayVendors") + return } func NewDescribeCustomerGatewayVendorsResponse() (response *DescribeCustomerGatewayVendorsResponse) { - response = &DescribeCustomerGatewayVendorsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeCustomerGatewayVendorsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeCustomerGatewayVendors）用于查询可支持的对端网关厂商信息。 func (c *Client) DescribeCustomerGatewayVendors(request *DescribeCustomerGatewayVendorsRequest) (response *DescribeCustomerGatewayVendorsResponse, err error) { - if request == nil { - request = NewDescribeCustomerGatewayVendorsRequest() - } - response = NewDescribeCustomerGatewayVendorsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeCustomerGatewayVendorsRequest() + } + response = NewDescribeCustomerGatewayVendorsResponse() + err = c.Send(request, response) + return } func NewDescribeCustomerGatewaysRequest() (request *DescribeCustomerGatewaysRequest) { - request = &DescribeCustomerGatewaysRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeCustomerGateways") - return + request = &DescribeCustomerGatewaysRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeCustomerGateways") + return } func NewDescribeCustomerGatewaysResponse() (response *DescribeCustomerGatewaysResponse) { - response = &DescribeCustomerGatewaysResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeCustomerGatewaysResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeCustomerGateways）用于查询对端网关列表。 func (c *Client) DescribeCustomerGateways(request *DescribeCustomerGatewaysRequest) (response *DescribeCustomerGatewaysResponse, err error) { - if request == nil { - request = NewDescribeCustomerGatewaysRequest() - } - response = NewDescribeCustomerGatewaysResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeCustomerGatewaysRequest() + } + response = NewDescribeCustomerGatewaysResponse() + err = c.Send(request, response) + return } func NewDescribeDhcpIpsRequest() (request *DescribeDhcpIpsRequest) { - request = &DescribeDhcpIpsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeDhcpIps") - return + request = &DescribeDhcpIpsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeDhcpIps") + return } func NewDescribeDhcpIpsResponse() (response *DescribeDhcpIpsResponse) { - response = &DescribeDhcpIpsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeDhcpIpsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeDhcpIps）用于查询DhcpIp列表 func (c *Client) DescribeDhcpIps(request *DescribeDhcpIpsRequest) (response *DescribeDhcpIpsResponse, err error) { - if request == nil { - request = NewDescribeDhcpIpsRequest() - } - response = NewDescribeDhcpIpsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeDhcpIpsRequest() + } + response = NewDescribeDhcpIpsResponse() + err = c.Send(request, response) + return } func NewDescribeDirectConnectGatewayCcnRoutesRequest() (request *DescribeDirectConnectGatewayCcnRoutesRequest) { - request = &DescribeDirectConnectGatewayCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeDirectConnectGatewayCcnRoutes") - return + request = &DescribeDirectConnectGatewayCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeDirectConnectGatewayCcnRoutes") + return } func NewDescribeDirectConnectGatewayCcnRoutesResponse() (response *DescribeDirectConnectGatewayCcnRoutesResponse) { - response = &DescribeDirectConnectGatewayCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeDirectConnectGatewayCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeDirectConnectGatewayCcnRoutes）用于查询专线网关的云联网路由（IDC网段） func (c *Client) DescribeDirectConnectGatewayCcnRoutes(request *DescribeDirectConnectGatewayCcnRoutesRequest) (response *DescribeDirectConnectGatewayCcnRoutesResponse, err error) { - if request == nil { - request = NewDescribeDirectConnectGatewayCcnRoutesRequest() - } - response = NewDescribeDirectConnectGatewayCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeDirectConnectGatewayCcnRoutesRequest() + } + response = NewDescribeDirectConnectGatewayCcnRoutesResponse() + err = c.Send(request, response) + return } func NewDescribeDirectConnectGatewaysRequest() (request *DescribeDirectConnectGatewaysRequest) { - request = &DescribeDirectConnectGatewaysRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeDirectConnectGateways") - return + request = &DescribeDirectConnectGatewaysRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeDirectConnectGateways") + return } func NewDescribeDirectConnectGatewaysResponse() (response *DescribeDirectConnectGatewaysResponse) { - response = &DescribeDirectConnectGatewaysResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeDirectConnectGatewaysResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeDirectConnectGateways）用于查询专线网关。 func (c *Client) DescribeDirectConnectGateways(request *DescribeDirectConnectGatewaysRequest) (response *DescribeDirectConnectGatewaysResponse, err error) { - if request == nil { - request = NewDescribeDirectConnectGatewaysRequest() - } - response = NewDescribeDirectConnectGatewaysResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeDirectConnectGatewaysRequest() + } + response = NewDescribeDirectConnectGatewaysResponse() + err = c.Send(request, response) + return } func NewDescribeFlowLogRequest() (request *DescribeFlowLogRequest) { - request = &DescribeFlowLogRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeFlowLog") - return + request = &DescribeFlowLogRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeFlowLog") + return } func NewDescribeFlowLogResponse() (response *DescribeFlowLogResponse) { - response = &DescribeFlowLogResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeFlowLogResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeFlowLog）用于查询流日志实例信息 func (c *Client) DescribeFlowLog(request *DescribeFlowLogRequest) (response *DescribeFlowLogResponse, err error) { - if request == nil { - request = NewDescribeFlowLogRequest() - } - response = NewDescribeFlowLogResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeFlowLogRequest() + } + response = NewDescribeFlowLogResponse() + err = c.Send(request, response) + return } func NewDescribeFlowLogsRequest() (request *DescribeFlowLogsRequest) { - request = &DescribeFlowLogsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeFlowLogs") - return + request = &DescribeFlowLogsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeFlowLogs") + return } func NewDescribeFlowLogsResponse() (response *DescribeFlowLogsResponse) { - response = &DescribeFlowLogsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeFlowLogsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeFlowLogs）用于查询获取流日志集合 func (c *Client) DescribeFlowLogs(request *DescribeFlowLogsRequest) (response *DescribeFlowLogsResponse, err error) { - if request == nil { - request = NewDescribeFlowLogsRequest() - } - response = NewDescribeFlowLogsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeFlowLogsRequest() + } + response = NewDescribeFlowLogsResponse() + err = c.Send(request, response) + return } func NewDescribeGatewayFlowMonitorDetailRequest() (request *DescribeGatewayFlowMonitorDetailRequest) { - request = &DescribeGatewayFlowMonitorDetailRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeGatewayFlowMonitorDetail") - return + request = &DescribeGatewayFlowMonitorDetailRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeGatewayFlowMonitorDetail") + return } func NewDescribeGatewayFlowMonitorDetailResponse() (response *DescribeGatewayFlowMonitorDetailResponse) { - response = &DescribeGatewayFlowMonitorDetailResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeGatewayFlowMonitorDetailResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeGatewayFlowMonitorDetail）用于查询网关流量监控明细。 // * 只支持单个网关实例查询。即入参 `VpnId` `DirectConnectGatewayId` `PeeringConnectionId` `NatId` 最多只支持传一个，且必须传一个。 // * 如果网关有流量，但调用本接口没有返回数据，请在控制台对应网关详情页确认是否开启网关流量监控。 func (c *Client) DescribeGatewayFlowMonitorDetail(request *DescribeGatewayFlowMonitorDetailRequest) (response *DescribeGatewayFlowMonitorDetailResponse, err error) { - if request == nil { - request = NewDescribeGatewayFlowMonitorDetailRequest() - } - response = NewDescribeGatewayFlowMonitorDetailResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeGatewayFlowMonitorDetailRequest() + } + response = NewDescribeGatewayFlowMonitorDetailResponse() + err = c.Send(request, response) + return } func NewDescribeGatewayFlowQosRequest() (request *DescribeGatewayFlowQosRequest) { - request = &DescribeGatewayFlowQosRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeGatewayFlowQos") - return + request = &DescribeGatewayFlowQosRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeGatewayFlowQos") + return } func NewDescribeGatewayFlowQosResponse() (response *DescribeGatewayFlowQosResponse) { - response = &DescribeGatewayFlowQosResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeGatewayFlowQosResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeGatewayFlowQos）用于查询网关来访IP流控带宽。 func (c *Client) DescribeGatewayFlowQos(request *DescribeGatewayFlowQosRequest) (response *DescribeGatewayFlowQosResponse, err error) { - if request == nil { - request = NewDescribeGatewayFlowQosRequest() - } - response = NewDescribeGatewayFlowQosResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeGatewayFlowQosRequest() + } + response = NewDescribeGatewayFlowQosResponse() + err = c.Send(request, response) + return } func NewDescribeHaVipsRequest() (request *DescribeHaVipsRequest) { - request = &DescribeHaVipsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeHaVips") - return + request = &DescribeHaVipsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeHaVips") + return } func NewDescribeHaVipsResponse() (response *DescribeHaVipsResponse) { - response = &DescribeHaVipsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeHaVipsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeHaVips）用于查询高可用虚拟IP（HAVIP）列表。 func (c *Client) DescribeHaVips(request *DescribeHaVipsRequest) (response *DescribeHaVipsResponse, err error) { - if request == nil { - request = NewDescribeHaVipsRequest() - } - response = NewDescribeHaVipsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeHaVipsRequest() + } + response = NewDescribeHaVipsResponse() + err = c.Send(request, response) + return } func NewDescribeIp6AddressesRequest() (request *DescribeIp6AddressesRequest) { - request = &DescribeIp6AddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeIp6Addresses") - return + request = &DescribeIp6AddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeIp6Addresses") + return } func NewDescribeIp6AddressesResponse() (response *DescribeIp6AddressesResponse) { - response = &DescribeIp6AddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeIp6AddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于查询IPV6地址信息 func (c *Client) DescribeIp6Addresses(request *DescribeIp6AddressesRequest) (response *DescribeIp6AddressesResponse, err error) { - if request == nil { - request = NewDescribeIp6AddressesRequest() - } - response = NewDescribeIp6AddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeIp6AddressesRequest() + } + response = NewDescribeIp6AddressesResponse() + err = c.Send(request, response) + return } func NewDescribeIp6TranslatorQuotaRequest() (request *DescribeIp6TranslatorQuotaRequest) { - request = &DescribeIp6TranslatorQuotaRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeIp6TranslatorQuota") - return + request = &DescribeIp6TranslatorQuotaRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeIp6TranslatorQuota") + return } func NewDescribeIp6TranslatorQuotaResponse() (response *DescribeIp6TranslatorQuotaResponse) { - response = &DescribeIp6TranslatorQuotaResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeIp6TranslatorQuotaResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 查询账户在指定地域IPV6转换实例和规则的配额 func (c *Client) DescribeIp6TranslatorQuota(request *DescribeIp6TranslatorQuotaRequest) (response *DescribeIp6TranslatorQuotaResponse, err error) { - if request == nil { - request = NewDescribeIp6TranslatorQuotaRequest() - } - response = NewDescribeIp6TranslatorQuotaResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeIp6TranslatorQuotaRequest() + } + response = NewDescribeIp6TranslatorQuotaResponse() + err = c.Send(request, response) + return } func NewDescribeIp6TranslatorsRequest() (request *DescribeIp6TranslatorsRequest) { - request = &DescribeIp6TranslatorsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeIp6Translators") - return + request = &DescribeIp6TranslatorsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeIp6Translators") + return } func NewDescribeIp6TranslatorsResponse() (response *DescribeIp6TranslatorsResponse) { - response = &DescribeIp6TranslatorsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeIp6TranslatorsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 1. 该接口用于查询账户下的IPV6转换实例及其绑定的转换规则信息 // 2. 支持过滤查询 func (c *Client) DescribeIp6Translators(request *DescribeIp6TranslatorsRequest) (response *DescribeIp6TranslatorsResponse, err error) { - if request == nil { - request = NewDescribeIp6TranslatorsRequest() - } - response = NewDescribeIp6TranslatorsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeIp6TranslatorsRequest() + } + response = NewDescribeIp6TranslatorsResponse() + err = c.Send(request, response) + return } func NewDescribeNatGatewayDestinationIpPortTranslationNatRulesRequest() (request *DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest) { - request = &DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNatGatewayDestinationIpPortTranslationNatRules") - return + request = &DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNatGatewayDestinationIpPortTranslationNatRules") + return } func NewDescribeNatGatewayDestinationIpPortTranslationNatRulesResponse() (response *DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse) { - response = &DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeNatGatewayDestinationIpPortTranslationNatRules）用于查询NAT网关端口转发规则对象数组。 func (c *Client) DescribeNatGatewayDestinationIpPortTranslationNatRules(request *DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest) (response *DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse, err error) { - if request == nil { - request = NewDescribeNatGatewayDestinationIpPortTranslationNatRulesRequest() - } - response = NewDescribeNatGatewayDestinationIpPortTranslationNatRulesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNatGatewayDestinationIpPortTranslationNatRulesRequest() + } + response = NewDescribeNatGatewayDestinationIpPortTranslationNatRulesResponse() + err = c.Send(request, response) + return } func NewDescribeNatGatewaysRequest() (request *DescribeNatGatewaysRequest) { - request = &DescribeNatGatewaysRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNatGateways") - return + request = &DescribeNatGatewaysRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNatGateways") + return } func NewDescribeNatGatewaysResponse() (response *DescribeNatGatewaysResponse) { - response = &DescribeNatGatewaysResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNatGatewaysResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeNatGateways）用于查询 NAT 网关。 func (c *Client) DescribeNatGateways(request *DescribeNatGatewaysRequest) (response *DescribeNatGatewaysResponse, err error) { - if request == nil { - request = NewDescribeNatGatewaysRequest() - } - response = NewDescribeNatGatewaysResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNatGatewaysRequest() + } + response = NewDescribeNatGatewaysResponse() + err = c.Send(request, response) + return } func NewDescribeNetDetectStatesRequest() (request *DescribeNetDetectStatesRequest) { - request = &DescribeNetDetectStatesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetDetectStates") - return + request = &DescribeNetDetectStatesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetDetectStates") + return } func NewDescribeNetDetectStatesResponse() (response *DescribeNetDetectStatesResponse) { - response = &DescribeNetDetectStatesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNetDetectStatesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeNetDetectStates)用于查询网络探测验证结果列表。 func (c *Client) DescribeNetDetectStates(request *DescribeNetDetectStatesRequest) (response *DescribeNetDetectStatesResponse, err error) { - if request == nil { - request = NewDescribeNetDetectStatesRequest() - } - response = NewDescribeNetDetectStatesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNetDetectStatesRequest() + } + response = NewDescribeNetDetectStatesResponse() + err = c.Send(request, response) + return } func NewDescribeNetDetectsRequest() (request *DescribeNetDetectsRequest) { - request = &DescribeNetDetectsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetDetects") - return + request = &DescribeNetDetectsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetDetects") + return } func NewDescribeNetDetectsResponse() (response *DescribeNetDetectsResponse) { - response = &DescribeNetDetectsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNetDetectsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeNetDetects）用于查询网络探测列表。 func (c *Client) DescribeNetDetects(request *DescribeNetDetectsRequest) (response *DescribeNetDetectsResponse, err error) { - if request == nil { - request = NewDescribeNetDetectsRequest() - } - response = NewDescribeNetDetectsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNetDetectsRequest() + } + response = NewDescribeNetDetectsResponse() + err = c.Send(request, response) + return } func NewDescribeNetworkAclsRequest() (request *DescribeNetworkAclsRequest) { - request = &DescribeNetworkAclsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetworkAcls") - return + request = &DescribeNetworkAclsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetworkAcls") + return } func NewDescribeNetworkAclsResponse() (response *DescribeNetworkAclsResponse) { - response = &DescribeNetworkAclsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNetworkAclsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeNetworkAcls）用于查询网络ACL列表。 func (c *Client) DescribeNetworkAcls(request *DescribeNetworkAclsRequest) (response *DescribeNetworkAclsResponse, err error) { - if request == nil { - request = NewDescribeNetworkAclsRequest() - } - response = NewDescribeNetworkAclsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNetworkAclsRequest() + } + response = NewDescribeNetworkAclsResponse() + err = c.Send(request, response) + return } func NewDescribeNetworkInterfaceLimitRequest() (request *DescribeNetworkInterfaceLimitRequest) { - request = &DescribeNetworkInterfaceLimitRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetworkInterfaceLimit") - return + request = &DescribeNetworkInterfaceLimitRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetworkInterfaceLimit") + return } func NewDescribeNetworkInterfaceLimitResponse() (response *DescribeNetworkInterfaceLimitResponse) { - response = &DescribeNetworkInterfaceLimitResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNetworkInterfaceLimitResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeNetworkInterfaceLimit）根据CVM实例ID或弹性网卡ID查询弹性网卡配额，返回该CVM实例或弹性网卡能绑定的弹性网卡配额，以及弹性网卡可以分配的IP配额 func (c *Client) DescribeNetworkInterfaceLimit(request *DescribeNetworkInterfaceLimitRequest) (response *DescribeNetworkInterfaceLimitResponse, err error) { - if request == nil { - request = NewDescribeNetworkInterfaceLimitRequest() - } - response = NewDescribeNetworkInterfaceLimitResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNetworkInterfaceLimitRequest() + } + response = NewDescribeNetworkInterfaceLimitResponse() + err = c.Send(request, response) + return } func NewDescribeNetworkInterfacesRequest() (request *DescribeNetworkInterfacesRequest) { - request = &DescribeNetworkInterfacesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetworkInterfaces") - return + request = &DescribeNetworkInterfacesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeNetworkInterfaces") + return } func NewDescribeNetworkInterfacesResponse() (response *DescribeNetworkInterfacesResponse) { - response = &DescribeNetworkInterfacesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeNetworkInterfacesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeNetworkInterfaces）用于查询弹性网卡列表。 func (c *Client) DescribeNetworkInterfaces(request *DescribeNetworkInterfacesRequest) (response *DescribeNetworkInterfacesResponse, err error) { - if request == nil { - request = NewDescribeNetworkInterfacesRequest() - } - response = NewDescribeNetworkInterfacesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeNetworkInterfacesRequest() + } + response = NewDescribeNetworkInterfacesResponse() + err = c.Send(request, response) + return } func NewDescribeRouteConflictsRequest() (request *DescribeRouteConflictsRequest) { - request = &DescribeRouteConflictsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeRouteConflicts") - return + request = &DescribeRouteConflictsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeRouteConflicts") + return } func NewDescribeRouteConflictsResponse() (response *DescribeRouteConflictsResponse) { - response = &DescribeRouteConflictsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeRouteConflictsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeRouteConflicts）用于查询自定义路由策略与云联网路由策略冲突列表 func (c *Client) DescribeRouteConflicts(request *DescribeRouteConflictsRequest) (response *DescribeRouteConflictsResponse, err error) { - if request == nil { - request = NewDescribeRouteConflictsRequest() - } - response = NewDescribeRouteConflictsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeRouteConflictsRequest() + } + response = NewDescribeRouteConflictsResponse() + err = c.Send(request, response) + return } func NewDescribeRouteTablesRequest() (request *DescribeRouteTablesRequest) { - request = &DescribeRouteTablesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeRouteTables") - return + request = &DescribeRouteTablesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeRouteTables") + return } func NewDescribeRouteTablesResponse() (response *DescribeRouteTablesResponse) { - response = &DescribeRouteTablesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeRouteTablesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeRouteTables）用于查询路由表。 func (c *Client) DescribeRouteTables(request *DescribeRouteTablesRequest) (response *DescribeRouteTablesResponse, err error) { - if request == nil { - request = NewDescribeRouteTablesRequest() - } - response = NewDescribeRouteTablesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeRouteTablesRequest() + } + response = NewDescribeRouteTablesResponse() + err = c.Send(request, response) + return } func NewDescribeSecurityGroupAssociationStatisticsRequest() (request *DescribeSecurityGroupAssociationStatisticsRequest) { - request = &DescribeSecurityGroupAssociationStatisticsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupAssociationStatistics") - return + request = &DescribeSecurityGroupAssociationStatisticsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupAssociationStatistics") + return } func NewDescribeSecurityGroupAssociationStatisticsResponse() (response *DescribeSecurityGroupAssociationStatisticsResponse) { - response = &DescribeSecurityGroupAssociationStatisticsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeSecurityGroupAssociationStatisticsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeSecurityGroupAssociationStatistics）用于查询安全组关联的实例统计。 func (c *Client) DescribeSecurityGroupAssociationStatistics(request *DescribeSecurityGroupAssociationStatisticsRequest) (response *DescribeSecurityGroupAssociationStatisticsResponse, err error) { - if request == nil { - request = NewDescribeSecurityGroupAssociationStatisticsRequest() - } - response = NewDescribeSecurityGroupAssociationStatisticsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeSecurityGroupAssociationStatisticsRequest() + } + response = NewDescribeSecurityGroupAssociationStatisticsResponse() + err = c.Send(request, response) + return } func NewDescribeSecurityGroupLimitsRequest() (request *DescribeSecurityGroupLimitsRequest) { - request = &DescribeSecurityGroupLimitsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupLimits") - return + request = &DescribeSecurityGroupLimitsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupLimits") + return } func NewDescribeSecurityGroupLimitsResponse() (response *DescribeSecurityGroupLimitsResponse) { - response = &DescribeSecurityGroupLimitsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeSecurityGroupLimitsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeSecurityGroupLimits)用于查询用户安全组配额。 func (c *Client) DescribeSecurityGroupLimits(request *DescribeSecurityGroupLimitsRequest) (response *DescribeSecurityGroupLimitsResponse, err error) { - if request == nil { - request = NewDescribeSecurityGroupLimitsRequest() - } - response = NewDescribeSecurityGroupLimitsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeSecurityGroupLimitsRequest() + } + response = NewDescribeSecurityGroupLimitsResponse() + err = c.Send(request, response) + return } func NewDescribeSecurityGroupPoliciesRequest() (request *DescribeSecurityGroupPoliciesRequest) { - request = &DescribeSecurityGroupPoliciesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupPolicies") - return + request = &DescribeSecurityGroupPoliciesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupPolicies") + return } func NewDescribeSecurityGroupPoliciesResponse() (response *DescribeSecurityGroupPoliciesResponse) { - response = &DescribeSecurityGroupPoliciesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeSecurityGroupPoliciesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeSecurityGroupPolicies）用于查询安全组规则。 func (c *Client) DescribeSecurityGroupPolicies(request *DescribeSecurityGroupPoliciesRequest) (response *DescribeSecurityGroupPoliciesResponse, err error) { - if request == nil { - request = NewDescribeSecurityGroupPoliciesRequest() - } - response = NewDescribeSecurityGroupPoliciesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeSecurityGroupPoliciesRequest() + } + response = NewDescribeSecurityGroupPoliciesResponse() + err = c.Send(request, response) + return } func NewDescribeSecurityGroupReferencesRequest() (request *DescribeSecurityGroupReferencesRequest) { - request = &DescribeSecurityGroupReferencesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupReferences") - return + request = &DescribeSecurityGroupReferencesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroupReferences") + return } func NewDescribeSecurityGroupReferencesResponse() (response *DescribeSecurityGroupReferencesResponse) { - response = &DescribeSecurityGroupReferencesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeSecurityGroupReferencesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeSecurityGroupReferences）用于查询安全组被引用信息。 func (c *Client) DescribeSecurityGroupReferences(request *DescribeSecurityGroupReferencesRequest) (response *DescribeSecurityGroupReferencesResponse, err error) { - if request == nil { - request = NewDescribeSecurityGroupReferencesRequest() - } - response = NewDescribeSecurityGroupReferencesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeSecurityGroupReferencesRequest() + } + response = NewDescribeSecurityGroupReferencesResponse() + err = c.Send(request, response) + return } func NewDescribeSecurityGroupsRequest() (request *DescribeSecurityGroupsRequest) { - request = &DescribeSecurityGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroups") - return + request = &DescribeSecurityGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeSecurityGroups") + return } func NewDescribeSecurityGroupsResponse() (response *DescribeSecurityGroupsResponse) { - response = &DescribeSecurityGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeSecurityGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeSecurityGroups）用于查询安全组。 func (c *Client) DescribeSecurityGroups(request *DescribeSecurityGroupsRequest) (response *DescribeSecurityGroupsResponse, err error) { - if request == nil { - request = NewDescribeSecurityGroupsRequest() - } - response = NewDescribeSecurityGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeSecurityGroupsRequest() + } + response = NewDescribeSecurityGroupsResponse() + err = c.Send(request, response) + return } func NewDescribeServiceTemplateGroupsRequest() (request *DescribeServiceTemplateGroupsRequest) { - request = &DescribeServiceTemplateGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeServiceTemplateGroups") - return + request = &DescribeServiceTemplateGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeServiceTemplateGroups") + return } func NewDescribeServiceTemplateGroupsResponse() (response *DescribeServiceTemplateGroupsResponse) { - response = &DescribeServiceTemplateGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeServiceTemplateGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeServiceTemplateGroups）用于查询协议端口模板集合 func (c *Client) DescribeServiceTemplateGroups(request *DescribeServiceTemplateGroupsRequest) (response *DescribeServiceTemplateGroupsResponse, err error) { - if request == nil { - request = NewDescribeServiceTemplateGroupsRequest() - } - response = NewDescribeServiceTemplateGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeServiceTemplateGroupsRequest() + } + response = NewDescribeServiceTemplateGroupsResponse() + err = c.Send(request, response) + return } func NewDescribeServiceTemplatesRequest() (request *DescribeServiceTemplatesRequest) { - request = &DescribeServiceTemplatesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeServiceTemplates") - return + request = &DescribeServiceTemplatesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeServiceTemplates") + return } func NewDescribeServiceTemplatesResponse() (response *DescribeServiceTemplatesResponse) { - response = &DescribeServiceTemplatesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeServiceTemplatesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeServiceTemplates）用于查询协议端口模板 func (c *Client) DescribeServiceTemplates(request *DescribeServiceTemplatesRequest) (response *DescribeServiceTemplatesResponse, err error) { - if request == nil { - request = NewDescribeServiceTemplatesRequest() - } - response = NewDescribeServiceTemplatesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeServiceTemplatesRequest() + } + response = NewDescribeServiceTemplatesResponse() + err = c.Send(request, response) + return } func NewDescribeSubnetsRequest() (request *DescribeSubnetsRequest) { - request = &DescribeSubnetsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeSubnets") - return + request = &DescribeSubnetsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeSubnets") + return } func NewDescribeSubnetsResponse() (response *DescribeSubnetsResponse) { - response = &DescribeSubnetsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeSubnetsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeSubnets）用于查询子网列表。 func (c *Client) DescribeSubnets(request *DescribeSubnetsRequest) (response *DescribeSubnetsResponse, err error) { - if request == nil { - request = NewDescribeSubnetsRequest() - } - response = NewDescribeSubnetsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeSubnetsRequest() + } + response = NewDescribeSubnetsResponse() + err = c.Send(request, response) + return } func NewDescribeTaskResultRequest() (request *DescribeTaskResultRequest) { - request = &DescribeTaskResultRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeTaskResult") - return + request = &DescribeTaskResultRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeTaskResult") + return } func NewDescribeTaskResultResponse() (response *DescribeTaskResultResponse) { - response = &DescribeTaskResultResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeTaskResultResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 查询EIP异步任务执行结果 func (c *Client) DescribeTaskResult(request *DescribeTaskResultRequest) (response *DescribeTaskResultResponse, err error) { - if request == nil { - request = NewDescribeTaskResultRequest() - } - response = NewDescribeTaskResultResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeTaskResultRequest() + } + response = NewDescribeTaskResultResponse() + err = c.Send(request, response) + return } func NewDescribeTemplateLimitsRequest() (request *DescribeTemplateLimitsRequest) { - request = &DescribeTemplateLimitsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeTemplateLimits") - return + request = &DescribeTemplateLimitsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeTemplateLimits") + return } func NewDescribeTemplateLimitsResponse() (response *DescribeTemplateLimitsResponse) { - response = &DescribeTemplateLimitsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeTemplateLimitsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeTemplateLimits）用于查询参数模板配额列表。 func (c *Client) DescribeTemplateLimits(request *DescribeTemplateLimitsRequest) (response *DescribeTemplateLimitsResponse, err error) { - if request == nil { - request = NewDescribeTemplateLimitsRequest() - } - response = NewDescribeTemplateLimitsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeTemplateLimitsRequest() + } + response = NewDescribeTemplateLimitsResponse() + err = c.Send(request, response) + return } func NewDescribeVpcInstancesRequest() (request *DescribeVpcInstancesRequest) { - request = &DescribeVpcInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcInstances") - return + request = &DescribeVpcInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcInstances") + return } func NewDescribeVpcInstancesResponse() (response *DescribeVpcInstancesResponse) { - response = &DescribeVpcInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpcInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpcInstances）用于查询VPC下的云主机实例列表。 func (c *Client) DescribeVpcInstances(request *DescribeVpcInstancesRequest) (response *DescribeVpcInstancesResponse, err error) { - if request == nil { - request = NewDescribeVpcInstancesRequest() - } - response = NewDescribeVpcInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpcInstancesRequest() + } + response = NewDescribeVpcInstancesResponse() + err = c.Send(request, response) + return } func NewDescribeVpcIpv6AddressesRequest() (request *DescribeVpcIpv6AddressesRequest) { - request = &DescribeVpcIpv6AddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcIpv6Addresses") - return + request = &DescribeVpcIpv6AddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcIpv6Addresses") + return } func NewDescribeVpcIpv6AddressesResponse() (response *DescribeVpcIpv6AddressesResponse) { - response = &DescribeVpcIpv6AddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpcIpv6AddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpcIpv6Addresses）用于查询 `VPC` `IPv6` 信息。 // 只能查询已使用的`IPv6`信息，当查询未使用的IP时，本接口不会报错，但不会出现在返回结果里。 func (c *Client) DescribeVpcIpv6Addresses(request *DescribeVpcIpv6AddressesRequest) (response *DescribeVpcIpv6AddressesResponse, err error) { - if request == nil { - request = NewDescribeVpcIpv6AddressesRequest() - } - response = NewDescribeVpcIpv6AddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpcIpv6AddressesRequest() + } + response = NewDescribeVpcIpv6AddressesResponse() + err = c.Send(request, response) + return } func NewDescribeVpcLimitsRequest() (request *DescribeVpcLimitsRequest) { - request = &DescribeVpcLimitsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcLimits") - return + request = &DescribeVpcLimitsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcLimits") + return } func NewDescribeVpcLimitsResponse() (response *DescribeVpcLimitsResponse) { - response = &DescribeVpcLimitsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpcLimitsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 获取私有网络配额，部分私有网络的配额有地域属性。 @@ -3366,329 +3367,329 @@ func NewDescribeVpcLimitsResponse() (response *DescribeVpcLimitsResponse) { // * eni-max-ipv6s（每个ENI可分配的IPv6地址数） // * vpc-max-assistant_cidrs（每个VPC可分配的辅助CIDR数） func (c *Client) DescribeVpcLimits(request *DescribeVpcLimitsRequest) (response *DescribeVpcLimitsResponse, err error) { - if request == nil { - request = NewDescribeVpcLimitsRequest() - } - response = NewDescribeVpcLimitsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpcLimitsRequest() + } + response = NewDescribeVpcLimitsResponse() + err = c.Send(request, response) + return } func NewDescribeVpcPrivateIpAddressesRequest() (request *DescribeVpcPrivateIpAddressesRequest) { - request = &DescribeVpcPrivateIpAddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcPrivateIpAddresses") - return + request = &DescribeVpcPrivateIpAddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcPrivateIpAddresses") + return } func NewDescribeVpcPrivateIpAddressesResponse() (response *DescribeVpcPrivateIpAddressesResponse) { - response = &DescribeVpcPrivateIpAddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpcPrivateIpAddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpcPrivateIpAddresses）用于查询VPC内网IP信息。
    // 只能查询已使用的IP信息，当查询未使用的IP时，本接口不会报错，但不会出现在返回结果里。 func (c *Client) DescribeVpcPrivateIpAddresses(request *DescribeVpcPrivateIpAddressesRequest) (response *DescribeVpcPrivateIpAddressesResponse, err error) { - if request == nil { - request = NewDescribeVpcPrivateIpAddressesRequest() - } - response = NewDescribeVpcPrivateIpAddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpcPrivateIpAddressesRequest() + } + response = NewDescribeVpcPrivateIpAddressesResponse() + err = c.Send(request, response) + return } func NewDescribeVpcResourceDashboardRequest() (request *DescribeVpcResourceDashboardRequest) { - request = &DescribeVpcResourceDashboardRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcResourceDashboard") - return + request = &DescribeVpcResourceDashboardRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcResourceDashboard") + return } func NewDescribeVpcResourceDashboardResponse() (response *DescribeVpcResourceDashboardResponse) { - response = &DescribeVpcResourceDashboardResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpcResourceDashboardResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DescribeVpcResourceDashboard)用于查看VPC资源信息。 func (c *Client) DescribeVpcResourceDashboard(request *DescribeVpcResourceDashboardRequest) (response *DescribeVpcResourceDashboardResponse, err error) { - if request == nil { - request = NewDescribeVpcResourceDashboardRequest() - } - response = NewDescribeVpcResourceDashboardResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpcResourceDashboardRequest() + } + response = NewDescribeVpcResourceDashboardResponse() + err = c.Send(request, response) + return } func NewDescribeVpcsRequest() (request *DescribeVpcsRequest) { - request = &DescribeVpcsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcs") - return + request = &DescribeVpcsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpcs") + return } func NewDescribeVpcsResponse() (response *DescribeVpcsResponse) { - response = &DescribeVpcsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpcsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpcs）用于查询私有网络列表。 func (c *Client) DescribeVpcs(request *DescribeVpcsRequest) (response *DescribeVpcsResponse, err error) { - if request == nil { - request = NewDescribeVpcsRequest() - } - response = NewDescribeVpcsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpcsRequest() + } + response = NewDescribeVpcsResponse() + err = c.Send(request, response) + return } func NewDescribeVpnConnectionsRequest() (request *DescribeVpnConnectionsRequest) { - request = &DescribeVpnConnectionsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpnConnections") - return + request = &DescribeVpnConnectionsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpnConnections") + return } func NewDescribeVpnConnectionsResponse() (response *DescribeVpnConnectionsResponse) { - response = &DescribeVpnConnectionsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpnConnectionsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpnConnections）查询VPN通道列表。 func (c *Client) DescribeVpnConnections(request *DescribeVpnConnectionsRequest) (response *DescribeVpnConnectionsResponse, err error) { - if request == nil { - request = NewDescribeVpnConnectionsRequest() - } - response = NewDescribeVpnConnectionsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpnConnectionsRequest() + } + response = NewDescribeVpnConnectionsResponse() + err = c.Send(request, response) + return } func NewDescribeVpnGatewayCcnRoutesRequest() (request *DescribeVpnGatewayCcnRoutesRequest) { - request = &DescribeVpnGatewayCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpnGatewayCcnRoutes") - return + request = &DescribeVpnGatewayCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpnGatewayCcnRoutes") + return } func NewDescribeVpnGatewayCcnRoutesResponse() (response *DescribeVpnGatewayCcnRoutesResponse) { - response = &DescribeVpnGatewayCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpnGatewayCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpnGatewayCcnRoutes）用于查询VPN网关云联网路由 func (c *Client) DescribeVpnGatewayCcnRoutes(request *DescribeVpnGatewayCcnRoutesRequest) (response *DescribeVpnGatewayCcnRoutesResponse, err error) { - if request == nil { - request = NewDescribeVpnGatewayCcnRoutesRequest() - } - response = NewDescribeVpnGatewayCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpnGatewayCcnRoutesRequest() + } + response = NewDescribeVpnGatewayCcnRoutesResponse() + err = c.Send(request, response) + return } func NewDescribeVpnGatewaysRequest() (request *DescribeVpnGatewaysRequest) { - request = &DescribeVpnGatewaysRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpnGateways") - return + request = &DescribeVpnGatewaysRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DescribeVpnGateways") + return } func NewDescribeVpnGatewaysResponse() (response *DescribeVpnGatewaysResponse) { - response = &DescribeVpnGatewaysResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DescribeVpnGatewaysResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DescribeVpnGateways）用于查询VPN网关列表。 func (c *Client) DescribeVpnGateways(request *DescribeVpnGatewaysRequest) (response *DescribeVpnGatewaysResponse, err error) { - if request == nil { - request = NewDescribeVpnGatewaysRequest() - } - response = NewDescribeVpnGatewaysResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDescribeVpnGatewaysRequest() + } + response = NewDescribeVpnGatewaysResponse() + err = c.Send(request, response) + return } func NewDetachCcnInstancesRequest() (request *DetachCcnInstancesRequest) { - request = &DetachCcnInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DetachCcnInstances") - return + request = &DetachCcnInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DetachCcnInstances") + return } func NewDetachCcnInstancesResponse() (response *DetachCcnInstancesResponse) { - response = &DetachCcnInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DetachCcnInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DetachCcnInstances）用于从云联网实例中解关联指定的网络实例。
    // 解关联网络实例后，相应的路由策略会一并删除。 func (c *Client) DetachCcnInstances(request *DetachCcnInstancesRequest) (response *DetachCcnInstancesResponse, err error) { - if request == nil { - request = NewDetachCcnInstancesRequest() - } - response = NewDetachCcnInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDetachCcnInstancesRequest() + } + response = NewDetachCcnInstancesResponse() + err = c.Send(request, response) + return } func NewDetachClassicLinkVpcRequest() (request *DetachClassicLinkVpcRequest) { - request = &DetachClassicLinkVpcRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DetachClassicLinkVpc") - return + request = &DetachClassicLinkVpcRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DetachClassicLinkVpc") + return } func NewDetachClassicLinkVpcResponse() (response *DetachClassicLinkVpcResponse) { - response = &DetachClassicLinkVpcResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DetachClassicLinkVpcResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DetachClassicLinkVpc)用于删除私有网络和基础网络设备互通。 func (c *Client) DetachClassicLinkVpc(request *DetachClassicLinkVpcRequest) (response *DetachClassicLinkVpcResponse, err error) { - if request == nil { - request = NewDetachClassicLinkVpcRequest() - } - response = NewDetachClassicLinkVpcResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDetachClassicLinkVpcRequest() + } + response = NewDetachClassicLinkVpcResponse() + err = c.Send(request, response) + return } func NewDetachNetworkInterfaceRequest() (request *DetachNetworkInterfaceRequest) { - request = &DetachNetworkInterfaceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DetachNetworkInterface") - return + request = &DetachNetworkInterfaceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DetachNetworkInterface") + return } func NewDetachNetworkInterfaceResponse() (response *DetachNetworkInterfaceResponse) { - response = &DetachNetworkInterfaceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DetachNetworkInterfaceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DetachNetworkInterface）用于弹性网卡解绑云主机。 func (c *Client) DetachNetworkInterface(request *DetachNetworkInterfaceRequest) (response *DetachNetworkInterfaceResponse, err error) { - if request == nil { - request = NewDetachNetworkInterfaceRequest() - } - response = NewDetachNetworkInterfaceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDetachNetworkInterfaceRequest() + } + response = NewDetachNetworkInterfaceResponse() + err = c.Send(request, response) + return } func NewDisableCcnRoutesRequest() (request *DisableCcnRoutesRequest) { - request = &DisableCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisableCcnRoutes") - return + request = &DisableCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisableCcnRoutes") + return } func NewDisableCcnRoutesResponse() (response *DisableCcnRoutesResponse) { - response = &DisableCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisableCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisableCcnRoutes）用于禁用已经启用的云联网（CCN）路由 func (c *Client) DisableCcnRoutes(request *DisableCcnRoutesRequest) (response *DisableCcnRoutesResponse, err error) { - if request == nil { - request = NewDisableCcnRoutesRequest() - } - response = NewDisableCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisableCcnRoutesRequest() + } + response = NewDisableCcnRoutesResponse() + err = c.Send(request, response) + return } func NewDisableGatewayFlowMonitorRequest() (request *DisableGatewayFlowMonitorRequest) { - request = &DisableGatewayFlowMonitorRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisableGatewayFlowMonitor") - return + request = &DisableGatewayFlowMonitorRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisableGatewayFlowMonitor") + return } func NewDisableGatewayFlowMonitorResponse() (response *DisableGatewayFlowMonitorResponse) { - response = &DisableGatewayFlowMonitorResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisableGatewayFlowMonitorResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisableGatewayFlowMonitor）用于关闭网关流量监控。 func (c *Client) DisableGatewayFlowMonitor(request *DisableGatewayFlowMonitorRequest) (response *DisableGatewayFlowMonitorResponse, err error) { - if request == nil { - request = NewDisableGatewayFlowMonitorRequest() - } - response = NewDisableGatewayFlowMonitorResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisableGatewayFlowMonitorRequest() + } + response = NewDisableGatewayFlowMonitorResponse() + err = c.Send(request, response) + return } func NewDisableRoutesRequest() (request *DisableRoutesRequest) { - request = &DisableRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisableRoutes") - return + request = &DisableRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisableRoutes") + return } func NewDisableRoutesResponse() (response *DisableRoutesResponse) { - response = &DisableRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisableRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisableRoutes）用于禁用已启用的子网路由 func (c *Client) DisableRoutes(request *DisableRoutesRequest) (response *DisableRoutesResponse, err error) { - if request == nil { - request = NewDisableRoutesRequest() - } - response = NewDisableRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisableRoutesRequest() + } + response = NewDisableRoutesResponse() + err = c.Send(request, response) + return } func NewDisassociateAddressRequest() (request *DisassociateAddressRequest) { - request = &DisassociateAddressRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisassociateAddress") - return + request = &DisassociateAddressRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisassociateAddress") + return } func NewDisassociateAddressResponse() (response *DisassociateAddressResponse) { - response = &DisassociateAddressResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateAddressResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (DisassociateAddress) 用于解绑[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）。 @@ -3697,1142 +3698,1142 @@ func NewDisassociateAddressResponse() (response *DisassociateAddressResponse) { // * 只有状态为 BIND 和 BIND_ENI 的 EIP 才能进行解绑定操作。 // * EIP 如果被封堵，则不能进行解绑定操作。 func (c *Client) DisassociateAddress(request *DisassociateAddressRequest) (response *DisassociateAddressResponse, err error) { - if request == nil { - request = NewDisassociateAddressRequest() - } - response = NewDisassociateAddressResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateAddressRequest() + } + response = NewDisassociateAddressResponse() + err = c.Send(request, response) + return } func NewDisassociateDhcpIpWithAddressIpRequest() (request *DisassociateDhcpIpWithAddressIpRequest) { - request = &DisassociateDhcpIpWithAddressIpRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisassociateDhcpIpWithAddressIp") - return + request = &DisassociateDhcpIpWithAddressIpRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisassociateDhcpIpWithAddressIp") + return } func NewDisassociateDhcpIpWithAddressIpResponse() (response *DisassociateDhcpIpWithAddressIpResponse) { - response = &DisassociateDhcpIpWithAddressIpResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateDhcpIpWithAddressIpResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisassociateDhcpIpWithAddressIp）用于将DhcpIp已绑定的弹性公网IP（EIP）解除绑定。
    func (c *Client) DisassociateDhcpIpWithAddressIp(request *DisassociateDhcpIpWithAddressIpRequest) (response *DisassociateDhcpIpWithAddressIpResponse, err error) { - if request == nil { - request = NewDisassociateDhcpIpWithAddressIpRequest() - } - response = NewDisassociateDhcpIpWithAddressIpResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateDhcpIpWithAddressIpRequest() + } + response = NewDisassociateDhcpIpWithAddressIpResponse() + err = c.Send(request, response) + return } func NewDisassociateNatGatewayAddressRequest() (request *DisassociateNatGatewayAddressRequest) { - request = &DisassociateNatGatewayAddressRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisassociateNatGatewayAddress") - return + request = &DisassociateNatGatewayAddressRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisassociateNatGatewayAddress") + return } func NewDisassociateNatGatewayAddressResponse() (response *DisassociateNatGatewayAddressResponse) { - response = &DisassociateNatGatewayAddressResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateNatGatewayAddressResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisassociateNatGatewayAddress）用于NAT网关解绑弹性IP。 func (c *Client) DisassociateNatGatewayAddress(request *DisassociateNatGatewayAddressRequest) (response *DisassociateNatGatewayAddressResponse, err error) { - if request == nil { - request = NewDisassociateNatGatewayAddressRequest() - } - response = NewDisassociateNatGatewayAddressResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateNatGatewayAddressRequest() + } + response = NewDisassociateNatGatewayAddressResponse() + err = c.Send(request, response) + return } func NewDisassociateNetworkAclSubnetsRequest() (request *DisassociateNetworkAclSubnetsRequest) { - request = &DisassociateNetworkAclSubnetsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisassociateNetworkAclSubnets") - return + request = &DisassociateNetworkAclSubnetsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisassociateNetworkAclSubnets") + return } func NewDisassociateNetworkAclSubnetsResponse() (response *DisassociateNetworkAclSubnetsResponse) { - response = &DisassociateNetworkAclSubnetsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateNetworkAclSubnetsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisassociateNetworkAclSubnets）用于网络ACL解关联vpc下的子网。 func (c *Client) DisassociateNetworkAclSubnets(request *DisassociateNetworkAclSubnetsRequest) (response *DisassociateNetworkAclSubnetsResponse, err error) { - if request == nil { - request = NewDisassociateNetworkAclSubnetsRequest() - } - response = NewDisassociateNetworkAclSubnetsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateNetworkAclSubnetsRequest() + } + response = NewDisassociateNetworkAclSubnetsResponse() + err = c.Send(request, response) + return } func NewDisassociateNetworkInterfaceSecurityGroupsRequest() (request *DisassociateNetworkInterfaceSecurityGroupsRequest) { - request = &DisassociateNetworkInterfaceSecurityGroupsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DisassociateNetworkInterfaceSecurityGroups") - return + request = &DisassociateNetworkInterfaceSecurityGroupsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DisassociateNetworkInterfaceSecurityGroups") + return } func NewDisassociateNetworkInterfaceSecurityGroupsResponse() (response *DisassociateNetworkInterfaceSecurityGroupsResponse) { - response = &DisassociateNetworkInterfaceSecurityGroupsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DisassociateNetworkInterfaceSecurityGroupsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（DisassociateNetworkInterfaceSecurityGroups）用于弹性网卡解绑安全组。支持弹性网卡完全解绑安全组。 func (c *Client) DisassociateNetworkInterfaceSecurityGroups(request *DisassociateNetworkInterfaceSecurityGroupsRequest) (response *DisassociateNetworkInterfaceSecurityGroupsResponse, err error) { - if request == nil { - request = NewDisassociateNetworkInterfaceSecurityGroupsRequest() - } - response = NewDisassociateNetworkInterfaceSecurityGroupsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDisassociateNetworkInterfaceSecurityGroupsRequest() + } + response = NewDisassociateNetworkInterfaceSecurityGroupsResponse() + err = c.Send(request, response) + return } func NewDownloadCustomerGatewayConfigurationRequest() (request *DownloadCustomerGatewayConfigurationRequest) { - request = &DownloadCustomerGatewayConfigurationRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "DownloadCustomerGatewayConfiguration") - return + request = &DownloadCustomerGatewayConfigurationRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "DownloadCustomerGatewayConfiguration") + return } func NewDownloadCustomerGatewayConfigurationResponse() (response *DownloadCustomerGatewayConfigurationResponse) { - response = &DownloadCustomerGatewayConfigurationResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &DownloadCustomerGatewayConfigurationResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(DownloadCustomerGatewayConfiguration)用于下载VPN通道配置。 func (c *Client) DownloadCustomerGatewayConfiguration(request *DownloadCustomerGatewayConfigurationRequest) (response *DownloadCustomerGatewayConfigurationResponse, err error) { - if request == nil { - request = NewDownloadCustomerGatewayConfigurationRequest() - } - response = NewDownloadCustomerGatewayConfigurationResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewDownloadCustomerGatewayConfigurationRequest() + } + response = NewDownloadCustomerGatewayConfigurationResponse() + err = c.Send(request, response) + return } func NewEnableCcnRoutesRequest() (request *EnableCcnRoutesRequest) { - request = &EnableCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "EnableCcnRoutes") - return + request = &EnableCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "EnableCcnRoutes") + return } func NewEnableCcnRoutesResponse() (response *EnableCcnRoutesResponse) { - response = &EnableCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &EnableCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（EnableCcnRoutes）用于启用已经加入云联网（CCN）的路由。
    // 本接口会校验启用后，是否与已有路由冲突，如果冲突，则无法启用，失败处理。路由冲突时，需要先禁用与之冲突的路由，才能启用该路由。 func (c *Client) EnableCcnRoutes(request *EnableCcnRoutesRequest) (response *EnableCcnRoutesResponse, err error) { - if request == nil { - request = NewEnableCcnRoutesRequest() - } - response = NewEnableCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewEnableCcnRoutesRequest() + } + response = NewEnableCcnRoutesResponse() + err = c.Send(request, response) + return } func NewEnableGatewayFlowMonitorRequest() (request *EnableGatewayFlowMonitorRequest) { - request = &EnableGatewayFlowMonitorRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "EnableGatewayFlowMonitor") - return + request = &EnableGatewayFlowMonitorRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "EnableGatewayFlowMonitor") + return } func NewEnableGatewayFlowMonitorResponse() (response *EnableGatewayFlowMonitorResponse) { - response = &EnableGatewayFlowMonitorResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &EnableGatewayFlowMonitorResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（EnableGatewayFlowMonitor）用于开启网关流量监控。 func (c *Client) EnableGatewayFlowMonitor(request *EnableGatewayFlowMonitorRequest) (response *EnableGatewayFlowMonitorResponse, err error) { - if request == nil { - request = NewEnableGatewayFlowMonitorRequest() - } - response = NewEnableGatewayFlowMonitorResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewEnableGatewayFlowMonitorRequest() + } + response = NewEnableGatewayFlowMonitorResponse() + err = c.Send(request, response) + return } func NewEnableRoutesRequest() (request *EnableRoutesRequest) { - request = &EnableRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "EnableRoutes") - return + request = &EnableRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "EnableRoutes") + return } func NewEnableRoutesResponse() (response *EnableRoutesResponse) { - response = &EnableRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &EnableRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（EnableRoutes）用于启用已禁用的子网路由。
    // 本接口会校验启用后，是否与已有路由冲突，如果冲突，则无法启用，失败处理。路由冲突时，需要先禁用与之冲突的路由，才能启用该路由。 func (c *Client) EnableRoutes(request *EnableRoutesRequest) (response *EnableRoutesResponse, err error) { - if request == nil { - request = NewEnableRoutesRequest() - } - response = NewEnableRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewEnableRoutesRequest() + } + response = NewEnableRoutesResponse() + err = c.Send(request, response) + return } func NewGetCcnRegionBandwidthLimitsRequest() (request *GetCcnRegionBandwidthLimitsRequest) { - request = &GetCcnRegionBandwidthLimitsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "GetCcnRegionBandwidthLimits") - return + request = &GetCcnRegionBandwidthLimitsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "GetCcnRegionBandwidthLimits") + return } func NewGetCcnRegionBandwidthLimitsResponse() (response *GetCcnRegionBandwidthLimitsResponse) { - response = &GetCcnRegionBandwidthLimitsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &GetCcnRegionBandwidthLimitsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（GetCcnRegionBandwidthLimits）用于查询云联网相关地域带宽信息，其中预付费模式的云联网仅支持地域间限速，后付费模式的云联网支持地域间限速和地域出口限速。 func (c *Client) GetCcnRegionBandwidthLimits(request *GetCcnRegionBandwidthLimitsRequest) (response *GetCcnRegionBandwidthLimitsResponse, err error) { - if request == nil { - request = NewGetCcnRegionBandwidthLimitsRequest() - } - response = NewGetCcnRegionBandwidthLimitsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewGetCcnRegionBandwidthLimitsRequest() + } + response = NewGetCcnRegionBandwidthLimitsResponse() + err = c.Send(request, response) + return } func NewHaVipAssociateAddressIpRequest() (request *HaVipAssociateAddressIpRequest) { - request = &HaVipAssociateAddressIpRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "HaVipAssociateAddressIp") - return + request = &HaVipAssociateAddressIpRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "HaVipAssociateAddressIp") + return } func NewHaVipAssociateAddressIpResponse() (response *HaVipAssociateAddressIpResponse) { - response = &HaVipAssociateAddressIpResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &HaVipAssociateAddressIpResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（HaVipAssociateAddressIp）用于高可用虚拟IP（HAVIP）绑定弹性公网IP（EIP）
    // 本接口是异步完成，如需查询异步任务执行结果，请使用本接口返回的`RequestId`轮询`QueryTask`接口 func (c *Client) HaVipAssociateAddressIp(request *HaVipAssociateAddressIpRequest) (response *HaVipAssociateAddressIpResponse, err error) { - if request == nil { - request = NewHaVipAssociateAddressIpRequest() - } - response = NewHaVipAssociateAddressIpResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewHaVipAssociateAddressIpRequest() + } + response = NewHaVipAssociateAddressIpResponse() + err = c.Send(request, response) + return } func NewHaVipDisassociateAddressIpRequest() (request *HaVipDisassociateAddressIpRequest) { - request = &HaVipDisassociateAddressIpRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "HaVipDisassociateAddressIp") - return + request = &HaVipDisassociateAddressIpRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "HaVipDisassociateAddressIp") + return } func NewHaVipDisassociateAddressIpResponse() (response *HaVipDisassociateAddressIpResponse) { - response = &HaVipDisassociateAddressIpResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &HaVipDisassociateAddressIpResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（HaVipDisassociateAddressIp）用于将高可用虚拟IP（HAVIP）已绑定的弹性公网IP（EIP）解除绑定
    // 本接口是异步完成，如需查询异步任务执行结果，请使用本接口返回的`RequestId`轮询`QueryTask`接口 func (c *Client) HaVipDisassociateAddressIp(request *HaVipDisassociateAddressIpRequest) (response *HaVipDisassociateAddressIpResponse, err error) { - if request == nil { - request = NewHaVipDisassociateAddressIpRequest() - } - response = NewHaVipDisassociateAddressIpResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewHaVipDisassociateAddressIpRequest() + } + response = NewHaVipDisassociateAddressIpResponse() + err = c.Send(request, response) + return } func NewInquiryPriceCreateVpnGatewayRequest() (request *InquiryPriceCreateVpnGatewayRequest) { - request = &InquiryPriceCreateVpnGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "InquiryPriceCreateVpnGateway") - return + request = &InquiryPriceCreateVpnGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "InquiryPriceCreateVpnGateway") + return } func NewInquiryPriceCreateVpnGatewayResponse() (response *InquiryPriceCreateVpnGatewayResponse) { - response = &InquiryPriceCreateVpnGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceCreateVpnGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（InquiryPriceCreateVpnGateway）用于创建VPN网关询价。 func (c *Client) InquiryPriceCreateVpnGateway(request *InquiryPriceCreateVpnGatewayRequest) (response *InquiryPriceCreateVpnGatewayResponse, err error) { - if request == nil { - request = NewInquiryPriceCreateVpnGatewayRequest() - } - response = NewInquiryPriceCreateVpnGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceCreateVpnGatewayRequest() + } + response = NewInquiryPriceCreateVpnGatewayResponse() + err = c.Send(request, response) + return } func NewInquiryPriceRenewVpnGatewayRequest() (request *InquiryPriceRenewVpnGatewayRequest) { - request = &InquiryPriceRenewVpnGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "InquiryPriceRenewVpnGateway") - return + request = &InquiryPriceRenewVpnGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "InquiryPriceRenewVpnGateway") + return } func NewInquiryPriceRenewVpnGatewayResponse() (response *InquiryPriceRenewVpnGatewayResponse) { - response = &InquiryPriceRenewVpnGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceRenewVpnGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（InquiryPriceRenewVpnGateway）用于续费VPN网关询价。目前仅支持IPSEC类型网关的询价。 func (c *Client) InquiryPriceRenewVpnGateway(request *InquiryPriceRenewVpnGatewayRequest) (response *InquiryPriceRenewVpnGatewayResponse, err error) { - if request == nil { - request = NewInquiryPriceRenewVpnGatewayRequest() - } - response = NewInquiryPriceRenewVpnGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceRenewVpnGatewayRequest() + } + response = NewInquiryPriceRenewVpnGatewayResponse() + err = c.Send(request, response) + return } func NewInquiryPriceResetVpnGatewayInternetMaxBandwidthRequest() (request *InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest) { - request = &InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "InquiryPriceResetVpnGatewayInternetMaxBandwidth") - return + request = &InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "InquiryPriceResetVpnGatewayInternetMaxBandwidth") + return } func NewInquiryPriceResetVpnGatewayInternetMaxBandwidthResponse() (response *InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse) { - response = &InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（InquiryPriceResetVpnGatewayInternetMaxBandwidth）调整VPN网关带宽上限询价。 func (c *Client) InquiryPriceResetVpnGatewayInternetMaxBandwidth(request *InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest) (response *InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse, err error) { - if request == nil { - request = NewInquiryPriceResetVpnGatewayInternetMaxBandwidthRequest() - } - response = NewInquiryPriceResetVpnGatewayInternetMaxBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewInquiryPriceResetVpnGatewayInternetMaxBandwidthRequest() + } + response = NewInquiryPriceResetVpnGatewayInternetMaxBandwidthResponse() + err = c.Send(request, response) + return } func NewMigrateNetworkInterfaceRequest() (request *MigrateNetworkInterfaceRequest) { - request = &MigrateNetworkInterfaceRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "MigrateNetworkInterface") - return + request = &MigrateNetworkInterfaceRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "MigrateNetworkInterface") + return } func NewMigrateNetworkInterfaceResponse() (response *MigrateNetworkInterfaceResponse) { - response = &MigrateNetworkInterfaceResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &MigrateNetworkInterfaceResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（MigrateNetworkInterface）用于弹性网卡迁移。 func (c *Client) MigrateNetworkInterface(request *MigrateNetworkInterfaceRequest) (response *MigrateNetworkInterfaceResponse, err error) { - if request == nil { - request = NewMigrateNetworkInterfaceRequest() - } - response = NewMigrateNetworkInterfaceResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewMigrateNetworkInterfaceRequest() + } + response = NewMigrateNetworkInterfaceResponse() + err = c.Send(request, response) + return } func NewMigratePrivateIpAddressRequest() (request *MigratePrivateIpAddressRequest) { - request = &MigratePrivateIpAddressRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "MigratePrivateIpAddress") - return + request = &MigratePrivateIpAddressRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "MigratePrivateIpAddress") + return } func NewMigratePrivateIpAddressResponse() (response *MigratePrivateIpAddressResponse) { - response = &MigratePrivateIpAddressResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &MigratePrivateIpAddressResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（MigratePrivateIpAddress）用于弹性网卡内网IP迁移。 -// +// // * 该接口用于将一个内网IP从一个弹性网卡上迁移到另外一个弹性网卡，主IP地址不支持迁移。 // * 迁移前后的弹性网卡必须在同一个子网内。 func (c *Client) MigratePrivateIpAddress(request *MigratePrivateIpAddressRequest) (response *MigratePrivateIpAddressResponse, err error) { - if request == nil { - request = NewMigratePrivateIpAddressRequest() - } - response = NewMigratePrivateIpAddressResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewMigratePrivateIpAddressRequest() + } + response = NewMigratePrivateIpAddressResponse() + err = c.Send(request, response) + return } func NewModifyAddressAttributeRequest() (request *ModifyAddressAttributeRequest) { - request = &ModifyAddressAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressAttribute") - return + request = &ModifyAddressAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressAttribute") + return } func NewModifyAddressAttributeResponse() (response *ModifyAddressAttributeResponse) { - response = &ModifyAddressAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyAddressAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ModifyAddressAttribute) 用于修改[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）的名称。 func (c *Client) ModifyAddressAttribute(request *ModifyAddressAttributeRequest) (response *ModifyAddressAttributeResponse, err error) { - if request == nil { - request = NewModifyAddressAttributeRequest() - } - response = NewModifyAddressAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyAddressAttributeRequest() + } + response = NewModifyAddressAttributeResponse() + err = c.Send(request, response) + return } func NewModifyAddressInternetChargeTypeRequest() (request *ModifyAddressInternetChargeTypeRequest) { - request = &ModifyAddressInternetChargeTypeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressInternetChargeType") - return + request = &ModifyAddressInternetChargeTypeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressInternetChargeType") + return } func NewModifyAddressInternetChargeTypeResponse() (response *ModifyAddressInternetChargeTypeResponse) { - response = &ModifyAddressInternetChargeTypeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyAddressInternetChargeTypeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于调整具有带宽属性弹性公网IP的网络计费模式 // * 支持BANDWIDTH_PREPAID_BY_MONTH和TRAFFIC_POSTPAID_BY_HOUR两种网络计费模式之间的切换。 // * 每个弹性公网IP支持调整两次，次数超出则无法调整。 func (c *Client) ModifyAddressInternetChargeType(request *ModifyAddressInternetChargeTypeRequest) (response *ModifyAddressInternetChargeTypeResponse, err error) { - if request == nil { - request = NewModifyAddressInternetChargeTypeRequest() - } - response = NewModifyAddressInternetChargeTypeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyAddressInternetChargeTypeRequest() + } + response = NewModifyAddressInternetChargeTypeResponse() + err = c.Send(request, response) + return } func NewModifyAddressTemplateAttributeRequest() (request *ModifyAddressTemplateAttributeRequest) { - request = &ModifyAddressTemplateAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressTemplateAttribute") - return + request = &ModifyAddressTemplateAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressTemplateAttribute") + return } func NewModifyAddressTemplateAttributeResponse() (response *ModifyAddressTemplateAttributeResponse) { - response = &ModifyAddressTemplateAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyAddressTemplateAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyAddressTemplateAttribute）用于修改IP地址模板 func (c *Client) ModifyAddressTemplateAttribute(request *ModifyAddressTemplateAttributeRequest) (response *ModifyAddressTemplateAttributeResponse, err error) { - if request == nil { - request = NewModifyAddressTemplateAttributeRequest() - } - response = NewModifyAddressTemplateAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyAddressTemplateAttributeRequest() + } + response = NewModifyAddressTemplateAttributeResponse() + err = c.Send(request, response) + return } func NewModifyAddressTemplateGroupAttributeRequest() (request *ModifyAddressTemplateGroupAttributeRequest) { - request = &ModifyAddressTemplateGroupAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressTemplateGroupAttribute") - return + request = &ModifyAddressTemplateGroupAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressTemplateGroupAttribute") + return } func NewModifyAddressTemplateGroupAttributeResponse() (response *ModifyAddressTemplateGroupAttributeResponse) { - response = &ModifyAddressTemplateGroupAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyAddressTemplateGroupAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyAddressTemplateGroupAttribute）用于修改IP地址模板集合 func (c *Client) ModifyAddressTemplateGroupAttribute(request *ModifyAddressTemplateGroupAttributeRequest) (response *ModifyAddressTemplateGroupAttributeResponse, err error) { - if request == nil { - request = NewModifyAddressTemplateGroupAttributeRequest() - } - response = NewModifyAddressTemplateGroupAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyAddressTemplateGroupAttributeRequest() + } + response = NewModifyAddressTemplateGroupAttributeResponse() + err = c.Send(request, response) + return } func NewModifyAddressesBandwidthRequest() (request *ModifyAddressesBandwidthRequest) { - request = &ModifyAddressesBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressesBandwidth") - return + request = &ModifyAddressesBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyAddressesBandwidth") + return } func NewModifyAddressesBandwidthResponse() (response *ModifyAddressesBandwidthResponse) { - response = &ModifyAddressesBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyAddressesBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyAddressesBandwidth）用于调整[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)(简称EIP)带宽，包括后付费EIP, 预付费EIP和带宽包EIP func (c *Client) ModifyAddressesBandwidth(request *ModifyAddressesBandwidthRequest) (response *ModifyAddressesBandwidthResponse, err error) { - if request == nil { - request = NewModifyAddressesBandwidthRequest() - } - response = NewModifyAddressesBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyAddressesBandwidthRequest() + } + response = NewModifyAddressesBandwidthResponse() + err = c.Send(request, response) + return } func NewModifyAssistantCidrRequest() (request *ModifyAssistantCidrRequest) { - request = &ModifyAssistantCidrRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyAssistantCidr") - return + request = &ModifyAssistantCidrRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyAssistantCidr") + return } func NewModifyAssistantCidrResponse() (response *ModifyAssistantCidrResponse) { - response = &ModifyAssistantCidrResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyAssistantCidrResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(ModifyAssistantCidr)用于批量修改辅助CIDR，支持新增和删除。（接口灰度中，如需使用请提工单。） func (c *Client) ModifyAssistantCidr(request *ModifyAssistantCidrRequest) (response *ModifyAssistantCidrResponse, err error) { - if request == nil { - request = NewModifyAssistantCidrRequest() - } - response = NewModifyAssistantCidrResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyAssistantCidrRequest() + } + response = NewModifyAssistantCidrResponse() + err = c.Send(request, response) + return } func NewModifyBandwidthPackageAttributeRequest() (request *ModifyBandwidthPackageAttributeRequest) { - request = &ModifyBandwidthPackageAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyBandwidthPackageAttribute") - return + request = &ModifyBandwidthPackageAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyBandwidthPackageAttribute") + return } func NewModifyBandwidthPackageAttributeResponse() (response *ModifyBandwidthPackageAttributeResponse) { - response = &ModifyBandwidthPackageAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyBandwidthPackageAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口用于修改带宽包属性，包括带宽包名字等 func (c *Client) ModifyBandwidthPackageAttribute(request *ModifyBandwidthPackageAttributeRequest) (response *ModifyBandwidthPackageAttributeResponse, err error) { - if request == nil { - request = NewModifyBandwidthPackageAttributeRequest() - } - response = NewModifyBandwidthPackageAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyBandwidthPackageAttributeRequest() + } + response = NewModifyBandwidthPackageAttributeResponse() + err = c.Send(request, response) + return } func NewModifyCcnAttributeRequest() (request *ModifyCcnAttributeRequest) { - request = &ModifyCcnAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyCcnAttribute") - return + request = &ModifyCcnAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyCcnAttribute") + return } func NewModifyCcnAttributeResponse() (response *ModifyCcnAttributeResponse) { - response = &ModifyCcnAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyCcnAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyCcnAttribute）用于修改云联网（CCN）的相关属性。 func (c *Client) ModifyCcnAttribute(request *ModifyCcnAttributeRequest) (response *ModifyCcnAttributeResponse, err error) { - if request == nil { - request = NewModifyCcnAttributeRequest() - } - response = NewModifyCcnAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyCcnAttributeRequest() + } + response = NewModifyCcnAttributeResponse() + err = c.Send(request, response) + return } func NewModifyCcnRegionBandwidthLimitsTypeRequest() (request *ModifyCcnRegionBandwidthLimitsTypeRequest) { - request = &ModifyCcnRegionBandwidthLimitsTypeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyCcnRegionBandwidthLimitsType") - return + request = &ModifyCcnRegionBandwidthLimitsTypeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyCcnRegionBandwidthLimitsType") + return } func NewModifyCcnRegionBandwidthLimitsTypeResponse() (response *ModifyCcnRegionBandwidthLimitsTypeResponse) { - response = &ModifyCcnRegionBandwidthLimitsTypeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyCcnRegionBandwidthLimitsTypeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyCcnRegionBandwidthLimitsType）用于修改后付费云联网实例修改带宽限速策略。 func (c *Client) ModifyCcnRegionBandwidthLimitsType(request *ModifyCcnRegionBandwidthLimitsTypeRequest) (response *ModifyCcnRegionBandwidthLimitsTypeResponse, err error) { - if request == nil { - request = NewModifyCcnRegionBandwidthLimitsTypeRequest() - } - response = NewModifyCcnRegionBandwidthLimitsTypeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyCcnRegionBandwidthLimitsTypeRequest() + } + response = NewModifyCcnRegionBandwidthLimitsTypeResponse() + err = c.Send(request, response) + return } func NewModifyCustomerGatewayAttributeRequest() (request *ModifyCustomerGatewayAttributeRequest) { - request = &ModifyCustomerGatewayAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyCustomerGatewayAttribute") - return + request = &ModifyCustomerGatewayAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyCustomerGatewayAttribute") + return } func NewModifyCustomerGatewayAttributeResponse() (response *ModifyCustomerGatewayAttributeResponse) { - response = &ModifyCustomerGatewayAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyCustomerGatewayAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyCustomerGatewayAttribute）用于修改对端网关信息。 func (c *Client) ModifyCustomerGatewayAttribute(request *ModifyCustomerGatewayAttributeRequest) (response *ModifyCustomerGatewayAttributeResponse, err error) { - if request == nil { - request = NewModifyCustomerGatewayAttributeRequest() - } - response = NewModifyCustomerGatewayAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyCustomerGatewayAttributeRequest() + } + response = NewModifyCustomerGatewayAttributeResponse() + err = c.Send(request, response) + return } func NewModifyDhcpIpAttributeRequest() (request *ModifyDhcpIpAttributeRequest) { - request = &ModifyDhcpIpAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyDhcpIpAttribute") - return + request = &ModifyDhcpIpAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyDhcpIpAttribute") + return } func NewModifyDhcpIpAttributeResponse() (response *ModifyDhcpIpAttributeResponse) { - response = &ModifyDhcpIpAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyDhcpIpAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyDhcpIpAttribute）用于修改DhcpIp属性 func (c *Client) ModifyDhcpIpAttribute(request *ModifyDhcpIpAttributeRequest) (response *ModifyDhcpIpAttributeResponse, err error) { - if request == nil { - request = NewModifyDhcpIpAttributeRequest() - } - response = NewModifyDhcpIpAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyDhcpIpAttributeRequest() + } + response = NewModifyDhcpIpAttributeResponse() + err = c.Send(request, response) + return } func NewModifyDirectConnectGatewayAttributeRequest() (request *ModifyDirectConnectGatewayAttributeRequest) { - request = &ModifyDirectConnectGatewayAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyDirectConnectGatewayAttribute") - return + request = &ModifyDirectConnectGatewayAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyDirectConnectGatewayAttribute") + return } func NewModifyDirectConnectGatewayAttributeResponse() (response *ModifyDirectConnectGatewayAttributeResponse) { - response = &ModifyDirectConnectGatewayAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyDirectConnectGatewayAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyDirectConnectGatewayAttribute）用于修改专线网关属性 func (c *Client) ModifyDirectConnectGatewayAttribute(request *ModifyDirectConnectGatewayAttributeRequest) (response *ModifyDirectConnectGatewayAttributeResponse, err error) { - if request == nil { - request = NewModifyDirectConnectGatewayAttributeRequest() - } - response = NewModifyDirectConnectGatewayAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyDirectConnectGatewayAttributeRequest() + } + response = NewModifyDirectConnectGatewayAttributeResponse() + err = c.Send(request, response) + return } func NewModifyFlowLogAttributeRequest() (request *ModifyFlowLogAttributeRequest) { - request = &ModifyFlowLogAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyFlowLogAttribute") - return + request = &ModifyFlowLogAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyFlowLogAttribute") + return } func NewModifyFlowLogAttributeResponse() (response *ModifyFlowLogAttributeResponse) { - response = &ModifyFlowLogAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyFlowLogAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyFlowLogAttribute）用于修改流日志属性 func (c *Client) ModifyFlowLogAttribute(request *ModifyFlowLogAttributeRequest) (response *ModifyFlowLogAttributeResponse, err error) { - if request == nil { - request = NewModifyFlowLogAttributeRequest() - } - response = NewModifyFlowLogAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyFlowLogAttributeRequest() + } + response = NewModifyFlowLogAttributeResponse() + err = c.Send(request, response) + return } func NewModifyGatewayFlowQosRequest() (request *ModifyGatewayFlowQosRequest) { - request = &ModifyGatewayFlowQosRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyGatewayFlowQos") - return + request = &ModifyGatewayFlowQosRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyGatewayFlowQos") + return } func NewModifyGatewayFlowQosResponse() (response *ModifyGatewayFlowQosResponse) { - response = &ModifyGatewayFlowQosResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyGatewayFlowQosResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyGatewayFlowQos）用于调整网关流控带宽。 func (c *Client) ModifyGatewayFlowQos(request *ModifyGatewayFlowQosRequest) (response *ModifyGatewayFlowQosResponse, err error) { - if request == nil { - request = NewModifyGatewayFlowQosRequest() - } - response = NewModifyGatewayFlowQosResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyGatewayFlowQosRequest() + } + response = NewModifyGatewayFlowQosResponse() + err = c.Send(request, response) + return } func NewModifyHaVipAttributeRequest() (request *ModifyHaVipAttributeRequest) { - request = &ModifyHaVipAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyHaVipAttribute") - return + request = &ModifyHaVipAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyHaVipAttribute") + return } func NewModifyHaVipAttributeResponse() (response *ModifyHaVipAttributeResponse) { - response = &ModifyHaVipAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyHaVipAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyHaVipAttribute）用于修改高可用虚拟IP（HAVIP）属性 func (c *Client) ModifyHaVipAttribute(request *ModifyHaVipAttributeRequest) (response *ModifyHaVipAttributeResponse, err error) { - if request == nil { - request = NewModifyHaVipAttributeRequest() - } - response = NewModifyHaVipAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyHaVipAttributeRequest() + } + response = NewModifyHaVipAttributeResponse() + err = c.Send(request, response) + return } func NewModifyIp6AddressesBandwidthRequest() (request *ModifyIp6AddressesBandwidthRequest) { - request = &ModifyIp6AddressesBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyIp6AddressesBandwidth") - return + request = &ModifyIp6AddressesBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyIp6AddressesBandwidth") + return } func NewModifyIp6AddressesBandwidthResponse() (response *ModifyIp6AddressesBandwidthResponse) { - response = &ModifyIp6AddressesBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyIp6AddressesBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于修改IPV6地址访问internet的带宽 func (c *Client) ModifyIp6AddressesBandwidth(request *ModifyIp6AddressesBandwidthRequest) (response *ModifyIp6AddressesBandwidthResponse, err error) { - if request == nil { - request = NewModifyIp6AddressesBandwidthRequest() - } - response = NewModifyIp6AddressesBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyIp6AddressesBandwidthRequest() + } + response = NewModifyIp6AddressesBandwidthResponse() + err = c.Send(request, response) + return } func NewModifyIp6RuleRequest() (request *ModifyIp6RuleRequest) { - request = &ModifyIp6RuleRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyIp6Rule") - return + request = &ModifyIp6RuleRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyIp6Rule") + return } func NewModifyIp6RuleResponse() (response *ModifyIp6RuleResponse) { - response = &ModifyIp6RuleResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyIp6RuleResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于修改IPV6转换规则，当前仅支持修改转换规则名称，IPV4地址和IPV4端口号 func (c *Client) ModifyIp6Rule(request *ModifyIp6RuleRequest) (response *ModifyIp6RuleResponse, err error) { - if request == nil { - request = NewModifyIp6RuleRequest() - } - response = NewModifyIp6RuleResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyIp6RuleRequest() + } + response = NewModifyIp6RuleResponse() + err = c.Send(request, response) + return } func NewModifyIp6TranslatorRequest() (request *ModifyIp6TranslatorRequest) { - request = &ModifyIp6TranslatorRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyIp6Translator") - return + request = &ModifyIp6TranslatorRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyIp6Translator") + return } func NewModifyIp6TranslatorResponse() (response *ModifyIp6TranslatorResponse) { - response = &ModifyIp6TranslatorResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyIp6TranslatorResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于修改IP6转换实例属性，当前仅支持修改实例名称。 func (c *Client) ModifyIp6Translator(request *ModifyIp6TranslatorRequest) (response *ModifyIp6TranslatorResponse, err error) { - if request == nil { - request = NewModifyIp6TranslatorRequest() - } - response = NewModifyIp6TranslatorResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyIp6TranslatorRequest() + } + response = NewModifyIp6TranslatorResponse() + err = c.Send(request, response) + return } func NewModifyIpv6AddressesAttributeRequest() (request *ModifyIpv6AddressesAttributeRequest) { - request = &ModifyIpv6AddressesAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyIpv6AddressesAttribute") - return + request = &ModifyIpv6AddressesAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyIpv6AddressesAttribute") + return } func NewModifyIpv6AddressesAttributeResponse() (response *ModifyIpv6AddressesAttributeResponse) { - response = &ModifyIpv6AddressesAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyIpv6AddressesAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyIpv6AddressesAttribute）用于修改弹性网卡内网IPv6地址属性。 func (c *Client) ModifyIpv6AddressesAttribute(request *ModifyIpv6AddressesAttributeRequest) (response *ModifyIpv6AddressesAttributeResponse, err error) { - if request == nil { - request = NewModifyIpv6AddressesAttributeRequest() - } - response = NewModifyIpv6AddressesAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyIpv6AddressesAttributeRequest() + } + response = NewModifyIpv6AddressesAttributeResponse() + err = c.Send(request, response) + return } func NewModifyNatGatewayAttributeRequest() (request *ModifyNatGatewayAttributeRequest) { - request = &ModifyNatGatewayAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyNatGatewayAttribute") - return + request = &ModifyNatGatewayAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyNatGatewayAttribute") + return } func NewModifyNatGatewayAttributeResponse() (response *ModifyNatGatewayAttributeResponse) { - response = &ModifyNatGatewayAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyNatGatewayAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyNatGatewayAttribute）用于修改NAT网关的属性。 func (c *Client) ModifyNatGatewayAttribute(request *ModifyNatGatewayAttributeRequest) (response *ModifyNatGatewayAttributeResponse, err error) { - if request == nil { - request = NewModifyNatGatewayAttributeRequest() - } - response = NewModifyNatGatewayAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyNatGatewayAttributeRequest() + } + response = NewModifyNatGatewayAttributeResponse() + err = c.Send(request, response) + return } func NewModifyNatGatewayDestinationIpPortTranslationNatRuleRequest() (request *ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest) { - request = &ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyNatGatewayDestinationIpPortTranslationNatRule") - return + request = &ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyNatGatewayDestinationIpPortTranslationNatRule") + return } func NewModifyNatGatewayDestinationIpPortTranslationNatRuleResponse() (response *ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse) { - response = &ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyNatGatewayDestinationIpPortTranslationNatRule）用于修改NAT网关端口转发规则。 func (c *Client) ModifyNatGatewayDestinationIpPortTranslationNatRule(request *ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest) (response *ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse, err error) { - if request == nil { - request = NewModifyNatGatewayDestinationIpPortTranslationNatRuleRequest() - } - response = NewModifyNatGatewayDestinationIpPortTranslationNatRuleResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyNatGatewayDestinationIpPortTranslationNatRuleRequest() + } + response = NewModifyNatGatewayDestinationIpPortTranslationNatRuleResponse() + err = c.Send(request, response) + return } func NewModifyNetDetectRequest() (request *ModifyNetDetectRequest) { - request = &ModifyNetDetectRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetDetect") - return + request = &ModifyNetDetectRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetDetect") + return } func NewModifyNetDetectResponse() (response *ModifyNetDetectResponse) { - response = &ModifyNetDetectResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyNetDetectResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(ModifyNetDetect)用于修改网络探测参数。 func (c *Client) ModifyNetDetect(request *ModifyNetDetectRequest) (response *ModifyNetDetectResponse, err error) { - if request == nil { - request = NewModifyNetDetectRequest() - } - response = NewModifyNetDetectResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyNetDetectRequest() + } + response = NewModifyNetDetectResponse() + err = c.Send(request, response) + return } func NewModifyNetworkAclAttributeRequest() (request *ModifyNetworkAclAttributeRequest) { - request = &ModifyNetworkAclAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetworkAclAttribute") - return + request = &ModifyNetworkAclAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetworkAclAttribute") + return } func NewModifyNetworkAclAttributeResponse() (response *ModifyNetworkAclAttributeResponse) { - response = &ModifyNetworkAclAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyNetworkAclAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyNetworkAclAttribute）用于修改网络ACL属性。 func (c *Client) ModifyNetworkAclAttribute(request *ModifyNetworkAclAttributeRequest) (response *ModifyNetworkAclAttributeResponse, err error) { - if request == nil { - request = NewModifyNetworkAclAttributeRequest() - } - response = NewModifyNetworkAclAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyNetworkAclAttributeRequest() + } + response = NewModifyNetworkAclAttributeResponse() + err = c.Send(request, response) + return } func NewModifyNetworkAclEntriesRequest() (request *ModifyNetworkAclEntriesRequest) { - request = &ModifyNetworkAclEntriesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetworkAclEntries") - return + request = &ModifyNetworkAclEntriesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetworkAclEntries") + return } func NewModifyNetworkAclEntriesResponse() (response *ModifyNetworkAclEntriesResponse) { - response = &ModifyNetworkAclEntriesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyNetworkAclEntriesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyNetworkAclEntries）用于修改（包括添加和删除）网络ACL的入站规则和出站规则。在NetworkAclEntrySet参数中： // * 若同时传入入站规则和出站规则，则重置原有的入站规则和出站规则，并分别导入传入的规则。 // * 若仅传入入站规则，则仅重置原有的入站规则，并导入传入的规则，不影响原有的出站规则（若仅传入出站规则，处理方式类似入站方向）。 func (c *Client) ModifyNetworkAclEntries(request *ModifyNetworkAclEntriesRequest) (response *ModifyNetworkAclEntriesResponse, err error) { - if request == nil { - request = NewModifyNetworkAclEntriesRequest() - } - response = NewModifyNetworkAclEntriesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyNetworkAclEntriesRequest() + } + response = NewModifyNetworkAclEntriesResponse() + err = c.Send(request, response) + return } func NewModifyNetworkInterfaceAttributeRequest() (request *ModifyNetworkInterfaceAttributeRequest) { - request = &ModifyNetworkInterfaceAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetworkInterfaceAttribute") - return + request = &ModifyNetworkInterfaceAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyNetworkInterfaceAttribute") + return } func NewModifyNetworkInterfaceAttributeResponse() (response *ModifyNetworkInterfaceAttributeResponse) { - response = &ModifyNetworkInterfaceAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyNetworkInterfaceAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyNetworkInterfaceAttribute）用于修改弹性网卡属性。 func (c *Client) ModifyNetworkInterfaceAttribute(request *ModifyNetworkInterfaceAttributeRequest) (response *ModifyNetworkInterfaceAttributeResponse, err error) { - if request == nil { - request = NewModifyNetworkInterfaceAttributeRequest() - } - response = NewModifyNetworkInterfaceAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyNetworkInterfaceAttributeRequest() + } + response = NewModifyNetworkInterfaceAttributeResponse() + err = c.Send(request, response) + return } func NewModifyPrivateIpAddressesAttributeRequest() (request *ModifyPrivateIpAddressesAttributeRequest) { - request = &ModifyPrivateIpAddressesAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyPrivateIpAddressesAttribute") - return + request = &ModifyPrivateIpAddressesAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyPrivateIpAddressesAttribute") + return } func NewModifyPrivateIpAddressesAttributeResponse() (response *ModifyPrivateIpAddressesAttributeResponse) { - response = &ModifyPrivateIpAddressesAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyPrivateIpAddressesAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyPrivateIpAddressesAttribute）用于修改弹性网卡内网IP属性。 func (c *Client) ModifyPrivateIpAddressesAttribute(request *ModifyPrivateIpAddressesAttributeRequest) (response *ModifyPrivateIpAddressesAttributeResponse, err error) { - if request == nil { - request = NewModifyPrivateIpAddressesAttributeRequest() - } - response = NewModifyPrivateIpAddressesAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyPrivateIpAddressesAttributeRequest() + } + response = NewModifyPrivateIpAddressesAttributeResponse() + err = c.Send(request, response) + return } func NewModifyRouteTableAttributeRequest() (request *ModifyRouteTableAttributeRequest) { - request = &ModifyRouteTableAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyRouteTableAttribute") - return + request = &ModifyRouteTableAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyRouteTableAttribute") + return } func NewModifyRouteTableAttributeResponse() (response *ModifyRouteTableAttributeResponse) { - response = &ModifyRouteTableAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyRouteTableAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyRouteTableAttribute）用于修改路由表（RouteTable）属性。 func (c *Client) ModifyRouteTableAttribute(request *ModifyRouteTableAttributeRequest) (response *ModifyRouteTableAttributeResponse, err error) { - if request == nil { - request = NewModifyRouteTableAttributeRequest() - } - response = NewModifyRouteTableAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyRouteTableAttributeRequest() + } + response = NewModifyRouteTableAttributeResponse() + err = c.Send(request, response) + return } func NewModifySecurityGroupAttributeRequest() (request *ModifySecurityGroupAttributeRequest) { - request = &ModifySecurityGroupAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifySecurityGroupAttribute") - return + request = &ModifySecurityGroupAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifySecurityGroupAttribute") + return } func NewModifySecurityGroupAttributeResponse() (response *ModifySecurityGroupAttributeResponse) { - response = &ModifySecurityGroupAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifySecurityGroupAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifySecurityGroupAttribute）用于修改安全组（SecurityGroupPolicy）属性。 func (c *Client) ModifySecurityGroupAttribute(request *ModifySecurityGroupAttributeRequest) (response *ModifySecurityGroupAttributeResponse, err error) { - if request == nil { - request = NewModifySecurityGroupAttributeRequest() - } - response = NewModifySecurityGroupAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifySecurityGroupAttributeRequest() + } + response = NewModifySecurityGroupAttributeResponse() + err = c.Send(request, response) + return } func NewModifySecurityGroupPoliciesRequest() (request *ModifySecurityGroupPoliciesRequest) { - request = &ModifySecurityGroupPoliciesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifySecurityGroupPolicies") - return + request = &ModifySecurityGroupPoliciesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifySecurityGroupPolicies") + return } func NewModifySecurityGroupPoliciesResponse() (response *ModifySecurityGroupPoliciesResponse) { - response = &ModifySecurityGroupPoliciesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifySecurityGroupPoliciesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifySecurityGroupPolicies）用于重置安全组出站和入站规则（SecurityGroupPolicy）。 -// +// //
      //
    • 接口是先删除当前所有的出入站规则，然后再添加 Egress 和 Ingress 规则，不支持自定义索引 PolicyIndex。
      • //
    • 在 SecurityGroupPolicySet 参数中：
        @@ -4848,721 +4849,721 @@ func NewModifySecurityGroupPoliciesResponse() (response *ModifySecurityGroupPoli //
    // func (c *Client) ModifySecurityGroupPolicies(request *ModifySecurityGroupPoliciesRequest) (response *ModifySecurityGroupPoliciesResponse, err error) { - if request == nil { - request = NewModifySecurityGroupPoliciesRequest() - } - response = NewModifySecurityGroupPoliciesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifySecurityGroupPoliciesRequest() + } + response = NewModifySecurityGroupPoliciesResponse() + err = c.Send(request, response) + return } func NewModifyServiceTemplateAttributeRequest() (request *ModifyServiceTemplateAttributeRequest) { - request = &ModifyServiceTemplateAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyServiceTemplateAttribute") - return + request = &ModifyServiceTemplateAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyServiceTemplateAttribute") + return } func NewModifyServiceTemplateAttributeResponse() (response *ModifyServiceTemplateAttributeResponse) { - response = &ModifyServiceTemplateAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyServiceTemplateAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyServiceTemplateAttribute）用于修改协议端口模板 func (c *Client) ModifyServiceTemplateAttribute(request *ModifyServiceTemplateAttributeRequest) (response *ModifyServiceTemplateAttributeResponse, err error) { - if request == nil { - request = NewModifyServiceTemplateAttributeRequest() - } - response = NewModifyServiceTemplateAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyServiceTemplateAttributeRequest() + } + response = NewModifyServiceTemplateAttributeResponse() + err = c.Send(request, response) + return } func NewModifyServiceTemplateGroupAttributeRequest() (request *ModifyServiceTemplateGroupAttributeRequest) { - request = &ModifyServiceTemplateGroupAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyServiceTemplateGroupAttribute") - return + request = &ModifyServiceTemplateGroupAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyServiceTemplateGroupAttribute") + return } func NewModifyServiceTemplateGroupAttributeResponse() (response *ModifyServiceTemplateGroupAttributeResponse) { - response = &ModifyServiceTemplateGroupAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyServiceTemplateGroupAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyServiceTemplateGroupAttribute）用于修改协议端口模板集合。 func (c *Client) ModifyServiceTemplateGroupAttribute(request *ModifyServiceTemplateGroupAttributeRequest) (response *ModifyServiceTemplateGroupAttributeResponse, err error) { - if request == nil { - request = NewModifyServiceTemplateGroupAttributeRequest() - } - response = NewModifyServiceTemplateGroupAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyServiceTemplateGroupAttributeRequest() + } + response = NewModifyServiceTemplateGroupAttributeResponse() + err = c.Send(request, response) + return } func NewModifySubnetAttributeRequest() (request *ModifySubnetAttributeRequest) { - request = &ModifySubnetAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifySubnetAttribute") - return + request = &ModifySubnetAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifySubnetAttribute") + return } func NewModifySubnetAttributeResponse() (response *ModifySubnetAttributeResponse) { - response = &ModifySubnetAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifySubnetAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifySubnetAttribute）用于修改子网属性。 func (c *Client) ModifySubnetAttribute(request *ModifySubnetAttributeRequest) (response *ModifySubnetAttributeResponse, err error) { - if request == nil { - request = NewModifySubnetAttributeRequest() - } - response = NewModifySubnetAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifySubnetAttributeRequest() + } + response = NewModifySubnetAttributeResponse() + err = c.Send(request, response) + return } func NewModifyVpcAttributeRequest() (request *ModifyVpcAttributeRequest) { - request = &ModifyVpcAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpcAttribute") - return + request = &ModifyVpcAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpcAttribute") + return } func NewModifyVpcAttributeResponse() (response *ModifyVpcAttributeResponse) { - response = &ModifyVpcAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyVpcAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyVpcAttribute）用于修改私有网络（VPC）的相关属性。 func (c *Client) ModifyVpcAttribute(request *ModifyVpcAttributeRequest) (response *ModifyVpcAttributeResponse, err error) { - if request == nil { - request = NewModifyVpcAttributeRequest() - } - response = NewModifyVpcAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyVpcAttributeRequest() + } + response = NewModifyVpcAttributeResponse() + err = c.Send(request, response) + return } func NewModifyVpnConnectionAttributeRequest() (request *ModifyVpnConnectionAttributeRequest) { - request = &ModifyVpnConnectionAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpnConnectionAttribute") - return + request = &ModifyVpnConnectionAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpnConnectionAttribute") + return } func NewModifyVpnConnectionAttributeResponse() (response *ModifyVpnConnectionAttributeResponse) { - response = &ModifyVpnConnectionAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyVpnConnectionAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyVpnConnectionAttribute）用于修改VPN通道。 func (c *Client) ModifyVpnConnectionAttribute(request *ModifyVpnConnectionAttributeRequest) (response *ModifyVpnConnectionAttributeResponse, err error) { - if request == nil { - request = NewModifyVpnConnectionAttributeRequest() - } - response = NewModifyVpnConnectionAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyVpnConnectionAttributeRequest() + } + response = NewModifyVpnConnectionAttributeResponse() + err = c.Send(request, response) + return } func NewModifyVpnGatewayAttributeRequest() (request *ModifyVpnGatewayAttributeRequest) { - request = &ModifyVpnGatewayAttributeRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpnGatewayAttribute") - return + request = &ModifyVpnGatewayAttributeRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpnGatewayAttribute") + return } func NewModifyVpnGatewayAttributeResponse() (response *ModifyVpnGatewayAttributeResponse) { - response = &ModifyVpnGatewayAttributeResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyVpnGatewayAttributeResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyVpnGatewayAttribute）用于修改VPN网关属性。 func (c *Client) ModifyVpnGatewayAttribute(request *ModifyVpnGatewayAttributeRequest) (response *ModifyVpnGatewayAttributeResponse, err error) { - if request == nil { - request = NewModifyVpnGatewayAttributeRequest() - } - response = NewModifyVpnGatewayAttributeResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyVpnGatewayAttributeRequest() + } + response = NewModifyVpnGatewayAttributeResponse() + err = c.Send(request, response) + return } func NewModifyVpnGatewayCcnRoutesRequest() (request *ModifyVpnGatewayCcnRoutesRequest) { - request = &ModifyVpnGatewayCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpnGatewayCcnRoutes") - return + request = &ModifyVpnGatewayCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ModifyVpnGatewayCcnRoutes") + return } func NewModifyVpnGatewayCcnRoutesResponse() (response *ModifyVpnGatewayCcnRoutesResponse) { - response = &ModifyVpnGatewayCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ModifyVpnGatewayCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ModifyVpnGatewayCcnRoutes）用于修改VPN网关云联网路由 func (c *Client) ModifyVpnGatewayCcnRoutes(request *ModifyVpnGatewayCcnRoutesRequest) (response *ModifyVpnGatewayCcnRoutesResponse, err error) { - if request == nil { - request = NewModifyVpnGatewayCcnRoutesRequest() - } - response = NewModifyVpnGatewayCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewModifyVpnGatewayCcnRoutesRequest() + } + response = NewModifyVpnGatewayCcnRoutesResponse() + err = c.Send(request, response) + return } func NewRejectAttachCcnInstancesRequest() (request *RejectAttachCcnInstancesRequest) { - request = &RejectAttachCcnInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "RejectAttachCcnInstances") - return + request = &RejectAttachCcnInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "RejectAttachCcnInstances") + return } func NewRejectAttachCcnInstancesResponse() (response *RejectAttachCcnInstancesResponse) { - response = &RejectAttachCcnInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RejectAttachCcnInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（RejectAttachCcnInstances）用于跨账号关联实例时，云联网所有者拒绝关联操作。 func (c *Client) RejectAttachCcnInstances(request *RejectAttachCcnInstancesRequest) (response *RejectAttachCcnInstancesResponse, err error) { - if request == nil { - request = NewRejectAttachCcnInstancesRequest() - } - response = NewRejectAttachCcnInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRejectAttachCcnInstancesRequest() + } + response = NewRejectAttachCcnInstancesResponse() + err = c.Send(request, response) + return } func NewReleaseAddressesRequest() (request *ReleaseAddressesRequest) { - request = &ReleaseAddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ReleaseAddresses") - return + request = &ReleaseAddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ReleaseAddresses") + return } func NewReleaseAddressesResponse() (response *ReleaseAddressesResponse) { - response = &ReleaseAddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ReleaseAddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (ReleaseAddresses) 用于释放一个或多个[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）。 // * 该操作不可逆，释放后 EIP 关联的 IP 地址将不再属于您的名下。 // * 只有状态为 UNBIND 的 EIP 才能进行释放操作。 func (c *Client) ReleaseAddresses(request *ReleaseAddressesRequest) (response *ReleaseAddressesResponse, err error) { - if request == nil { - request = NewReleaseAddressesRequest() - } - response = NewReleaseAddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewReleaseAddressesRequest() + } + response = NewReleaseAddressesResponse() + err = c.Send(request, response) + return } func NewReleaseIp6AddressesBandwidthRequest() (request *ReleaseIp6AddressesBandwidthRequest) { - request = &ReleaseIp6AddressesBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ReleaseIp6AddressesBandwidth") - return + request = &ReleaseIp6AddressesBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ReleaseIp6AddressesBandwidth") + return } func NewReleaseIp6AddressesBandwidthResponse() (response *ReleaseIp6AddressesBandwidthResponse) { - response = &ReleaseIp6AddressesBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ReleaseIp6AddressesBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 该接口用于给弹性公网IPv6地址释放带宽。 func (c *Client) ReleaseIp6AddressesBandwidth(request *ReleaseIp6AddressesBandwidthRequest) (response *ReleaseIp6AddressesBandwidthResponse, err error) { - if request == nil { - request = NewReleaseIp6AddressesBandwidthRequest() - } - response = NewReleaseIp6AddressesBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewReleaseIp6AddressesBandwidthRequest() + } + response = NewReleaseIp6AddressesBandwidthResponse() + err = c.Send(request, response) + return } func NewRemoveBandwidthPackageResourcesRequest() (request *RemoveBandwidthPackageResourcesRequest) { - request = &RemoveBandwidthPackageResourcesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "RemoveBandwidthPackageResources") - return + request = &RemoveBandwidthPackageResourcesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "RemoveBandwidthPackageResources") + return } func NewRemoveBandwidthPackageResourcesResponse() (response *RemoveBandwidthPackageResourcesResponse) { - response = &RemoveBandwidthPackageResourcesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RemoveBandwidthPackageResourcesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 接口用于删除带宽包资源，包括[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)和[负载均衡](https://cloud.tencent.com/document/product/214/517)等 func (c *Client) RemoveBandwidthPackageResources(request *RemoveBandwidthPackageResourcesRequest) (response *RemoveBandwidthPackageResourcesResponse, err error) { - if request == nil { - request = NewRemoveBandwidthPackageResourcesRequest() - } - response = NewRemoveBandwidthPackageResourcesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRemoveBandwidthPackageResourcesRequest() + } + response = NewRemoveBandwidthPackageResourcesResponse() + err = c.Send(request, response) + return } func NewRemoveIp6RulesRequest() (request *RemoveIp6RulesRequest) { - request = &RemoveIp6RulesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "RemoveIp6Rules") - return + request = &RemoveIp6RulesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "RemoveIp6Rules") + return } func NewRemoveIp6RulesResponse() (response *RemoveIp6RulesResponse) { - response = &RemoveIp6RulesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RemoveIp6RulesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 1. 该接口用于删除IPV6转换规则 // 2. 支持批量删除同一个转换实例下的多个转换规则 func (c *Client) RemoveIp6Rules(request *RemoveIp6RulesRequest) (response *RemoveIp6RulesResponse, err error) { - if request == nil { - request = NewRemoveIp6RulesRequest() - } - response = NewRemoveIp6RulesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRemoveIp6RulesRequest() + } + response = NewRemoveIp6RulesResponse() + err = c.Send(request, response) + return } func NewRenewVpnGatewayRequest() (request *RenewVpnGatewayRequest) { - request = &RenewVpnGatewayRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "RenewVpnGateway") - return + request = &RenewVpnGatewayRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "RenewVpnGateway") + return } func NewRenewVpnGatewayResponse() (response *RenewVpnGatewayResponse) { - response = &RenewVpnGatewayResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &RenewVpnGatewayResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（RenewVpnGateway）用于预付费（包年包月）VPN网关续费。目前只支持IPSEC网关。 func (c *Client) RenewVpnGateway(request *RenewVpnGatewayRequest) (response *RenewVpnGatewayResponse, err error) { - if request == nil { - request = NewRenewVpnGatewayRequest() - } - response = NewRenewVpnGatewayResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewRenewVpnGatewayRequest() + } + response = NewRenewVpnGatewayResponse() + err = c.Send(request, response) + return } func NewReplaceDirectConnectGatewayCcnRoutesRequest() (request *ReplaceDirectConnectGatewayCcnRoutesRequest) { - request = &ReplaceDirectConnectGatewayCcnRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ReplaceDirectConnectGatewayCcnRoutes") - return + request = &ReplaceDirectConnectGatewayCcnRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ReplaceDirectConnectGatewayCcnRoutes") + return } func NewReplaceDirectConnectGatewayCcnRoutesResponse() (response *ReplaceDirectConnectGatewayCcnRoutesResponse) { - response = &ReplaceDirectConnectGatewayCcnRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ReplaceDirectConnectGatewayCcnRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ReplaceDirectConnectGatewayCcnRoutes）根据路由ID（RouteId）修改指定的路由（Route），支持批量修改。 func (c *Client) ReplaceDirectConnectGatewayCcnRoutes(request *ReplaceDirectConnectGatewayCcnRoutesRequest) (response *ReplaceDirectConnectGatewayCcnRoutesResponse, err error) { - if request == nil { - request = NewReplaceDirectConnectGatewayCcnRoutesRequest() - } - response = NewReplaceDirectConnectGatewayCcnRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewReplaceDirectConnectGatewayCcnRoutesRequest() + } + response = NewReplaceDirectConnectGatewayCcnRoutesResponse() + err = c.Send(request, response) + return } func NewReplaceRouteTableAssociationRequest() (request *ReplaceRouteTableAssociationRequest) { - request = &ReplaceRouteTableAssociationRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ReplaceRouteTableAssociation") - return + request = &ReplaceRouteTableAssociationRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ReplaceRouteTableAssociation") + return } func NewReplaceRouteTableAssociationResponse() (response *ReplaceRouteTableAssociationResponse) { - response = &ReplaceRouteTableAssociationResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ReplaceRouteTableAssociationResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ReplaceRouteTableAssociation)用于修改子网（Subnet）关联的路由表（RouteTable）。 // * 一个子网只能关联一个路由表。 func (c *Client) ReplaceRouteTableAssociation(request *ReplaceRouteTableAssociationRequest) (response *ReplaceRouteTableAssociationResponse, err error) { - if request == nil { - request = NewReplaceRouteTableAssociationRequest() - } - response = NewReplaceRouteTableAssociationResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewReplaceRouteTableAssociationRequest() + } + response = NewReplaceRouteTableAssociationResponse() + err = c.Send(request, response) + return } func NewReplaceRoutesRequest() (request *ReplaceRoutesRequest) { - request = &ReplaceRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ReplaceRoutes") - return + request = &ReplaceRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ReplaceRoutes") + return } func NewReplaceRoutesResponse() (response *ReplaceRoutesResponse) { - response = &ReplaceRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ReplaceRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ReplaceRoutes）根据路由策略ID（RouteId）修改指定的路由策略（Route），支持批量修改。 func (c *Client) ReplaceRoutes(request *ReplaceRoutesRequest) (response *ReplaceRoutesResponse, err error) { - if request == nil { - request = NewReplaceRoutesRequest() - } - response = NewReplaceRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewReplaceRoutesRequest() + } + response = NewReplaceRoutesResponse() + err = c.Send(request, response) + return } func NewReplaceSecurityGroupPolicyRequest() (request *ReplaceSecurityGroupPolicyRequest) { - request = &ReplaceSecurityGroupPolicyRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ReplaceSecurityGroupPolicy") - return + request = &ReplaceSecurityGroupPolicyRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ReplaceSecurityGroupPolicy") + return } func NewReplaceSecurityGroupPolicyResponse() (response *ReplaceSecurityGroupPolicyResponse) { - response = &ReplaceSecurityGroupPolicyResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ReplaceSecurityGroupPolicyResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ReplaceSecurityGroupPolicy）用于替换单条安全组规则（SecurityGroupPolicy）。 // 单个请求中只能替换单个方向的一条规则, 必须要指定索引（PolicyIndex）。 func (c *Client) ReplaceSecurityGroupPolicy(request *ReplaceSecurityGroupPolicyRequest) (response *ReplaceSecurityGroupPolicyResponse, err error) { - if request == nil { - request = NewReplaceSecurityGroupPolicyRequest() - } - response = NewReplaceSecurityGroupPolicyResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewReplaceSecurityGroupPolicyRequest() + } + response = NewReplaceSecurityGroupPolicyResponse() + err = c.Send(request, response) + return } func NewResetAttachCcnInstancesRequest() (request *ResetAttachCcnInstancesRequest) { - request = &ResetAttachCcnInstancesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ResetAttachCcnInstances") - return + request = &ResetAttachCcnInstancesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ResetAttachCcnInstances") + return } func NewResetAttachCcnInstancesResponse() (response *ResetAttachCcnInstancesResponse) { - response = &ResetAttachCcnInstancesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetAttachCcnInstancesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ResetAttachCcnInstances）用于跨账号关联实例申请过期时，重新申请关联操作。 func (c *Client) ResetAttachCcnInstances(request *ResetAttachCcnInstancesRequest) (response *ResetAttachCcnInstancesResponse, err error) { - if request == nil { - request = NewResetAttachCcnInstancesRequest() - } - response = NewResetAttachCcnInstancesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetAttachCcnInstancesRequest() + } + response = NewResetAttachCcnInstancesResponse() + err = c.Send(request, response) + return } func NewResetNatGatewayConnectionRequest() (request *ResetNatGatewayConnectionRequest) { - request = &ResetNatGatewayConnectionRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ResetNatGatewayConnection") - return + request = &ResetNatGatewayConnectionRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ResetNatGatewayConnection") + return } func NewResetNatGatewayConnectionResponse() (response *ResetNatGatewayConnectionResponse) { - response = &ResetNatGatewayConnectionResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetNatGatewayConnectionResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ResetNatGatewayConnection）用来NAT网关并发连接上限。 func (c *Client) ResetNatGatewayConnection(request *ResetNatGatewayConnectionRequest) (response *ResetNatGatewayConnectionResponse, err error) { - if request == nil { - request = NewResetNatGatewayConnectionRequest() - } - response = NewResetNatGatewayConnectionResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetNatGatewayConnectionRequest() + } + response = NewResetNatGatewayConnectionResponse() + err = c.Send(request, response) + return } func NewResetRoutesRequest() (request *ResetRoutesRequest) { - request = &ResetRoutesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ResetRoutes") - return + request = &ResetRoutesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ResetRoutes") + return } func NewResetRoutesResponse() (response *ResetRoutesResponse) { - response = &ResetRoutesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetRoutesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ResetRoutes）用于对某个路由表名称和所有路由策略（Route）进行重新设置。
    // 注意: 调用本接口是先删除当前路由表中所有路由策略, 再保存新提交的路由策略内容, 会引起网络中断。 func (c *Client) ResetRoutes(request *ResetRoutesRequest) (response *ResetRoutesResponse, err error) { - if request == nil { - request = NewResetRoutesRequest() - } - response = NewResetRoutesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetRoutesRequest() + } + response = NewResetRoutesResponse() + err = c.Send(request, response) + return } func NewResetVpnConnectionRequest() (request *ResetVpnConnectionRequest) { - request = &ResetVpnConnectionRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ResetVpnConnection") - return + request = &ResetVpnConnectionRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ResetVpnConnection") + return } func NewResetVpnConnectionResponse() (response *ResetVpnConnectionResponse) { - response = &ResetVpnConnectionResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetVpnConnectionResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口(ResetVpnConnection)用于重置VPN通道。 func (c *Client) ResetVpnConnection(request *ResetVpnConnectionRequest) (response *ResetVpnConnectionResponse, err error) { - if request == nil { - request = NewResetVpnConnectionRequest() - } - response = NewResetVpnConnectionResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetVpnConnectionRequest() + } + response = NewResetVpnConnectionResponse() + err = c.Send(request, response) + return } func NewResetVpnGatewayInternetMaxBandwidthRequest() (request *ResetVpnGatewayInternetMaxBandwidthRequest) { - request = &ResetVpnGatewayInternetMaxBandwidthRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "ResetVpnGatewayInternetMaxBandwidth") - return + request = &ResetVpnGatewayInternetMaxBandwidthRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "ResetVpnGatewayInternetMaxBandwidth") + return } func NewResetVpnGatewayInternetMaxBandwidthResponse() (response *ResetVpnGatewayInternetMaxBandwidthResponse) { - response = &ResetVpnGatewayInternetMaxBandwidthResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &ResetVpnGatewayInternetMaxBandwidthResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（ResetVpnGatewayInternetMaxBandwidth）调整VPN网关带宽上限。目前支持升级配置，如果是包年包月VPN网关需要在有效期内。 func (c *Client) ResetVpnGatewayInternetMaxBandwidth(request *ResetVpnGatewayInternetMaxBandwidthRequest) (response *ResetVpnGatewayInternetMaxBandwidthResponse, err error) { - if request == nil { - request = NewResetVpnGatewayInternetMaxBandwidthRequest() - } - response = NewResetVpnGatewayInternetMaxBandwidthResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewResetVpnGatewayInternetMaxBandwidthRequest() + } + response = NewResetVpnGatewayInternetMaxBandwidthResponse() + err = c.Send(request, response) + return } func NewSetCcnRegionBandwidthLimitsRequest() (request *SetCcnRegionBandwidthLimitsRequest) { - request = &SetCcnRegionBandwidthLimitsRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "SetCcnRegionBandwidthLimits") - return + request = &SetCcnRegionBandwidthLimitsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "SetCcnRegionBandwidthLimits") + return } func NewSetCcnRegionBandwidthLimitsResponse() (response *SetCcnRegionBandwidthLimitsResponse) { - response = &SetCcnRegionBandwidthLimitsResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &SetCcnRegionBandwidthLimitsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（SetCcnRegionBandwidthLimits）用于设置云联网（CCN）各地域出带宽上限，或者地域间带宽上限。 func (c *Client) SetCcnRegionBandwidthLimits(request *SetCcnRegionBandwidthLimitsRequest) (response *SetCcnRegionBandwidthLimitsResponse, err error) { - if request == nil { - request = NewSetCcnRegionBandwidthLimitsRequest() - } - response = NewSetCcnRegionBandwidthLimitsResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewSetCcnRegionBandwidthLimitsRequest() + } + response = NewSetCcnRegionBandwidthLimitsResponse() + err = c.Send(request, response) + return } func NewTransformAddressRequest() (request *TransformAddressRequest) { - request = &TransformAddressRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "TransformAddress") - return + request = &TransformAddressRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "TransformAddress") + return } func NewTransformAddressResponse() (response *TransformAddressResponse) { - response = &TransformAddressResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &TransformAddressResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口 (TransformAddress) 用于将实例的普通公网 IP 转换为[弹性公网IP](https://cloud.tencent.com/document/product/213/1941)（简称 EIP）。 // * 平台对用户每地域每日解绑 EIP 重新分配普通公网 IP 次数有所限制（可参见 [EIP 产品简介](/document/product/213/1941)）。上述配额可通过 [DescribeAddressQuota](https://cloud.tencent.com/document/api/213/1378) 接口获取。 func (c *Client) TransformAddress(request *TransformAddressRequest) (response *TransformAddressResponse, err error) { - if request == nil { - request = NewTransformAddressRequest() - } - response = NewTransformAddressResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewTransformAddressRequest() + } + response = NewTransformAddressResponse() + err = c.Send(request, response) + return } func NewUnassignIpv6AddressesRequest() (request *UnassignIpv6AddressesRequest) { - request = &UnassignIpv6AddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "UnassignIpv6Addresses") - return + request = &UnassignIpv6AddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "UnassignIpv6Addresses") + return } func NewUnassignIpv6AddressesResponse() (response *UnassignIpv6AddressesResponse) { - response = &UnassignIpv6AddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &UnassignIpv6AddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（UnassignIpv6Addresses）用于释放弹性网卡`IPv6`地址。
    // 本接口是异步完成，如需查询异步任务执行结果，请使用本接口返回的`RequestId`轮询`QueryTask`接口。 func (c *Client) UnassignIpv6Addresses(request *UnassignIpv6AddressesRequest) (response *UnassignIpv6AddressesResponse, err error) { - if request == nil { - request = NewUnassignIpv6AddressesRequest() - } - response = NewUnassignIpv6AddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewUnassignIpv6AddressesRequest() + } + response = NewUnassignIpv6AddressesResponse() + err = c.Send(request, response) + return } func NewUnassignIpv6CidrBlockRequest() (request *UnassignIpv6CidrBlockRequest) { - request = &UnassignIpv6CidrBlockRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "UnassignIpv6CidrBlock") - return + request = &UnassignIpv6CidrBlockRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "UnassignIpv6CidrBlock") + return } func NewUnassignIpv6CidrBlockResponse() (response *UnassignIpv6CidrBlockResponse) { - response = &UnassignIpv6CidrBlockResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &UnassignIpv6CidrBlockResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（UnassignIpv6CidrBlock）用于释放IPv6网段。
    // 网段如果还有IP占用且未回收，则网段无法释放。 func (c *Client) UnassignIpv6CidrBlock(request *UnassignIpv6CidrBlockRequest) (response *UnassignIpv6CidrBlockResponse, err error) { - if request == nil { - request = NewUnassignIpv6CidrBlockRequest() - } - response = NewUnassignIpv6CidrBlockResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewUnassignIpv6CidrBlockRequest() + } + response = NewUnassignIpv6CidrBlockResponse() + err = c.Send(request, response) + return } func NewUnassignIpv6SubnetCidrBlockRequest() (request *UnassignIpv6SubnetCidrBlockRequest) { - request = &UnassignIpv6SubnetCidrBlockRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "UnassignIpv6SubnetCidrBlock") - return + request = &UnassignIpv6SubnetCidrBlockRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "UnassignIpv6SubnetCidrBlock") + return } func NewUnassignIpv6SubnetCidrBlockResponse() (response *UnassignIpv6SubnetCidrBlockResponse) { - response = &UnassignIpv6SubnetCidrBlockResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &UnassignIpv6SubnetCidrBlockResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（UnassignIpv6SubnetCidrBlock）用于释放IPv6子网段。
    // 子网段如果还有IP占用且未回收，则子网段无法释放。 func (c *Client) UnassignIpv6SubnetCidrBlock(request *UnassignIpv6SubnetCidrBlockRequest) (response *UnassignIpv6SubnetCidrBlockResponse, err error) { - if request == nil { - request = NewUnassignIpv6SubnetCidrBlockRequest() - } - response = NewUnassignIpv6SubnetCidrBlockResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewUnassignIpv6SubnetCidrBlockRequest() + } + response = NewUnassignIpv6SubnetCidrBlockResponse() + err = c.Send(request, response) + return } func NewUnassignPrivateIpAddressesRequest() (request *UnassignPrivateIpAddressesRequest) { - request = &UnassignPrivateIpAddressesRequest{ - BaseRequest: &tchttp.BaseRequest{}, - } - request.Init().WithApiInfo("vpc", APIVersion, "UnassignPrivateIpAddresses") - return + request = &UnassignPrivateIpAddressesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("vpc", APIVersion, "UnassignPrivateIpAddresses") + return } func NewUnassignPrivateIpAddressesResponse() (response *UnassignPrivateIpAddressesResponse) { - response = &UnassignPrivateIpAddressesResponse{ - BaseResponse: &tchttp.BaseResponse{}, - } - return + response = &UnassignPrivateIpAddressesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return } // 本接口（UnassignPrivateIpAddresses）用于弹性网卡退还内网 IP。 // * 退还弹性网卡上的辅助内网IP，接口自动解关联弹性公网 IP。不能退还弹性网卡的主内网IP。 func (c *Client) UnassignPrivateIpAddresses(request *UnassignPrivateIpAddressesRequest) (response *UnassignPrivateIpAddressesResponse, err error) { - if request == nil { - request = NewUnassignPrivateIpAddressesRequest() - } - response = NewUnassignPrivateIpAddressesResponse() - err = c.Send(request, response) - return + if request == nil { + request = NewUnassignPrivateIpAddressesRequest() + } + response = NewUnassignPrivateIpAddressesResponse() + err = c.Send(request, response) + return } diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/models.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/models.go index f91795756..d84343bc2 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/models.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/models.go @@ -15,9 +15,9 @@ package v20170312 import ( - "encoding/json" + "encoding/json" - tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" + tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" ) type AcceptAttachCcnInstancesRequest struct { @@ -31,12 +31,12 @@ type AcceptAttachCcnInstancesRequest struct { } func (r *AcceptAttachCcnInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AcceptAttachCcnInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AcceptAttachCcnInstancesResponse struct { @@ -49,12 +49,12 @@ type AcceptAttachCcnInstancesResponse struct { } func (r *AcceptAttachCcnInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AcceptAttachCcnInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AccountAttribute struct { @@ -86,12 +86,12 @@ type AddBandwidthPackageResourcesRequest struct { } func (r *AddBandwidthPackageResourcesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AddBandwidthPackageResourcesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AddBandwidthPackageResourcesResponse struct { @@ -104,12 +104,12 @@ type AddBandwidthPackageResourcesResponse struct { } func (r *AddBandwidthPackageResourcesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AddBandwidthPackageResourcesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AddIp6RulesRequest struct { @@ -126,12 +126,12 @@ type AddIp6RulesRequest struct { } func (r *AddIp6RulesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AddIp6RulesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AddIp6RulesResponse struct { @@ -147,12 +147,12 @@ type AddIp6RulesResponse struct { } func (r *AddIp6RulesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AddIp6RulesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type Address struct { @@ -320,12 +320,12 @@ type AllocateAddressesRequest struct { } func (r *AllocateAddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AllocateAddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AllocateAddressesResponse struct { @@ -344,12 +344,12 @@ type AllocateAddressesResponse struct { } func (r *AllocateAddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AllocateAddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AllocateIp6AddressesBandwidthRequest struct { @@ -366,12 +366,12 @@ type AllocateIp6AddressesBandwidthRequest struct { } func (r *AllocateIp6AddressesBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AllocateIp6AddressesBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AllocateIp6AddressesBandwidthResponse struct { @@ -390,12 +390,12 @@ type AllocateIp6AddressesBandwidthResponse struct { } func (r *AllocateIp6AddressesBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AllocateIp6AddressesBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignIpv6AddressesRequest struct { @@ -412,12 +412,12 @@ type AssignIpv6AddressesRequest struct { } func (r *AssignIpv6AddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignIpv6AddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignIpv6AddressesResponse struct { @@ -433,12 +433,12 @@ type AssignIpv6AddressesResponse struct { } func (r *AssignIpv6AddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignIpv6AddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignIpv6CidrBlockRequest struct { @@ -449,12 +449,12 @@ type AssignIpv6CidrBlockRequest struct { } func (r *AssignIpv6CidrBlockRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignIpv6CidrBlockRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignIpv6CidrBlockResponse struct { @@ -470,12 +470,12 @@ type AssignIpv6CidrBlockResponse struct { } func (r *AssignIpv6CidrBlockResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignIpv6CidrBlockResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignIpv6SubnetCidrBlockRequest struct { @@ -489,12 +489,12 @@ type AssignIpv6SubnetCidrBlockRequest struct { } func (r *AssignIpv6SubnetCidrBlockRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignIpv6SubnetCidrBlockRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignIpv6SubnetCidrBlockResponse struct { @@ -510,12 +510,12 @@ type AssignIpv6SubnetCidrBlockResponse struct { } func (r *AssignIpv6SubnetCidrBlockResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignIpv6SubnetCidrBlockResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignPrivateIpAddressesRequest struct { @@ -532,12 +532,12 @@ type AssignPrivateIpAddressesRequest struct { } func (r *AssignPrivateIpAddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignPrivateIpAddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssignPrivateIpAddressesResponse struct { @@ -553,12 +553,12 @@ type AssignPrivateIpAddressesResponse struct { } func (r *AssignPrivateIpAddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssignPrivateIpAddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssistantCidr struct { @@ -594,12 +594,12 @@ type AssociateAddressRequest struct { } func (r *AssociateAddressRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateAddressRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateAddressResponse struct { @@ -615,12 +615,12 @@ type AssociateAddressResponse struct { } func (r *AssociateAddressResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateAddressResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateDhcpIpWithAddressIpRequest struct { @@ -634,12 +634,12 @@ type AssociateDhcpIpWithAddressIpRequest struct { } func (r *AssociateDhcpIpWithAddressIpRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateDhcpIpWithAddressIpRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateDhcpIpWithAddressIpResponse struct { @@ -652,12 +652,12 @@ type AssociateDhcpIpWithAddressIpResponse struct { } func (r *AssociateDhcpIpWithAddressIpResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateDhcpIpWithAddressIpResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateNatGatewayAddressRequest struct { @@ -677,12 +677,12 @@ type AssociateNatGatewayAddressRequest struct { } func (r *AssociateNatGatewayAddressRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateNatGatewayAddressRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateNatGatewayAddressResponse struct { @@ -695,12 +695,12 @@ type AssociateNatGatewayAddressResponse struct { } func (r *AssociateNatGatewayAddressResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateNatGatewayAddressResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateNetworkAclSubnetsRequest struct { @@ -714,12 +714,12 @@ type AssociateNetworkAclSubnetsRequest struct { } func (r *AssociateNetworkAclSubnetsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateNetworkAclSubnetsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateNetworkAclSubnetsResponse struct { @@ -732,12 +732,12 @@ type AssociateNetworkAclSubnetsResponse struct { } func (r *AssociateNetworkAclSubnetsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateNetworkAclSubnetsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateNetworkInterfaceSecurityGroupsRequest struct { @@ -751,12 +751,12 @@ type AssociateNetworkInterfaceSecurityGroupsRequest struct { } func (r *AssociateNetworkInterfaceSecurityGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateNetworkInterfaceSecurityGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AssociateNetworkInterfaceSecurityGroupsResponse struct { @@ -769,12 +769,12 @@ type AssociateNetworkInterfaceSecurityGroupsResponse struct { } func (r *AssociateNetworkInterfaceSecurityGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AssociateNetworkInterfaceSecurityGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AttachCcnInstancesRequest struct { @@ -791,12 +791,12 @@ type AttachCcnInstancesRequest struct { } func (r *AttachCcnInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AttachCcnInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AttachCcnInstancesResponse struct { @@ -809,12 +809,12 @@ type AttachCcnInstancesResponse struct { } func (r *AttachCcnInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AttachCcnInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AttachClassicLinkVpcRequest struct { @@ -828,12 +828,12 @@ type AttachClassicLinkVpcRequest struct { } func (r *AttachClassicLinkVpcRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AttachClassicLinkVpcRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AttachClassicLinkVpcResponse struct { @@ -846,12 +846,12 @@ type AttachClassicLinkVpcResponse struct { } func (r *AttachClassicLinkVpcResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AttachClassicLinkVpcResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AttachNetworkInterfaceRequest struct { @@ -865,12 +865,12 @@ type AttachNetworkInterfaceRequest struct { } func (r *AttachNetworkInterfaceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AttachNetworkInterfaceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type AttachNetworkInterfaceResponse struct { @@ -883,12 +883,12 @@ type AttachNetworkInterfaceResponse struct { } func (r *AttachNetworkInterfaceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *AttachNetworkInterfaceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type BandwidthPackage struct { @@ -1104,12 +1104,12 @@ type CheckAssistantCidrRequest struct { } func (r *CheckAssistantCidrRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CheckAssistantCidrRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CheckAssistantCidrResponse struct { @@ -1125,12 +1125,12 @@ type CheckAssistantCidrResponse struct { } func (r *CheckAssistantCidrResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CheckAssistantCidrResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CheckDefaultSubnetRequest struct { @@ -1141,12 +1141,12 @@ type CheckDefaultSubnetRequest struct { } func (r *CheckDefaultSubnetRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CheckDefaultSubnetRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CheckDefaultSubnetResponse struct { @@ -1162,12 +1162,12 @@ type CheckDefaultSubnetResponse struct { } func (r *CheckDefaultSubnetResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CheckDefaultSubnetResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CheckNetDetectStateRequest struct { @@ -1206,12 +1206,12 @@ type CheckNetDetectStateRequest struct { } func (r *CheckNetDetectStateRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CheckNetDetectStateRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CheckNetDetectStateResponse struct { @@ -1227,12 +1227,12 @@ type CheckNetDetectStateResponse struct { } func (r *CheckNetDetectStateResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CheckNetDetectStateResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ClassicLinkInstance struct { @@ -1276,12 +1276,12 @@ type CreateAddressTemplateGroupRequest struct { } func (r *CreateAddressTemplateGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAddressTemplateGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAddressTemplateGroupResponse struct { @@ -1297,12 +1297,12 @@ type CreateAddressTemplateGroupResponse struct { } func (r *CreateAddressTemplateGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAddressTemplateGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAddressTemplateRequest struct { @@ -1316,12 +1316,12 @@ type CreateAddressTemplateRequest struct { } func (r *CreateAddressTemplateRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAddressTemplateRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAddressTemplateResponse struct { @@ -1337,12 +1337,12 @@ type CreateAddressTemplateResponse struct { } func (r *CreateAddressTemplateResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAddressTemplateResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAndAttachNetworkInterfaceRequest struct { @@ -1377,12 +1377,12 @@ type CreateAndAttachNetworkInterfaceRequest struct { } func (r *CreateAndAttachNetworkInterfaceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAndAttachNetworkInterfaceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAndAttachNetworkInterfaceResponse struct { @@ -1398,12 +1398,12 @@ type CreateAndAttachNetworkInterfaceResponse struct { } func (r *CreateAndAttachNetworkInterfaceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAndAttachNetworkInterfaceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAssistantCidrRequest struct { @@ -1417,12 +1417,12 @@ type CreateAssistantCidrRequest struct { } func (r *CreateAssistantCidrRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAssistantCidrRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateAssistantCidrResponse struct { @@ -1430,7 +1430,7 @@ type CreateAssistantCidrResponse struct { Response *struct { // 辅助CIDR数组。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 AssistantCidrSet []*AssistantCidr `json:"AssistantCidrSet,omitempty" name:"AssistantCidrSet" list` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -1439,12 +1439,12 @@ type CreateAssistantCidrResponse struct { } func (r *CreateAssistantCidrResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateAssistantCidrResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateBandwidthPackageRequest struct { @@ -1473,12 +1473,12 @@ type CreateBandwidthPackageRequest struct { } func (r *CreateBandwidthPackageRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateBandwidthPackageRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateBandwidthPackageResponse struct { @@ -1497,12 +1497,12 @@ type CreateBandwidthPackageResponse struct { } func (r *CreateBandwidthPackageResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateBandwidthPackageResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateCcnRequest struct { @@ -1528,12 +1528,12 @@ type CreateCcnRequest struct { } func (r *CreateCcnRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateCcnRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateCcnResponse struct { @@ -1549,12 +1549,12 @@ type CreateCcnResponse struct { } func (r *CreateCcnResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateCcnResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateCustomerGatewayRequest struct { @@ -1568,12 +1568,12 @@ type CreateCustomerGatewayRequest struct { } func (r *CreateCustomerGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateCustomerGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateCustomerGatewayResponse struct { @@ -1589,12 +1589,12 @@ type CreateCustomerGatewayResponse struct { } func (r *CreateCustomerGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateCustomerGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDefaultSecurityGroupRequest struct { @@ -1605,12 +1605,12 @@ type CreateDefaultSecurityGroupRequest struct { } func (r *CreateDefaultSecurityGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDefaultSecurityGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDefaultSecurityGroupResponse struct { @@ -1626,12 +1626,12 @@ type CreateDefaultSecurityGroupResponse struct { } func (r *CreateDefaultSecurityGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDefaultSecurityGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDefaultVpcRequest struct { @@ -1645,12 +1645,12 @@ type CreateDefaultVpcRequest struct { } func (r *CreateDefaultVpcRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDefaultVpcRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDefaultVpcResponse struct { @@ -1666,12 +1666,12 @@ type CreateDefaultVpcResponse struct { } func (r *CreateDefaultVpcResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDefaultVpcResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDhcpIpRequest struct { @@ -1691,12 +1691,12 @@ type CreateDhcpIpRequest struct { } func (r *CreateDhcpIpRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDhcpIpRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDhcpIpResponse struct { @@ -1712,12 +1712,12 @@ type CreateDhcpIpResponse struct { } func (r *CreateDhcpIpResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDhcpIpResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDirectConnectGatewayCcnRoutesRequest struct { @@ -1731,12 +1731,12 @@ type CreateDirectConnectGatewayCcnRoutesRequest struct { } func (r *CreateDirectConnectGatewayCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDirectConnectGatewayCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDirectConnectGatewayCcnRoutesResponse struct { @@ -1749,12 +1749,12 @@ type CreateDirectConnectGatewayCcnRoutesResponse struct { } func (r *CreateDirectConnectGatewayCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDirectConnectGatewayCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDirectConnectGatewayRequest struct { @@ -1779,12 +1779,12 @@ type CreateDirectConnectGatewayRequest struct { } func (r *CreateDirectConnectGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDirectConnectGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateDirectConnectGatewayResponse struct { @@ -1800,12 +1800,12 @@ type CreateDirectConnectGatewayResponse struct { } func (r *CreateDirectConnectGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateDirectConnectGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateFlowLogRequest struct { @@ -1834,12 +1834,12 @@ type CreateFlowLogRequest struct { } func (r *CreateFlowLogRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateFlowLogRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateFlowLogResponse struct { @@ -1855,12 +1855,12 @@ type CreateFlowLogResponse struct { } func (r *CreateFlowLogResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateFlowLogResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateHaVipRequest struct { @@ -1880,12 +1880,12 @@ type CreateHaVipRequest struct { } func (r *CreateHaVipRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateHaVipRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateHaVipResponse struct { @@ -1901,12 +1901,12 @@ type CreateHaVipResponse struct { } func (r *CreateHaVipResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateHaVipResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateIp6TranslatorsRequest struct { @@ -1923,12 +1923,12 @@ type CreateIp6TranslatorsRequest struct { } func (r *CreateIp6TranslatorsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateIp6TranslatorsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateIp6TranslatorsResponse struct { @@ -1944,12 +1944,12 @@ type CreateIp6TranslatorsResponse struct { } func (r *CreateIp6TranslatorsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateIp6TranslatorsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNatGatewayDestinationIpPortTranslationNatRuleRequest struct { @@ -1963,12 +1963,12 @@ type CreateNatGatewayDestinationIpPortTranslationNatRuleRequest struct { } func (r *CreateNatGatewayDestinationIpPortTranslationNatRuleRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNatGatewayDestinationIpPortTranslationNatRuleRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNatGatewayDestinationIpPortTranslationNatRuleResponse struct { @@ -1981,12 +1981,12 @@ type CreateNatGatewayDestinationIpPortTranslationNatRuleResponse struct { } func (r *CreateNatGatewayDestinationIpPortTranslationNatRuleResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNatGatewayDestinationIpPortTranslationNatRuleResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNatGatewayRequest struct { @@ -2018,12 +2018,12 @@ type CreateNatGatewayRequest struct { } func (r *CreateNatGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNatGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNatGatewayResponse struct { @@ -2042,12 +2042,12 @@ type CreateNatGatewayResponse struct { } func (r *CreateNatGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNatGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNetDetectRequest struct { @@ -2086,12 +2086,12 @@ type CreateNetDetectRequest struct { } func (r *CreateNetDetectRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNetDetectRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNetDetectResponse struct { @@ -2107,12 +2107,12 @@ type CreateNetDetectResponse struct { } func (r *CreateNetDetectResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNetDetectResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNetworkAclRequest struct { @@ -2126,12 +2126,12 @@ type CreateNetworkAclRequest struct { } func (r *CreateNetworkAclRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNetworkAclRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNetworkAclResponse struct { @@ -2147,12 +2147,12 @@ type CreateNetworkAclResponse struct { } func (r *CreateNetworkAclResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNetworkAclResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNetworkInterfaceRequest struct { @@ -2184,12 +2184,12 @@ type CreateNetworkInterfaceRequest struct { } func (r *CreateNetworkInterfaceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNetworkInterfaceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateNetworkInterfaceResponse struct { @@ -2205,12 +2205,12 @@ type CreateNetworkInterfaceResponse struct { } func (r *CreateNetworkInterfaceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateNetworkInterfaceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateRouteTableRequest struct { @@ -2227,12 +2227,12 @@ type CreateRouteTableRequest struct { } func (r *CreateRouteTableRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateRouteTableRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateRouteTableResponse struct { @@ -2248,12 +2248,12 @@ type CreateRouteTableResponse struct { } func (r *CreateRouteTableResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateRouteTableResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateRoutesRequest struct { @@ -2267,12 +2267,12 @@ type CreateRoutesRequest struct { } func (r *CreateRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateRoutesResponse struct { @@ -2291,12 +2291,12 @@ type CreateRoutesResponse struct { } func (r *CreateRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSecurityGroupPoliciesRequest struct { @@ -2310,12 +2310,12 @@ type CreateSecurityGroupPoliciesRequest struct { } func (r *CreateSecurityGroupPoliciesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSecurityGroupPoliciesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSecurityGroupPoliciesResponse struct { @@ -2328,12 +2328,12 @@ type CreateSecurityGroupPoliciesResponse struct { } func (r *CreateSecurityGroupPoliciesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSecurityGroupPoliciesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSecurityGroupRequest struct { @@ -2353,12 +2353,12 @@ type CreateSecurityGroupRequest struct { } func (r *CreateSecurityGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSecurityGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSecurityGroupResponse struct { @@ -2374,12 +2374,12 @@ type CreateSecurityGroupResponse struct { } func (r *CreateSecurityGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSecurityGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSecurityGroupWithPoliciesRequest struct { @@ -2399,12 +2399,12 @@ type CreateSecurityGroupWithPoliciesRequest struct { } func (r *CreateSecurityGroupWithPoliciesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSecurityGroupWithPoliciesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSecurityGroupWithPoliciesResponse struct { @@ -2420,12 +2420,12 @@ type CreateSecurityGroupWithPoliciesResponse struct { } func (r *CreateSecurityGroupWithPoliciesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSecurityGroupWithPoliciesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateServiceTemplateGroupRequest struct { @@ -2439,12 +2439,12 @@ type CreateServiceTemplateGroupRequest struct { } func (r *CreateServiceTemplateGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateServiceTemplateGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateServiceTemplateGroupResponse struct { @@ -2460,12 +2460,12 @@ type CreateServiceTemplateGroupResponse struct { } func (r *CreateServiceTemplateGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateServiceTemplateGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateServiceTemplateRequest struct { @@ -2479,12 +2479,12 @@ type CreateServiceTemplateRequest struct { } func (r *CreateServiceTemplateRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateServiceTemplateRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateServiceTemplateResponse struct { @@ -2500,12 +2500,12 @@ type CreateServiceTemplateResponse struct { } func (r *CreateServiceTemplateResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateServiceTemplateResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSubnetRequest struct { @@ -2528,12 +2528,12 @@ type CreateSubnetRequest struct { } func (r *CreateSubnetRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSubnetRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSubnetResponse struct { @@ -2549,12 +2549,12 @@ type CreateSubnetResponse struct { } func (r *CreateSubnetResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSubnetResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSubnetsRequest struct { @@ -2571,12 +2571,12 @@ type CreateSubnetsRequest struct { } func (r *CreateSubnetsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSubnetsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateSubnetsResponse struct { @@ -2592,12 +2592,12 @@ type CreateSubnetsResponse struct { } func (r *CreateSubnetsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateSubnetsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateVpcRequest struct { @@ -2623,12 +2623,12 @@ type CreateVpcRequest struct { } func (r *CreateVpcRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateVpcRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateVpcResponse struct { @@ -2644,12 +2644,12 @@ type CreateVpcResponse struct { } func (r *CreateVpcResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateVpcResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateVpnConnectionRequest struct { @@ -2681,12 +2681,12 @@ type CreateVpnConnectionRequest struct { } func (r *CreateVpnConnectionRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateVpnConnectionRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateVpnConnectionResponse struct { @@ -2702,12 +2702,12 @@ type CreateVpnConnectionResponse struct { } func (r *CreateVpnConnectionResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateVpnConnectionResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateVpnGatewayRequest struct { @@ -2736,12 +2736,12 @@ type CreateVpnGatewayRequest struct { } func (r *CreateVpnGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateVpnGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CreateVpnGatewayResponse struct { @@ -2757,12 +2757,12 @@ type CreateVpnGatewayResponse struct { } func (r *CreateVpnGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *CreateVpnGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type CustomerGateway struct { @@ -2848,12 +2848,12 @@ type DeleteAddressTemplateGroupRequest struct { } func (r *DeleteAddressTemplateGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteAddressTemplateGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteAddressTemplateGroupResponse struct { @@ -2866,12 +2866,12 @@ type DeleteAddressTemplateGroupResponse struct { } func (r *DeleteAddressTemplateGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteAddressTemplateGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteAddressTemplateRequest struct { @@ -2882,12 +2882,12 @@ type DeleteAddressTemplateRequest struct { } func (r *DeleteAddressTemplateRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteAddressTemplateRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteAddressTemplateResponse struct { @@ -2900,12 +2900,12 @@ type DeleteAddressTemplateResponse struct { } func (r *DeleteAddressTemplateResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteAddressTemplateResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteAssistantCidrRequest struct { @@ -2919,12 +2919,12 @@ type DeleteAssistantCidrRequest struct { } func (r *DeleteAssistantCidrRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteAssistantCidrRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteAssistantCidrResponse struct { @@ -2937,12 +2937,12 @@ type DeleteAssistantCidrResponse struct { } func (r *DeleteAssistantCidrResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteAssistantCidrResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteBandwidthPackageRequest struct { @@ -2953,12 +2953,12 @@ type DeleteBandwidthPackageRequest struct { } func (r *DeleteBandwidthPackageRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteBandwidthPackageRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteBandwidthPackageResponse struct { @@ -2971,12 +2971,12 @@ type DeleteBandwidthPackageResponse struct { } func (r *DeleteBandwidthPackageResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteBandwidthPackageResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteCcnRequest struct { @@ -2987,12 +2987,12 @@ type DeleteCcnRequest struct { } func (r *DeleteCcnRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteCcnRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteCcnResponse struct { @@ -3005,12 +3005,12 @@ type DeleteCcnResponse struct { } func (r *DeleteCcnResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteCcnResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteCustomerGatewayRequest struct { @@ -3021,12 +3021,12 @@ type DeleteCustomerGatewayRequest struct { } func (r *DeleteCustomerGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteCustomerGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteCustomerGatewayResponse struct { @@ -3039,12 +3039,12 @@ type DeleteCustomerGatewayResponse struct { } func (r *DeleteCustomerGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteCustomerGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDhcpIpRequest struct { @@ -3055,12 +3055,12 @@ type DeleteDhcpIpRequest struct { } func (r *DeleteDhcpIpRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDhcpIpRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDhcpIpResponse struct { @@ -3073,12 +3073,12 @@ type DeleteDhcpIpResponse struct { } func (r *DeleteDhcpIpResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDhcpIpResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDirectConnectGatewayCcnRoutesRequest struct { @@ -3092,12 +3092,12 @@ type DeleteDirectConnectGatewayCcnRoutesRequest struct { } func (r *DeleteDirectConnectGatewayCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDirectConnectGatewayCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDirectConnectGatewayCcnRoutesResponse struct { @@ -3110,12 +3110,12 @@ type DeleteDirectConnectGatewayCcnRoutesResponse struct { } func (r *DeleteDirectConnectGatewayCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDirectConnectGatewayCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDirectConnectGatewayRequest struct { @@ -3126,12 +3126,12 @@ type DeleteDirectConnectGatewayRequest struct { } func (r *DeleteDirectConnectGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDirectConnectGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteDirectConnectGatewayResponse struct { @@ -3144,12 +3144,12 @@ type DeleteDirectConnectGatewayResponse struct { } func (r *DeleteDirectConnectGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteDirectConnectGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteFlowLogRequest struct { @@ -3163,12 +3163,12 @@ type DeleteFlowLogRequest struct { } func (r *DeleteFlowLogRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteFlowLogRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteFlowLogResponse struct { @@ -3181,12 +3181,12 @@ type DeleteFlowLogResponse struct { } func (r *DeleteFlowLogResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteFlowLogResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteHaVipRequest struct { @@ -3197,12 +3197,12 @@ type DeleteHaVipRequest struct { } func (r *DeleteHaVipRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteHaVipRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteHaVipResponse struct { @@ -3215,12 +3215,12 @@ type DeleteHaVipResponse struct { } func (r *DeleteHaVipResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteHaVipResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteIp6TranslatorsRequest struct { @@ -3231,12 +3231,12 @@ type DeleteIp6TranslatorsRequest struct { } func (r *DeleteIp6TranslatorsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteIp6TranslatorsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteIp6TranslatorsResponse struct { @@ -3249,12 +3249,12 @@ type DeleteIp6TranslatorsResponse struct { } func (r *DeleteIp6TranslatorsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteIp6TranslatorsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest struct { @@ -3268,12 +3268,12 @@ type DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest struct { } func (r *DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNatGatewayDestinationIpPortTranslationNatRuleRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse struct { @@ -3286,12 +3286,12 @@ type DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse struct { } func (r *DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNatGatewayDestinationIpPortTranslationNatRuleResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNatGatewayRequest struct { @@ -3302,12 +3302,12 @@ type DeleteNatGatewayRequest struct { } func (r *DeleteNatGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNatGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNatGatewayResponse struct { @@ -3320,12 +3320,12 @@ type DeleteNatGatewayResponse struct { } func (r *DeleteNatGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNatGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNetDetectRequest struct { @@ -3336,12 +3336,12 @@ type DeleteNetDetectRequest struct { } func (r *DeleteNetDetectRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNetDetectRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNetDetectResponse struct { @@ -3354,12 +3354,12 @@ type DeleteNetDetectResponse struct { } func (r *DeleteNetDetectResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNetDetectResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNetworkAclRequest struct { @@ -3370,12 +3370,12 @@ type DeleteNetworkAclRequest struct { } func (r *DeleteNetworkAclRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNetworkAclRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNetworkAclResponse struct { @@ -3388,12 +3388,12 @@ type DeleteNetworkAclResponse struct { } func (r *DeleteNetworkAclResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNetworkAclResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNetworkInterfaceRequest struct { @@ -3404,12 +3404,12 @@ type DeleteNetworkInterfaceRequest struct { } func (r *DeleteNetworkInterfaceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNetworkInterfaceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteNetworkInterfaceResponse struct { @@ -3422,12 +3422,12 @@ type DeleteNetworkInterfaceResponse struct { } func (r *DeleteNetworkInterfaceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteNetworkInterfaceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteRouteTableRequest struct { @@ -3438,12 +3438,12 @@ type DeleteRouteTableRequest struct { } func (r *DeleteRouteTableRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteRouteTableRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteRouteTableResponse struct { @@ -3456,12 +3456,12 @@ type DeleteRouteTableResponse struct { } func (r *DeleteRouteTableResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteRouteTableResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteRoutesRequest struct { @@ -3475,12 +3475,12 @@ type DeleteRoutesRequest struct { } func (r *DeleteRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteRoutesResponse struct { @@ -3493,12 +3493,12 @@ type DeleteRoutesResponse struct { } func (r *DeleteRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteSecurityGroupPoliciesRequest struct { @@ -3512,12 +3512,12 @@ type DeleteSecurityGroupPoliciesRequest struct { } func (r *DeleteSecurityGroupPoliciesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteSecurityGroupPoliciesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteSecurityGroupPoliciesResponse struct { @@ -3530,12 +3530,12 @@ type DeleteSecurityGroupPoliciesResponse struct { } func (r *DeleteSecurityGroupPoliciesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteSecurityGroupPoliciesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteSecurityGroupRequest struct { @@ -3546,12 +3546,12 @@ type DeleteSecurityGroupRequest struct { } func (r *DeleteSecurityGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteSecurityGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteSecurityGroupResponse struct { @@ -3564,12 +3564,12 @@ type DeleteSecurityGroupResponse struct { } func (r *DeleteSecurityGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteSecurityGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteServiceTemplateGroupRequest struct { @@ -3580,12 +3580,12 @@ type DeleteServiceTemplateGroupRequest struct { } func (r *DeleteServiceTemplateGroupRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteServiceTemplateGroupRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteServiceTemplateGroupResponse struct { @@ -3598,12 +3598,12 @@ type DeleteServiceTemplateGroupResponse struct { } func (r *DeleteServiceTemplateGroupResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteServiceTemplateGroupResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteServiceTemplateRequest struct { @@ -3614,12 +3614,12 @@ type DeleteServiceTemplateRequest struct { } func (r *DeleteServiceTemplateRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteServiceTemplateRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteServiceTemplateResponse struct { @@ -3632,12 +3632,12 @@ type DeleteServiceTemplateResponse struct { } func (r *DeleteServiceTemplateResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteServiceTemplateResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteSubnetRequest struct { @@ -3648,12 +3648,12 @@ type DeleteSubnetRequest struct { } func (r *DeleteSubnetRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteSubnetRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteSubnetResponse struct { @@ -3666,12 +3666,12 @@ type DeleteSubnetResponse struct { } func (r *DeleteSubnetResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteSubnetResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteVpcRequest struct { @@ -3682,12 +3682,12 @@ type DeleteVpcRequest struct { } func (r *DeleteVpcRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteVpcRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteVpcResponse struct { @@ -3700,12 +3700,12 @@ type DeleteVpcResponse struct { } func (r *DeleteVpcResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteVpcResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteVpnConnectionRequest struct { @@ -3719,12 +3719,12 @@ type DeleteVpnConnectionRequest struct { } func (r *DeleteVpnConnectionRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteVpnConnectionRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteVpnConnectionResponse struct { @@ -3737,12 +3737,12 @@ type DeleteVpnConnectionResponse struct { } func (r *DeleteVpnConnectionResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteVpnConnectionResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteVpnGatewayRequest struct { @@ -3753,12 +3753,12 @@ type DeleteVpnGatewayRequest struct { } func (r *DeleteVpnGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteVpnGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DeleteVpnGatewayResponse struct { @@ -3771,12 +3771,12 @@ type DeleteVpnGatewayResponse struct { } func (r *DeleteVpnGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DeleteVpnGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAccountAttributesRequest struct { @@ -3784,12 +3784,12 @@ type DescribeAccountAttributesRequest struct { } func (r *DescribeAccountAttributesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAccountAttributesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAccountAttributesResponse struct { @@ -3805,12 +3805,12 @@ type DescribeAccountAttributesResponse struct { } func (r *DescribeAccountAttributesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAccountAttributesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressQuotaRequest struct { @@ -3818,12 +3818,12 @@ type DescribeAddressQuotaRequest struct { } func (r *DescribeAddressQuotaRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressQuotaRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressQuotaResponse struct { @@ -3839,12 +3839,12 @@ type DescribeAddressQuotaResponse struct { } func (r *DescribeAddressQuotaResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressQuotaResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressTemplateGroupsRequest struct { @@ -3863,12 +3863,12 @@ type DescribeAddressTemplateGroupsRequest struct { } func (r *DescribeAddressTemplateGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressTemplateGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressTemplateGroupsResponse struct { @@ -3887,12 +3887,12 @@ type DescribeAddressTemplateGroupsResponse struct { } func (r *DescribeAddressTemplateGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressTemplateGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressTemplatesRequest struct { @@ -3911,12 +3911,12 @@ type DescribeAddressTemplatesRequest struct { } func (r *DescribeAddressTemplatesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressTemplatesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressTemplatesResponse struct { @@ -3935,12 +3935,12 @@ type DescribeAddressTemplatesResponse struct { } func (r *DescribeAddressTemplatesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressTemplatesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressesRequest struct { @@ -3968,12 +3968,12 @@ type DescribeAddressesRequest struct { } func (r *DescribeAddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAddressesResponse struct { @@ -3992,12 +3992,12 @@ type DescribeAddressesResponse struct { } func (r *DescribeAddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAssistantCidrRequest struct { @@ -4018,12 +4018,12 @@ type DescribeAssistantCidrRequest struct { } func (r *DescribeAssistantCidrRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAssistantCidrRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeAssistantCidrResponse struct { @@ -4031,7 +4031,7 @@ type DescribeAssistantCidrResponse struct { Response *struct { // 符合条件的辅助CIDR数组。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 AssistantCidrSet []*AssistantCidr `json:"AssistantCidrSet,omitempty" name:"AssistantCidrSet" list` // 符合条件的实例数量。 @@ -4043,12 +4043,12 @@ type DescribeAssistantCidrResponse struct { } func (r *DescribeAssistantCidrResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeAssistantCidrResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeBandwidthPackageQuotaRequest struct { @@ -4056,12 +4056,12 @@ type DescribeBandwidthPackageQuotaRequest struct { } func (r *DescribeBandwidthPackageQuotaRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeBandwidthPackageQuotaRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeBandwidthPackageQuotaResponse struct { @@ -4077,12 +4077,12 @@ type DescribeBandwidthPackageQuotaResponse struct { } func (r *DescribeBandwidthPackageQuotaResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeBandwidthPackageQuotaResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeBandwidthPackagesRequest struct { @@ -4109,12 +4109,12 @@ type DescribeBandwidthPackagesRequest struct { } func (r *DescribeBandwidthPackagesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeBandwidthPackagesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeBandwidthPackagesResponse struct { @@ -4133,12 +4133,12 @@ type DescribeBandwidthPackagesResponse struct { } func (r *DescribeBandwidthPackagesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeBandwidthPackagesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnAttachedInstancesRequest struct { @@ -4168,12 +4168,12 @@ type DescribeCcnAttachedInstancesRequest struct { } func (r *DescribeCcnAttachedInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnAttachedInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnAttachedInstancesResponse struct { @@ -4192,12 +4192,12 @@ type DescribeCcnAttachedInstancesResponse struct { } func (r *DescribeCcnAttachedInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnAttachedInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnRegionBandwidthLimitsRequest struct { @@ -4208,12 +4208,12 @@ type DescribeCcnRegionBandwidthLimitsRequest struct { } func (r *DescribeCcnRegionBandwidthLimitsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnRegionBandwidthLimitsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnRegionBandwidthLimitsResponse struct { @@ -4229,12 +4229,12 @@ type DescribeCcnRegionBandwidthLimitsResponse struct { } func (r *DescribeCcnRegionBandwidthLimitsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnRegionBandwidthLimitsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnRoutesRequest struct { @@ -4262,12 +4262,12 @@ type DescribeCcnRoutesRequest struct { } func (r *DescribeCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnRoutesResponse struct { @@ -4286,12 +4286,12 @@ type DescribeCcnRoutesResponse struct { } func (r *DescribeCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnsRequest struct { @@ -4323,12 +4323,12 @@ type DescribeCcnsRequest struct { } func (r *DescribeCcnsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCcnsResponse struct { @@ -4347,12 +4347,12 @@ type DescribeCcnsResponse struct { } func (r *DescribeCcnsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCcnsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeClassicLinkInstancesRequest struct { @@ -4371,12 +4371,12 @@ type DescribeClassicLinkInstancesRequest struct { } func (r *DescribeClassicLinkInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeClassicLinkInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeClassicLinkInstancesResponse struct { @@ -4395,12 +4395,12 @@ type DescribeClassicLinkInstancesResponse struct { } func (r *DescribeClassicLinkInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeClassicLinkInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCustomerGatewayVendorsRequest struct { @@ -4408,12 +4408,12 @@ type DescribeCustomerGatewayVendorsRequest struct { } func (r *DescribeCustomerGatewayVendorsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCustomerGatewayVendorsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCustomerGatewayVendorsResponse struct { @@ -4429,12 +4429,12 @@ type DescribeCustomerGatewayVendorsResponse struct { } func (r *DescribeCustomerGatewayVendorsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCustomerGatewayVendorsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCustomerGatewaysRequest struct { @@ -4457,12 +4457,12 @@ type DescribeCustomerGatewaysRequest struct { } func (r *DescribeCustomerGatewaysRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCustomerGatewaysRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeCustomerGatewaysResponse struct { @@ -4481,12 +4481,12 @@ type DescribeCustomerGatewaysResponse struct { } func (r *DescribeCustomerGatewaysResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeCustomerGatewaysResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDhcpIpsRequest struct { @@ -4511,12 +4511,12 @@ type DescribeDhcpIpsRequest struct { } func (r *DescribeDhcpIpsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDhcpIpsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDhcpIpsResponse struct { @@ -4535,12 +4535,12 @@ type DescribeDhcpIpsResponse struct { } func (r *DescribeDhcpIpsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDhcpIpsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDirectConnectGatewayCcnRoutesRequest struct { @@ -4562,12 +4562,12 @@ type DescribeDirectConnectGatewayCcnRoutesRequest struct { } func (r *DescribeDirectConnectGatewayCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDirectConnectGatewayCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDirectConnectGatewayCcnRoutesResponse struct { @@ -4586,12 +4586,12 @@ type DescribeDirectConnectGatewayCcnRoutesResponse struct { } func (r *DescribeDirectConnectGatewayCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDirectConnectGatewayCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDirectConnectGatewaysRequest struct { @@ -4618,12 +4618,12 @@ type DescribeDirectConnectGatewaysRequest struct { } func (r *DescribeDirectConnectGatewaysRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDirectConnectGatewaysRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeDirectConnectGatewaysResponse struct { @@ -4642,12 +4642,12 @@ type DescribeDirectConnectGatewaysResponse struct { } func (r *DescribeDirectConnectGatewaysResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeDirectConnectGatewaysResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeFlowLogRequest struct { @@ -4661,12 +4661,12 @@ type DescribeFlowLogRequest struct { } func (r *DescribeFlowLogRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeFlowLogRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeFlowLogResponse struct { @@ -4682,12 +4682,12 @@ type DescribeFlowLogResponse struct { } func (r *DescribeFlowLogResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeFlowLogResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeFlowLogsRequest struct { @@ -4736,12 +4736,12 @@ type DescribeFlowLogsRequest struct { } func (r *DescribeFlowLogsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeFlowLogsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeFlowLogsResponse struct { @@ -4760,12 +4760,12 @@ type DescribeFlowLogsResponse struct { } func (r *DescribeFlowLogsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeFlowLogsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeGatewayFlowMonitorDetailRequest struct { @@ -4800,12 +4800,12 @@ type DescribeGatewayFlowMonitorDetailRequest struct { } func (r *DescribeGatewayFlowMonitorDetailRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeGatewayFlowMonitorDetailRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeGatewayFlowMonitorDetailResponse struct { @@ -4824,12 +4824,12 @@ type DescribeGatewayFlowMonitorDetailResponse struct { } func (r *DescribeGatewayFlowMonitorDetailResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeGatewayFlowMonitorDetailResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeGatewayFlowQosRequest struct { @@ -4852,12 +4852,12 @@ type DescribeGatewayFlowQosRequest struct { } func (r *DescribeGatewayFlowQosRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeGatewayFlowQosRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeGatewayFlowQosResponse struct { @@ -4876,12 +4876,12 @@ type DescribeGatewayFlowQosResponse struct { } func (r *DescribeGatewayFlowQosResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeGatewayFlowQosResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeHaVipsRequest struct { @@ -4907,12 +4907,12 @@ type DescribeHaVipsRequest struct { } func (r *DescribeHaVipsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeHaVipsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeHaVipsResponse struct { @@ -4931,12 +4931,12 @@ type DescribeHaVipsResponse struct { } func (r *DescribeHaVipsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeHaVipsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeIp6AddressesRequest struct { @@ -4958,12 +4958,12 @@ type DescribeIp6AddressesRequest struct { } func (r *DescribeIp6AddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeIp6AddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeIp6AddressesResponse struct { @@ -4982,12 +4982,12 @@ type DescribeIp6AddressesResponse struct { } func (r *DescribeIp6AddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeIp6AddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeIp6TranslatorQuotaRequest struct { @@ -4998,12 +4998,12 @@ type DescribeIp6TranslatorQuotaRequest struct { } func (r *DescribeIp6TranslatorQuotaRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeIp6TranslatorQuotaRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeIp6TranslatorQuotaResponse struct { @@ -5011,7 +5011,7 @@ type DescribeIp6TranslatorQuotaResponse struct { Response *struct { // 账户在指定地域的IPV6转换实例及规则配额信息 - // QUOTAID属性是TOTAL_TRANSLATOR_QUOTA，表示账户在指定地域的IPV6转换实例配额信息；QUOTAID属性是IPV6转换实例唯一ID（形如ip6-xxxxxxxx），表示账户在该转换实例允许创建的转换规则配额 + // QUOTAID属性是TOTAL_TRANSLATOR_QUOTA，表示账户在指定地域的IPV6转换实例配额信息；QUOTAID属性是IPV6转换实例唯一ID（形如ip6-xxxxxxxx），表示账户在该转换实例允许创建的转换规则配额 QuotaSet []*Quota `json:"QuotaSet,omitempty" name:"QuotaSet" list` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -5020,12 +5020,12 @@ type DescribeIp6TranslatorQuotaResponse struct { } func (r *DescribeIp6TranslatorQuotaResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeIp6TranslatorQuotaResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeIp6TranslatorsRequest struct { @@ -5049,12 +5049,12 @@ type DescribeIp6TranslatorsRequest struct { } func (r *DescribeIp6TranslatorsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeIp6TranslatorsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeIp6TranslatorsResponse struct { @@ -5073,12 +5073,12 @@ type DescribeIp6TranslatorsResponse struct { } func (r *DescribeIp6TranslatorsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeIp6TranslatorsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest struct { @@ -5106,12 +5106,12 @@ type DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest struct { } func (r *DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNatGatewayDestinationIpPortTranslationNatRulesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse struct { @@ -5130,12 +5130,12 @@ type DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse struct { } func (r *DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNatGatewayDestinationIpPortTranslationNatRulesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNatGatewaysRequest struct { @@ -5158,12 +5158,12 @@ type DescribeNatGatewaysRequest struct { } func (r *DescribeNatGatewaysRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNatGatewaysRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNatGatewaysResponse struct { @@ -5182,12 +5182,12 @@ type DescribeNatGatewaysResponse struct { } func (r *DescribeNatGatewaysResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNatGatewaysResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetDetectStatesRequest struct { @@ -5208,12 +5208,12 @@ type DescribeNetDetectStatesRequest struct { } func (r *DescribeNetDetectStatesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetDetectStatesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetDetectStatesResponse struct { @@ -5221,11 +5221,11 @@ type DescribeNetDetectStatesResponse struct { Response *struct { // 符合条件的网络探测验证结果对象数组。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 NetDetectStateSet []*NetDetectState `json:"NetDetectStateSet,omitempty" name:"NetDetectStateSet" list` // 符合条件的网络探测验证结果对象数量。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 TotalCount *uint64 `json:"TotalCount,omitempty" name:"TotalCount"` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -5234,12 +5234,12 @@ type DescribeNetDetectStatesResponse struct { } func (r *DescribeNetDetectStatesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetDetectStatesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetDetectsRequest struct { @@ -5263,12 +5263,12 @@ type DescribeNetDetectsRequest struct { } func (r *DescribeNetDetectsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetDetectsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetDetectsResponse struct { @@ -5276,11 +5276,11 @@ type DescribeNetDetectsResponse struct { Response *struct { // 符合条件的网络探测对象数组。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 NetDetectSet []*NetDetect `json:"NetDetectSet,omitempty" name:"NetDetectSet" list` // 符合条件的网络探测对象数量。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 TotalCount *uint64 `json:"TotalCount,omitempty" name:"TotalCount"` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -5289,12 +5289,12 @@ type DescribeNetDetectsResponse struct { } func (r *DescribeNetDetectsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetDetectsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetworkAclsRequest struct { @@ -5317,12 +5317,12 @@ type DescribeNetworkAclsRequest struct { } func (r *DescribeNetworkAclsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetworkAclsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetworkAclsResponse struct { @@ -5341,12 +5341,12 @@ type DescribeNetworkAclsResponse struct { } func (r *DescribeNetworkAclsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetworkAclsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetworkInterfaceLimitRequest struct { @@ -5357,12 +5357,12 @@ type DescribeNetworkInterfaceLimitRequest struct { } func (r *DescribeNetworkInterfaceLimitRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetworkInterfaceLimitRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetworkInterfaceLimitResponse struct { @@ -5381,12 +5381,12 @@ type DescribeNetworkInterfaceLimitResponse struct { } func (r *DescribeNetworkInterfaceLimitResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetworkInterfaceLimitResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetworkInterfacesRequest struct { @@ -5418,12 +5418,12 @@ type DescribeNetworkInterfacesRequest struct { } func (r *DescribeNetworkInterfacesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetworkInterfacesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeNetworkInterfacesResponse struct { @@ -5442,12 +5442,12 @@ type DescribeNetworkInterfacesResponse struct { } func (r *DescribeNetworkInterfacesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeNetworkInterfacesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeRouteConflictsRequest struct { @@ -5461,12 +5461,12 @@ type DescribeRouteConflictsRequest struct { } func (r *DescribeRouteConflictsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeRouteConflictsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeRouteConflictsResponse struct { @@ -5482,12 +5482,12 @@ type DescribeRouteConflictsResponse struct { } func (r *DescribeRouteConflictsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeRouteConflictsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeRouteTablesRequest struct { @@ -5513,12 +5513,12 @@ type DescribeRouteTablesRequest struct { } func (r *DescribeRouteTablesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeRouteTablesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeRouteTablesResponse struct { @@ -5537,12 +5537,12 @@ type DescribeRouteTablesResponse struct { } func (r *DescribeRouteTablesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeRouteTablesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupAssociationStatisticsRequest struct { @@ -5553,12 +5553,12 @@ type DescribeSecurityGroupAssociationStatisticsRequest struct { } func (r *DescribeSecurityGroupAssociationStatisticsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupAssociationStatisticsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupAssociationStatisticsResponse struct { @@ -5574,12 +5574,12 @@ type DescribeSecurityGroupAssociationStatisticsResponse struct { } func (r *DescribeSecurityGroupAssociationStatisticsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupAssociationStatisticsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupLimitsRequest struct { @@ -5587,12 +5587,12 @@ type DescribeSecurityGroupLimitsRequest struct { } func (r *DescribeSecurityGroupLimitsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupLimitsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupLimitsResponse struct { @@ -5608,12 +5608,12 @@ type DescribeSecurityGroupLimitsResponse struct { } func (r *DescribeSecurityGroupLimitsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupLimitsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupPoliciesRequest struct { @@ -5624,12 +5624,12 @@ type DescribeSecurityGroupPoliciesRequest struct { } func (r *DescribeSecurityGroupPoliciesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupPoliciesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupPoliciesResponse struct { @@ -5645,12 +5645,12 @@ type DescribeSecurityGroupPoliciesResponse struct { } func (r *DescribeSecurityGroupPoliciesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupPoliciesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupReferencesRequest struct { @@ -5661,12 +5661,12 @@ type DescribeSecurityGroupReferencesRequest struct { } func (r *DescribeSecurityGroupReferencesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupReferencesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupReferencesResponse struct { @@ -5682,12 +5682,12 @@ type DescribeSecurityGroupReferencesResponse struct { } func (r *DescribeSecurityGroupReferencesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupReferencesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupsRequest struct { @@ -5712,12 +5712,12 @@ type DescribeSecurityGroupsRequest struct { } func (r *DescribeSecurityGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSecurityGroupsResponse struct { @@ -5736,12 +5736,12 @@ type DescribeSecurityGroupsResponse struct { } func (r *DescribeSecurityGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSecurityGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeServiceTemplateGroupsRequest struct { @@ -5760,12 +5760,12 @@ type DescribeServiceTemplateGroupsRequest struct { } func (r *DescribeServiceTemplateGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeServiceTemplateGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeServiceTemplateGroupsResponse struct { @@ -5784,12 +5784,12 @@ type DescribeServiceTemplateGroupsResponse struct { } func (r *DescribeServiceTemplateGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeServiceTemplateGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeServiceTemplatesRequest struct { @@ -5808,12 +5808,12 @@ type DescribeServiceTemplatesRequest struct { } func (r *DescribeServiceTemplatesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeServiceTemplatesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeServiceTemplatesResponse struct { @@ -5832,12 +5832,12 @@ type DescribeServiceTemplatesResponse struct { } func (r *DescribeServiceTemplatesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeServiceTemplatesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSubnetsRequest struct { @@ -5866,12 +5866,12 @@ type DescribeSubnetsRequest struct { } func (r *DescribeSubnetsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSubnetsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeSubnetsResponse struct { @@ -5890,12 +5890,12 @@ type DescribeSubnetsResponse struct { } func (r *DescribeSubnetsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeSubnetsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeTaskResultRequest struct { @@ -5909,12 +5909,12 @@ type DescribeTaskResultRequest struct { } func (r *DescribeTaskResultRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeTaskResultRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeTaskResultResponse struct { @@ -5933,12 +5933,12 @@ type DescribeTaskResultResponse struct { } func (r *DescribeTaskResultResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeTaskResultResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeTemplateLimitsRequest struct { @@ -5946,12 +5946,12 @@ type DescribeTemplateLimitsRequest struct { } func (r *DescribeTemplateLimitsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeTemplateLimitsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeTemplateLimitsResponse struct { @@ -5967,12 +5967,12 @@ type DescribeTemplateLimitsResponse struct { } func (r *DescribeTemplateLimitsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeTemplateLimitsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcInstancesRequest struct { @@ -5992,12 +5992,12 @@ type DescribeVpcInstancesRequest struct { } func (r *DescribeVpcInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcInstancesResponse struct { @@ -6016,12 +6016,12 @@ type DescribeVpcInstancesResponse struct { } func (r *DescribeVpcInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcIpv6AddressesRequest struct { @@ -6041,12 +6041,12 @@ type DescribeVpcIpv6AddressesRequest struct { } func (r *DescribeVpcIpv6AddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcIpv6AddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcIpv6AddressesResponse struct { @@ -6065,12 +6065,12 @@ type DescribeVpcIpv6AddressesResponse struct { } func (r *DescribeVpcIpv6AddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcIpv6AddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcLimitsRequest struct { @@ -6081,12 +6081,12 @@ type DescribeVpcLimitsRequest struct { } func (r *DescribeVpcLimitsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcLimitsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcLimitsResponse struct { @@ -6102,12 +6102,12 @@ type DescribeVpcLimitsResponse struct { } func (r *DescribeVpcLimitsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcLimitsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcPrivateIpAddressesRequest struct { @@ -6121,12 +6121,12 @@ type DescribeVpcPrivateIpAddressesRequest struct { } func (r *DescribeVpcPrivateIpAddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcPrivateIpAddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcPrivateIpAddressesResponse struct { @@ -6142,12 +6142,12 @@ type DescribeVpcPrivateIpAddressesResponse struct { } func (r *DescribeVpcPrivateIpAddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcPrivateIpAddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcResourceDashboardRequest struct { @@ -6158,12 +6158,12 @@ type DescribeVpcResourceDashboardRequest struct { } func (r *DescribeVpcResourceDashboardRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcResourceDashboardRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcResourceDashboardResponse struct { @@ -6179,12 +6179,12 @@ type DescribeVpcResourceDashboardResponse struct { } func (r *DescribeVpcResourceDashboardResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcResourceDashboardResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcsRequest struct { @@ -6210,12 +6210,12 @@ type DescribeVpcsRequest struct { } func (r *DescribeVpcsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpcsResponse struct { @@ -6234,12 +6234,12 @@ type DescribeVpcsResponse struct { } func (r *DescribeVpcsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpcsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpnConnectionsRequest struct { @@ -6264,12 +6264,12 @@ type DescribeVpnConnectionsRequest struct { } func (r *DescribeVpnConnectionsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpnConnectionsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpnConnectionsResponse struct { @@ -6288,12 +6288,12 @@ type DescribeVpnConnectionsResponse struct { } func (r *DescribeVpnConnectionsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpnConnectionsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpnGatewayCcnRoutesRequest struct { @@ -6310,12 +6310,12 @@ type DescribeVpnGatewayCcnRoutesRequest struct { } func (r *DescribeVpnGatewayCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpnGatewayCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpnGatewayCcnRoutesResponse struct { @@ -6334,12 +6334,12 @@ type DescribeVpnGatewayCcnRoutesResponse struct { } func (r *DescribeVpnGatewayCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpnGatewayCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpnGatewaysRequest struct { @@ -6366,12 +6366,12 @@ type DescribeVpnGatewaysRequest struct { } func (r *DescribeVpnGatewaysRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpnGatewaysRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DescribeVpnGatewaysResponse struct { @@ -6390,12 +6390,12 @@ type DescribeVpnGatewaysResponse struct { } func (r *DescribeVpnGatewaysResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DescribeVpnGatewaysResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DestinationIpPortTranslationNatRule struct { @@ -6430,12 +6430,12 @@ type DetachCcnInstancesRequest struct { } func (r *DetachCcnInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DetachCcnInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DetachCcnInstancesResponse struct { @@ -6448,12 +6448,12 @@ type DetachCcnInstancesResponse struct { } func (r *DetachCcnInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DetachCcnInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DetachClassicLinkVpcRequest struct { @@ -6467,12 +6467,12 @@ type DetachClassicLinkVpcRequest struct { } func (r *DetachClassicLinkVpcRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DetachClassicLinkVpcRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DetachClassicLinkVpcResponse struct { @@ -6485,12 +6485,12 @@ type DetachClassicLinkVpcResponse struct { } func (r *DetachClassicLinkVpcResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DetachClassicLinkVpcResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DetachNetworkInterfaceRequest struct { @@ -6504,12 +6504,12 @@ type DetachNetworkInterfaceRequest struct { } func (r *DetachNetworkInterfaceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DetachNetworkInterfaceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DetachNetworkInterfaceResponse struct { @@ -6522,12 +6522,12 @@ type DetachNetworkInterfaceResponse struct { } func (r *DetachNetworkInterfaceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DetachNetworkInterfaceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DhcpIp struct { @@ -6636,12 +6636,12 @@ type DisableCcnRoutesRequest struct { } func (r *DisableCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisableCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisableCcnRoutesResponse struct { @@ -6654,12 +6654,12 @@ type DisableCcnRoutesResponse struct { } func (r *DisableCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisableCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisableGatewayFlowMonitorRequest struct { @@ -6673,12 +6673,12 @@ type DisableGatewayFlowMonitorRequest struct { } func (r *DisableGatewayFlowMonitorRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisableGatewayFlowMonitorRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisableGatewayFlowMonitorResponse struct { @@ -6691,12 +6691,12 @@ type DisableGatewayFlowMonitorResponse struct { } func (r *DisableGatewayFlowMonitorResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisableGatewayFlowMonitorResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisableRoutesRequest struct { @@ -6713,12 +6713,12 @@ type DisableRoutesRequest struct { } func (r *DisableRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisableRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisableRoutesResponse struct { @@ -6731,12 +6731,12 @@ type DisableRoutesResponse struct { } func (r *DisableRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisableRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateAddressRequest struct { @@ -6750,12 +6750,12 @@ type DisassociateAddressRequest struct { } func (r *DisassociateAddressRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateAddressRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateAddressResponse struct { @@ -6771,12 +6771,12 @@ type DisassociateAddressResponse struct { } func (r *DisassociateAddressResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateAddressResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateDhcpIpWithAddressIpRequest struct { @@ -6787,12 +6787,12 @@ type DisassociateDhcpIpWithAddressIpRequest struct { } func (r *DisassociateDhcpIpWithAddressIpRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateDhcpIpWithAddressIpRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateDhcpIpWithAddressIpResponse struct { @@ -6805,12 +6805,12 @@ type DisassociateDhcpIpWithAddressIpResponse struct { } func (r *DisassociateDhcpIpWithAddressIpResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateDhcpIpWithAddressIpResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateNatGatewayAddressRequest struct { @@ -6824,12 +6824,12 @@ type DisassociateNatGatewayAddressRequest struct { } func (r *DisassociateNatGatewayAddressRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateNatGatewayAddressRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateNatGatewayAddressResponse struct { @@ -6842,12 +6842,12 @@ type DisassociateNatGatewayAddressResponse struct { } func (r *DisassociateNatGatewayAddressResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateNatGatewayAddressResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateNetworkAclSubnetsRequest struct { @@ -6861,12 +6861,12 @@ type DisassociateNetworkAclSubnetsRequest struct { } func (r *DisassociateNetworkAclSubnetsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateNetworkAclSubnetsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateNetworkAclSubnetsResponse struct { @@ -6879,12 +6879,12 @@ type DisassociateNetworkAclSubnetsResponse struct { } func (r *DisassociateNetworkAclSubnetsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateNetworkAclSubnetsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateNetworkInterfaceSecurityGroupsRequest struct { @@ -6898,12 +6898,12 @@ type DisassociateNetworkInterfaceSecurityGroupsRequest struct { } func (r *DisassociateNetworkInterfaceSecurityGroupsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateNetworkInterfaceSecurityGroupsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DisassociateNetworkInterfaceSecurityGroupsResponse struct { @@ -6916,12 +6916,12 @@ type DisassociateNetworkInterfaceSecurityGroupsResponse struct { } func (r *DisassociateNetworkInterfaceSecurityGroupsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DisassociateNetworkInterfaceSecurityGroupsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DownloadCustomerGatewayConfigurationRequest struct { @@ -6941,12 +6941,12 @@ type DownloadCustomerGatewayConfigurationRequest struct { } func (r *DownloadCustomerGatewayConfigurationRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DownloadCustomerGatewayConfigurationRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type DownloadCustomerGatewayConfigurationResponse struct { @@ -6962,12 +6962,12 @@ type DownloadCustomerGatewayConfigurationResponse struct { } func (r *DownloadCustomerGatewayConfigurationResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *DownloadCustomerGatewayConfigurationResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type EnableCcnRoutesRequest struct { @@ -6981,12 +6981,12 @@ type EnableCcnRoutesRequest struct { } func (r *EnableCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *EnableCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type EnableCcnRoutesResponse struct { @@ -6999,12 +6999,12 @@ type EnableCcnRoutesResponse struct { } func (r *EnableCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *EnableCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type EnableGatewayFlowMonitorRequest struct { @@ -7018,12 +7018,12 @@ type EnableGatewayFlowMonitorRequest struct { } func (r *EnableGatewayFlowMonitorRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *EnableGatewayFlowMonitorRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type EnableGatewayFlowMonitorResponse struct { @@ -7036,12 +7036,12 @@ type EnableGatewayFlowMonitorResponse struct { } func (r *EnableGatewayFlowMonitorResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *EnableGatewayFlowMonitorResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type EnableRoutesRequest struct { @@ -7058,12 +7058,12 @@ type EnableRoutesRequest struct { } func (r *EnableRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *EnableRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type EnableRoutesResponse struct { @@ -7076,12 +7076,12 @@ type EnableRoutesResponse struct { } func (r *EnableRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *EnableRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type Filter struct { @@ -7193,12 +7193,12 @@ type GetCcnRegionBandwidthLimitsRequest struct { } func (r *GetCcnRegionBandwidthLimitsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *GetCcnRegionBandwidthLimitsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type GetCcnRegionBandwidthLimitsResponse struct { @@ -7206,11 +7206,11 @@ type GetCcnRegionBandwidthLimitsResponse struct { Response *struct { // 云联网（CCN）各地域出带宽带宽详情。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 CcnBandwidthSet []*CcnBandwidthInfo `json:"CcnBandwidthSet,omitempty" name:"CcnBandwidthSet" list` // 符合条件的对象数。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 TotalCount *uint64 `json:"TotalCount,omitempty" name:"TotalCount"` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -7219,12 +7219,12 @@ type GetCcnRegionBandwidthLimitsResponse struct { } func (r *GetCcnRegionBandwidthLimitsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *GetCcnRegionBandwidthLimitsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type HaVip struct { @@ -7276,12 +7276,12 @@ type HaVipAssociateAddressIpRequest struct { } func (r *HaVipAssociateAddressIpRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *HaVipAssociateAddressIpRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type HaVipAssociateAddressIpResponse struct { @@ -7294,12 +7294,12 @@ type HaVipAssociateAddressIpResponse struct { } func (r *HaVipAssociateAddressIpResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *HaVipAssociateAddressIpResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type HaVipDisassociateAddressIpRequest struct { @@ -7310,12 +7310,12 @@ type HaVipDisassociateAddressIpRequest struct { } func (r *HaVipDisassociateAddressIpRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *HaVipDisassociateAddressIpRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type HaVipDisassociateAddressIpResponse struct { @@ -7328,12 +7328,12 @@ type HaVipDisassociateAddressIpResponse struct { } func (r *HaVipDisassociateAddressIpResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *HaVipDisassociateAddressIpResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type IKEOptionsSpecification struct { @@ -7407,12 +7407,12 @@ type InquiryPriceCreateVpnGatewayRequest struct { } func (r *InquiryPriceCreateVpnGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceCreateVpnGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceCreateVpnGatewayResponse struct { @@ -7428,12 +7428,12 @@ type InquiryPriceCreateVpnGatewayResponse struct { } func (r *InquiryPriceCreateVpnGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceCreateVpnGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceRenewVpnGatewayRequest struct { @@ -7447,12 +7447,12 @@ type InquiryPriceRenewVpnGatewayRequest struct { } func (r *InquiryPriceRenewVpnGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceRenewVpnGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceRenewVpnGatewayResponse struct { @@ -7468,12 +7468,12 @@ type InquiryPriceRenewVpnGatewayResponse struct { } func (r *InquiryPriceRenewVpnGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceRenewVpnGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest struct { @@ -7487,12 +7487,12 @@ type InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest struct { } func (r *InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetVpnGatewayInternetMaxBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse struct { @@ -7508,12 +7508,12 @@ type InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse struct { } func (r *InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *InquiryPriceResetVpnGatewayInternetMaxBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type InstanceChargePrepaid struct { @@ -7669,12 +7669,12 @@ type MigrateNetworkInterfaceRequest struct { } func (r *MigrateNetworkInterfaceRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *MigrateNetworkInterfaceRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type MigrateNetworkInterfaceResponse struct { @@ -7687,12 +7687,12 @@ type MigrateNetworkInterfaceResponse struct { } func (r *MigrateNetworkInterfaceResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *MigrateNetworkInterfaceResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type MigratePrivateIpAddressRequest struct { @@ -7709,12 +7709,12 @@ type MigratePrivateIpAddressRequest struct { } func (r *MigratePrivateIpAddressRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *MigratePrivateIpAddressRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type MigratePrivateIpAddressResponse struct { @@ -7727,12 +7727,12 @@ type MigratePrivateIpAddressResponse struct { } func (r *MigratePrivateIpAddressResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *MigratePrivateIpAddressResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressAttributeRequest struct { @@ -7749,12 +7749,12 @@ type ModifyAddressAttributeRequest struct { } func (r *ModifyAddressAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressAttributeResponse struct { @@ -7767,12 +7767,12 @@ type ModifyAddressAttributeResponse struct { } func (r *ModifyAddressAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressInternetChargeTypeRequest struct { @@ -7792,12 +7792,12 @@ type ModifyAddressInternetChargeTypeRequest struct { } func (r *ModifyAddressInternetChargeTypeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressInternetChargeTypeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressInternetChargeTypeResponse struct { @@ -7810,12 +7810,12 @@ type ModifyAddressInternetChargeTypeResponse struct { } func (r *ModifyAddressInternetChargeTypeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressInternetChargeTypeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressTemplateAttributeRequest struct { @@ -7832,12 +7832,12 @@ type ModifyAddressTemplateAttributeRequest struct { } func (r *ModifyAddressTemplateAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressTemplateAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressTemplateAttributeResponse struct { @@ -7850,12 +7850,12 @@ type ModifyAddressTemplateAttributeResponse struct { } func (r *ModifyAddressTemplateAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressTemplateAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressTemplateGroupAttributeRequest struct { @@ -7872,12 +7872,12 @@ type ModifyAddressTemplateGroupAttributeRequest struct { } func (r *ModifyAddressTemplateGroupAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressTemplateGroupAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressTemplateGroupAttributeResponse struct { @@ -7890,12 +7890,12 @@ type ModifyAddressTemplateGroupAttributeResponse struct { } func (r *ModifyAddressTemplateGroupAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressTemplateGroupAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressesBandwidthRequest struct { @@ -7915,12 +7915,12 @@ type ModifyAddressesBandwidthRequest struct { } func (r *ModifyAddressesBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressesBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAddressesBandwidthResponse struct { @@ -7936,12 +7936,12 @@ type ModifyAddressesBandwidthResponse struct { } func (r *ModifyAddressesBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAddressesBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAssistantCidrRequest struct { @@ -7958,12 +7958,12 @@ type ModifyAssistantCidrRequest struct { } func (r *ModifyAssistantCidrRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAssistantCidrRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyAssistantCidrResponse struct { @@ -7971,7 +7971,7 @@ type ModifyAssistantCidrResponse struct { Response *struct { // 辅助CIDR数组。 - // 注意：此字段可能返回 null，表示取不到有效值。 + // 注意：此字段可能返回 null，表示取不到有效值。 AssistantCidrSet []*AssistantCidr `json:"AssistantCidrSet,omitempty" name:"AssistantCidrSet" list` // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 @@ -7980,12 +7980,12 @@ type ModifyAssistantCidrResponse struct { } func (r *ModifyAssistantCidrResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyAssistantCidrResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyBandwidthPackageAttributeRequest struct { @@ -8002,12 +8002,12 @@ type ModifyBandwidthPackageAttributeRequest struct { } func (r *ModifyBandwidthPackageAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyBandwidthPackageAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyBandwidthPackageAttributeResponse struct { @@ -8020,12 +8020,12 @@ type ModifyBandwidthPackageAttributeResponse struct { } func (r *ModifyBandwidthPackageAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyBandwidthPackageAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyCcnAttributeRequest struct { @@ -8042,12 +8042,12 @@ type ModifyCcnAttributeRequest struct { } func (r *ModifyCcnAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyCcnAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyCcnAttributeResponse struct { @@ -8060,12 +8060,12 @@ type ModifyCcnAttributeResponse struct { } func (r *ModifyCcnAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyCcnAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyCcnRegionBandwidthLimitsTypeRequest struct { @@ -8079,12 +8079,12 @@ type ModifyCcnRegionBandwidthLimitsTypeRequest struct { } func (r *ModifyCcnRegionBandwidthLimitsTypeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyCcnRegionBandwidthLimitsTypeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyCcnRegionBandwidthLimitsTypeResponse struct { @@ -8097,12 +8097,12 @@ type ModifyCcnRegionBandwidthLimitsTypeResponse struct { } func (r *ModifyCcnRegionBandwidthLimitsTypeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyCcnRegionBandwidthLimitsTypeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyCustomerGatewayAttributeRequest struct { @@ -8116,12 +8116,12 @@ type ModifyCustomerGatewayAttributeRequest struct { } func (r *ModifyCustomerGatewayAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyCustomerGatewayAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyCustomerGatewayAttributeResponse struct { @@ -8134,12 +8134,12 @@ type ModifyCustomerGatewayAttributeResponse struct { } func (r *ModifyCustomerGatewayAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyCustomerGatewayAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyDhcpIpAttributeRequest struct { @@ -8153,12 +8153,12 @@ type ModifyDhcpIpAttributeRequest struct { } func (r *ModifyDhcpIpAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyDhcpIpAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyDhcpIpAttributeResponse struct { @@ -8171,12 +8171,12 @@ type ModifyDhcpIpAttributeResponse struct { } func (r *ModifyDhcpIpAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyDhcpIpAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyDirectConnectGatewayAttributeRequest struct { @@ -8193,12 +8193,12 @@ type ModifyDirectConnectGatewayAttributeRequest struct { } func (r *ModifyDirectConnectGatewayAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyDirectConnectGatewayAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyDirectConnectGatewayAttributeResponse struct { @@ -8211,12 +8211,12 @@ type ModifyDirectConnectGatewayAttributeResponse struct { } func (r *ModifyDirectConnectGatewayAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyDirectConnectGatewayAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyFlowLogAttributeRequest struct { @@ -8236,12 +8236,12 @@ type ModifyFlowLogAttributeRequest struct { } func (r *ModifyFlowLogAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyFlowLogAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyFlowLogAttributeResponse struct { @@ -8254,12 +8254,12 @@ type ModifyFlowLogAttributeResponse struct { } func (r *ModifyFlowLogAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyFlowLogAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyGatewayFlowQosRequest struct { @@ -8279,12 +8279,12 @@ type ModifyGatewayFlowQosRequest struct { } func (r *ModifyGatewayFlowQosRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyGatewayFlowQosRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyGatewayFlowQosResponse struct { @@ -8297,12 +8297,12 @@ type ModifyGatewayFlowQosResponse struct { } func (r *ModifyGatewayFlowQosResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyGatewayFlowQosResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyHaVipAttributeRequest struct { @@ -8316,12 +8316,12 @@ type ModifyHaVipAttributeRequest struct { } func (r *ModifyHaVipAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyHaVipAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyHaVipAttributeResponse struct { @@ -8334,12 +8334,12 @@ type ModifyHaVipAttributeResponse struct { } func (r *ModifyHaVipAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyHaVipAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIp6AddressesBandwidthRequest struct { @@ -8356,12 +8356,12 @@ type ModifyIp6AddressesBandwidthRequest struct { } func (r *ModifyIp6AddressesBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIp6AddressesBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIp6AddressesBandwidthResponse struct { @@ -8374,12 +8374,12 @@ type ModifyIp6AddressesBandwidthResponse struct { } func (r *ModifyIp6AddressesBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIp6AddressesBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIp6RuleRequest struct { @@ -8402,12 +8402,12 @@ type ModifyIp6RuleRequest struct { } func (r *ModifyIp6RuleRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIp6RuleRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIp6RuleResponse struct { @@ -8420,12 +8420,12 @@ type ModifyIp6RuleResponse struct { } func (r *ModifyIp6RuleResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIp6RuleResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIp6TranslatorRequest struct { @@ -8439,12 +8439,12 @@ type ModifyIp6TranslatorRequest struct { } func (r *ModifyIp6TranslatorRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIp6TranslatorRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIp6TranslatorResponse struct { @@ -8457,12 +8457,12 @@ type ModifyIp6TranslatorResponse struct { } func (r *ModifyIp6TranslatorResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIp6TranslatorResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIpv6AddressesAttributeRequest struct { @@ -8476,12 +8476,12 @@ type ModifyIpv6AddressesAttributeRequest struct { } func (r *ModifyIpv6AddressesAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIpv6AddressesAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyIpv6AddressesAttributeResponse struct { @@ -8494,12 +8494,12 @@ type ModifyIpv6AddressesAttributeResponse struct { } func (r *ModifyIpv6AddressesAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyIpv6AddressesAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNatGatewayAttributeRequest struct { @@ -8516,12 +8516,12 @@ type ModifyNatGatewayAttributeRequest struct { } func (r *ModifyNatGatewayAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNatGatewayAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNatGatewayAttributeResponse struct { @@ -8534,12 +8534,12 @@ type ModifyNatGatewayAttributeResponse struct { } func (r *ModifyNatGatewayAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNatGatewayAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest struct { @@ -8556,12 +8556,12 @@ type ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest struct { } func (r *ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNatGatewayDestinationIpPortTranslationNatRuleRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse struct { @@ -8574,12 +8574,12 @@ type ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse struct { } func (r *ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNatGatewayDestinationIpPortTranslationNatRuleResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetDetectRequest struct { @@ -8615,12 +8615,12 @@ type ModifyNetDetectRequest struct { } func (r *ModifyNetDetectRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetDetectRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetDetectResponse struct { @@ -8633,12 +8633,12 @@ type ModifyNetDetectResponse struct { } func (r *ModifyNetDetectResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetDetectResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetworkAclAttributeRequest struct { @@ -8652,12 +8652,12 @@ type ModifyNetworkAclAttributeRequest struct { } func (r *ModifyNetworkAclAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetworkAclAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetworkAclAttributeResponse struct { @@ -8670,12 +8670,12 @@ type ModifyNetworkAclAttributeResponse struct { } func (r *ModifyNetworkAclAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetworkAclAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetworkAclEntriesRequest struct { @@ -8689,12 +8689,12 @@ type ModifyNetworkAclEntriesRequest struct { } func (r *ModifyNetworkAclEntriesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetworkAclEntriesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetworkAclEntriesResponse struct { @@ -8707,12 +8707,12 @@ type ModifyNetworkAclEntriesResponse struct { } func (r *ModifyNetworkAclEntriesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetworkAclEntriesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetworkInterfaceAttributeRequest struct { @@ -8732,12 +8732,12 @@ type ModifyNetworkInterfaceAttributeRequest struct { } func (r *ModifyNetworkInterfaceAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetworkInterfaceAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyNetworkInterfaceAttributeResponse struct { @@ -8750,12 +8750,12 @@ type ModifyNetworkInterfaceAttributeResponse struct { } func (r *ModifyNetworkInterfaceAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyNetworkInterfaceAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyPrivateIpAddressesAttributeRequest struct { @@ -8769,12 +8769,12 @@ type ModifyPrivateIpAddressesAttributeRequest struct { } func (r *ModifyPrivateIpAddressesAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyPrivateIpAddressesAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyPrivateIpAddressesAttributeResponse struct { @@ -8787,12 +8787,12 @@ type ModifyPrivateIpAddressesAttributeResponse struct { } func (r *ModifyPrivateIpAddressesAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyPrivateIpAddressesAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyRouteTableAttributeRequest struct { @@ -8806,12 +8806,12 @@ type ModifyRouteTableAttributeRequest struct { } func (r *ModifyRouteTableAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyRouteTableAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyRouteTableAttributeResponse struct { @@ -8824,12 +8824,12 @@ type ModifyRouteTableAttributeResponse struct { } func (r *ModifyRouteTableAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyRouteTableAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifySecurityGroupAttributeRequest struct { @@ -8846,12 +8846,12 @@ type ModifySecurityGroupAttributeRequest struct { } func (r *ModifySecurityGroupAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifySecurityGroupAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifySecurityGroupAttributeResponse struct { @@ -8864,12 +8864,12 @@ type ModifySecurityGroupAttributeResponse struct { } func (r *ModifySecurityGroupAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifySecurityGroupAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifySecurityGroupPoliciesRequest struct { @@ -8886,12 +8886,12 @@ type ModifySecurityGroupPoliciesRequest struct { } func (r *ModifySecurityGroupPoliciesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifySecurityGroupPoliciesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifySecurityGroupPoliciesResponse struct { @@ -8904,12 +8904,12 @@ type ModifySecurityGroupPoliciesResponse struct { } func (r *ModifySecurityGroupPoliciesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifySecurityGroupPoliciesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyServiceTemplateAttributeRequest struct { @@ -8926,12 +8926,12 @@ type ModifyServiceTemplateAttributeRequest struct { } func (r *ModifyServiceTemplateAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyServiceTemplateAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyServiceTemplateAttributeResponse struct { @@ -8944,12 +8944,12 @@ type ModifyServiceTemplateAttributeResponse struct { } func (r *ModifyServiceTemplateAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyServiceTemplateAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyServiceTemplateGroupAttributeRequest struct { @@ -8966,12 +8966,12 @@ type ModifyServiceTemplateGroupAttributeRequest struct { } func (r *ModifyServiceTemplateGroupAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyServiceTemplateGroupAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyServiceTemplateGroupAttributeResponse struct { @@ -8984,12 +8984,12 @@ type ModifyServiceTemplateGroupAttributeResponse struct { } func (r *ModifyServiceTemplateGroupAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyServiceTemplateGroupAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifySubnetAttributeRequest struct { @@ -9006,12 +9006,12 @@ type ModifySubnetAttributeRequest struct { } func (r *ModifySubnetAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifySubnetAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifySubnetAttributeResponse struct { @@ -9024,12 +9024,12 @@ type ModifySubnetAttributeResponse struct { } func (r *ModifySubnetAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifySubnetAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpcAttributeRequest struct { @@ -9052,12 +9052,12 @@ type ModifyVpcAttributeRequest struct { } func (r *ModifyVpcAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpcAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpcAttributeResponse struct { @@ -9070,12 +9070,12 @@ type ModifyVpcAttributeResponse struct { } func (r *ModifyVpcAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpcAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpnConnectionAttributeRequest struct { @@ -9101,12 +9101,12 @@ type ModifyVpnConnectionAttributeRequest struct { } func (r *ModifyVpnConnectionAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpnConnectionAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpnConnectionAttributeResponse struct { @@ -9119,12 +9119,12 @@ type ModifyVpnConnectionAttributeResponse struct { } func (r *ModifyVpnConnectionAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpnConnectionAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpnGatewayAttributeRequest struct { @@ -9141,12 +9141,12 @@ type ModifyVpnGatewayAttributeRequest struct { } func (r *ModifyVpnGatewayAttributeRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpnGatewayAttributeRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpnGatewayAttributeResponse struct { @@ -9159,12 +9159,12 @@ type ModifyVpnGatewayAttributeResponse struct { } func (r *ModifyVpnGatewayAttributeResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpnGatewayAttributeResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpnGatewayCcnRoutesRequest struct { @@ -9178,12 +9178,12 @@ type ModifyVpnGatewayCcnRoutesRequest struct { } func (r *ModifyVpnGatewayCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpnGatewayCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ModifyVpnGatewayCcnRoutesResponse struct { @@ -9196,12 +9196,12 @@ type ModifyVpnGatewayCcnRoutesResponse struct { } func (r *ModifyVpnGatewayCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ModifyVpnGatewayCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type NatGateway struct { @@ -9569,12 +9569,12 @@ type RejectAttachCcnInstancesRequest struct { } func (r *RejectAttachCcnInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RejectAttachCcnInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RejectAttachCcnInstancesResponse struct { @@ -9587,12 +9587,12 @@ type RejectAttachCcnInstancesResponse struct { } func (r *RejectAttachCcnInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RejectAttachCcnInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReleaseAddressesRequest struct { @@ -9603,12 +9603,12 @@ type ReleaseAddressesRequest struct { } func (r *ReleaseAddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReleaseAddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReleaseAddressesResponse struct { @@ -9624,12 +9624,12 @@ type ReleaseAddressesResponse struct { } func (r *ReleaseAddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReleaseAddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReleaseIp6AddressesBandwidthRequest struct { @@ -9643,12 +9643,12 @@ type ReleaseIp6AddressesBandwidthRequest struct { } func (r *ReleaseIp6AddressesBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReleaseIp6AddressesBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReleaseIp6AddressesBandwidthResponse struct { @@ -9664,12 +9664,12 @@ type ReleaseIp6AddressesBandwidthResponse struct { } func (r *ReleaseIp6AddressesBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReleaseIp6AddressesBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RemoveBandwidthPackageResourcesRequest struct { @@ -9686,12 +9686,12 @@ type RemoveBandwidthPackageResourcesRequest struct { } func (r *RemoveBandwidthPackageResourcesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RemoveBandwidthPackageResourcesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RemoveBandwidthPackageResourcesResponse struct { @@ -9704,12 +9704,12 @@ type RemoveBandwidthPackageResourcesResponse struct { } func (r *RemoveBandwidthPackageResourcesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RemoveBandwidthPackageResourcesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RemoveIp6RulesRequest struct { @@ -9723,12 +9723,12 @@ type RemoveIp6RulesRequest struct { } func (r *RemoveIp6RulesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RemoveIp6RulesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RemoveIp6RulesResponse struct { @@ -9741,12 +9741,12 @@ type RemoveIp6RulesResponse struct { } func (r *RemoveIp6RulesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RemoveIp6RulesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RenewVpnGatewayRequest struct { @@ -9760,12 +9760,12 @@ type RenewVpnGatewayRequest struct { } func (r *RenewVpnGatewayRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RenewVpnGatewayRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type RenewVpnGatewayResponse struct { @@ -9778,12 +9778,12 @@ type RenewVpnGatewayResponse struct { } func (r *RenewVpnGatewayResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *RenewVpnGatewayResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceDirectConnectGatewayCcnRoutesRequest struct { @@ -9797,12 +9797,12 @@ type ReplaceDirectConnectGatewayCcnRoutesRequest struct { } func (r *ReplaceDirectConnectGatewayCcnRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceDirectConnectGatewayCcnRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceDirectConnectGatewayCcnRoutesResponse struct { @@ -9815,12 +9815,12 @@ type ReplaceDirectConnectGatewayCcnRoutesResponse struct { } func (r *ReplaceDirectConnectGatewayCcnRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceDirectConnectGatewayCcnRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceRouteTableAssociationRequest struct { @@ -9834,12 +9834,12 @@ type ReplaceRouteTableAssociationRequest struct { } func (r *ReplaceRouteTableAssociationRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceRouteTableAssociationRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceRouteTableAssociationResponse struct { @@ -9852,12 +9852,12 @@ type ReplaceRouteTableAssociationResponse struct { } func (r *ReplaceRouteTableAssociationResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceRouteTableAssociationResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceRoutesRequest struct { @@ -9871,12 +9871,12 @@ type ReplaceRoutesRequest struct { } func (r *ReplaceRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceRoutesResponse struct { @@ -9889,12 +9889,12 @@ type ReplaceRoutesResponse struct { } func (r *ReplaceRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceSecurityGroupPolicyRequest struct { @@ -9908,12 +9908,12 @@ type ReplaceSecurityGroupPolicyRequest struct { } func (r *ReplaceSecurityGroupPolicyRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceSecurityGroupPolicyRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ReplaceSecurityGroupPolicyResponse struct { @@ -9926,12 +9926,12 @@ type ReplaceSecurityGroupPolicyResponse struct { } func (r *ReplaceSecurityGroupPolicyResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ReplaceSecurityGroupPolicyResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetAttachCcnInstancesRequest struct { @@ -9948,12 +9948,12 @@ type ResetAttachCcnInstancesRequest struct { } func (r *ResetAttachCcnInstancesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetAttachCcnInstancesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetAttachCcnInstancesResponse struct { @@ -9966,12 +9966,12 @@ type ResetAttachCcnInstancesResponse struct { } func (r *ResetAttachCcnInstancesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetAttachCcnInstancesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetNatGatewayConnectionRequest struct { @@ -9985,12 +9985,12 @@ type ResetNatGatewayConnectionRequest struct { } func (r *ResetNatGatewayConnectionRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetNatGatewayConnectionRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetNatGatewayConnectionResponse struct { @@ -10003,12 +10003,12 @@ type ResetNatGatewayConnectionResponse struct { } func (r *ResetNatGatewayConnectionResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetNatGatewayConnectionResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetRoutesRequest struct { @@ -10025,12 +10025,12 @@ type ResetRoutesRequest struct { } func (r *ResetRoutesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetRoutesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetRoutesResponse struct { @@ -10043,12 +10043,12 @@ type ResetRoutesResponse struct { } func (r *ResetRoutesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetRoutesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetVpnConnectionRequest struct { @@ -10062,12 +10062,12 @@ type ResetVpnConnectionRequest struct { } func (r *ResetVpnConnectionRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetVpnConnectionRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetVpnConnectionResponse struct { @@ -10080,12 +10080,12 @@ type ResetVpnConnectionResponse struct { } func (r *ResetVpnConnectionResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetVpnConnectionResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetVpnGatewayInternetMaxBandwidthRequest struct { @@ -10099,12 +10099,12 @@ type ResetVpnGatewayInternetMaxBandwidthRequest struct { } func (r *ResetVpnGatewayInternetMaxBandwidthRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetVpnGatewayInternetMaxBandwidthRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type ResetVpnGatewayInternetMaxBandwidthResponse struct { @@ -10117,12 +10117,12 @@ type ResetVpnGatewayInternetMaxBandwidthResponse struct { } func (r *ResetVpnGatewayInternetMaxBandwidthResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *ResetVpnGatewayInternetMaxBandwidthResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type Resource struct { @@ -10277,7 +10277,7 @@ type Route struct { // DIRECTCONNECT：专线网关； // PEERCONNECTION：对等连接； // SSLVPN：sslvpn网关； - // NAT：NAT网关; + // NAT：NAT网关; // NORMAL_CVM：普通云服务器； // EIP：云服务器的公网IP； // CCN：云联网。 @@ -10540,12 +10540,12 @@ type SetCcnRegionBandwidthLimitsRequest struct { } func (r *SetCcnRegionBandwidthLimitsRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *SetCcnRegionBandwidthLimitsRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type SetCcnRegionBandwidthLimitsResponse struct { @@ -10558,12 +10558,12 @@ type SetCcnRegionBandwidthLimitsResponse struct { } func (r *SetCcnRegionBandwidthLimitsResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *SetCcnRegionBandwidthLimitsResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type Subnet struct { @@ -10663,12 +10663,12 @@ type TransformAddressRequest struct { } func (r *TransformAddressRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *TransformAddressRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type TransformAddressResponse struct { @@ -10681,12 +10681,12 @@ type TransformAddressResponse struct { } func (r *TransformAddressResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *TransformAddressResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignIpv6AddressesRequest struct { @@ -10700,12 +10700,12 @@ type UnassignIpv6AddressesRequest struct { } func (r *UnassignIpv6AddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignIpv6AddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignIpv6AddressesResponse struct { @@ -10718,12 +10718,12 @@ type UnassignIpv6AddressesResponse struct { } func (r *UnassignIpv6AddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignIpv6AddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignIpv6CidrBlockRequest struct { @@ -10737,12 +10737,12 @@ type UnassignIpv6CidrBlockRequest struct { } func (r *UnassignIpv6CidrBlockRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignIpv6CidrBlockRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignIpv6CidrBlockResponse struct { @@ -10755,12 +10755,12 @@ type UnassignIpv6CidrBlockResponse struct { } func (r *UnassignIpv6CidrBlockResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignIpv6CidrBlockResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignIpv6SubnetCidrBlockRequest struct { @@ -10774,12 +10774,12 @@ type UnassignIpv6SubnetCidrBlockRequest struct { } func (r *UnassignIpv6SubnetCidrBlockRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignIpv6SubnetCidrBlockRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignIpv6SubnetCidrBlockResponse struct { @@ -10792,12 +10792,12 @@ type UnassignIpv6SubnetCidrBlockResponse struct { } func (r *UnassignIpv6SubnetCidrBlockResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignIpv6SubnetCidrBlockResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignPrivateIpAddressesRequest struct { @@ -10811,12 +10811,12 @@ type UnassignPrivateIpAddressesRequest struct { } func (r *UnassignPrivateIpAddressesRequest) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignPrivateIpAddressesRequest) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type UnassignPrivateIpAddressesResponse struct { @@ -10829,12 +10829,12 @@ type UnassignPrivateIpAddressesResponse struct { } func (r *UnassignPrivateIpAddressesResponse) ToJsonString() string { - b, _ := json.Marshal(r) - return string(b) + b, _ := json.Marshal(r) + return string(b) } func (r *UnassignPrivateIpAddressesResponse) FromJsonString(s string) error { - return json.Unmarshal([]byte(s), &r) + return json.Unmarshal([]byte(s), &r) } type Vpc struct { diff --git a/vendor/github.com/ufilesdk-dev/ufile-gosdk/file.go b/vendor/github.com/ufilesdk-dev/ufile-gosdk/file.go index 106fd4c0f..1cca94d8e 100644 --- a/vendor/github.com/ufilesdk-dev/ufile-gosdk/file.go +++ b/vendor/github.com/ufilesdk-dev/ufile-gosdk/file.go @@ -2,8 +2,8 @@ package ufsdk import ( "bytes" - "crypto/md5" "encoding/base64" + "crypto/md5" "encoding/json" "fmt" "io" @@ -205,6 +205,7 @@ func (u *UFileRequest) PutFileWithPolicy(filePath, keyName, mimeType string, pol return u.request(req) } + //DeleteFile 删除一个文件，如果删除成功 statuscode 会返回 204，否则会返回 404 表示文件不存在。 //keyName 表示传到 ufile 的文件名。 func (u *UFileRequest) DeleteFile(keyName string) error { @@ -410,7 +411,7 @@ func (u *UFileRequest) Copy(dstkeyName, srcBucketName, srcKeyName string) (err e if err != nil { return err } - req.Header.Add("X-Ufile-Copy-Source", "/"+srcBucketName+"/"+srcKeyName) + req.Header.Add("X-Ufile-Copy-Source", "/" + srcBucketName + "/" + srcKeyName) authorization := u.Auth.Authorization("PUT", u.BucketName, dstkeyName, req.Header) req.Header.Add("authorization", authorization) diff --git a/vendor/github.com/ufilesdk-dev/ufile-gosdk/file_mutipart_upload_with_policy.go b/vendor/github.com/ufilesdk-dev/ufile-gosdk/file_mutipart_upload_with_policy.go index 6457d1753..51d29fa0d 100644 --- a/vendor/github.com/ufilesdk-dev/ufile-gosdk/file_mutipart_upload_with_policy.go +++ b/vendor/github.com/ufilesdk-dev/ufile-gosdk/file_mutipart_upload_with_policy.go @@ -2,8 +2,8 @@ package ufsdk import ( "bytes" - "encoding/base64" "io" + "encoding/base64" "net/http" "net/url" "strconv" @@ -131,6 +131,7 @@ func (u *UFileRequest) AsyncUploadWithPolicy(filePath, keyName, mimeType string, return u.FinishMultipartUploadWithPolicy(state, policy_json) } + //FinishMultipartUpload 完成分片上传。分片上传必须要调用的接口。 //state 参数是 InitiateMultipartUpload 返回的 func (u *UFileRequest) FinishMultipartUploadWithPolicy(state *MultipartState, policy_json string) error { @@ -150,7 +151,7 @@ func (u *UFileRequest) FinishMultipartUploadWithPolicy(state *MultipartState, po if err != nil { return err } - + req.Header.Add("Content-Type", state.mimeType) policy := base64.URLEncoding.EncodeToString([]byte(policy_json)) @@ -161,3 +162,5 @@ func (u *UFileRequest) FinishMultipartUploadWithPolicy(state *MultipartState, po return u.request(req) } + + diff --git a/vendor/github.com/ufilesdk-dev/ufile-gosdk/request.go b/vendor/github.com/ufilesdk-dev/ufile-gosdk/request.go index 4a43ef880..f69c2bc52 100644 --- a/vendor/github.com/ufilesdk-dev/ufile-gosdk/request.go +++ b/vendor/github.com/ufilesdk-dev/ufile-gosdk/request.go @@ -22,13 +22,13 @@ import ( //4.远端请求返回值统一返回一个 error，如果为 nil 表示无错。LastResponseStatus，LastResponseHeader，LastResponseBody 可以查看具体的 HTTP 返回信息（）。如果你想少敲几行代码可以直接调用 DumpResponse(true) 查看详细返回。 // type UFileRequest struct { - Auth Auth - BucketName string - Host string - Client *http.Client - Context context.Context - baseURL *url.URL - RequestHeader http.Header + Auth Auth + BucketName string + Host string + Client *http.Client + Context context.Context + baseURL *url.URL + RequestHeader http.Header LastResponseStatus int LastResponseHeader http.Header @@ -65,7 +65,7 @@ func NewFileRequest(config *Config, client *http.Client) (*UFileRequest, error) //client 这里你可以传空，会使用默认的 http.Client。如果你需要设置超时以及一些其他相关的网络配置选项请传入一个自定义的 client。 func NewFileRequestWithHeader(config *Config, header http.Header, client *http.Client) (*UFileRequest, error) { req, err := NewFileRequest(config, client) - if err != nil { + if err != nil{ return nil, err } req.RequestHeader = header diff --git a/vendor/github.com/ugorji/go/codec/0doc.go b/vendor/github.com/ugorji/go/codec/0doc.go index 5286c7d42..bd7361c87 100644 --- a/vendor/github.com/ugorji/go/codec/0doc.go +++ b/vendor/github.com/ugorji/go/codec/0doc.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license found in the LICENSE file. /* -High Performance, Feature-Rich Idiomatic Go codec/encoding library for +High Performance, Feature-Rich Idiomatic Go codec/encoding library for binc, msgpack, cbor, json. Supported Serialization formats are: @@ -11,7 +11,7 @@ Supported Serialization formats are: - binc: http://github.com/ugorji/binc - cbor: http://cbor.io http://tools.ietf.org/html/rfc7049 - json: http://json.org http://tools.ietf.org/html/rfc7159 - - simple: + - simple: To install: @@ -19,7 +19,7 @@ To install: This package understands the 'unsafe' tag, to allow using unsafe semantics: - - When decoding into a struct, you need to read the field name as a string + - When decoding into a struct, you need to read the field name as a string so you can find the struct field it is mapped to. Using `unsafe` will bypass the allocation and copying overhead of []byte->string conversion. @@ -38,9 +38,9 @@ Rich Feature Set includes: - Very High Performance. Our extensive benchmarks show us outperforming Gob, Json, Bson, etc by 2-4X. - Multiple conversions: - Package coerces types where appropriate + Package coerces types where appropriate e.g. decode an int in the stream into a float, etc. - - Corner Cases: + - Corner Cases: Overflows, nil maps/slices, nil values in streams are handled correctly - Standard field renaming via tags - Support for omitting empty fields during an encoding @@ -56,7 +56,7 @@ Rich Feature Set includes: - Fast (no-reflection) encoding/decoding of common maps and slices - Code-generation for faster performance. - Support binary (e.g. messagepack, cbor) and text (e.g. json) formats - - Support indefinite-length formats to enable true streaming + - Support indefinite-length formats to enable true streaming (for formats which support it e.g. json, cbor) - Support canonical encoding, where a value is ALWAYS encoded as same sequence of bytes. This mostly applies to maps, where iteration order is non-deterministic. @@ -68,12 +68,12 @@ Rich Feature Set includes: - Encode/Decode from/to chan types (for iterative streaming support) - Drop-in replacement for encoding/json. `json:` key in struct tag supported. - Provides a RPC Server and Client Codec for net/rpc communication protocol. - - Handle unique idiosynchracies of codecs e.g. - - For messagepack, configure how ambiguities in handling raw bytes are resolved - - For messagepack, provide rpc server/client codec to support + - Handle unique idiosynchracies of codecs e.g. + - For messagepack, configure how ambiguities in handling raw bytes are resolved + - For messagepack, provide rpc server/client codec to support msgpack-rpc protocol defined at: https://github.com/msgpack-rpc/msgpack-rpc/blob/master/spec.md - + Extension Support Users can register a function to handle the encoding or decoding of diff --git a/vendor/github.com/ugorji/go/codec/gen.generated.go b/vendor/github.com/ugorji/go/codec/gen.generated.go index b130ed67d..2ace97b78 100644 --- a/vendor/github.com/ugorji/go/codec/gen.generated.go +++ b/vendor/github.com/ugorji/go/codec/gen.generated.go @@ -172,3 +172,4 @@ if {{var "l"}} == 0 { *{{ .Varname }} = {{var "v"}} }{{end}} ` + diff --git a/vendor/github.com/zclconf/go-cty-yaml/readerc.go b/vendor/github.com/zclconf/go-cty-yaml/readerc.go index b0c436c4a..7c1f5fac3 100644 --- a/vendor/github.com/zclconf/go-cty-yaml/readerc.go +++ b/vendor/github.com/zclconf/go-cty-yaml/readerc.go @@ -95,7 +95,7 @@ func yaml_parser_update_buffer(parser *yaml_parser_t, length int) bool { // [Go] This function was changed to guarantee the requested length size at EOF. // The fact we need to do this is pretty awful, but the description above implies - // for that to be the case, and there are tests + // for that to be the case, and there are tests // If the EOF flag is set and the raw buffer is empty, do nothing. if parser.eof && parser.raw_buffer_pos == len(parser.raw_buffer) { diff --git a/vendor/github.com/zclconf/go-cty/cty/function/stdlib/string.go b/vendor/github.com/zclconf/go-cty/cty/function/stdlib/string.go index 1cbea9c70..01ebc47fd 100644 --- a/vendor/github.com/zclconf/go-cty/cty/function/stdlib/string.go +++ b/vendor/github.com/zclconf/go-cty/cty/function/stdlib/string.go @@ -151,6 +151,7 @@ var SubstrFunc = function.New(&function.Spec{ return cty.StringVal(""), nil } + sub := in pos := 0 var i int diff --git a/vendor/golang.org/x/net/html/const.go b/vendor/golang.org/x/net/html/const.go index 73804d347..ff7acf2d5 100644 --- a/vendor/golang.org/x/net/html/const.go +++ b/vendor/golang.org/x/net/html/const.go @@ -52,7 +52,7 @@ var isSpecialElementMap = map[string]bool{ "iframe": true, "img": true, "input": true, - "keygen": true, + "keygen": true, // "keygen" has been removed from the spec, but are kept here for backwards compatibility. "li": true, "link": true, "listing": true, diff --git a/vendor/golang.org/x/net/html/foreign.go b/vendor/golang.org/x/net/html/foreign.go index 74774c458..9da9e9dc4 100644 --- a/vendor/golang.org/x/net/html/foreign.go +++ b/vendor/golang.org/x/net/html/foreign.go @@ -161,65 +161,62 @@ var mathMLAttributeAdjustments = map[string]string{ } var svgAttributeAdjustments = map[string]string{ - "attributename": "attributeName", - "attributetype": "attributeType", - "basefrequency": "baseFrequency", - "baseprofile": "baseProfile", - "calcmode": "calcMode", - "clippathunits": "clipPathUnits", - "contentscripttype": "contentScriptType", - "contentstyletype": "contentStyleType", - "diffuseconstant": "diffuseConstant", - "edgemode": "edgeMode", - "externalresourcesrequired": "externalResourcesRequired", - "filterunits": "filterUnits", - "glyphref": "glyphRef", - "gradienttransform": "gradientTransform", - "gradientunits": "gradientUnits", - "kernelmatrix": "kernelMatrix", - "kernelunitlength": "kernelUnitLength", - "keypoints": "keyPoints", - "keysplines": "keySplines", - "keytimes": "keyTimes", - "lengthadjust": "lengthAdjust", - "limitingconeangle": "limitingConeAngle", - "markerheight": "markerHeight", - "markerunits": "markerUnits", - "markerwidth": "markerWidth", - "maskcontentunits": "maskContentUnits", - "maskunits": "maskUnits", - "numoctaves": "numOctaves", - "pathlength": "pathLength", - "patterncontentunits": "patternContentUnits", - "patterntransform": "patternTransform", - "patternunits": "patternUnits", - "pointsatx": "pointsAtX", - "pointsaty": "pointsAtY", - "pointsatz": "pointsAtZ", - "preservealpha": "preserveAlpha", - "preserveaspectratio": "preserveAspectRatio", - "primitiveunits": "primitiveUnits", - "refx": "refX", - "refy": "refY", - "repeatcount": "repeatCount", - "repeatdur": "repeatDur", - "requiredextensions": "requiredExtensions", - "requiredfeatures": "requiredFeatures", - "specularconstant": "specularConstant", - "specularexponent": "specularExponent", - "spreadmethod": "spreadMethod", - "startoffset": "startOffset", - "stddeviation": "stdDeviation", - "stitchtiles": "stitchTiles", - "surfacescale": "surfaceScale", - "systemlanguage": "systemLanguage", - "tablevalues": "tableValues", - "targetx": "targetX", - "targety": "targetY", - "textlength": "textLength", - "viewbox": "viewBox", - "viewtarget": "viewTarget", - "xchannelselector": "xChannelSelector", - "ychannelselector": "yChannelSelector", - "zoomandpan": "zoomAndPan", + "attributename": "attributeName", + "attributetype": "attributeType", + "basefrequency": "baseFrequency", + "baseprofile": "baseProfile", + "calcmode": "calcMode", + "clippathunits": "clipPathUnits", + "diffuseconstant": "diffuseConstant", + "edgemode": "edgeMode", + "filterunits": "filterUnits", + "glyphref": "glyphRef", + "gradienttransform": "gradientTransform", + "gradientunits": "gradientUnits", + "kernelmatrix": "kernelMatrix", + "kernelunitlength": "kernelUnitLength", + "keypoints": "keyPoints", + "keysplines": "keySplines", + "keytimes": "keyTimes", + "lengthadjust": "lengthAdjust", + "limitingconeangle": "limitingConeAngle", + "markerheight": "markerHeight", + "markerunits": "markerUnits", + "markerwidth": "markerWidth", + "maskcontentunits": "maskContentUnits", + "maskunits": "maskUnits", + "numoctaves": "numOctaves", + "pathlength": "pathLength", + "patterncontentunits": "patternContentUnits", + "patterntransform": "patternTransform", + "patternunits": "patternUnits", + "pointsatx": "pointsAtX", + "pointsaty": "pointsAtY", + "pointsatz": "pointsAtZ", + "preservealpha": "preserveAlpha", + "preserveaspectratio": "preserveAspectRatio", + "primitiveunits": "primitiveUnits", + "refx": "refX", + "refy": "refY", + "repeatcount": "repeatCount", + "repeatdur": "repeatDur", + "requiredextensions": "requiredExtensions", + "requiredfeatures": "requiredFeatures", + "specularconstant": "specularConstant", + "specularexponent": "specularExponent", + "spreadmethod": "spreadMethod", + "startoffset": "startOffset", + "stddeviation": "stdDeviation", + "stitchtiles": "stitchTiles", + "surfacescale": "surfaceScale", + "systemlanguage": "systemLanguage", + "tablevalues": "tableValues", + "targetx": "targetX", + "targety": "targetY", + "textlength": "textLength", + "viewbox": "viewBox", + "viewtarget": "viewTarget", + "xchannelselector": "xChannelSelector", + "ychannelselector": "yChannelSelector", + "zoomandpan": "zoomAndPan", } diff --git a/vendor/golang.org/x/net/html/render.go b/vendor/golang.org/x/net/html/render.go index 46879c083..b46d81ca6 100644 --- a/vendor/golang.org/x/net/html/render.go +++ b/vendor/golang.org/x/net/html/render.go @@ -263,7 +263,7 @@ var voidElements = map[string]bool{ "hr": true, "img": true, "input": true, - "keygen": true, + "keygen": true, // "keygen" has been removed from the spec, but are kept here for backwards compatibility. "link": true, "meta": true, "param": true, diff --git a/vendor/golang.org/x/net/http/httpproxy/proxy.go b/vendor/golang.org/x/net/http/httpproxy/proxy.go index 163645b86..1415b0779 100644 --- a/vendor/golang.org/x/net/http/httpproxy/proxy.go +++ b/vendor/golang.org/x/net/http/httpproxy/proxy.go @@ -27,8 +27,7 @@ import ( type Config struct { // HTTPProxy represents the value of the HTTP_PROXY or // http_proxy environment variable. It will be used as the proxy - // URL for HTTP requests and HTTPS requests unless overridden by - // HTTPSProxy or NoProxy. + // URL for HTTP requests unless overridden by NoProxy. HTTPProxy string // HTTPSProxy represents the HTTPS_PROXY or https_proxy @@ -129,8 +128,7 @@ func (cfg *config) proxyForURL(reqURL *url.URL) (*url.URL, error) { var proxy *url.URL if reqURL.Scheme == "https" { proxy = cfg.httpsProxy - } - if proxy == nil { + } else if reqURL.Scheme == "http" { proxy = cfg.httpProxy if proxy != nil && cfg.CGI { return nil, errors.New("refusing to use HTTP_PROXY value in CGI environment; see golang.org/s/cgihttpproxy") diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go index 02714ade6..2aa859f76 100644 --- a/vendor/golang.org/x/net/http2/server.go +++ b/vendor/golang.org/x/net/http2/server.go @@ -1694,6 +1694,7 @@ func (sc *serverConn) processData(f *DataFrame) error { if len(data) > 0 { wrote, err := st.body.Write(data) if err != nil { + sc.sendWindowUpdate(nil, int(f.Length)-wrote) return streamError(id, ErrCodeStreamClosed) } if wrote != len(data) { diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go index 4ec326699..4182f52b4 100644 --- a/vendor/golang.org/x/net/http2/transport.go +++ b/vendor/golang.org/x/net/http2/transport.go @@ -689,6 +689,7 @@ func (t *Transport) newClientConn(c net.Conn, singleUse bool) (*ClientConn, erro cc.inflow.add(transportDefaultConnFlow + initialWindowSize) cc.bw.Flush() if cc.werr != nil { + cc.Close() return nil, cc.werr } @@ -1080,6 +1081,15 @@ func (cc *ClientConn) roundTrip(req *http.Request) (res *http.Response, gotErrAf bodyWriter := cc.t.getBodyWriterState(cs, body) cs.on100 = bodyWriter.on100 + defer func() { + cc.wmu.Lock() + werr := cc.werr + cc.wmu.Unlock() + if werr != nil { + cc.Close() + } + }() + cc.wmu.Lock() endStream := !hasBody && !hasTrailers werr := cc.writeHeaders(cs.ID, endStream, int(cc.maxFrameSize), hdrs) diff --git a/vendor/golang.org/x/sys/cpu/cpu.go b/vendor/golang.org/x/sys/cpu/cpu.go index 5cce25ed9..f77701fe8 100644 --- a/vendor/golang.org/x/sys/cpu/cpu.go +++ b/vendor/golang.org/x/sys/cpu/cpu.go @@ -29,26 +29,46 @@ type CacheLinePad struct{ _ [cacheLineSize]byte } // and HasAVX2 are only set if the OS supports XMM and YMM // registers in addition to the CPUID feature bit being set. var X86 struct { - _ CacheLinePad - HasAES bool // AES hardware implementation (AES NI) - HasADX bool // Multi-precision add-carry instruction extensions - HasAVX bool // Advanced vector extension - HasAVX2 bool // Advanced vector extension 2 - HasBMI1 bool // Bit manipulation instruction set 1 - HasBMI2 bool // Bit manipulation instruction set 2 - HasERMS bool // Enhanced REP for MOVSB and STOSB - HasFMA bool // Fused-multiply-add instructions - HasOSXSAVE bool // OS supports XSAVE/XRESTOR for saving/restoring XMM registers. - HasPCLMULQDQ bool // PCLMULQDQ instruction - most often used for AES-GCM - HasPOPCNT bool // Hamming weight instruction POPCNT. - HasRDRAND bool // RDRAND instruction (on-chip random number generator) - HasRDSEED bool // RDSEED instruction (on-chip random number generator) - HasSSE2 bool // Streaming SIMD extension 2 (always available on amd64) - HasSSE3 bool // Streaming SIMD extension 3 - HasSSSE3 bool // Supplemental streaming SIMD extension 3 - HasSSE41 bool // Streaming SIMD extension 4 and 4.1 - HasSSE42 bool // Streaming SIMD extension 4 and 4.2 - _ CacheLinePad + _ CacheLinePad + HasAES bool // AES hardware implementation (AES NI) + HasADX bool // Multi-precision add-carry instruction extensions + HasAVX bool // Advanced vector extension + HasAVX2 bool // Advanced vector extension 2 + HasAVX512 bool // Advanced vector extension 512 + HasAVX512F bool // Advanced vector extension 512 Foundation Instructions + HasAVX512CD bool // Advanced vector extension 512 Conflict Detection Instructions + HasAVX512ER bool // Advanced vector extension 512 Exponential and Reciprocal Instructions + HasAVX512PF bool // Advanced vector extension 512 Prefetch Instructions Instructions + HasAVX512VL bool // Advanced vector extension 512 Vector Length Extensions + HasAVX512BW bool // Advanced vector extension 512 Byte and Word Instructions + HasAVX512DQ bool // Advanced vector extension 512 Doubleword and Quadword Instructions + HasAVX512IFMA bool // Advanced vector extension 512 Integer Fused Multiply Add + HasAVX512VBMI bool // Advanced vector extension 512 Vector Byte Manipulation Instructions + HasAVX5124VNNIW bool // Advanced vector extension 512 Vector Neural Network Instructions Word variable precision + HasAVX5124FMAPS bool // Advanced vector extension 512 Fused Multiply Accumulation Packed Single precision + HasAVX512VPOPCNTDQ bool // Advanced vector extension 512 Double and quad word population count instructions + HasAVX512VPCLMULQDQ bool // Advanced vector extension 512 Vector carry-less multiply operations + HasAVX512VNNI bool // Advanced vector extension 512 Vector Neural Network Instructions + HasAVX512GFNI bool // Advanced vector extension 512 Galois field New Instructions + HasAVX512VAES bool // Advanced vector extension 512 Vector AES instructions + HasAVX512VBMI2 bool // Advanced vector extension 512 Vector Byte Manipulation Instructions 2 + HasAVX512BITALG bool // Advanced vector extension 512 Bit Algorithms + HasAVX512BF16 bool // Advanced vector extension 512 BFloat16 Instructions + HasBMI1 bool // Bit manipulation instruction set 1 + HasBMI2 bool // Bit manipulation instruction set 2 + HasERMS bool // Enhanced REP for MOVSB and STOSB + HasFMA bool // Fused-multiply-add instructions + HasOSXSAVE bool // OS supports XSAVE/XRESTOR for saving/restoring XMM registers. + HasPCLMULQDQ bool // PCLMULQDQ instruction - most often used for AES-GCM + HasPOPCNT bool // Hamming weight instruction POPCNT. + HasRDRAND bool // RDRAND instruction (on-chip random number generator) + HasRDSEED bool // RDSEED instruction (on-chip random number generator) + HasSSE2 bool // Streaming SIMD extension 2 (always available on amd64) + HasSSE3 bool // Streaming SIMD extension 3 + HasSSSE3 bool // Supplemental streaming SIMD extension 3 + HasSSE41 bool // Streaming SIMD extension 4 and 4.1 + HasSSE42 bool // Streaming SIMD extension 4 and 4.2 + _ CacheLinePad } // ARM64 contains the supported CPU features of the diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_arm64.go index 2d9002438..951078f2e 100644 --- a/vendor/golang.org/x/sys/cpu/cpu_arm64.go +++ b/vendor/golang.org/x/sys/cpu/cpu_arm64.go @@ -39,7 +39,7 @@ func initOptions() { func archInit() { switch runtime.GOOS { - case "android", "darwin", "netbsd": + case "android", "darwin", "ios", "netbsd": // Android and iOS don't seem to allow reading these registers. // // NetBSD: diff --git a/vendor/golang.org/x/sys/cpu/cpu_x86.go b/vendor/golang.org/x/sys/cpu/cpu_x86.go index 2ad039d40..48d429331 100644 --- a/vendor/golang.org/x/sys/cpu/cpu_x86.go +++ b/vendor/golang.org/x/sys/cpu/cpu_x86.go @@ -16,6 +16,26 @@ func initOptions() { {Name: "aes", Feature: &X86.HasAES}, {Name: "avx", Feature: &X86.HasAVX}, {Name: "avx2", Feature: &X86.HasAVX2}, + {Name: "avx512", Feature: &X86.HasAVX512}, + {Name: "avx512f", Feature: &X86.HasAVX512F}, + {Name: "avx512cd", Feature: &X86.HasAVX512CD}, + {Name: "avx512er", Feature: &X86.HasAVX512ER}, + {Name: "avx512pf", Feature: &X86.HasAVX512PF}, + {Name: "avx512vl", Feature: &X86.HasAVX512VL}, + {Name: "avx512bw", Feature: &X86.HasAVX512BW}, + {Name: "avx512dq", Feature: &X86.HasAVX512DQ}, + {Name: "avx512ifma", Feature: &X86.HasAVX512IFMA}, + {Name: "avx512vbmi", Feature: &X86.HasAVX512VBMI}, + {Name: "avx512vnniw", Feature: &X86.HasAVX5124VNNIW}, + {Name: "avx5124fmaps", Feature: &X86.HasAVX5124FMAPS}, + {Name: "avx512vpopcntdq", Feature: &X86.HasAVX512VPOPCNTDQ}, + {Name: "avx512vpclmulqdq", Feature: &X86.HasAVX512VPCLMULQDQ}, + {Name: "avx512vnni", Feature: &X86.HasAVX512VNNI}, + {Name: "avx512gfni", Feature: &X86.HasAVX512GFNI}, + {Name: "avx512vaes", Feature: &X86.HasAVX512VAES}, + {Name: "avx512vbmi2", Feature: &X86.HasAVX512VBMI2}, + {Name: "avx512bitalg", Feature: &X86.HasAVX512BITALG}, + {Name: "avx512bf16", Feature: &X86.HasAVX512BF16}, {Name: "bmi1", Feature: &X86.HasBMI1}, {Name: "bmi2", Feature: &X86.HasBMI2}, {Name: "erms", Feature: &X86.HasERMS}, @@ -59,12 +79,15 @@ func archInit() { X86.HasOSXSAVE = isSet(27, ecx1) X86.HasRDRAND = isSet(30, ecx1) - osSupportsAVX := false + var osSupportsAVX, osSupportsAVX512 bool // For XGETBV, OSXSAVE bit is required and sufficient. if X86.HasOSXSAVE { eax, _ := xgetbv() // Check if XMM and YMM registers have OS support. osSupportsAVX = isSet(1, eax) && isSet(2, eax) + + // Check if OPMASK and ZMM registers have OS support. + osSupportsAVX512 = osSupportsAVX && isSet(5, eax) && isSet(6, eax) && isSet(7, eax) } X86.HasAVX = isSet(28, ecx1) && osSupportsAVX @@ -73,7 +96,7 @@ func archInit() { return } - _, ebx7, _, _ := cpuid(7, 0) + _, ebx7, ecx7, edx7 := cpuid(7, 0) X86.HasBMI1 = isSet(3, ebx7) X86.HasAVX2 = isSet(5, ebx7) && osSupportsAVX X86.HasBMI2 = isSet(8, ebx7) @@ -81,6 +104,30 @@ func archInit() { X86.HasRDSEED = isSet(18, ebx7) X86.HasADX = isSet(19, ebx7) + X86.HasAVX512 = isSet(16, ebx7) && osSupportsAVX512 // Because avx-512 foundation is the core required extension + if X86.HasAVX512 { + X86.HasAVX512F = true + X86.HasAVX512CD = isSet(28, ebx7) + X86.HasAVX512ER = isSet(27, ebx7) + X86.HasAVX512PF = isSet(26, ebx7) + X86.HasAVX512VL = isSet(31, ebx7) + X86.HasAVX512BW = isSet(30, ebx7) + X86.HasAVX512DQ = isSet(17, ebx7) + X86.HasAVX512IFMA = isSet(21, ebx7) + X86.HasAVX512VBMI = isSet(1, ecx7) + X86.HasAVX5124VNNIW = isSet(2, edx7) + X86.HasAVX5124FMAPS = isSet(3, edx7) + X86.HasAVX512VPOPCNTDQ = isSet(14, ecx7) + X86.HasAVX512VPCLMULQDQ = isSet(10, ecx7) + X86.HasAVX512VNNI = isSet(11, ecx7) + X86.HasAVX512GFNI = isSet(8, ecx7) + X86.HasAVX512VAES = isSet(9, ecx7) + X86.HasAVX512VBMI2 = isSet(6, ecx7) + X86.HasAVX512BITALG = isSet(12, ecx7) + + eax71, _, _, _ := cpuid(7, 1) + X86.HasAVX512BF16 = isSet(5, eax71) + } } func isSet(bitpos uint, value uint32) bool { diff --git a/vendor/golang.org/x/sys/unix/gccgo.go b/vendor/golang.org/x/sys/unix/gccgo.go index cd6f5a613..86032c11e 100644 --- a/vendor/golang.org/x/sys/unix/gccgo.go +++ b/vendor/golang.org/x/sys/unix/gccgo.go @@ -12,10 +12,8 @@ import "syscall" // We can't use the gc-syntax .s files for gccgo. On the plus side // much of the functionality can be written directly in Go. -//extern gccgoRealSyscallNoError func realSyscallNoError(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r uintptr) -//extern gccgoRealSyscall func realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r, errno uintptr) func SyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) { diff --git a/vendor/golang.org/x/sys/unix/gccgo_c.c b/vendor/golang.org/x/sys/unix/gccgo_c.c index c44730c5e..2cb1fefac 100644 --- a/vendor/golang.org/x/sys/unix/gccgo_c.c +++ b/vendor/golang.org/x/sys/unix/gccgo_c.c @@ -21,6 +21,9 @@ struct ret { uintptr_t err; }; +struct ret gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9) + __asm__(GOSYM_PREFIX GOPKGPATH ".realSyscall"); + struct ret gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9) { @@ -32,6 +35,9 @@ gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintp return r; } +uintptr_t gccgoRealSyscallNoError(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9) + __asm__(GOSYM_PREFIX GOPKGPATH ".realSyscallNoError"); + uintptr_t gccgoRealSyscallNoError(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9) { diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh index e7c51aa40..1bef7148d 100644 --- a/vendor/golang.org/x/sys/unix/mkerrors.sh +++ b/vendor/golang.org/x/sys/unix/mkerrors.sh @@ -517,6 +517,7 @@ ccflags="$@" $2 ~ /^CP_/ || $2 ~ /^CPUSTATES$/ || $2 ~ /^ALG_/ || + $2 ~ /^FI(CLONE|DEDUPERANGE)/ || $2 ~ /^FS_(POLICY_FLAGS|KEY_DESC|ENCRYPTION_MODE|[A-Z0-9_]+_KEY_SIZE)/ || $2 ~ /^FS_IOC_.*(ENCRYPTION|VERITY|[GS]ETFLAGS)/ || $2 ~ /^FS_VERITY_/ || diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go b/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go index 7d08dae5b..57a0021da 100644 --- a/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go +++ b/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go @@ -20,7 +20,7 @@ func cmsgAlignOf(salen int) int { case "aix": // There is no alignment on AIX. salign = 1 - case "darwin", "illumos", "solaris": + case "darwin", "ios", "illumos", "solaris": // NOTE: It seems like 64-bit Darwin, Illumos and Solaris // kernels still require 32-bit aligned access to network // subsystem. @@ -32,6 +32,10 @@ func cmsgAlignOf(salen int) int { if runtime.GOARCH == "arm" { salign = 8 } + // NetBSD aarch64 requires 128-bit alignment. + if runtime.GOOS == "netbsd" && runtime.GOARCH == "arm64" { + salign = 16 + } } return (salen + salign - 1) & ^(salign - 1) diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd.go b/vendor/golang.org/x/sys/unix/syscall_bsd.go index 60bbe10ad..123536a02 100644 --- a/vendor/golang.org/x/sys/unix/syscall_bsd.go +++ b/vendor/golang.org/x/sys/unix/syscall_bsd.go @@ -18,6 +18,21 @@ import ( "unsafe" ) +const ImplementsGetwd = true + +func Getwd() (string, error) { + var buf [PathMax]byte + _, err := Getcwd(buf[0:]) + if err != nil { + return "", err + } + n := clen(buf[:]) + if n < 1 { + return "", EINVAL + } + return string(buf[:n]), nil +} + /* * Wrapped */ @@ -272,7 +287,7 @@ func Accept(fd int) (nfd int, sa Sockaddr, err error) { if err != nil { return } - if runtime.GOOS == "darwin" && len == 0 { + if (runtime.GOOS == "darwin" || runtime.GOOS == "ios") && len == 0 { // Accepted socket has no address. // This is likely due to a bug in xnu kernels, // where instead of ECONNABORTED error socket diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go index eddcf3a91..21b8092cd 100644 --- a/vendor/golang.org/x/sys/unix/syscall_darwin.go +++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go @@ -13,29 +13,10 @@ package unix import ( - "errors" "syscall" "unsafe" ) -const ImplementsGetwd = true - -func Getwd() (string, error) { - buf := make([]byte, 2048) - attrs, err := getAttrList(".", attrList{CommonAttr: attrCmnFullpath}, buf, 0) - if err == nil && len(attrs) == 1 && len(attrs[0]) >= 2 { - wd := string(attrs[0]) - // Sanity check that it's an absolute path and ends - // in a null byte, which we then strip. - if wd[0] == '/' && wd[len(wd)-1] == 0 { - return wd[:len(wd)-1], nil - } - } - // If pkg/os/getwd.go gets ENOTSUP, it will fall back to the - // slow algorithm. - return "", ENOTSUP -} - // SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets. type SockaddrDatalink struct { Len uint8 @@ -97,11 +78,6 @@ func direntNamlen(buf []byte) (uint64, bool) { func PtraceAttach(pid int) (err error) { return ptrace(PT_ATTACH, pid, 0, 0) } func PtraceDetach(pid int) (err error) { return ptrace(PT_DETACH, pid, 0, 0) } -const ( - attrBitMapCount = 5 - attrCmnFullpath = 0x08000000 -) - type attrList struct { bitmapCount uint16 _ uint16 @@ -112,54 +88,6 @@ type attrList struct { Forkattr uint32 } -func getAttrList(path string, attrList attrList, attrBuf []byte, options uint) (attrs [][]byte, err error) { - if len(attrBuf) < 4 { - return nil, errors.New("attrBuf too small") - } - attrList.bitmapCount = attrBitMapCount - - var _p0 *byte - _p0, err = BytePtrFromString(path) - if err != nil { - return nil, err - } - - if err := getattrlist(_p0, unsafe.Pointer(&attrList), unsafe.Pointer(&attrBuf[0]), uintptr(len(attrBuf)), int(options)); err != nil { - return nil, err - } - size := *(*uint32)(unsafe.Pointer(&attrBuf[0])) - - // dat is the section of attrBuf that contains valid data, - // without the 4 byte length header. All attribute offsets - // are relative to dat. - dat := attrBuf - if int(size) < len(attrBuf) { - dat = dat[:size] - } - dat = dat[4:] // remove length prefix - - for i := uint32(0); int(i) < len(dat); { - header := dat[i:] - if len(header) < 8 { - return attrs, errors.New("truncated attribute header") - } - datOff := *(*int32)(unsafe.Pointer(&header[0])) - attrLen := *(*uint32)(unsafe.Pointer(&header[4])) - if datOff < 0 || uint32(datOff)+attrLen > uint32(len(dat)) { - return attrs, errors.New("truncated results; attrBuf too small") - } - end := uint32(datOff) + attrLen - attrs = append(attrs, dat[datOff:end]) - i = end - if r := i % 4; r != 0 { - i += (4 - r) - } - } - return -} - -//sys getattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error) - //sysnb pipe() (r int, w int, err error) func Pipe(p []int) (err error) { @@ -419,6 +347,7 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e //sys Fpathconf(fd int, name int) (val int, err error) //sys Fsync(fd int) (err error) //sys Ftruncate(fd int, length int64) (err error) +//sys Getcwd(buf []byte) (n int, err error) //sys Getdtablesize() (size int) //sysnb Getegid() (egid int) //sysnb Geteuid() (uid int) diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go index 8a195ae58..bed7dcfec 100644 --- a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go +++ b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go @@ -129,23 +129,8 @@ func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) { return } -const ImplementsGetwd = true - //sys Getcwd(buf []byte) (n int, err error) = SYS___GETCWD -func Getwd() (string, error) { - var buf [PathMax]byte - _, err := Getcwd(buf[0:]) - if err != nil { - return "", err - } - n := clen(buf[:]) - if n < 1 { - return "", EINVAL - } - return string(buf[:n]), nil -} - func Getfsstat(buf []Statfs_t, flags int) (n int, err error) { var _p0 unsafe.Pointer var bufsize uintptr diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/golang.org/x/sys/unix/syscall_freebsd.go index 6932e7c2c..f6db02aff 100644 --- a/vendor/golang.org/x/sys/unix/syscall_freebsd.go +++ b/vendor/golang.org/x/sys/unix/syscall_freebsd.go @@ -140,23 +140,8 @@ func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) { return } -const ImplementsGetwd = true - //sys Getcwd(buf []byte) (n int, err error) = SYS___GETCWD -func Getwd() (string, error) { - var buf [PathMax]byte - _, err := Getcwd(buf[0:]) - if err != nil { - return "", err - } - n := clen(buf[:]) - if n < 1 { - return "", EINVAL - } - return string(buf[:n]), nil -} - func Getfsstat(buf []Statfs_t, flags int) (n int, err error) { var ( _p0 unsafe.Pointer diff --git a/vendor/golang.org/x/sys/unix/syscall_illumos.go b/vendor/golang.org/x/sys/unix/syscall_illumos.go index 16e40091c..bbc4f3ea5 100644 --- a/vendor/golang.org/x/sys/unix/syscall_illumos.go +++ b/vendor/golang.org/x/sys/unix/syscall_illumos.go @@ -56,7 +56,7 @@ func Pwritev(fd int, iovs [][]byte, off int64) (n int, err error) { return n, err } -//sys accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) +//sys accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) = libsocket.accept4 func Accept4(fd int, flags int) (nfd int, sa Sockaddr, err error) { var rsa RawSockaddrAny diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go index ec7e4c4d3..94dafa4e5 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux.go @@ -112,6 +112,31 @@ func IoctlGetRTCWkAlrm(fd int) (*RTCWkAlrm, error) { return &value, err } +// IoctlFileClone performs an FICLONERANGE ioctl operation to clone the range of +// data conveyed in value to the file associated with the file descriptor +// destFd. See the ioctl_ficlonerange(2) man page for details. +func IoctlFileCloneRange(destFd int, value *FileCloneRange) error { + err := ioctl(destFd, FICLONERANGE, uintptr(unsafe.Pointer(value))) + runtime.KeepAlive(value) + return err +} + +// IoctlFileClone performs an FICLONE ioctl operation to clone the entire file +// associated with the file description srcFd to the file associated with the +// file descriptor destFd. See the ioctl_ficlone(2) man page for details. +func IoctlFileClone(destFd, srcFd int) error { + return ioctl(destFd, FICLONE, uintptr(srcFd)) +} + +// IoctlFileClone performs an FIDEDUPERANGE ioctl operation to share the range of +// data conveyed in value with the file associated with the file descriptor +// destFd. See the ioctl_fideduperange(2) man page for details. +func IoctlFileDedupeRange(destFd int, value *FileDedupeRange) error { + err := ioctl(destFd, FIDEDUPERANGE, uintptr(unsafe.Pointer(value))) + runtime.KeepAlive(value) + return err +} + //sys Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) func Link(oldpath string, newpath string) (err error) { diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go index 45b50a610..dbd5e03b6 100644 --- a/vendor/golang.org/x/sys/unix/syscall_netbsd.go +++ b/vendor/golang.org/x/sys/unix/syscall_netbsd.go @@ -141,23 +141,8 @@ func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) { return } -const ImplementsGetwd = true - //sys Getcwd(buf []byte) (n int, err error) = SYS___GETCWD -func Getwd() (string, error) { - var buf [PathMax]byte - _, err := Getcwd(buf[0:]) - if err != nil { - return "", err - } - n := clen(buf[:]) - if n < 1 { - return "", EINVAL - } - return string(buf[:n]), nil -} - // TODO func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) { return -1, ENOSYS diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go index a266e92a9..2c1f46ea1 100644 --- a/vendor/golang.org/x/sys/unix/syscall_openbsd.go +++ b/vendor/golang.org/x/sys/unix/syscall_openbsd.go @@ -114,23 +114,8 @@ func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) { return } -const ImplementsGetwd = true - //sys Getcwd(buf []byte) (n int, err error) = SYS___GETCWD -func Getwd() (string, error) { - var buf [PathMax]byte - _, err := Getcwd(buf[0:]) - if err != nil { - return "", err - } - n := clen(buf[:]) - if n < 1 { - return "", EINVAL - } - return string(buf[:n]), nil -} - func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) { if raceenabled { raceReleaseMerge(unsafe.Pointer(&ioSync)) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux.go b/vendor/golang.org/x/sys/unix/zerrors_linux.go index 388050a0f..79e032f4f 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux.go @@ -686,6 +686,7 @@ const ( FD_CLOEXEC = 0x1 FD_SETSIZE = 0x400 FF0 = 0x0 + FIDEDUPERANGE = 0xc0189436 FSCRYPT_KEY_DESCRIPTOR_SIZE = 0x8 FSCRYPT_KEY_DESC_PREFIX = "fscrypt:" FSCRYPT_KEY_DESC_PREFIX_SIZE = 0x8 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go index 11b25f68c..dd282c08b 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go @@ -71,6 +71,8 @@ const ( EXTPROC = 0x10000 FF1 = 0x8000 FFDLY = 0x8000 + FICLONE = 0x40049409 + FICLONERANGE = 0x4020940d FLUSHO = 0x1000 FP_XSTATE_MAGIC2 = 0x46505845 FS_IOC_ENABLE_VERITY = 0x40806685 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go index f92cff6ea..82fc93c7b 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go @@ -71,6 +71,8 @@ const ( EXTPROC = 0x10000 FF1 = 0x8000 FFDLY = 0x8000 + FICLONE = 0x40049409 + FICLONERANGE = 0x4020940d FLUSHO = 0x1000 FP_XSTATE_MAGIC2 = 0x46505845 FS_IOC_ENABLE_VERITY = 0x40806685 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go index 12bcbf88d..fe7094f27 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go @@ -71,6 +71,8 @@ const ( EXTPROC = 0x10000 FF1 = 0x8000 FFDLY = 0x8000 + FICLONE = 0x40049409 + FICLONERANGE = 0x4020940d FLUSHO = 0x1000 FS_IOC_ENABLE_VERITY = 0x40806685 FS_IOC_GETFLAGS = 0x80046601 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go index 84f71e99f..3b6cc5880 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go @@ -73,6 +73,8 @@ const ( EXTRA_MAGIC = 0x45585401 FF1 = 0x8000 FFDLY = 0x8000 + FICLONE = 0x40049409 + FICLONERANGE = 0x4020940d FLUSHO = 0x1000 FPSIMD_MAGIC = 0x46508001 FS_IOC_ENABLE_VERITY = 0x40806685 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go index eeadea943..ce3d9ae15 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go @@ -71,6 +71,8 @@ const ( EXTPROC = 0x10000 FF1 = 0x8000 FFDLY = 0x8000 + FICLONE = 0x80049409 + FICLONERANGE = 0x8020940d FLUSHO = 0x2000 FS_IOC_ENABLE_VERITY = 0x80806685 FS_IOC_GETFLAGS = 0x40046601 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go index 0be6c4ccc..7a85215ce 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go @@ -71,6 +71,8 @@ const ( EXTPROC = 0x10000 FF1 = 0x8000 FFDLY = 0x8000 + FICLONE = 0x80049409 + FICLONERANGE = 0x8020940d FLUSHO = 0x2000 FS_IOC_ENABLE_VERITY = 0x80806685 FS_IOC_GETFLAGS = 0x40086601 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go index 0880b745c..07d4cc1bd 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go @@ -71,6 +71,8 @@ const ( EXTPROC = 0x10000 FF1 = 0x8000 FFDLY = 0x8000 + FICLONE = 0x80049409 + FICLONERANGE = 0x8020940d FLUSHO = 0x2000 FS_IOC_ENABLE_VERITY = 0x80806685 FS_IOC_GETFLAGS = 0x40086601 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go index c8a66627a..d4842ba1c 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go @@ -71,6 +71,8 @@ const ( EXTPROC = 0x10000 FF1 = 0x8000 FFDLY = 0x8000 + FICLONE = 0x80049409 + FICLONERANGE = 0x8020940d FLUSHO = 0x2000 FS_IOC_ENABLE_VERITY = 0x80806685 FS_IOC_GETFLAGS = 0x40046601 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go index 97aae63f1..941e20dac 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go @@ -71,6 +71,8 @@ const ( EXTPROC = 0x10000000 FF1 = 0x4000 FFDLY = 0x4000 + FICLONE = 0x80049409 + FICLONERANGE = 0x8020940d FLUSHO = 0x800000 FS_IOC_ENABLE_VERITY = 0x80806685 FS_IOC_GETFLAGS = 0x40086601 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go index b0c3b0664..63d3bc566 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go @@ -71,6 +71,8 @@ const ( EXTPROC = 0x10000000 FF1 = 0x4000 FFDLY = 0x4000 + FICLONE = 0x80049409 + FICLONERANGE = 0x8020940d FLUSHO = 0x800000 FS_IOC_ENABLE_VERITY = 0x80806685 FS_IOC_GETFLAGS = 0x40086601 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go index 0c0518193..490bee1ab 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go @@ -71,6 +71,8 @@ const ( EXTPROC = 0x10000 FF1 = 0x8000 FFDLY = 0x8000 + FICLONE = 0x40049409 + FICLONERANGE = 0x4020940d FLUSHO = 0x1000 FS_IOC_ENABLE_VERITY = 0x40806685 FS_IOC_GETFLAGS = 0x80086601 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go index 0b96bd462..467b8218e 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go @@ -71,6 +71,8 @@ const ( EXTPROC = 0x10000 FF1 = 0x8000 FFDLY = 0x8000 + FICLONE = 0x40049409 + FICLONERANGE = 0x4020940d FLUSHO = 0x1000 FS_IOC_ENABLE_VERITY = 0x40806685 FS_IOC_GETFLAGS = 0x80086601 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go index bd5c30577..79fbafbcf 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go @@ -75,6 +75,8 @@ const ( EXTPROC = 0x10000 FF1 = 0x8000 FFDLY = 0x8000 + FICLONE = 0x80049409 + FICLONERANGE = 0x8020940d FLUSHO = 0x1000 FS_IOC_ENABLE_VERITY = 0x80806685 FS_IOC_GETFLAGS = 0x40086601 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go index 397614720..bd13b3856 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go @@ -490,21 +490,6 @@ func libc_munlockall_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func getattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error) { - _, _, e1 := syscall_syscall6(funcPC(libc_getattrlist_trampoline), uintptr(unsafe.Pointer(path)), uintptr(list), uintptr(buf), uintptr(size), uintptr(options), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -func libc_getattrlist_trampoline() - -//go:linkname libc_getattrlist libc_getattrlist -//go:cgo_import_dynamic libc_getattrlist getattrlist "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func pipe() (r int, w int, err error) { r0, r1, e1 := syscall_rawSyscall(funcPC(libc_pipe_trampoline), 0, 0, 0) r = int(r0) @@ -1277,6 +1262,28 @@ func libc_ftruncate_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getcwd(buf []byte) (n int, err error) { + var _p0 unsafe.Pointer + if len(buf) > 0 { + _p0 = unsafe.Pointer(&buf[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := syscall_syscall(funcPC(libc_getcwd_trampoline), uintptr(_p0), uintptr(len(buf)), 0) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +func libc_getcwd_trampoline() + +//go:linkname libc_getcwd libc_getcwd +//go:cgo_import_dynamic libc_getcwd getcwd "/usr/lib/libSystem.B.dylib" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Getdtablesize() (size int) { r0, _, _ := syscall_syscall(funcPC(libc_getdtablesize_trampoline), 0, 0, 0) size = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s index 961058db8..d5fb53fd1 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s @@ -60,8 +60,6 @@ TEXT ·libc_munlock_trampoline(SB),NOSPLIT,$0-0 JMP libc_munlock(SB) TEXT ·libc_munlockall_trampoline(SB),NOSPLIT,$0-0 JMP libc_munlockall(SB) -TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0 - JMP libc_getattrlist(SB) TEXT ·libc_pipe_trampoline(SB),NOSPLIT,$0-0 JMP libc_pipe(SB) TEXT ·libc_getxattr_trampoline(SB),NOSPLIT,$0-0 @@ -146,6 +144,8 @@ TEXT ·libc_fsync_trampoline(SB),NOSPLIT,$0-0 JMP libc_fsync(SB) TEXT ·libc_ftruncate_trampoline(SB),NOSPLIT,$0-0 JMP libc_ftruncate(SB) +TEXT ·libc_getcwd_trampoline(SB),NOSPLIT,$0-0 + JMP libc_getcwd(SB) TEXT ·libc_getdtablesize_trampoline(SB),NOSPLIT,$0-0 JMP libc_getdtablesize(SB) TEXT ·libc_getegid_trampoline(SB),NOSPLIT,$0-0 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go index e253f4387..d81696f9e 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go @@ -490,21 +490,6 @@ func libc_munlockall_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func getattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error) { - _, _, e1 := syscall_syscall6(funcPC(libc_getattrlist_trampoline), uintptr(unsafe.Pointer(path)), uintptr(list), uintptr(buf), uintptr(size), uintptr(options), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -func libc_getattrlist_trampoline() - -//go:linkname libc_getattrlist libc_getattrlist -//go:cgo_import_dynamic libc_getattrlist getattrlist "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func pipe() (r int, w int, err error) { r0, r1, e1 := syscall_rawSyscall(funcPC(libc_pipe_trampoline), 0, 0, 0) r = int(r0) @@ -1277,6 +1262,28 @@ func libc_ftruncate_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getcwd(buf []byte) (n int, err error) { + var _p0 unsafe.Pointer + if len(buf) > 0 { + _p0 = unsafe.Pointer(&buf[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := syscall_syscall(funcPC(libc_getcwd_trampoline), uintptr(_p0), uintptr(len(buf)), 0) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +func libc_getcwd_trampoline() + +//go:linkname libc_getcwd libc_getcwd +//go:cgo_import_dynamic libc_getcwd getcwd "/usr/lib/libSystem.B.dylib" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Getdtablesize() (size int) { r0, _, _ := syscall_syscall(funcPC(libc_getdtablesize_trampoline), 0, 0, 0) size = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s index b8be24c6b..887fd5f4e 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s @@ -60,8 +60,6 @@ TEXT ·libc_munlock_trampoline(SB),NOSPLIT,$0-0 JMP libc_munlock(SB) TEXT ·libc_munlockall_trampoline(SB),NOSPLIT,$0-0 JMP libc_munlockall(SB) -TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0 - JMP libc_getattrlist(SB) TEXT ·libc_pipe_trampoline(SB),NOSPLIT,$0-0 JMP libc_pipe(SB) TEXT ·libc_getxattr_trampoline(SB),NOSPLIT,$0-0 @@ -146,6 +144,8 @@ TEXT ·libc_fsync_trampoline(SB),NOSPLIT,$0-0 JMP libc_fsync(SB) TEXT ·libc_ftruncate_trampoline(SB),NOSPLIT,$0-0 JMP libc_ftruncate(SB) +TEXT ·libc_getcwd_trampoline(SB),NOSPLIT,$0-0 + JMP libc_getcwd(SB) TEXT ·libc_getdtablesize_trampoline(SB),NOSPLIT,$0-0 JMP libc_getdtablesize(SB) TEXT ·libc_getegid_trampoline(SB),NOSPLIT,$0-0 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go index be2e28311..d6b5249c2 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go @@ -490,21 +490,6 @@ func libc_munlockall_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func getattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error) { - _, _, e1 := syscall_syscall6(funcPC(libc_getattrlist_trampoline), uintptr(unsafe.Pointer(path)), uintptr(list), uintptr(buf), uintptr(size), uintptr(options), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -func libc_getattrlist_trampoline() - -//go:linkname libc_getattrlist libc_getattrlist -//go:cgo_import_dynamic libc_getattrlist getattrlist "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func pipe() (r int, w int, err error) { r0, r1, e1 := syscall_rawSyscall(funcPC(libc_pipe_trampoline), 0, 0, 0) r = int(r0) @@ -1277,6 +1262,28 @@ func libc_ftruncate_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getcwd(buf []byte) (n int, err error) { + var _p0 unsafe.Pointer + if len(buf) > 0 { + _p0 = unsafe.Pointer(&buf[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := syscall_syscall(funcPC(libc_getcwd_trampoline), uintptr(_p0), uintptr(len(buf)), 0) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +func libc_getcwd_trampoline() + +//go:linkname libc_getcwd libc_getcwd +//go:cgo_import_dynamic libc_getcwd getcwd "/usr/lib/libSystem.B.dylib" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Getdtablesize() (size int) { r0, _, _ := syscall_syscall(funcPC(libc_getdtablesize_trampoline), 0, 0, 0) size = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s index 403c21f06..5eec5f1d9 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s @@ -60,8 +60,6 @@ TEXT ·libc_munlock_trampoline(SB),NOSPLIT,$0-0 JMP libc_munlock(SB) TEXT ·libc_munlockall_trampoline(SB),NOSPLIT,$0-0 JMP libc_munlockall(SB) -TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0 - JMP libc_getattrlist(SB) TEXT ·libc_pipe_trampoline(SB),NOSPLIT,$0-0 JMP libc_pipe(SB) TEXT ·libc_getxattr_trampoline(SB),NOSPLIT,$0-0 @@ -146,6 +144,8 @@ TEXT ·libc_fsync_trampoline(SB),NOSPLIT,$0-0 JMP libc_fsync(SB) TEXT ·libc_ftruncate_trampoline(SB),NOSPLIT,$0-0 JMP libc_ftruncate(SB) +TEXT ·libc_getcwd_trampoline(SB),NOSPLIT,$0-0 + JMP libc_getcwd(SB) TEXT ·libc_getdtablesize_trampoline(SB),NOSPLIT,$0-0 JMP libc_getdtablesize(SB) TEXT ·libc_getegid_trampoline(SB),NOSPLIT,$0-0 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go index 34976a4c2..08638436c 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go @@ -490,21 +490,6 @@ func libc_munlockall_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func getattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error) { - _, _, e1 := syscall_syscall6(funcPC(libc_getattrlist_trampoline), uintptr(unsafe.Pointer(path)), uintptr(list), uintptr(buf), uintptr(size), uintptr(options), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -func libc_getattrlist_trampoline() - -//go:linkname libc_getattrlist libc_getattrlist -//go:cgo_import_dynamic libc_getattrlist getattrlist "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func pipe() (r int, w int, err error) { r0, r1, e1 := syscall_rawSyscall(funcPC(libc_pipe_trampoline), 0, 0, 0) r = int(r0) @@ -1277,6 +1262,28 @@ func libc_ftruncate_trampoline() // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getcwd(buf []byte) (n int, err error) { + var _p0 unsafe.Pointer + if len(buf) > 0 { + _p0 = unsafe.Pointer(&buf[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + r0, _, e1 := syscall_syscall(funcPC(libc_getcwd_trampoline), uintptr(_p0), uintptr(len(buf)), 0) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +func libc_getcwd_trampoline() + +//go:linkname libc_getcwd libc_getcwd +//go:cgo_import_dynamic libc_getcwd getcwd "/usr/lib/libSystem.B.dylib" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Getdtablesize() (size int) { r0, _, _ := syscall_syscall(funcPC(libc_getdtablesize_trampoline), 0, 0, 0) size = int(r0) diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s index abe7b6edf..16aebee23 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s @@ -60,8 +60,6 @@ TEXT ·libc_munlock_trampoline(SB),NOSPLIT,$0-0 JMP libc_munlock(SB) TEXT ·libc_munlockall_trampoline(SB),NOSPLIT,$0-0 JMP libc_munlockall(SB) -TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0 - JMP libc_getattrlist(SB) TEXT ·libc_pipe_trampoline(SB),NOSPLIT,$0-0 JMP libc_pipe(SB) TEXT ·libc_getxattr_trampoline(SB),NOSPLIT,$0-0 @@ -146,6 +144,8 @@ TEXT ·libc_fsync_trampoline(SB),NOSPLIT,$0-0 JMP libc_fsync(SB) TEXT ·libc_ftruncate_trampoline(SB),NOSPLIT,$0-0 JMP libc_ftruncate(SB) +TEXT ·libc_getcwd_trampoline(SB),NOSPLIT,$0-0 + JMP libc_getcwd(SB) TEXT ·libc_getdtablesize_trampoline(SB),NOSPLIT,$0-0 JMP libc_getdtablesize(SB) TEXT ·libc_getegid_trampoline(SB),NOSPLIT,$0-0 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go index 8b329c458..d3af083f4 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go @@ -13,7 +13,7 @@ import ( //go:cgo_import_dynamic libc_preadv preadv "libc.so" //go:cgo_import_dynamic libc_writev writev "libc.so" //go:cgo_import_dynamic libc_pwritev pwritev "libc.so" -//go:cgo_import_dynamic libc_accept4 accept4 "libc.so" +//go:cgo_import_dynamic libc_accept4 accept4 "libsocket.so" //go:cgo_import_dynamic libc_pipe2 pipe2 "libc.so" //go:linkname procreadv libc_readv diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go index 9f47b87c5..6103f2150 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go +++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go @@ -145,6 +145,10 @@ type Dirent struct { _ [3]byte } +const ( + PathMax = 0x400 +) + type RawSockaddrInet4 struct { Len uint8 Family uint8 diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go index 966798a87..e6576d1c4 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go @@ -151,6 +151,10 @@ type Dirent struct { _ [3]byte } +const ( + PathMax = 0x400 +) + type RawSockaddrInet4 struct { Len uint8 Family uint8 diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go index 4fe4c9cd7..af9560fa1 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go +++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go @@ -146,6 +146,10 @@ type Dirent struct { _ [3]byte } +const ( + PathMax = 0x400 +) + type RawSockaddrInet4 struct { Len uint8 Family uint8 diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go index 21999e4b0..a09c0f942 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go @@ -151,6 +151,10 @@ type Dirent struct { _ [3]byte } +const ( + PathMax = 0x400 +) + type RawSockaddrInet4 struct { Len uint8 Family uint8 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go index 68e4974a9..a92a5019a 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go @@ -76,6 +76,21 @@ type Fsid struct { Val [2]int32 } +type FileCloneRange struct { + Src_fd int64 + Src_offset uint64 + Src_length uint64 + Dest_offset uint64 +} + +type FileDedupeRange struct { + Src_offset uint64 + Src_length uint64 + Dest_count uint16 + Reserved1 uint16 + Reserved2 uint32 +} + type FscryptPolicy struct { Version uint8 Contents_encryption_mode uint8 diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go b/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go index 8dcd8bbb7..e8cba6b23 100644 --- a/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go +++ b/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go @@ -491,7 +491,7 @@ func (p *parser) parseMapType(parent *types.Package) types.Type { // // For unqualified and anonymous names, the returned package is the parent // package unless parent == nil, in which case the returned package is the -// package being imported. (The parent package is not nil if the the name +// package being imported. (The parent package is not nil if the name // is an unqualified struct field or interface method name belonging to a // type declared in another package.) // diff --git a/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go b/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go index dc6177c12..35bc6a412 100644 --- a/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go +++ b/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go @@ -39,7 +39,12 @@ func GetSizes(ctx context.Context, buildFlags, env []string, gocmdRunner *gocomm } if tool == "off" { - return GetSizesGolist(ctx, buildFlags, env, gocmdRunner, dir) + inv := gocommand.Invocation{ + BuildFlags: buildFlags, + Env: env, + WorkingDir: dir, + } + return GetSizesGolist(ctx, inv, gocmdRunner) } req, err := json.Marshal(struct { @@ -75,26 +80,17 @@ func GetSizes(ctx context.Context, buildFlags, env []string, gocmdRunner *gocomm return response.Sizes, nil } -func GetSizesGolist(ctx context.Context, buildFlags, env []string, gocmdRunner *gocommand.Runner, dir string) (types.Sizes, error) { - inv := gocommand.Invocation{ - Verb: "list", - Args: []string{"-f", "{{context.GOARCH}} {{context.Compiler}}", "--", "unsafe"}, - Env: env, - BuildFlags: buildFlags, - WorkingDir: dir, - } +func GetSizesGolist(ctx context.Context, inv gocommand.Invocation, gocmdRunner *gocommand.Runner) (types.Sizes, error) { + inv.Verb = "list" + inv.Args = []string{"-f", "{{context.GOARCH}} {{context.Compiler}}", "--", "unsafe"} stdout, stderr, friendlyErr, rawErr := gocmdRunner.RunRaw(ctx, inv) var goarch, compiler string if rawErr != nil { if strings.Contains(rawErr.Error(), "cannot find main module") { // User's running outside of a module. All bets are off. Get GOARCH and guess compiler is gc. // TODO(matloob): Is this a problem in practice? - inv := gocommand.Invocation{ - Verb: "env", - Args: []string{"GOARCH"}, - Env: env, - WorkingDir: dir, - } + inv.Verb = "env" + inv.Args = []string{"GOARCH"} envout, enverr := gocmdRunner.Run(ctx, inv) if enverr != nil { return nil, enverr diff --git a/vendor/golang.org/x/tools/go/packages/golist.go b/vendor/golang.org/x/tools/go/packages/golist.go index bc04503c1..81381fa1c 100644 --- a/vendor/golang.org/x/tools/go/packages/golist.go +++ b/vendor/golang.org/x/tools/go/packages/golist.go @@ -10,6 +10,7 @@ import ( "encoding/json" "fmt" "go/types" + "io/ioutil" "log" "os" "os/exec" @@ -91,7 +92,7 @@ type golistState struct { goVersionOnce sync.Once goVersionError error - goVersion string // third field of 'go version' + goVersion int // The X in Go 1.X. // vendorDirs caches the (non)existence of vendor directories. vendorDirs map[string]bool @@ -139,6 +140,12 @@ func goListDriver(cfg *Config, patterns ...string) (*driverResponse, error) { response := newDeduper() + state := &golistState{ + cfg: cfg, + ctx: ctx, + vendorDirs: map[string]bool{}, + } + // Fill in response.Sizes asynchronously if necessary. var sizeserr error var sizeswg sync.WaitGroup @@ -146,19 +153,13 @@ func goListDriver(cfg *Config, patterns ...string) (*driverResponse, error) { sizeswg.Add(1) go func() { var sizes types.Sizes - sizes, sizeserr = packagesdriver.GetSizesGolist(ctx, cfg.BuildFlags, cfg.Env, cfg.gocmdRunner, cfg.Dir) + sizes, sizeserr = packagesdriver.GetSizesGolist(ctx, state.cfgInvocation(), cfg.gocmdRunner) // types.SizesFor always returns nil or a *types.StdSizes. response.dr.Sizes, _ = sizes.(*types.StdSizes) sizeswg.Done() }() } - state := &golistState{ - cfg: cfg, - ctx: ctx, - vendorDirs: map[string]bool{}, - } - // Determine files requested in contains patterns var containFiles []string restPatterns := make([]string, 0, len(patterns)) @@ -208,56 +209,58 @@ extractQueries: } } - modifiedPkgs, needPkgs, err := state.processGolistOverlay(response) - if err != nil { - return nil, err - } + // Only use go/packages' overlay processing if we're using a Go version + // below 1.16. Otherwise, go list handles it. + if goVersion, err := state.getGoVersion(); err == nil && goVersion < 16 { + modifiedPkgs, needPkgs, err := state.processGolistOverlay(response) + if err != nil { + return nil, err + } - var containsCandidates []string - if len(containFiles) > 0 { - containsCandidates = append(containsCandidates, modifiedPkgs...) - containsCandidates = append(containsCandidates, needPkgs...) - } - if err := state.addNeededOverlayPackages(response, needPkgs); err != nil { - return nil, err - } - // Check candidate packages for containFiles. - if len(containFiles) > 0 { - for _, id := range containsCandidates { - pkg, ok := response.seenPackages[id] - if !ok { - response.addPackage(&Package{ - ID: id, - Errors: []Error{ - { + var containsCandidates []string + if len(containFiles) > 0 { + containsCandidates = append(containsCandidates, modifiedPkgs...) + containsCandidates = append(containsCandidates, needPkgs...) + } + if err := state.addNeededOverlayPackages(response, needPkgs); err != nil { + return nil, err + } + // Check candidate packages for containFiles. + if len(containFiles) > 0 { + for _, id := range containsCandidates { + pkg, ok := response.seenPackages[id] + if !ok { + response.addPackage(&Package{ + ID: id, + Errors: []Error{{ Kind: ListError, Msg: fmt.Sprintf("package %s expected but not seen", id), - }, - }, - }) - continue - } - for _, f := range containFiles { - for _, g := range pkg.GoFiles { - if sameFile(f, g) { - response.addRoot(id) + }}, + }) + continue + } + for _, f := range containFiles { + for _, g := range pkg.GoFiles { + if sameFile(f, g) { + response.addRoot(id) + } } } } } - } - // Add root for any package that matches a pattern. This applies only to - // packages that are modified by overlays, since they are not added as - // roots automatically. - for _, pattern := range restPatterns { - match := matchPattern(pattern) - for _, pkgID := range modifiedPkgs { - pkg, ok := response.seenPackages[pkgID] - if !ok { - continue - } - if match(pkg.PkgPath) { - response.addRoot(pkg.ID) + // Add root for any package that matches a pattern. This applies only to + // packages that are modified by overlays, since they are not added as + // roots automatically. + for _, pattern := range restPatterns { + match := matchPattern(pattern) + for _, pkgID := range modifiedPkgs { + pkg, ok := response.seenPackages[pkgID] + if !ok { + continue + } + if match(pkg.PkgPath) { + response.addRoot(pkg.ID) + } } } } @@ -381,32 +384,34 @@ func (state *golistState) adhocPackage(pattern, query string) (*driverResponse, // Fields must match go list; // see $GOROOT/src/cmd/go/internal/load/pkg.go. type jsonPackage struct { - ImportPath string - Dir string - Name string - Export string - GoFiles []string - CompiledGoFiles []string - CFiles []string - CgoFiles []string - CXXFiles []string - MFiles []string - HFiles []string - FFiles []string - SFiles []string - SwigFiles []string - SwigCXXFiles []string - SysoFiles []string - Imports []string - ImportMap map[string]string - Deps []string - Module *Module - TestGoFiles []string - TestImports []string - XTestGoFiles []string - XTestImports []string - ForTest string // q in a "p [q.test]" package, else "" - DepOnly bool + ImportPath string + Dir string + Name string + Export string + GoFiles []string + CompiledGoFiles []string + IgnoredGoFiles []string + IgnoredOtherFiles []string + CFiles []string + CgoFiles []string + CXXFiles []string + MFiles []string + HFiles []string + FFiles []string + SFiles []string + SwigFiles []string + SwigCXXFiles []string + SysoFiles []string + Imports []string + ImportMap map[string]string + Deps []string + Module *Module + TestGoFiles []string + TestImports []string + XTestGoFiles []string + XTestImports []string + ForTest string // q in a "p [q.test]" package, else "" + DepOnly bool Error *jsonPackageError } @@ -558,6 +563,7 @@ func (state *golistState) createDriverResponse(words ...string) (*driverResponse GoFiles: absJoin(p.Dir, p.GoFiles, p.CgoFiles), CompiledGoFiles: absJoin(p.Dir, p.CompiledGoFiles), OtherFiles: absJoin(p.Dir, otherFiles(p)...), + IgnoredFiles: absJoin(p.Dir, p.IgnoredGoFiles, p.IgnoredOtherFiles), forTest: p.ForTest, Module: p.Module, } @@ -728,7 +734,7 @@ func (state *golistState) shouldAddFilenameFromError(p *jsonPackage) bool { // On Go 1.14 and earlier, only add filenames from errors if the import stack is empty. // The import stack behaves differently for these versions than newer Go versions. - if strings.HasPrefix(goV, "go1.13") || strings.HasPrefix(goV, "go1.14") { + if goV < 15 { return len(p.Error.ImportStack) == 0 } @@ -739,31 +745,9 @@ func (state *golistState) shouldAddFilenameFromError(p *jsonPackage) bool { return len(p.Error.ImportStack) == 0 || p.Error.ImportStack[len(p.Error.ImportStack)-1] == p.ImportPath } -func (state *golistState) getGoVersion() (string, error) { +func (state *golistState) getGoVersion() (int, error) { state.goVersionOnce.Do(func() { - var b *bytes.Buffer - // Invoke go version. Don't use invokeGo because it will supply build flags, and - // go version doesn't expect build flags. - inv := gocommand.Invocation{ - Verb: "version", - Env: state.cfg.Env, - Logf: state.cfg.Logf, - } - gocmdRunner := state.cfg.gocmdRunner - if gocmdRunner == nil { - gocmdRunner = &gocommand.Runner{} - } - b, _, _, state.goVersionError = gocmdRunner.RunRaw(state.cfg.Context, inv) - if state.goVersionError != nil { - return - } - - sp := strings.Split(b.String(), " ") - if len(sp) < 3 { - state.goVersionError = fmt.Errorf("go version output: expected 'go version ', got '%s'", b.String()) - return - } - state.goVersion = sp[2] + state.goVersion, state.goVersionError = gocommand.GoVersion(state.ctx, state.cfgInvocation(), state.cfg.gocmdRunner) }) return state.goVersion, state.goVersionError } @@ -836,18 +820,46 @@ func golistargs(cfg *Config, words []string) []string { return fullargs } -// invokeGo returns the stdout of a go command invocation. -func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer, error) { +// cfgInvocation returns an Invocation that reflects cfg's settings. +func (state *golistState) cfgInvocation() gocommand.Invocation { cfg := state.cfg - - inv := gocommand.Invocation{ - Verb: verb, - Args: args, + return gocommand.Invocation{ BuildFlags: cfg.BuildFlags, + ModFile: cfg.modFile, + ModFlag: cfg.modFlag, Env: cfg.Env, Logf: cfg.Logf, WorkingDir: cfg.Dir, } +} + +// invokeGo returns the stdout of a go command invocation. +func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer, error) { + cfg := state.cfg + + inv := state.cfgInvocation() + + // For Go versions 1.16 and above, `go list` accepts overlays directly via + // the -overlay flag. Set it, if it's available. + // + // The check for "list" is not necessarily required, but we should avoid + // getting the go version if possible. + if verb == "list" { + goVersion, err := state.getGoVersion() + if err != nil { + return nil, err + } + if goVersion >= 16 { + filename, cleanup, err := state.writeOverlays() + if err != nil { + return nil, err + } + defer cleanup() + inv.Overlay = filename + } + } + inv.Verb = verb + inv.Args = args gocmdRunner := cfg.gocmdRunner if gocmdRunner == nil { gocmdRunner = &gocommand.Runner{} @@ -987,6 +999,67 @@ func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer, return stdout, nil } +// OverlayJSON is the format overlay files are expected to be in. +// The Replace map maps from overlaid paths to replacement paths: +// the Go command will forward all reads trying to open +// each overlaid path to its replacement path, or consider the overlaid +// path not to exist if the replacement path is empty. +// +// From golang/go#39958. +type OverlayJSON struct { + Replace map[string]string `json:"replace,omitempty"` +} + +// writeOverlays writes out files for go list's -overlay flag, as described +// above. +func (state *golistState) writeOverlays() (filename string, cleanup func(), err error) { + // Do nothing if there are no overlays in the config. + if len(state.cfg.Overlay) == 0 { + return "", func() {}, nil + } + dir, err := ioutil.TempDir("", "gopackages-*") + if err != nil { + return "", nil, err + } + // The caller must clean up this directory, unless this function returns an + // error. + cleanup = func() { + os.RemoveAll(dir) + } + defer func() { + if err != nil { + cleanup() + } + }() + overlays := map[string]string{} + for k, v := range state.cfg.Overlay { + // Create a unique filename for the overlaid files, to avoid + // creating nested directories. + noSeparator := strings.Join(strings.Split(filepath.ToSlash(k), "/"), "") + f, err := ioutil.TempFile(dir, fmt.Sprintf("*-%s", noSeparator)) + if err != nil { + return "", func() {}, err + } + if _, err := f.Write(v); err != nil { + return "", func() {}, err + } + if err := f.Close(); err != nil { + return "", func() {}, err + } + overlays[k] = f.Name() + } + b, err := json.Marshal(OverlayJSON{Replace: overlays}) + if err != nil { + return "", func() {}, err + } + // Write out the overlay file that contains the filepath mappings. + filename = filepath.Join(dir, "overlay.json") + if err := ioutil.WriteFile(filename, b, 0665); err != nil { + return "", func() {}, err + } + return filename, cleanup, nil +} + func containsGoFile(s []string) bool { for _, f := range s { if strings.HasSuffix(f, ".go") { diff --git a/vendor/golang.org/x/tools/go/packages/golist_overlay.go b/vendor/golang.org/x/tools/go/packages/golist_overlay.go index 874f90134..de2c1dc57 100644 --- a/vendor/golang.org/x/tools/go/packages/golist_overlay.go +++ b/vendor/golang.org/x/tools/go/packages/golist_overlay.go @@ -1,3 +1,7 @@ +// Copyright 2018 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package packages import ( @@ -253,7 +257,7 @@ func (state *golistState) processGolistOverlay(response *responseDeduper) (modif return modifiedPkgs, needPkgs, err } -// resolveImport finds the the ID of a package given its import path. +// resolveImport finds the ID of a package given its import path. // In particular, it will find the right vendored copy when in GOPATH mode. func (state *golistState) resolveImport(sourceDir, importPath string) (string, error) { env, err := state.getEnv() diff --git a/vendor/golang.org/x/tools/go/packages/packages.go b/vendor/golang.org/x/tools/go/packages/packages.go index 04053f1e7..38475e871 100644 --- a/vendor/golang.org/x/tools/go/packages/packages.go +++ b/vendor/golang.org/x/tools/go/packages/packages.go @@ -144,6 +144,12 @@ type Config struct { // the build system's query tool. BuildFlags []string + // modFile will be used for -modfile in go command invocations. + modFile string + + // modFlag will be used for -modfile in go command invocations. + modFlag string + // Fset provides source position information for syntax trees and types. // If Fset is nil, Load will use a new fileset, but preserve Fset's value. Fset *token.FileSet @@ -289,6 +295,11 @@ type Package struct { // including assembly, C, C++, Fortran, Objective-C, SWIG, and so on. OtherFiles []string + // IgnoredFiles lists source files that are not part of the package + // using the current build configuration but that might be part of + // the package using other build configurations. + IgnoredFiles []string + // ExportFile is the absolute path to a file containing type // information for the package as provided by the build system. ExportFile string @@ -361,6 +372,12 @@ func init() { packagesinternal.SetGoCmdRunner = func(config interface{}, runner *gocommand.Runner) { config.(*Config).gocmdRunner = runner } + packagesinternal.SetModFile = func(config interface{}, value string) { + config.(*Config).modFile = value + } + packagesinternal.SetModFlag = func(config interface{}, value string) { + config.(*Config).modFlag = value + } packagesinternal.TypecheckCgo = int(typecheckCgo) } @@ -404,6 +421,7 @@ type flatPackage struct { GoFiles []string `json:",omitempty"` CompiledGoFiles []string `json:",omitempty"` OtherFiles []string `json:",omitempty"` + IgnoredFiles []string `json:",omitempty"` ExportFile string `json:",omitempty"` Imports map[string]string `json:",omitempty"` } @@ -426,6 +444,7 @@ func (p *Package) MarshalJSON() ([]byte, error) { GoFiles: p.GoFiles, CompiledGoFiles: p.CompiledGoFiles, OtherFiles: p.OtherFiles, + IgnoredFiles: p.IgnoredFiles, ExportFile: p.ExportFile, } if len(p.Imports) > 0 { @@ -712,7 +731,8 @@ func (ld *loader) refine(roots []string, list ...*Package) ([]*Package, error) { result[i] = lpkg.Package } for i := range ld.pkgs { - // Clear all unrequested fields, for extra de-Hyrum-ization. + // Clear all unrequested fields, + // to catch programs that use more than they request. if ld.requestedMode&NeedName == 0 { ld.pkgs[i].Name = "" ld.pkgs[i].PkgPath = "" @@ -720,6 +740,7 @@ func (ld *loader) refine(roots []string, list ...*Package) ([]*Package, error) { if ld.requestedMode&NeedFiles == 0 { ld.pkgs[i].GoFiles = nil ld.pkgs[i].OtherFiles = nil + ld.pkgs[i].IgnoredFiles = nil } if ld.requestedMode&NeedCompiledGoFiles == 0 { ld.pkgs[i].CompiledGoFiles = nil diff --git a/vendor/golang.org/x/tools/internal/gocommand/invoke.go b/vendor/golang.org/x/tools/internal/gocommand/invoke.go index f516e1762..8ba225383 100644 --- a/vendor/golang.org/x/tools/internal/gocommand/invoke.go +++ b/vendor/golang.org/x/tools/internal/gocommand/invoke.go @@ -130,6 +130,9 @@ type Invocation struct { Verb string Args []string BuildFlags []string + ModFlag string + ModFile string + Overlay string Env []string WorkingDir string Logf func(format string, args ...interface{}) @@ -158,17 +161,41 @@ func (i *Invocation) run(ctx context.Context, stdout, stderr io.Writer) error { } goArgs := []string{i.Verb} + + appendModFile := func() { + if i.ModFile != "" { + goArgs = append(goArgs, "-modfile="+i.ModFile) + } + } + appendModFlag := func() { + if i.ModFlag != "" { + goArgs = append(goArgs, "-mod="+i.ModFlag) + } + } + appendOverlayFlag := func() { + if i.Overlay != "" { + goArgs = append(goArgs, "-overlay="+i.Overlay) + } + } + switch i.Verb { - case "mod": - // mod needs the sub-verb before build flags. - goArgs = append(goArgs, i.Args[0]) - goArgs = append(goArgs, i.BuildFlags...) - goArgs = append(goArgs, i.Args[1:]...) - case "env": - // env doesn't take build flags. + case "env", "version": goArgs = append(goArgs, i.Args...) - default: + case "mod": + // mod needs the sub-verb before flags. + goArgs = append(goArgs, i.Args[0]) + appendModFile() + goArgs = append(goArgs, i.Args[1:]...) + case "get": goArgs = append(goArgs, i.BuildFlags...) + appendModFile() + goArgs = append(goArgs, i.Args...) + + default: // notably list and build. + goArgs = append(goArgs, i.BuildFlags...) + appendModFile() + appendModFlag() + appendOverlayFlag() goArgs = append(goArgs, i.Args...) } cmd := exec.Command("go", goArgs...) diff --git a/vendor/golang.org/x/tools/internal/gocommand/version.go b/vendor/golang.org/x/tools/internal/gocommand/version.go new file mode 100644 index 000000000..60d45ac0e --- /dev/null +++ b/vendor/golang.org/x/tools/internal/gocommand/version.go @@ -0,0 +1,40 @@ +// Copyright 2020 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package gocommand + +import ( + "context" + "fmt" + "strings" +) + +// GoVersion checks the go version by running "go list" with modules off. +// It returns the X in Go 1.X. +func GoVersion(ctx context.Context, inv Invocation, r *Runner) (int, error) { + inv.Verb = "list" + inv.Args = []string{"-e", "-f", `{{context.ReleaseTags}}`} + inv.Env = append(append([]string{}, inv.Env...), "GO111MODULE=off") + // Unset any unneeded flags. + inv.ModFile = "" + inv.ModFlag = "" + stdoutBytes, err := r.Run(ctx, inv) + if err != nil { + return 0, err + } + stdout := stdoutBytes.String() + if len(stdout) < 3 { + return 0, fmt.Errorf("bad ReleaseTags output: %q", stdout) + } + // Split up "[go1.1 go1.15]" + tags := strings.Fields(stdout[1 : len(stdout)-2]) + for i := len(tags) - 1; i >= 0; i-- { + var version int + if _, err := fmt.Sscanf(tags[i], "go1.%d", &version); err != nil { + continue + } + return version, nil + } + return 0, fmt.Errorf("no parseable ReleaseTags in %v", tags) +} diff --git a/vendor/golang.org/x/tools/internal/imports/fix.go b/vendor/golang.org/x/tools/internal/imports/fix.go index 675d16c87..d859617b7 100644 --- a/vendor/golang.org/x/tools/internal/imports/fix.go +++ b/vendor/golang.org/x/tools/internal/imports/fix.go @@ -83,7 +83,7 @@ type ImportFix struct { IdentName string // FixType is the type of fix this is (AddImport, DeleteImport, SetImportName). FixType ImportFixType - Relevance int // see pkg + Relevance float64 // see pkg } // An ImportInfo represents a single import statement. @@ -592,9 +592,9 @@ func getFixes(fset *token.FileSet, f *ast.File, filename string, env *ProcessEnv return fixes, nil } -// Highest relevance, used for the standard library. Chosen arbitrarily to -// match pre-existing gopls code. -const MaxRelevance = 7 +// MaxRelevance is the highest relevance, used for the standard library. +// Chosen arbitrarily to match pre-existing gopls code. +const MaxRelevance = 7.0 // getCandidatePkgs works with the passed callback to find all acceptable packages. // It deduplicates by import path, and uses a cached stdlib rather than reading @@ -607,6 +607,10 @@ func getCandidatePkgs(ctx context.Context, wrappedCallback *scanCallback, filena if err != nil { return err } + + var mu sync.Mutex // to guard asynchronous access to dupCheck + dupCheck := map[string]struct{}{} + // Start off with the standard library. for importPath, exports := range stdlib { p := &pkg{ @@ -615,14 +619,12 @@ func getCandidatePkgs(ctx context.Context, wrappedCallback *scanCallback, filena packageName: path.Base(importPath), relevance: MaxRelevance, } + dupCheck[importPath] = struct{}{} if notSelf(p) && wrappedCallback.dirFound(p) && wrappedCallback.packageNameLoaded(p) { wrappedCallback.exportsLoaded(p, exports) } } - var mu sync.Mutex - dupCheck := map[string]struct{}{} - scanFilter := &scanCallback{ rootFound: func(root gopathwalk.Root) bool { // Exclude goroot results -- getting them is relatively expensive, not cached, @@ -658,8 +660,8 @@ func getCandidatePkgs(ctx context.Context, wrappedCallback *scanCallback, filena return resolver.scan(ctx, scanFilter) } -func ScoreImportPaths(ctx context.Context, env *ProcessEnv, paths []string) (map[string]int, error) { - result := make(map[string]int) +func ScoreImportPaths(ctx context.Context, env *ProcessEnv, paths []string) (map[string]float64, error) { + result := make(map[string]float64) resolver, err := env.GetResolver() if err != nil { return nil, err @@ -802,6 +804,8 @@ type ProcessEnv struct { GocmdRunner *gocommand.Runner BuildFlags []string + ModFlag string + ModFile string // Env overrides the OS environment, and can be used to specify // GOPROXY, GO111MODULE, etc. PATH cannot be set here, because @@ -995,7 +999,7 @@ type Resolver interface { // loadExports may be called concurrently. loadExports(ctx context.Context, pkg *pkg, includeTest bool) (string, []string, error) // scoreImportPath returns the relevance for an import path. - scoreImportPath(ctx context.Context, path string) int + scoreImportPath(ctx context.Context, path string) float64 ClearForNewScan() } @@ -1260,10 +1264,10 @@ func packageDirToName(dir string) (packageName string, err error) { } type pkg struct { - dir string // absolute file path to pkg directory ("/usr/lib/go/src/net/http") - importPathShort string // vendorless import path ("net/http", "a/b") - packageName string // package name loaded from source if requested - relevance int // a weakly-defined score of how relevant a package is. 0 is most relevant. + dir string // absolute file path to pkg directory ("/usr/lib/go/src/net/http") + importPathShort string // vendorless import path ("net/http", "a/b") + packageName string // package name loaded from source if requested + relevance float64 // a weakly-defined score of how relevant a package is. 0 is most relevant. } type pkgDistance struct { @@ -1389,7 +1393,7 @@ func (r *gopathResolver) scan(ctx context.Context, callback *scanCallback) error return nil } -func (r *gopathResolver) scoreImportPath(ctx context.Context, path string) int { +func (r *gopathResolver) scoreImportPath(ctx context.Context, path string) float64 { if _, ok := stdlib[path]; ok { return MaxRelevance } diff --git a/vendor/golang.org/x/tools/internal/imports/mod.go b/vendor/golang.org/x/tools/internal/imports/mod.go index 94880d616..73f7a4958 100644 --- a/vendor/golang.org/x/tools/internal/imports/mod.go +++ b/vendor/golang.org/x/tools/internal/imports/mod.go @@ -59,6 +59,8 @@ func (r *ModuleResolver) init() error { } inv := gocommand.Invocation{ BuildFlags: r.env.BuildFlags, + ModFlag: r.env.ModFlag, + ModFile: r.env.ModFile, Env: r.env.env(), Logf: r.env.Logf, WorkingDir: r.env.WorkingDir, @@ -345,10 +347,11 @@ func (r *ModuleResolver) modInfo(dir string) (modDir string, modName string) { } if r.dirInModuleCache(dir) { - matches := modCacheRegexp.FindStringSubmatch(dir) - index := strings.Index(dir, matches[1]+"@"+matches[2]) - modDir := filepath.Join(dir[:index], matches[1]+"@"+matches[2]) - return modDir, readModName(filepath.Join(modDir, "go.mod")) + if matches := modCacheRegexp.FindStringSubmatch(dir); len(matches) == 3 { + index := strings.Index(dir, matches[1]+"@"+matches[2]) + modDir := filepath.Join(dir[:index], matches[1]+"@"+matches[2]) + return modDir, readModName(filepath.Join(modDir, "go.mod")) + } } for { if info, ok := r.cacheLoad(dir); ok { @@ -487,7 +490,7 @@ func (r *ModuleResolver) scan(ctx context.Context, callback *scanCallback) error return nil } -func (r *ModuleResolver) scoreImportPath(ctx context.Context, path string) int { +func (r *ModuleResolver) scoreImportPath(ctx context.Context, path string) float64 { if _, ok := stdlib[path]; ok { return MaxRelevance } @@ -495,17 +498,31 @@ func (r *ModuleResolver) scoreImportPath(ctx context.Context, path string) int { return modRelevance(mod) } -func modRelevance(mod *gocommand.ModuleJSON) int { +func modRelevance(mod *gocommand.ModuleJSON) float64 { + var relevance float64 switch { case mod == nil: // out of scope return MaxRelevance - 4 case mod.Indirect: - return MaxRelevance - 3 + relevance = MaxRelevance - 3 case !mod.Main: - return MaxRelevance - 2 + relevance = MaxRelevance - 2 default: - return MaxRelevance - 1 // main module ties with stdlib + relevance = MaxRelevance - 1 // main module ties with stdlib } + + _, versionString, ok := module.SplitPathVersion(mod.Path) + if ok { + index := strings.Index(versionString, "v") + if index == -1 { + return relevance + } + if versionNumber, err := strconv.ParseFloat(versionString[index+1:], 64); err == nil { + relevance += versionNumber / 1000 + } + } + + return relevance } // canonicalize gets the result of canonicalizing the packages using the results diff --git a/vendor/golang.org/x/tools/internal/packagesinternal/packages.go b/vendor/golang.org/x/tools/internal/packagesinternal/packages.go index 2c4527f24..1335a5eed 100644 --- a/vendor/golang.org/x/tools/internal/packagesinternal/packages.go +++ b/vendor/golang.org/x/tools/internal/packagesinternal/packages.go @@ -12,3 +12,6 @@ var GetGoCmdRunner = func(config interface{}) *gocommand.Runner { return nil } var SetGoCmdRunner = func(config interface{}, runner *gocommand.Runner) {} var TypecheckCgo int + +var SetModFlag = func(config interface{}, value string) {} +var SetModFile = func(config interface{}, value string) {} diff --git a/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go b/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go new file mode 100644 index 000000000..65473eb22 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go @@ -0,0 +1,1358 @@ +// Copyright 2020 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package typesinternal + +//go:generate stringer -type=ErrorCode + +type ErrorCode int + +// This file defines the error codes that can be produced during type-checking. +// Collectively, these codes provide an identifier that may be used to +// implement special handling for certain types of errors. +// +// Error codes should be fine-grained enough that the exact nature of the error +// can be easily determined, but coarse enough that they are not an +// implementation detail of the type checking algorithm. As a rule-of-thumb, +// errors should be considered equivalent if there is a theoretical refactoring +// of the type checker in which they are emitted in exactly one place. For +// example, the type checker emits different error messages for "too many +// arguments" and "too few arguments", but one can imagine an alternative type +// checker where this check instead just emits a single "wrong number of +// arguments", so these errors should have the same code. +// +// Error code names should be as brief as possible while retaining accuracy and +// distinctiveness. In most cases names should start with an adjective +// describing the nature of the error (e.g. "invalid", "unused", "misplaced"), +// and end with a noun identifying the relevant language object. For example, +// "DuplicateDecl" or "InvalidSliceExpr". For brevity, naming follows the +// convention that "bad" implies a problem with syntax, and "invalid" implies a +// problem with types. + +const ( + _ ErrorCode = iota + + // Test is reserved for errors that only apply while in self-test mode. + Test + + /* package names */ + + // BlankPkgName occurs when a package name is the blank identifier "_". + // + // Per the spec: + // "The PackageName must not be the blank identifier." + BlankPkgName + + // MismatchedPkgName occurs when a file's package name doesn't match the + // package name already established by other files. + MismatchedPkgName + + // InvalidPkgUse occurs when a package identifier is used outside of a + // selector expression. + // + // Example: + // import "fmt" + // + // var _ = fmt + InvalidPkgUse + + /* imports */ + + // BadImportPath occurs when an import path is not valid. + BadImportPath + + // BrokenImport occurs when importing a package fails. + // + // Example: + // import "amissingpackage" + BrokenImport + + // ImportCRenamed occurs when the special import "C" is renamed. "C" is a + // pseudo-package, and must not be renamed. + // + // Example: + // import _ "C" + ImportCRenamed + + // UnusedImport occurs when an import is unused. + // + // Example: + // import "fmt" + // + // func main() {} + UnusedImport + + /* initialization */ + + // InvalidInitCycle occurs when an invalid cycle is detected within the + // initialization graph. + // + // Example: + // var x int = f() + // + // func f() int { return x } + InvalidInitCycle + + /* decls */ + + // DuplicateDecl occurs when an identifier is declared multiple times. + // + // Example: + // var x = 1 + // var x = 2 + DuplicateDecl + + // InvalidDeclCycle occurs when a declaration cycle is not valid. + // + // Example: + // import "unsafe" + // + // type T struct { + // a [n]int + // } + // + // var n = unsafe.Sizeof(T{}) + InvalidDeclCycle + + // InvalidTypeCycle occurs when a cycle in type definitions results in a + // type that is not well-defined. + // + // Example: + // import "unsafe" + // + // type T [unsafe.Sizeof(T{})]int + InvalidTypeCycle + + /* decls > const */ + + // InvalidConstInit occurs when a const declaration has a non-constant + // initializer. + // + // Example: + // var x int + // const _ = x + InvalidConstInit + + // InvalidConstVal occurs when a const value cannot be converted to its + // target type. + // + // TODO(findleyr): this error code and example are not very clear. Consider + // removing it. + // + // Example: + // const _ = 1 << "hello" + InvalidConstVal + + // InvalidConstType occurs when the underlying type in a const declaration + // is not a valid constant type. + // + // Example: + // const c *int = 4 + InvalidConstType + + /* decls > var (+ other variable assignment codes) */ + + // UntypedNil occurs when the predeclared (untyped) value nil is used to + // initialize a variable declared without an explicit type. + // + // Example: + // var x = nil + UntypedNil + + // WrongAssignCount occurs when the number of values on the right-hand side + // of an assignment or or initialization expression does not match the number + // of variables on the left-hand side. + // + // Example: + // var x = 1, 2 + WrongAssignCount + + // UnassignableOperand occurs when the left-hand side of an assignment is + // not assignable. + // + // Example: + // func f() { + // const c = 1 + // c = 2 + // } + UnassignableOperand + + // NoNewVar occurs when a short variable declaration (':=') does not declare + // new variables. + // + // Example: + // func f() { + // x := 1 + // x := 2 + // } + NoNewVar + + // MultiValAssignOp occurs when an assignment operation (+=, *=, etc) does + // not have single-valued left-hand or right-hand side. + // + // Per the spec: + // "In assignment operations, both the left- and right-hand expression lists + // must contain exactly one single-valued expression" + // + // Example: + // func f() int { + // x, y := 1, 2 + // x, y += 1 + // return x + y + // } + MultiValAssignOp + + // InvalidIfaceAssign occurs when a value of type T is used as an + // interface, but T does not implement a method of the expected interface. + // + // Example: + // type I interface { + // f() + // } + // + // type T int + // + // var x I = T(1) + InvalidIfaceAssign + + // InvalidChanAssign occurs when a chan assignment is invalid. + // + // Per the spec, a value x is assignable to a channel type T if: + // "x is a bidirectional channel value, T is a channel type, x's type V and + // T have identical element types, and at least one of V or T is not a + // defined type." + // + // Example: + // type T1 chan int + // type T2 chan int + // + // var x T1 + // // Invalid assignment because both types are named + // var _ T2 = x + InvalidChanAssign + + // IncompatibleAssign occurs when the type of the right-hand side expression + // in an assignment cannot be assigned to the type of the variable being + // assigned. + // + // Example: + // var x []int + // var _ int = x + IncompatibleAssign + + // UnaddressableFieldAssign occurs when trying to assign to a struct field + // in a map value. + // + // Example: + // func f() { + // m := make(map[string]struct{i int}) + // m["foo"].i = 42 + // } + UnaddressableFieldAssign + + /* decls > type (+ other type expression codes) */ + + // NotAType occurs when the identifier used as the underlying type in a type + // declaration or the right-hand side of a type alias does not denote a type. + // + // Example: + // var S = 2 + // + // type T S + NotAType + + // InvalidArrayLen occurs when an array length is not a constant value. + // + // Example: + // var n = 3 + // var _ = [n]int{} + InvalidArrayLen + + // BlankIfaceMethod occurs when a method name is '_'. + // + // Per the spec: + // "The name of each explicitly specified method must be unique and not + // blank." + // + // Example: + // type T interface { + // _(int) + // } + BlankIfaceMethod + + // IncomparableMapKey occurs when a map key type does not support the == and + // != operators. + // + // Per the spec: + // "The comparison operators == and != must be fully defined for operands of + // the key type; thus the key type must not be a function, map, or slice." + // + // Example: + // var x map[T]int + // + // type T []int + IncomparableMapKey + + // InvalidIfaceEmbed occurs when a non-interface type is embedded in an + // interface. + // + // Example: + // type T struct {} + // + // func (T) m() + // + // type I interface { + // T + // } + InvalidIfaceEmbed + + // InvalidPtrEmbed occurs when an embedded field is of the pointer form *T, + // and T itself is itself a pointer, an unsafe.Pointer, or an interface. + // + // Per the spec: + // "An embedded field must be specified as a type name T or as a pointer to + // a non-interface type name *T, and T itself may not be a pointer type." + // + // Example: + // type T *int + // + // type S struct { + // *T + // } + InvalidPtrEmbed + + /* decls > func and method */ + + // BadRecv occurs when a method declaration does not have exactly one + // receiver parameter. + // + // Example: + // func () _() {} + BadRecv + + // InvalidRecv occurs when a receiver type expression is not of the form T + // or *T, or T is a pointer type. + // + // Example: + // type T struct {} + // + // func (**T) m() {} + InvalidRecv + + // DuplicateFieldAndMethod occurs when an identifier appears as both a field + // and method name. + // + // Example: + // type T struct { + // m int + // } + // + // func (T) m() {} + DuplicateFieldAndMethod + + // DuplicateMethod occurs when two methods on the same receiver type have + // the same name. + // + // Example: + // type T struct {} + // func (T) m() {} + // func (T) m(i int) int { return i } + DuplicateMethod + + /* decls > special */ + + // InvalidBlank occurs when a blank identifier is used as a value or type. + // + // Per the spec: + // "The blank identifier may appear as an operand only on the left-hand side + // of an assignment." + // + // Example: + // var x = _ + InvalidBlank + + // InvalidIota occurs when the predeclared identifier iota is used outside + // of a constant declaration. + // + // Example: + // var x = iota + InvalidIota + + // MissingInitBody occurs when an init function is missing its body. + // + // Example: + // func init() + MissingInitBody + + // InvalidInitSig occurs when an init function declares parameters or + // results. + // + // Example: + // func init() int { return 1 } + InvalidInitSig + + // InvalidInitDecl occurs when init is declared as anything other than a + // function. + // + // Example: + // var init = 1 + InvalidInitDecl + + // InvalidMainDecl occurs when main is declared as anything other than a + // function, in a main package. + InvalidMainDecl + + /* exprs */ + + // TooManyValues occurs when a function returns too many values for the + // expression context in which it is used. + // + // Example: + // func ReturnTwo() (int, int) { + // return 1, 2 + // } + // + // var x = ReturnTwo() + TooManyValues + + // NotAnExpr occurs when a type expression is used where a value expression + // is expected. + // + // Example: + // type T struct {} + // + // func f() { + // T + // } + NotAnExpr + + /* exprs > const */ + + // TruncatedFloat occurs when a float constant is truncated to an integer + // value. + // + // Example: + // var _ int = 98.6 + TruncatedFloat + + // NumericOverflow occurs when a numeric constant overflows its target type. + // + // Example: + // var x int8 = 1000 + NumericOverflow + + /* exprs > operation */ + + // UndefinedOp occurs when an operator is not defined for the type(s) used + // in an operation. + // + // Example: + // var c = "a" - "b" + UndefinedOp + + // MismatchedTypes occurs when operand types are incompatible in a binary + // operation. + // + // Example: + // var a = "hello" + // var b = 1 + // var c = a - b + MismatchedTypes + + // DivByZero occurs when a division operation is provable at compile + // time to be a division by zero. + // + // Example: + // const divisor = 0 + // var x int = 1/divisor + DivByZero + + // NonNumericIncDec occurs when an increment or decrement operator is + // applied to a non-numeric value. + // + // Example: + // func f() { + // var c = "c" + // c++ + // } + NonNumericIncDec + + /* exprs > ptr */ + + // UnaddressableOperand occurs when the & operator is applied to an + // unaddressable expression. + // + // Example: + // var x = &1 + UnaddressableOperand + + // InvalidIndirection occurs when a non-pointer value is indirected via the + // '*' operator. + // + // Example: + // var x int + // var y = *x + InvalidIndirection + + /* exprs > [] */ + + // NonIndexableOperand occurs when an index operation is applied to a value + // that cannot be indexed. + // + // Example: + // var x = 1 + // var y = x[1] + NonIndexableOperand + + // InvalidIndex occurs when an index argument is not of integer type, + // negative, or out-of-bounds. + // + // Example: + // var s = [...]int{1,2,3} + // var x = s[5] + // + // Example: + // var s = []int{1,2,3} + // var _ = s[-1] + // + // Example: + // var s = []int{1,2,3} + // var i string + // var _ = s[i] + InvalidIndex + + // SwappedSliceIndices occurs when constant indices in a slice expression + // are decreasing in value. + // + // Example: + // var _ = []int{1,2,3}[2:1] + SwappedSliceIndices + + /* operators > slice */ + + // NonSliceableOperand occurs when a slice operation is applied to a value + // whose type is not sliceable, or is unaddressable. + // + // Example: + // var x = [...]int{1, 2, 3}[:1] + // + // Example: + // var x = 1 + // var y = 1[:1] + NonSliceableOperand + + // InvalidSliceExpr occurs when a three-index slice expression (a[x:y:z]) is + // applied to a string. + // + // Example: + // var s = "hello" + // var x = s[1:2:3] + InvalidSliceExpr + + /* exprs > shift */ + + // InvalidShiftCount occurs when the right-hand side of a shift operation is + // either non-integer, negative, or too large. + // + // Example: + // var ( + // x string + // y int = 1 << x + // ) + InvalidShiftCount + + // InvalidShiftOperand occurs when the shifted operand is not an integer. + // + // Example: + // var s = "hello" + // var x = s << 2 + InvalidShiftOperand + + /* exprs > chan */ + + // InvalidReceive occurs when there is a channel receive from a value that + // is either not a channel, or is a send-only channel. + // + // Example: + // func f() { + // var x = 1 + // <-x + // } + InvalidReceive + + // InvalidSend occurs when there is a channel send to a value that is not a + // channel, or is a receive-only channel. + // + // Example: + // func f() { + // var x = 1 + // x <- "hello!" + // } + InvalidSend + + /* exprs > literal */ + + // DuplicateLitKey occurs when an index is duplicated in a slice, array, or + // map literal. + // + // Example: + // var _ = []int{0:1, 0:2} + // + // Example: + // var _ = map[string]int{"a": 1, "a": 2} + DuplicateLitKey + + // MissingLitKey occurs when a map literal is missing a key expression. + // + // Example: + // var _ = map[string]int{1} + MissingLitKey + + // InvalidLitIndex occurs when the key in a key-value element of a slice or + // array literal is not an integer constant. + // + // Example: + // var i = 0 + // var x = []string{i: "world"} + InvalidLitIndex + + // OversizeArrayLit occurs when an array literal exceeds its length. + // + // Example: + // var _ = [2]int{1,2,3} + OversizeArrayLit + + // MixedStructLit occurs when a struct literal contains a mix of positional + // and named elements. + // + // Example: + // var _ = struct{i, j int}{i: 1, 2} + MixedStructLit + + // InvalidStructLit occurs when a positional struct literal has an incorrect + // number of values. + // + // Example: + // var _ = struct{i, j int}{1,2,3} + InvalidStructLit + + // MissingLitField occurs when a struct literal refers to a field that does + // not exist on the struct type. + // + // Example: + // var _ = struct{i int}{j: 2} + MissingLitField + + // DuplicateLitField occurs when a struct literal contains duplicated + // fields. + // + // Example: + // var _ = struct{i int}{i: 1, i: 2} + DuplicateLitField + + // UnexportedLitField occurs when a positional struct literal implicitly + // assigns an unexported field of an imported type. + UnexportedLitField + + // InvalidLitField occurs when a field name is not a valid identifier. + // + // Example: + // var _ = struct{i int}{1: 1} + InvalidLitField + + // UntypedLit occurs when a composite literal omits a required type + // identifier. + // + // Example: + // type outer struct{ + // inner struct { i int } + // } + // + // var _ = outer{inner: {1}} + UntypedLit + + // InvalidLit occurs when a composite literal expression does not match its + // type. + // + // Example: + // type P *struct{ + // x int + // } + // var _ = P {} + InvalidLit + + /* exprs > selector */ + + // AmbiguousSelector occurs when a selector is ambiguous. + // + // Example: + // type E1 struct { i int } + // type E2 struct { i int } + // type T struct { E1; E2 } + // + // var x T + // var _ = x.i + AmbiguousSelector + + // UndeclaredImportedName occurs when a package-qualified identifier is + // undeclared by the imported package. + // + // Example: + // import "go/types" + // + // var _ = types.NotAnActualIdentifier + UndeclaredImportedName + + // UnexportedName occurs when a selector refers to an unexported identifier + // of an imported package. + // + // Example: + // import "reflect" + // + // type _ reflect.flag + UnexportedName + + // UndeclaredName occurs when an identifier is not declared in the current + // scope. + // + // Example: + // var x T + UndeclaredName + + // MissingFieldOrMethod occurs when a selector references a field or method + // that does not exist. + // + // Example: + // type T struct {} + // + // var x = T{}.f + MissingFieldOrMethod + + /* exprs > ... */ + + // BadDotDotDotSyntax occurs when a "..." occurs in a context where it is + // not valid. + // + // Example: + // var _ = map[int][...]int{0: {}} + BadDotDotDotSyntax + + // NonVariadicDotDotDot occurs when a "..." is used on the final argument to + // a non-variadic function. + // + // Example: + // func printArgs(s []string) { + // for _, a := range s { + // println(a) + // } + // } + // + // func f() { + // s := []string{"a", "b", "c"} + // printArgs(s...) + // } + NonVariadicDotDotDot + + // MisplacedDotDotDot occurs when a "..." is used somewhere other than the + // final argument to a function call. + // + // Example: + // func printArgs(args ...int) { + // for _, a := range args { + // println(a) + // } + // } + // + // func f() { + // a := []int{1,2,3} + // printArgs(0, a...) + // } + MisplacedDotDotDot + + // InvalidDotDotDotOperand occurs when a "..." operator is applied to a + // single-valued operand. + // + // Example: + // func printArgs(args ...int) { + // for _, a := range args { + // println(a) + // } + // } + // + // func f() { + // a := 1 + // printArgs(a...) + // } + // + // Example: + // func args() (int, int) { + // return 1, 2 + // } + // + // func printArgs(args ...int) { + // for _, a := range args { + // println(a) + // } + // } + // + // func g() { + // printArgs(args()...) + // } + InvalidDotDotDotOperand + + // InvalidDotDotDot occurs when a "..." is used in a non-variadic built-in + // function. + // + // Example: + // var s = []int{1, 2, 3} + // var l = len(s...) + InvalidDotDotDot + + /* exprs > built-in */ + + // UncalledBuiltin occurs when a built-in function is used as a + // function-valued expression, instead of being called. + // + // Per the spec: + // "The built-in functions do not have standard Go types, so they can only + // appear in call expressions; they cannot be used as function values." + // + // Example: + // var _ = copy + UncalledBuiltin + + // InvalidAppend occurs when append is called with a first argument that is + // not a slice. + // + // Example: + // var _ = append(1, 2) + InvalidAppend + + // InvalidCap occurs when an argument to the cap built-in function is not of + // supported type. + // + // See https://golang.org/ref/spec#Lengthand_capacity for information on + // which underlying types are supported as arguments to cap and len. + // + // Example: + // var s = 2 + // var x = cap(s) + InvalidCap + + // InvalidClose occurs when close(...) is called with an argument that is + // not of channel type, or that is a receive-only channel. + // + // Example: + // func f() { + // var x int + // close(x) + // } + InvalidClose + + // InvalidCopy occurs when the arguments are not of slice type or do not + // have compatible type. + // + // See https://golang.org/ref/spec#Appendingand_copying_slices for more + // information on the type requirements for the copy built-in. + // + // Example: + // func f() { + // var x []int + // y := []int64{1,2,3} + // copy(x, y) + // } + InvalidCopy + + // InvalidComplex occurs when the complex built-in function is called with + // arguments with incompatible types. + // + // Example: + // var _ = complex(float32(1), float64(2)) + InvalidComplex + + // InvalidDelete occurs when the delete built-in function is called with a + // first argument that is not a map. + // + // Example: + // func f() { + // m := "hello" + // delete(m, "e") + // } + InvalidDelete + + // InvalidImag occurs when the imag built-in function is called with an + // argument that does not have complex type. + // + // Example: + // var _ = imag(int(1)) + InvalidImag + + // InvalidLen occurs when an argument to the len built-in function is not of + // supported type. + // + // See https://golang.org/ref/spec#Lengthand_capacity for information on + // which underlying types are supported as arguments to cap and len. + // + // Example: + // var s = 2 + // var x = len(s) + InvalidLen + + // SwappedMakeArgs occurs when make is called with three arguments, and its + // length argument is larger than its capacity argument. + // + // Example: + // var x = make([]int, 3, 2) + SwappedMakeArgs + + // InvalidMake occurs when make is called with an unsupported type argument. + // + // See https://golang.org/ref/spec#Makingslices_maps_and_channels for + // information on the types that may be created using make. + // + // Example: + // var x = make(int) + InvalidMake + + // InvalidReal occurs when the real built-in function is called with an + // argument that does not have complex type. + // + // Example: + // var _ = real(int(1)) + InvalidReal + + /* exprs > assertion */ + + // InvalidAssert occurs when a type assertion is applied to a + // value that is not of interface type. + // + // Example: + // var x = 1 + // var _ = x.(float64) + InvalidAssert + + // ImpossibleAssert occurs for a type assertion x.(T) when the value x of + // interface cannot have dynamic type T, due to a missing or mismatching + // method on T. + // + // Example: + // type T int + // + // func (t *T) m() int { return int(*t) } + // + // type I interface { m() int } + // + // var x I + // var _ = x.(T) + ImpossibleAssert + + /* exprs > conversion */ + + // InvalidConversion occurs when the argument type cannot be converted to the + // target. + // + // See https://golang.org/ref/spec#Conversions for the rules of + // convertibility. + // + // Example: + // var x float64 + // var _ = string(x) + InvalidConversion + + // InvalidUntypedConversion occurs when an there is no valid implicit + // conversion from an untyped value satisfying the type constraints of the + // context in which it is used. + // + // Example: + // var _ = 1 + "" + InvalidUntypedConversion + + /* offsetof */ + + // BadOffsetofSyntax occurs when unsafe.Offsetof is called with an argument + // that is not a selector expression. + // + // Example: + // import "unsafe" + // + // var x int + // var _ = unsafe.Offsetof(x) + BadOffsetofSyntax + + // InvalidOffsetof occurs when unsafe.Offsetof is called with a method + // selector, rather than a field selector, or when the field is embedded via + // a pointer. + // + // Per the spec: + // + // "If f is an embedded field, it must be reachable without pointer + // indirections through fields of the struct. " + // + // Example: + // import "unsafe" + // + // type T struct { f int } + // type S struct { *T } + // var s S + // var _ = unsafe.Offsetof(s.f) + // + // Example: + // import "unsafe" + // + // type S struct{} + // + // func (S) m() {} + // + // var s S + // var _ = unsafe.Offsetof(s.m) + InvalidOffsetof + + /* control flow > scope */ + + // UnusedExpr occurs when a side-effect free expression is used as a + // statement. Such a statement has no effect. + // + // Example: + // func f(i int) { + // i*i + // } + UnusedExpr + + // UnusedVar occurs when a variable is declared but unused. + // + // Example: + // func f() { + // x := 1 + // } + UnusedVar + + // MissingReturn occurs when a function with results is missing a return + // statement. + // + // Example: + // func f() int {} + MissingReturn + + // WrongResultCount occurs when a return statement returns an incorrect + // number of values. + // + // Example: + // func ReturnOne() int { + // return 1, 2 + // } + WrongResultCount + + // OutOfScopeResult occurs when the name of a value implicitly returned by + // an empty return statement is shadowed in a nested scope. + // + // Example: + // func factor(n int) (i int) { + // for i := 2; i < n; i++ { + // if n%i == 0 { + // return + // } + // } + // return 0 + // } + OutOfScopeResult + + /* control flow > if */ + + // InvalidCond occurs when an if condition is not a boolean expression. + // + // Example: + // func checkReturn(i int) { + // if i { + // panic("non-zero return") + // } + // } + InvalidCond + + /* control flow > for */ + + // InvalidPostDecl occurs when there is a declaration in a for-loop post + // statement. + // + // Example: + // func f() { + // for i := 0; i < 10; j := 0 {} + // } + InvalidPostDecl + + // InvalidChanRange occurs when a send-only channel used in a range + // expression. + // + // Example: + // func sum(c chan<- int) { + // s := 0 + // for i := range c { + // s += i + // } + // } + InvalidChanRange + + // InvalidIterVar occurs when two iteration variables are used while ranging + // over a channel. + // + // Example: + // func f(c chan int) { + // for k, v := range c { + // println(k, v) + // } + // } + InvalidIterVar + + // InvalidRangeExpr occurs when the type of a range expression is not array, + // slice, string, map, or channel. + // + // Example: + // func f(i int) { + // for j := range i { + // println(j) + // } + // } + InvalidRangeExpr + + /* control flow > switch */ + + // MisplacedBreak occurs when a break statement is not within a for, switch, + // or select statement of the innermost function definition. + // + // Example: + // func f() { + // break + // } + MisplacedBreak + + // MisplacedContinue occurs when a continue statement is not within a for + // loop of the innermost function definition. + // + // Example: + // func sumeven(n int) int { + // proceed := func() { + // continue + // } + // sum := 0 + // for i := 1; i <= n; i++ { + // if i % 2 != 0 { + // proceed() + // } + // sum += i + // } + // return sum + // } + MisplacedContinue + + // MisplacedFallthrough occurs when a fallthrough statement is not within an + // expression switch. + // + // Example: + // func typename(i interface{}) string { + // switch i.(type) { + // case int64: + // fallthrough + // case int: + // return "int" + // } + // return "unsupported" + // } + MisplacedFallthrough + + // DuplicateCase occurs when a type or expression switch has duplicate + // cases. + // + // Example: + // func printInt(i int) { + // switch i { + // case 1: + // println("one") + // case 1: + // println("One") + // } + // } + DuplicateCase + + // DuplicateDefault occurs when a type or expression switch has multiple + // default clauses. + // + // Example: + // func printInt(i int) { + // switch i { + // case 1: + // println("one") + // default: + // println("One") + // default: + // println("1") + // } + // } + DuplicateDefault + + // BadTypeKeyword occurs when a .(type) expression is used anywhere other + // than a type switch. + // + // Example: + // type I interface { + // m() + // } + // var t I + // var _ = t.(type) + BadTypeKeyword + + // InvalidTypeSwitch occurs when .(type) is used on an expression that is + // not of interface type. + // + // Example: + // func f(i int) { + // switch x := i.(type) {} + // } + InvalidTypeSwitch + + /* control flow > select */ + + // InvalidSelectCase occurs when a select case is not a channel send or + // receive. + // + // Example: + // func checkChan(c <-chan int) bool { + // select { + // case c: + // return true + // default: + // return false + // } + // } + InvalidSelectCase + + /* control flow > labels and jumps */ + + // UndeclaredLabel occurs when an undeclared label is jumped to. + // + // Example: + // func f() { + // goto L + // } + UndeclaredLabel + + // DuplicateLabel occurs when a label is declared more than once. + // + // Example: + // func f() int { + // L: + // L: + // return 1 + // } + DuplicateLabel + + // MisplacedLabel occurs when a break or continue label is not on a for, + // switch, or select statement. + // + // Example: + // func f() { + // L: + // a := []int{1,2,3} + // for _, e := range a { + // if e > 10 { + // break L + // } + // println(a) + // } + // } + MisplacedLabel + + // UnusedLabel occurs when a label is declared but not used. + // + // Example: + // func f() { + // L: + // } + UnusedLabel + + // JumpOverDecl occurs when a label jumps over a variable declaration. + // + // Example: + // func f() int { + // goto L + // x := 2 + // L: + // x++ + // return x + // } + JumpOverDecl + + // JumpIntoBlock occurs when a forward jump goes to a label inside a nested + // block. + // + // Example: + // func f(x int) { + // goto L + // if x > 0 { + // L: + // print("inside block") + // } + // } + JumpIntoBlock + + /* control flow > calls */ + + // InvalidMethodExpr occurs when a pointer method is called but the argument + // is not addressable. + // + // Example: + // type T struct {} + // + // func (*T) m() int { return 1 } + // + // var _ = T.m(T{}) + InvalidMethodExpr + + // WrongArgCount occurs when too few or too many arguments are passed by a + // function call. + // + // Example: + // func f(i int) {} + // var x = f() + WrongArgCount + + // InvalidCall occurs when an expression is called that is not of function + // type. + // + // Example: + // var x = "x" + // var y = x() + InvalidCall + + /* control flow > suspended */ + + // UnusedResults occurs when a restricted expression-only built-in function + // is suspended via go or defer. Such a suspension discards the results of + // these side-effect free built-in functions, and therefore is ineffectual. + // + // Example: + // func f(a []int) int { + // defer len(a) + // return i + // } + UnusedResults + + // InvalidDefer occurs when a deferred expression is not a function call, + // for example if the expression is a type conversion. + // + // Example: + // func f(i int) int { + // defer int32(i) + // return i + // } + InvalidDefer + + // InvalidGo occurs when a go expression is not a function call, for example + // if the expression is a type conversion. + // + // Example: + // func f(i int) int { + // go int32(i) + // return i + // } + InvalidGo +) diff --git a/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go b/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go new file mode 100644 index 000000000..97f3ec891 --- /dev/null +++ b/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go @@ -0,0 +1,152 @@ +// Code generated by "stringer -type=ErrorCode"; DO NOT EDIT. + +package typesinternal + +import "strconv" + +func _() { + // An "invalid array index" compiler error signifies that the constant values have changed. + // Re-run the stringer command to generate them again. + var x [1]struct{} + _ = x[Test-1] + _ = x[BlankPkgName-2] + _ = x[MismatchedPkgName-3] + _ = x[InvalidPkgUse-4] + _ = x[BadImportPath-5] + _ = x[BrokenImport-6] + _ = x[ImportCRenamed-7] + _ = x[UnusedImport-8] + _ = x[InvalidInitCycle-9] + _ = x[DuplicateDecl-10] + _ = x[InvalidDeclCycle-11] + _ = x[InvalidTypeCycle-12] + _ = x[InvalidConstInit-13] + _ = x[InvalidConstVal-14] + _ = x[InvalidConstType-15] + _ = x[UntypedNil-16] + _ = x[WrongAssignCount-17] + _ = x[UnassignableOperand-18] + _ = x[NoNewVar-19] + _ = x[MultiValAssignOp-20] + _ = x[InvalidIfaceAssign-21] + _ = x[InvalidChanAssign-22] + _ = x[IncompatibleAssign-23] + _ = x[UnaddressableFieldAssign-24] + _ = x[NotAType-25] + _ = x[InvalidArrayLen-26] + _ = x[BlankIfaceMethod-27] + _ = x[IncomparableMapKey-28] + _ = x[InvalidIfaceEmbed-29] + _ = x[InvalidPtrEmbed-30] + _ = x[BadRecv-31] + _ = x[InvalidRecv-32] + _ = x[DuplicateFieldAndMethod-33] + _ = x[DuplicateMethod-34] + _ = x[InvalidBlank-35] + _ = x[InvalidIota-36] + _ = x[MissingInitBody-37] + _ = x[InvalidInitSig-38] + _ = x[InvalidInitDecl-39] + _ = x[InvalidMainDecl-40] + _ = x[TooManyValues-41] + _ = x[NotAnExpr-42] + _ = x[TruncatedFloat-43] + _ = x[NumericOverflow-44] + _ = x[UndefinedOp-45] + _ = x[MismatchedTypes-46] + _ = x[DivByZero-47] + _ = x[NonNumericIncDec-48] + _ = x[UnaddressableOperand-49] + _ = x[InvalidIndirection-50] + _ = x[NonIndexableOperand-51] + _ = x[InvalidIndex-52] + _ = x[SwappedSliceIndices-53] + _ = x[NonSliceableOperand-54] + _ = x[InvalidSliceExpr-55] + _ = x[InvalidShiftCount-56] + _ = x[InvalidShiftOperand-57] + _ = x[InvalidReceive-58] + _ = x[InvalidSend-59] + _ = x[DuplicateLitKey-60] + _ = x[MissingLitKey-61] + _ = x[InvalidLitIndex-62] + _ = x[OversizeArrayLit-63] + _ = x[MixedStructLit-64] + _ = x[InvalidStructLit-65] + _ = x[MissingLitField-66] + _ = x[DuplicateLitField-67] + _ = x[UnexportedLitField-68] + _ = x[InvalidLitField-69] + _ = x[UntypedLit-70] + _ = x[InvalidLit-71] + _ = x[AmbiguousSelector-72] + _ = x[UndeclaredImportedName-73] + _ = x[UnexportedName-74] + _ = x[UndeclaredName-75] + _ = x[MissingFieldOrMethod-76] + _ = x[BadDotDotDotSyntax-77] + _ = x[NonVariadicDotDotDot-78] + _ = x[MisplacedDotDotDot-79] + _ = x[InvalidDotDotDotOperand-80] + _ = x[InvalidDotDotDot-81] + _ = x[UncalledBuiltin-82] + _ = x[InvalidAppend-83] + _ = x[InvalidCap-84] + _ = x[InvalidClose-85] + _ = x[InvalidCopy-86] + _ = x[InvalidComplex-87] + _ = x[InvalidDelete-88] + _ = x[InvalidImag-89] + _ = x[InvalidLen-90] + _ = x[SwappedMakeArgs-91] + _ = x[InvalidMake-92] + _ = x[InvalidReal-93] + _ = x[InvalidAssert-94] + _ = x[ImpossibleAssert-95] + _ = x[InvalidConversion-96] + _ = x[InvalidUntypedConversion-97] + _ = x[BadOffsetofSyntax-98] + _ = x[InvalidOffsetof-99] + _ = x[UnusedExpr-100] + _ = x[UnusedVar-101] + _ = x[MissingReturn-102] + _ = x[WrongResultCount-103] + _ = x[OutOfScopeResult-104] + _ = x[InvalidCond-105] + _ = x[InvalidPostDecl-106] + _ = x[InvalidChanRange-107] + _ = x[InvalidIterVar-108] + _ = x[InvalidRangeExpr-109] + _ = x[MisplacedBreak-110] + _ = x[MisplacedContinue-111] + _ = x[MisplacedFallthrough-112] + _ = x[DuplicateCase-113] + _ = x[DuplicateDefault-114] + _ = x[BadTypeKeyword-115] + _ = x[InvalidTypeSwitch-116] + _ = x[InvalidSelectCase-117] + _ = x[UndeclaredLabel-118] + _ = x[DuplicateLabel-119] + _ = x[MisplacedLabel-120] + _ = x[UnusedLabel-121] + _ = x[JumpOverDecl-122] + _ = x[JumpIntoBlock-123] + _ = x[InvalidMethodExpr-124] + _ = x[WrongArgCount-125] + _ = x[InvalidCall-126] + _ = x[UnusedResults-127] + _ = x[InvalidDefer-128] + _ = x[InvalidGo-129] +} + +const _ErrorCode_name = "TestBlankPkgNameMismatchedPkgNameInvalidPkgUseBadImportPathBrokenImportImportCRenamedUnusedImportInvalidInitCycleDuplicateDeclInvalidDeclCycleInvalidTypeCycleInvalidConstInitInvalidConstValInvalidConstTypeUntypedNilWrongAssignCountUnassignableOperandNoNewVarMultiValAssignOpInvalidIfaceAssignInvalidChanAssignIncompatibleAssignUnaddressableFieldAssignNotATypeInvalidArrayLenBlankIfaceMethodIncomparableMapKeyInvalidIfaceEmbedInvalidPtrEmbedBadRecvInvalidRecvDuplicateFieldAndMethodDuplicateMethodInvalidBlankInvalidIotaMissingInitBodyInvalidInitSigInvalidInitDeclInvalidMainDeclTooManyValuesNotAnExprTruncatedFloatNumericOverflowUndefinedOpMismatchedTypesDivByZeroNonNumericIncDecUnaddressableOperandInvalidIndirectionNonIndexableOperandInvalidIndexSwappedSliceIndicesNonSliceableOperandInvalidSliceExprInvalidShiftCountInvalidShiftOperandInvalidReceiveInvalidSendDuplicateLitKeyMissingLitKeyInvalidLitIndexOversizeArrayLitMixedStructLitInvalidStructLitMissingLitFieldDuplicateLitFieldUnexportedLitFieldInvalidLitFieldUntypedLitInvalidLitAmbiguousSelectorUndeclaredImportedNameUnexportedNameUndeclaredNameMissingFieldOrMethodBadDotDotDotSyntaxNonVariadicDotDotDotMisplacedDotDotDotInvalidDotDotDotOperandInvalidDotDotDotUncalledBuiltinInvalidAppendInvalidCapInvalidCloseInvalidCopyInvalidComplexInvalidDeleteInvalidImagInvalidLenSwappedMakeArgsInvalidMakeInvalidRealInvalidAssertImpossibleAssertInvalidConversionInvalidUntypedConversionBadOffsetofSyntaxInvalidOffsetofUnusedExprUnusedVarMissingReturnWrongResultCountOutOfScopeResultInvalidCondInvalidPostDeclInvalidChanRangeInvalidIterVarInvalidRangeExprMisplacedBreakMisplacedContinueMisplacedFallthroughDuplicateCaseDuplicateDefaultBadTypeKeywordInvalidTypeSwitchInvalidSelectCaseUndeclaredLabelDuplicateLabelMisplacedLabelUnusedLabelJumpOverDeclJumpIntoBlockInvalidMethodExprWrongArgCountInvalidCallUnusedResultsInvalidDeferInvalidGo" + +var _ErrorCode_index = [...]uint16{0, 4, 16, 33, 46, 59, 71, 85, 97, 113, 126, 142, 158, 174, 189, 205, 215, 231, 250, 258, 274, 292, 309, 327, 351, 359, 374, 390, 408, 425, 440, 447, 458, 481, 496, 508, 519, 534, 548, 563, 578, 591, 600, 614, 629, 640, 655, 664, 680, 700, 718, 737, 749, 768, 787, 803, 820, 839, 853, 864, 879, 892, 907, 923, 937, 953, 968, 985, 1003, 1018, 1028, 1038, 1055, 1077, 1091, 1105, 1125, 1143, 1163, 1181, 1204, 1220, 1235, 1248, 1258, 1270, 1281, 1295, 1308, 1319, 1329, 1344, 1355, 1366, 1379, 1395, 1412, 1436, 1453, 1468, 1478, 1487, 1500, 1516, 1532, 1543, 1558, 1574, 1588, 1604, 1618, 1635, 1655, 1668, 1684, 1698, 1715, 1732, 1747, 1761, 1775, 1786, 1798, 1811, 1828, 1841, 1852, 1865, 1877, 1886} + +func (i ErrorCode) String() string { + i -= 1 + if i < 0 || i >= ErrorCode(len(_ErrorCode_index)-1) { + return "ErrorCode(" + strconv.FormatInt(int64(i+1), 10) + ")" + } + return _ErrorCode_name[_ErrorCode_index[i]:_ErrorCode_index[i+1]] +} diff --git a/vendor/gopkg.in/ini.v1/key.go b/vendor/gopkg.in/ini.v1/key.go index 7dd74fd47..0fee0dc7e 100644 --- a/vendor/gopkg.in/ini.v1/key.go +++ b/vendor/gopkg.in/ini.v1/key.go @@ -186,8 +186,8 @@ func (k *Key) Float64() (float64, error) { // Int returns int type value. func (k *Key) Int() (int, error) { - v, err := strconv.ParseInt(k.String(), 0, 64) - return int(v), err + v, err := strconv.ParseInt(k.String(), 0, 64) + return int(v), err } // Int64 returns int64 type value. @@ -669,7 +669,7 @@ func (k *Key) parseInts(strs []string, addInvalid, returnOnInvalid bool) ([]int, vals := make([]int, 0, len(strs)) for _, str := range strs { valInt64, err := strconv.ParseInt(str, 0, 64) - val := int(valInt64) + val := int(valInt64) if err != nil && returnOnInvalid { return nil, err } diff --git a/vendor/gopkg.in/yaml.v2/readerc.go b/vendor/gopkg.in/yaml.v2/readerc.go index b0c436c4a..7c1f5fac3 100644 --- a/vendor/gopkg.in/yaml.v2/readerc.go +++ b/vendor/gopkg.in/yaml.v2/readerc.go @@ -95,7 +95,7 @@ func yaml_parser_update_buffer(parser *yaml_parser_t, length int) bool { // [Go] This function was changed to guarantee the requested length size at EOF. // The fact we need to do this is pretty awful, but the description above implies - // for that to be the case, and there are tests + // for that to be the case, and there are tests // If the EOF flag is set and the raw buffer is empty, do nothing. if parser.eof && parser.raw_buffer_pos == len(parser.raw_buffer) { diff --git a/vendor/gopkg.in/yaml.v2/resolve.go b/vendor/gopkg.in/yaml.v2/resolve.go index e29c364b3..4120e0c91 100644 --- a/vendor/gopkg.in/yaml.v2/resolve.go +++ b/vendor/gopkg.in/yaml.v2/resolve.go @@ -180,7 +180,7 @@ func resolve(tag string, in string) (rtag string, out interface{}) { return yaml_INT_TAG, uintv } } else if strings.HasPrefix(plain, "-0b") { - intv, err := strconv.ParseInt("-"+plain[3:], 2, 64) + intv, err := strconv.ParseInt("-" + plain[3:], 2, 64) if err == nil { if true || intv == int64(int(intv)) { return yaml_INT_TAG, int(intv) diff --git a/vendor/gopkg.in/yaml.v2/sorter.go b/vendor/gopkg.in/yaml.v2/sorter.go index 2edd73405..4c45e660a 100644 --- a/vendor/gopkg.in/yaml.v2/sorter.go +++ b/vendor/gopkg.in/yaml.v2/sorter.go @@ -52,7 +52,7 @@ func (l keyList) Less(i, j int) bool { var ai, bi int var an, bn int64 if ar[i] == '0' || br[i] == '0' { - for j := i - 1; j >= 0 && unicode.IsDigit(ar[j]); j-- { + for j := i-1; j >= 0 && unicode.IsDigit(ar[j]); j-- { if ar[j] != '0' { an = 1 bn = 1 diff --git a/vendor/modules.txt b/vendor/modules.txt index 5483adef6..425e03269 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -708,7 +708,7 @@ golang.org/x/mobile/event/key # golang.org/x/mod v0.3.0 golang.org/x/mod/module golang.org/x/mod/semver -# golang.org/x/net v0.0.0-20200904194848-62affa334b73 +# golang.org/x/net v0.0.0-20201021035429-f5854403a974 golang.org/x/net/context golang.org/x/net/context/ctxhttp golang.org/x/net/html @@ -731,10 +731,10 @@ golang.org/x/oauth2/google golang.org/x/oauth2/internal golang.org/x/oauth2/jws golang.org/x/oauth2/jwt -# golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 +# golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 golang.org/x/sync/errgroup golang.org/x/sync/semaphore -# golang.org/x/sys v0.0.0-20200918174421-af09f7315aff +# golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f golang.org/x/sys/cpu golang.org/x/sys/internal/unsafeheader golang.org/x/sys/unix @@ -762,7 +762,7 @@ golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm # golang.org/x/time v0.0.0-20191024005414-555d28b269f0 golang.org/x/time/rate -# golang.org/x/tools v0.0.0-20200918232735-d647fc253266 +# golang.org/x/tools v0.0.0-20201111133315-69daaf961d65 golang.org/x/tools/cmd/goimports golang.org/x/tools/go/ast/astutil golang.org/x/tools/go/gcexportdata diff --git a/website/pages/docs/builders/cloudstack.mdx b/website/pages/docs/builders/cloudstack.mdx index 0557dedde..8dacb901f 100644 --- a/website/pages/docs/builders/cloudstack.mdx +++ b/website/pages/docs/builders/cloudstack.mdx @@ -215,11 +215,11 @@ The available variables are: ## Http directory configuration -@include 'common/HTTPConfig.mdx' +@include 'common/commonsteps/HTTPConfig.mdx' ### Optional: -@include 'common/HTTPConfig-not-required.mdx' +@include 'common/commonsteps/HTTPConfig-not-required.mdx' ## Basic Example diff --git a/website/pages/docs/builders/hyperv/iso.mdx b/website/pages/docs/builders/hyperv/iso.mdx index af78850d4..39ecb2293 100644 --- a/website/pages/docs/builders/hyperv/iso.mdx +++ b/website/pages/docs/builders/hyperv/iso.mdx @@ -49,15 +49,15 @@ power off the VM. ## ISO Configuration Reference -@include 'common/ISOConfig.mdx' +@include 'common/commonsteps/ISOConfig.mdx' ### Required: -@include 'common/ISOConfig-required.mdx' +@include 'common/commonsteps/ISOConfig-required.mdx' ### Optional: -@include 'common/ISOConfig-not-required.mdx' +@include 'common/commonsteps/ISOConfig-not-required.mdx' ## Configuration Reference @@ -85,11 +85,11 @@ builder. ## Http directory configuration reference -@include 'common/HTTPConfig.mdx' +@include 'common/commonsteps/HTTPConfig.mdx' ### Optional: -@include 'common/HTTPConfig-not-required.mdx' +@include 'common/commonsteps/HTTPConfig-not-required.mdx' ## Shutdown configuration reference @@ -99,15 +99,15 @@ builder. ## Floppy configuration reference -@include 'common/FloppyConfig.mdx' +@include 'common/commonsteps/FloppyConfig.mdx' ### Optional: -@include 'common/FloppyConfig-not-required.mdx' +@include 'common/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration reference -@include 'common/CDConfig-not-required.mdx' +@include 'common/commonsteps/CDConfig-not-required.mdx' ## Communicator configuration reference diff --git a/website/pages/docs/builders/hyperv/vmcx.mdx b/website/pages/docs/builders/hyperv/vmcx.mdx index 6ee142587..4ff8ac9a0 100644 --- a/website/pages/docs/builders/hyperv/vmcx.mdx +++ b/website/pages/docs/builders/hyperv/vmcx.mdx @@ -72,15 +72,15 @@ builder. ## ISO Configuration Reference -@include 'common/ISOConfig.mdx' +@include 'common/commonsteps/ISOConfig.mdx' ### Required: -@include 'common/ISOConfig-required.mdx' +@include 'common/commonsteps/ISOConfig-required.mdx' ### Optional: -@include 'common/ISOConfig-not-required.mdx' +@include 'common/commonsteps/ISOConfig-not-required.mdx' ### Required for virtual machine import: @@ -121,11 +121,11 @@ builder. ### CD configuration -@include 'common/CDConfig.mdx' +@include 'common/commonsteps/CDConfig.mdx' #### Optional: -@include 'common/CDConfig-not-required.mdx' +@include 'common/commonsteps/CDConfig-not-required.mdx' ## Boot Command @@ -165,11 +165,11 @@ For more examples of various boot commands, see the sample projects from our ## Http directory configuration -@include 'common/HTTPConfig.mdx' +@include 'common/commonsteps/HTTPConfig.mdx' ### Optional: -@include 'common/HTTPConfig-not-required.mdx' +@include 'common/commonsteps/HTTPConfig-not-required.mdx' ## Integration Services diff --git a/website/pages/docs/builders/parallels/iso.mdx b/website/pages/docs/builders/parallels/iso.mdx index ed5d0e519..ac825c1ce 100644 --- a/website/pages/docs/builders/parallels/iso.mdx +++ b/website/pages/docs/builders/parallels/iso.mdx @@ -62,15 +62,15 @@ can also be supplied to override the typical auto-generated key: ## ISO Configuration Reference -@include 'common/ISOConfig.mdx' +@include 'common/commonsteps/ISOConfig.mdx' ### Required: -@include 'common/ISOConfig-required.mdx' +@include 'common/commonsteps/ISOConfig-required.mdx' ### Optional: -@include 'common/ISOConfig-not-required.mdx' +@include 'common/commonsteps/ISOConfig-not-required.mdx' ### Required: diff --git a/website/pages/docs/builders/proxmox/iso.mdx b/website/pages/docs/builders/proxmox/iso.mdx index b290b5937..41e0d18e6 100644 --- a/website/pages/docs/builders/proxmox/iso.mdx +++ b/website/pages/docs/builders/proxmox/iso.mdx @@ -294,11 +294,11 @@ For more examples of various boot commands, see the sample projects from our ## Http directory configuration -@include 'common/HTTPConfig.mdx' +@include 'common/commonsteps/HTTPConfig.mdx' ### Optional: -@include 'common/HTTPConfig-not-required.mdx' +@include 'common/commonsteps/HTTPConfig-not-required.mdx' ## Example: Fedora with kickstart diff --git a/website/pages/docs/builders/qemu.mdx b/website/pages/docs/builders/qemu.mdx index d81fb3e50..b8dfa5ef5 100644 --- a/website/pages/docs/builders/qemu.mdx +++ b/website/pages/docs/builders/qemu.mdx @@ -118,39 +118,39 @@ necessary for this build to succeed and can be found further down the page. ## ISO Configuration -@include 'common/ISOConfig.mdx' +@include 'common/commonsteps/ISOConfig.mdx' ### Required: -@include 'common/ISOConfig-required.mdx' +@include 'common/commonsteps/ISOConfig-required.mdx' ### Optional: -@include 'common/ISOConfig-not-required.mdx' +@include 'common/commonsteps/ISOConfig-not-required.mdx' ## Http directory configuration -@include 'common/HTTPConfig.mdx' +@include 'common/commonsteps/HTTPConfig.mdx' ### Optional: -@include 'common/HTTPConfig-not-required.mdx' +@include 'common/commonsteps/HTTPConfig-not-required.mdx' ## Floppy configuration -@include 'common/FloppyConfig.mdx' +@include 'common/commonsteps/FloppyConfig.mdx' ### Optional: -@include 'common/FloppyConfig-not-required.mdx' +@include 'common/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration -@include 'common/CDConfig.mdx' +@include 'common/commonsteps/CDConfig.mdx' #### Optional: -@include 'common/CDConfig-not-required.mdx' +@include 'common/commonsteps/CDConfig-not-required.mdx' ## Shutdown configuration diff --git a/website/pages/docs/builders/virtualbox/iso.mdx b/website/pages/docs/builders/virtualbox/iso.mdx index 0aac5181e..ac0f13bd6 100644 --- a/website/pages/docs/builders/virtualbox/iso.mdx +++ b/website/pages/docs/builders/virtualbox/iso.mdx @@ -95,39 +95,39 @@ necessary for this build to succeed and can be found further down the page. ### ISO Configuration -@include 'common/ISOConfig.mdx' +@include 'common/commonsteps/ISOConfig.mdx' #### Required: -@include 'common/ISOConfig-required.mdx' +@include 'common/commonsteps/ISOConfig-required.mdx' #### Optional: -@include 'common/ISOConfig-not-required.mdx' +@include 'common/commonsteps/ISOConfig-not-required.mdx' ### Http directory configuration -@include 'common/HTTPConfig.mdx' +@include 'common/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'common/HTTPConfig-not-required.mdx' +@include 'common/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration -@include 'common/FloppyConfig.mdx' +@include 'common/commonsteps/FloppyConfig.mdx' #### Optional: -@include 'common/FloppyConfig-not-required.mdx' +@include 'common/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration -@include 'common/CDConfig.mdx' +@include 'common/commonsteps/CDConfig.mdx' #### Optional: -@include 'common/CDConfig-not-required.mdx' +@include 'common/commonsteps/CDConfig-not-required.mdx' ### Export configuration diff --git a/website/pages/docs/builders/virtualbox/ovf.mdx b/website/pages/docs/builders/virtualbox/ovf.mdx index 21eade0e9..11e1809e7 100644 --- a/website/pages/docs/builders/virtualbox/ovf.mdx +++ b/website/pages/docs/builders/virtualbox/ovf.mdx @@ -109,27 +109,27 @@ necessary for this build to succeed and can be found further down the page. ### Http directory configuration -@include 'common/HTTPConfig.mdx' +@include 'common/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'common/HTTPConfig-not-required.mdx' +@include 'common/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration -@include 'common/FloppyConfig.mdx' +@include 'common/commonsteps/FloppyConfig.mdx' #### Optional: -@include 'common/FloppyConfig-not-required.mdx' +@include 'common/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration -@include 'common/CDConfig.mdx' +@include 'common/commonsteps/CDConfig.mdx' #### Optional: -@include 'common/CDConfig-not-required.mdx' +@include 'common/commonsteps/CDConfig-not-required.mdx' ### Export configuration diff --git a/website/pages/docs/builders/virtualbox/vm.mdx b/website/pages/docs/builders/virtualbox/vm.mdx index f189e0a68..c520e20c7 100644 --- a/website/pages/docs/builders/virtualbox/vm.mdx +++ b/website/pages/docs/builders/virtualbox/vm.mdx @@ -120,27 +120,27 @@ builder. ### Http directory configuration -@include 'common/HTTPConfig.mdx' +@include 'common/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'common/HTTPConfig-not-required.mdx' +@include 'common/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration -@include 'common/FloppyConfig.mdx' +@include 'common/commonsteps/FloppyConfig.mdx' #### Optional: -@include 'common/FloppyConfig-not-required.mdx' +@include 'common/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration -@include 'common/CDConfig.mdx' +@include 'common/commonsteps/CDConfig.mdx' #### Optional: -@include 'common/CDConfig-not-required.mdx' +@include 'common/commonsteps/CDConfig-not-required.mdx' ### Export configuration diff --git a/website/pages/docs/builders/vmware/iso.mdx b/website/pages/docs/builders/vmware/iso.mdx index ea21ed1bb..126052bbf 100644 --- a/website/pages/docs/builders/vmware/iso.mdx +++ b/website/pages/docs/builders/vmware/iso.mdx @@ -104,34 +104,34 @@ necessary for this build to succeed and can be found further down the page. ### ISO Configuration -@include 'common/ISOConfig.mdx' +@include 'common/commonsteps/ISOConfig.mdx' #### Required: -@include 'common/ISOConfig-required.mdx' +@include 'common/commonsteps/ISOConfig-required.mdx' #### Optional: -@include 'common/ISOConfig-not-required.mdx' +@include 'common/commonsteps/ISOConfig-not-required.mdx' ### Http directory configuration -@include 'common/HTTPConfig.mdx' +@include 'common/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'common/HTTPConfig-not-required.mdx' +@include 'common/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration -@include 'common/FloppyConfig.mdx' +@include 'common/commonsteps/FloppyConfig.mdx' #### Optional: -@include 'common/FloppyConfig-not-required.mdx' +@include 'common/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration -@include 'common/CDConfig-not-required.mdx' +@include 'common/commonsteps/CDConfig-not-required.mdx' ### Shutdown configuration diff --git a/website/pages/docs/builders/vmware/vmx.mdx b/website/pages/docs/builders/vmware/vmx.mdx index f7efbc017..6ad72a3f8 100644 --- a/website/pages/docs/builders/vmware/vmx.mdx +++ b/website/pages/docs/builders/vmware/vmx.mdx @@ -105,27 +105,27 @@ necessary for this build to succeed and can be found further down the page. ### Http directory configuration -@include 'common/HTTPConfig.mdx' +@include 'common/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'common/HTTPConfig-not-required.mdx' +@include 'common/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration -@include 'common/FloppyConfig.mdx' +@include 'common/commonsteps/FloppyConfig.mdx' #### Optional: -@include 'common/FloppyConfig-not-required.mdx' +@include 'common/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration -@include 'common/CDConfig.mdx' +@include 'common/commonsteps/CDConfig.mdx' #### Optional: -@include 'common/CDConfig-not-required.mdx' +@include 'common/commonsteps/CDConfig-not-required.mdx' ### Export configuration diff --git a/website/pages/docs/builders/vmware/vsphere-clone.mdx b/website/pages/docs/builders/vmware/vsphere-clone.mdx index ba7d26ba0..6201a9ace 100644 --- a/website/pages/docs/builders/vmware/vsphere-clone.mdx +++ b/website/pages/docs/builders/vmware/vsphere-clone.mdx @@ -162,11 +162,11 @@ can be done via environment variable: ### Http directory configuration -@include 'common/HTTPConfig.mdx' +@include 'common/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'common/HTTPConfig-not-required.mdx' +@include 'common/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration @@ -198,11 +198,11 @@ can be done via environment variable: ### CDRom Configuration -@include 'common/CDConfig.mdx' +@include 'common/commonsteps/CDConfig.mdx' #### Optional: -@include 'common/CDConfig-not-required.mdx' +@include 'common/commonsteps/CDConfig-not-required.mdx' @include 'builder/vsphere/common/CDRomConfig-not-required.mdx' diff --git a/website/pages/docs/builders/vmware/vsphere-iso.mdx b/website/pages/docs/builders/vmware/vsphere-iso.mdx index 92b0287c4..c7df57f17 100644 --- a/website/pages/docs/builders/vmware/vsphere-iso.mdx +++ b/website/pages/docs/builders/vmware/vsphere-iso.mdx @@ -89,11 +89,11 @@ source "vsphere-iso" "example" { ### Http directory configuration -@include 'common/HTTPConfig.mdx' +@include 'common/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'common/HTTPConfig-not-required.mdx' +@include 'common/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration @@ -125,15 +125,15 @@ source "vsphere-iso" "example" { ### ISO Configuration -@include 'common/ISOConfig.mdx' +@include 'common/commonsteps/ISOConfig.mdx' #### Required: -@include 'common/ISOConfig-required.mdx' +@include 'common/commonsteps/ISOConfig-required.mdx' #### Optional: -@include 'common/ISOConfig-not-required.mdx' +@include 'common/commonsteps/ISOConfig-not-required.mdx' ### CDRom Configuration @@ -176,11 +176,11 @@ iso_paths = [ @include 'builder/vsphere/common/RemoveCDRomConfig-not-required.mdx' -@include 'common/CDConfig.mdx' +@include 'common/commonsteps/CDConfig.mdx' #### Optional: -@include 'common/CDConfig-not-required.mdx' +@include 'common/commonsteps/CDConfig-not-required.mdx' ### Create Configuration From fa233a6a56505f7cb5b589771b7a7a70bb839f1c Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 11 Nov 2020 15:07:20 -0800 Subject: [PATCH 69/93] remove unused code leftover from original progress bar implementation --- common/terminal.go | 6 --- common/terminal_posix.go | 39 ----------------- common/terminal_test.go | 9 ---- common/terminal_windows.go | 86 -------------------------------------- 4 files changed, 140 deletions(-) delete mode 100644 common/terminal.go delete mode 100644 common/terminal_posix.go delete mode 100644 common/terminal_test.go delete mode 100644 common/terminal_windows.go diff --git a/common/terminal.go b/common/terminal.go deleted file mode 100644 index 4e862880a..000000000 --- a/common/terminal.go +++ /dev/null @@ -1,6 +0,0 @@ -package common - -// call into one of the platform-specific implementations to get the current terminal dimensions -func GetTerminalDimensions() (width, height int, err error) { - return platformGetTerminalDimensions() -} diff --git a/common/terminal_posix.go b/common/terminal_posix.go deleted file mode 100644 index 2a98a4fbd..000000000 --- a/common/terminal_posix.go +++ /dev/null @@ -1,39 +0,0 @@ -// +build !windows - -package common - -// Imports for determining terminal information across platforms -import ( - "os" - - "golang.org/x/sys/unix" -) - -// posix api -func platformGetTerminalDimensions() (width, height int, err error) { - - // grab the handle to stdin - // XXX: in some cases, packer closes stdin, so the following can't be guaranteed - /* - tty := os.Stdin - */ - - // open up a handle to the current tty - tty, err := os.Open("/dev/tty") - if err != nil { - return 0, 0, err - } - defer tty.Close() - - // convert the handle into a file descriptor - fd := int(tty.Fd()) - - // use it to make an Ioctl - ws, err := unix.IoctlGetWinsize(fd, unix.TIOCGWINSZ) - if err != nil { - return 0, 0, err - } - - // return the width and height - return int(ws.Col), int(ws.Row), nil -} diff --git a/common/terminal_test.go b/common/terminal_test.go deleted file mode 100644 index f1c66b092..000000000 --- a/common/terminal_test.go +++ /dev/null @@ -1,9 +0,0 @@ -package common - -import "testing" - -func TestGetTerminalDimensions(t *testing.T) { - if _, _, err := GetTerminalDimensions(); err != nil { - t.Fatalf("Unable to get terminal dimensions: %s", err) - } -} diff --git a/common/terminal_windows.go b/common/terminal_windows.go deleted file mode 100644 index 556873eb0..000000000 --- a/common/terminal_windows.go +++ /dev/null @@ -1,86 +0,0 @@ -// +build windows - -package common - -import ( - "syscall" - "unsafe" -) - -// windows constants and structures pulled from msdn -const ( - _STD_INPUT_HANDLE = -10 - _STD_OUTPUT_HANDLE = -11 - _STD_ERROR_HANDLE = -12 -) - -type ( - _SHORT int16 - _WORD uint16 - - _SMALL_RECT struct { - Left, Top, Right, Bottom _SHORT - } - _COORD struct { - X, Y _SHORT - } - _CONSOLE_SCREEN_BUFFER_INFO struct { - dwSize, dwCursorPosition _COORD - wAttributes _WORD - srWindow _SMALL_RECT - dwMaximumWindowSize _COORD - } -) - -// Low-level functions that call into Windows API for getting console info -var kernel32 = syscall.NewLazyDLL("kernel32.dll") -var kernel32_GetStdHandleProc = kernel32.NewProc("GetStdHandle") -var kernel32_GetConsoleScreenBufferInfoProc = kernel32.NewProc("GetConsoleScreenBufferInfo") - -func kernel32_GetStdHandle(nStdHandle int32) (syscall.Handle, error) { - res, _, err := kernel32_GetStdHandleProc.Call(uintptr(nStdHandle)) - if res == uintptr(syscall.InvalidHandle) { - return syscall.InvalidHandle, error(err) - } - return syscall.Handle(res), nil -} - -func kernel32_GetConsoleScreenBufferInfo(hConsoleOutput syscall.Handle, info *_CONSOLE_SCREEN_BUFFER_INFO) error { - ok, _, err := kernel32_GetConsoleScreenBufferInfoProc.Call(uintptr(hConsoleOutput), uintptr(unsafe.Pointer(info))) - if int(ok) == 0 { - return error(err) - } - return nil -} - -// windows api to get the console screen buffer info -func getConsoleScreenBufferInfo(csbi *_CONSOLE_SCREEN_BUFFER_INFO) (err error) { - var ( - bi _CONSOLE_SCREEN_BUFFER_INFO - fd syscall.Handle - ) - - // Re-open CONOUT$ as in some instances, stdout may be closed and guaranteed an stdout - if fd, err = syscall.Open("CONOUT$", syscall.O_RDWR, 0); err != nil { - return err - } - defer syscall.Close(fd) - - // grab the dimensions for the console - if err = kernel32_GetConsoleScreenBufferInfo(fd, &bi); err != nil { - return err - } - - *csbi = bi - return nil -} - -func platformGetTerminalDimensions() (width, height int, err error) { - var csbi _CONSOLE_SCREEN_BUFFER_INFO - - if err = getConsoleScreenBufferInfo(&csbi); err != nil { - return 0, 0, err - } - - return int(csbi.dwSize.X), int(csbi.dwSize.Y), nil -} From f52a2ad0fa1e1062e3200f019153a0cb6e8348a0 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 11 Nov 2020 15:52:06 -0800 Subject: [PATCH 70/93] move retry function that is only used by osc builder into that builder's common dir instead of the global common dir. Fix bug in quemu where the wrong retry value is checked against. --- {common => builder/osc/common/retry}/retry.go | 2 +- {common => builder/osc/common/retry}/retry_test.go | 2 +- builder/osc/common/state.go | 4 ++-- builder/osc/common/step_create_tags.go | 2 +- builder/osc/common/step_run_source_vm.go | 2 +- builder/osc/common/step_stop_bsu_backed_vm.go | 4 ++-- builder/qemu/step_convert_disk.go | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) rename {common => builder/osc/common/retry}/retry.go (99%) rename {common => builder/osc/common/retry}/retry_test.go (99%) diff --git a/common/retry.go b/builder/osc/common/retry/retry.go similarity index 99% rename from common/retry.go rename to builder/osc/common/retry/retry.go index b820cf817..628a86a69 100644 --- a/common/retry.go +++ b/builder/osc/common/retry/retry.go @@ -1,4 +1,4 @@ -package common +package retry import ( "fmt" diff --git a/common/retry_test.go b/builder/osc/common/retry/retry_test.go similarity index 99% rename from common/retry_test.go rename to builder/osc/common/retry/retry_test.go index 364f31a5c..bd59cb459 100644 --- a/common/retry_test.go +++ b/builder/osc/common/retry/retry_test.go @@ -1,4 +1,4 @@ -package common +package retry import ( "fmt" diff --git a/builder/osc/common/state.go b/builder/osc/common/state.go index a2e0e53a7..50afe4cce 100644 --- a/builder/osc/common/state.go +++ b/builder/osc/common/state.go @@ -6,7 +6,7 @@ import ( "log" "github.com/antihax/optional" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/builder/osc/common/retry" "github.com/outscale/osc-sdk-go/osc" ) @@ -68,7 +68,7 @@ func WaitUntilOscSnapshotDone(conn *osc.APIClient, snapshotID string) error { } func waitForState(errCh chan<- error, target string, refresh stateRefreshFunc) { - err := common.Retry(2, 2, 0, func(_ uint) (bool, error) { + err := retry.Retry(2, 2, 0, func(_ uint) (bool, error) { state, err := refresh() if err != nil { return false, err diff --git a/builder/osc/common/step_create_tags.go b/builder/osc/common/step_create_tags.go index f0382f560..2a2c60961 100644 --- a/builder/osc/common/step_create_tags.go +++ b/builder/osc/common/step_create_tags.go @@ -6,7 +6,7 @@ import ( "github.com/antihax/optional" "github.com/aws/aws-sdk-go/aws/awserr" - retry "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/builder/osc/common/retry" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" diff --git a/builder/osc/common/step_run_source_vm.go b/builder/osc/common/step_run_source_vm.go index 2eb251c47..0d0cb6054 100644 --- a/builder/osc/common/step_run_source_vm.go +++ b/builder/osc/common/step_run_source_vm.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/outscale/osc-sdk-go/osc" - retry "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/builder/osc/common/retry" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" diff --git a/builder/osc/common/step_stop_bsu_backed_vm.go b/builder/osc/common/step_stop_bsu_backed_vm.go index 9c31a3c8b..62cd830ac 100644 --- a/builder/osc/common/step_stop_bsu_backed_vm.go +++ b/builder/osc/common/step_stop_bsu_backed_vm.go @@ -6,7 +6,7 @@ import ( "github.com/antihax/optional" "github.com/aws/aws-sdk-go/aws/awserr" - "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/builder/osc/common/retry" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/outscale/osc-sdk-go/osc" @@ -41,7 +41,7 @@ func (s *StepStopBSUBackedVm) Run(ctx context.Context, state multistep.StateBag) // does not exist. // Work around this by retrying a few times, up to about 5 minutes. - err := common.Retry(10, 60, 6, func(i uint) (bool, error) { + err := retry.Retry(10, 60, 6, func(i uint) (bool, error) { ui.Message(fmt.Sprintf("Stopping vm, attempt %d", i+1)) _, _, err = oscconn.VmApi.StopVms(context.Background(), &osc.StopVmsOpts{ diff --git a/builder/qemu/step_convert_disk.go b/builder/qemu/step_convert_disk.go index 8e06cc821..a97343264 100644 --- a/builder/qemu/step_convert_disk.go +++ b/builder/qemu/step_convert_disk.go @@ -7,7 +7,6 @@ import ( "strings" "time" - "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" @@ -62,12 +61,13 @@ func (s *stepConvertDisk) Run(ctx context.Context, state multistep.StateBag) mul }) if err != nil { - if err == common.RetryExhaustedError { + switch err.(type) { + case *retry.RetryExhaustedError: err = fmt.Errorf("Exhausted retries for getting file lock: %s", err) state.Put("error", err) ui.Error(err.Error()) return multistep.ActionHalt - } else { + default: err := fmt.Errorf("Error converting hard drive: %s", err) state.Put("error", err) ui.Error(err.Error()) From 2bdfd53756611eafed685a4edced00aa1011de4e Mon Sep 17 00:00:00 2001 From: lollen Date: Sat, 14 Nov 2020 07:27:55 +0100 Subject: [PATCH 71/93] Proxmox-builder pass through boot-order Adding the boot field supported by Proxmox api and proxmox-api-go library. This is due to a change in Proxmox to allow for multiple boot harddrives which would break the packer proxmox builder (the hardcoded cdn boot value). Can be specified like the following example: "disks": [ { "type": "scsi", "disk_size": "20G", "storage_pool": "vmstorage", "storage_pool_type": "lvm" } ], "boot": "order=scsi0;ide2", "iso_file": "media:iso/{{ user `ubuntu_iso_file` }}" Not sure this is ideal, but it's a workaround for the #10252 issue. --- builder/proxmox/common/config.go | 1 + builder/proxmox/common/step_start_vm.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/builder/proxmox/common/config.go b/builder/proxmox/common/config.go index 1428345f9..2e3083b52 100644 --- a/builder/proxmox/common/config.go +++ b/builder/proxmox/common/config.go @@ -39,6 +39,7 @@ type Config struct { VMName string `mapstructure:"vm_name"` VMID int `mapstructure:"vm_id"` + Boot string `mapstructure:"boot"` Memory int `mapstructure:"memory"` Cores int `mapstructure:"cores"` CPUType string `mapstructure:"cpu_type"` diff --git a/builder/proxmox/common/step_start_vm.go b/builder/proxmox/common/step_start_vm.go index 0e92334fb..d5877a6a2 100644 --- a/builder/proxmox/common/step_start_vm.go +++ b/builder/proxmox/common/step_start_vm.go @@ -43,7 +43,7 @@ func (s *stepStartVM) Run(ctx context.Context, state multistep.StateBag) multist Name: c.VMName, Agent: agent, QemuKVM: kvm, - Boot: "cdn", // Boot priority, c:CDROM -> d:Disk -> n:Network + Boot: c.Boot, // Boot priority, example: "order=virtio0;ide2;net0", virtio0:Disk0 -> ide0:CDROM -> net0:Network QemuCpu: c.CPUType, Description: "Packer ephemeral build VM", Memory: c.Memory, From 54afe0b880cd4acf05d285013b01d5392038abf7 Mon Sep 17 00:00:00 2001 From: loloolllool Date: Sat, 14 Nov 2020 23:41:16 +0100 Subject: [PATCH 72/93] Generating new hcl2specs for proxmox builder. --- builder/proxmox/clone/config.hcl2spec.go | 2 ++ builder/proxmox/common/config.hcl2spec.go | 2 ++ builder/proxmox/iso/config.hcl2spec.go | 2 ++ 3 files changed, 6 insertions(+) diff --git a/builder/proxmox/clone/config.hcl2spec.go b/builder/proxmox/clone/config.hcl2spec.go index 074f82d6f..ea333d2aa 100644 --- a/builder/proxmox/clone/config.hcl2spec.go +++ b/builder/proxmox/clone/config.hcl2spec.go @@ -83,6 +83,7 @@ type FlatConfig struct { Pool *string `mapstructure:"pool" cty:"pool" hcl:"pool"` VMName *string `mapstructure:"vm_name" cty:"vm_name" hcl:"vm_name"` VMID *int `mapstructure:"vm_id" cty:"vm_id" hcl:"vm_id"` + Boot *string `mapstructure:"boot" cty:"boot" hcl:"boot"` Memory *int `mapstructure:"memory" cty:"memory" hcl:"memory"` Cores *int `mapstructure:"cores" cty:"cores" hcl:"cores"` CPUType *string `mapstructure:"cpu_type" cty:"cpu_type" hcl:"cpu_type"` @@ -190,6 +191,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "pool": &hcldec.AttrSpec{Name: "pool", Type: cty.String, Required: false}, "vm_name": &hcldec.AttrSpec{Name: "vm_name", Type: cty.String, Required: false}, "vm_id": &hcldec.AttrSpec{Name: "vm_id", Type: cty.Number, Required: false}, + "boot": &hcldec.AttrSpec{Name: "boot", Type: cty.String, Required: false}, "memory": &hcldec.AttrSpec{Name: "memory", Type: cty.Number, Required: false}, "cores": &hcldec.AttrSpec{Name: "cores", Type: cty.Number, Required: false}, "cpu_type": &hcldec.AttrSpec{Name: "cpu_type", Type: cty.String, Required: false}, diff --git a/builder/proxmox/common/config.hcl2spec.go b/builder/proxmox/common/config.hcl2spec.go index 5675e2d69..f47b11958 100644 --- a/builder/proxmox/common/config.hcl2spec.go +++ b/builder/proxmox/common/config.hcl2spec.go @@ -82,6 +82,7 @@ type FlatConfig struct { Pool *string `mapstructure:"pool" cty:"pool" hcl:"pool"` VMName *string `mapstructure:"vm_name" cty:"vm_name" hcl:"vm_name"` VMID *int `mapstructure:"vm_id" cty:"vm_id" hcl:"vm_id"` + Boot *string `mapstructure:"boot" cty:"boot" hcl:"boot"` Memory *int `mapstructure:"memory" cty:"memory" hcl:"memory"` Cores *int `mapstructure:"cores" cty:"cores" hcl:"cores"` CPUType *string `mapstructure:"cpu_type" cty:"cpu_type" hcl:"cpu_type"` @@ -187,6 +188,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "pool": &hcldec.AttrSpec{Name: "pool", Type: cty.String, Required: false}, "vm_name": &hcldec.AttrSpec{Name: "vm_name", Type: cty.String, Required: false}, "vm_id": &hcldec.AttrSpec{Name: "vm_id", Type: cty.Number, Required: false}, + "boot": &hcldec.AttrSpec{Name: "boot", Type: cty.String, Required: false}, "memory": &hcldec.AttrSpec{Name: "memory", Type: cty.Number, Required: false}, "cores": &hcldec.AttrSpec{Name: "cores", Type: cty.Number, Required: false}, "cpu_type": &hcldec.AttrSpec{Name: "cpu_type", Type: cty.String, Required: false}, diff --git a/builder/proxmox/iso/config.hcl2spec.go b/builder/proxmox/iso/config.hcl2spec.go index 272f8a794..374456efc 100644 --- a/builder/proxmox/iso/config.hcl2spec.go +++ b/builder/proxmox/iso/config.hcl2spec.go @@ -83,6 +83,7 @@ type FlatConfig struct { Pool *string `mapstructure:"pool" cty:"pool" hcl:"pool"` VMName *string `mapstructure:"vm_name" cty:"vm_name" hcl:"vm_name"` VMID *int `mapstructure:"vm_id" cty:"vm_id" hcl:"vm_id"` + Boot *string `mapstructure:"boot" cty:"boot" hcl:"boot"` Memory *int `mapstructure:"memory" cty:"memory" hcl:"memory"` Cores *int `mapstructure:"cores" cty:"cores" hcl:"cores"` CPUType *string `mapstructure:"cpu_type" cty:"cpu_type" hcl:"cpu_type"` @@ -196,6 +197,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "pool": &hcldec.AttrSpec{Name: "pool", Type: cty.String, Required: false}, "vm_name": &hcldec.AttrSpec{Name: "vm_name", Type: cty.String, Required: false}, "vm_id": &hcldec.AttrSpec{Name: "vm_id", Type: cty.Number, Required: false}, + "boot": &hcldec.AttrSpec{Name: "boot", Type: cty.String, Required: false}, "memory": &hcldec.AttrSpec{Name: "memory", Type: cty.Number, Required: false}, "cores": &hcldec.AttrSpec{Name: "cores", Type: cty.Number, Required: false}, "cpu_type": &hcldec.AttrSpec{Name: "cpu_type", Type: cty.String, Required: false}, From 5a3ea4b0949ca40ab3e0ff4b3b54bb54840270f3 Mon Sep 17 00:00:00 2001 From: loloolllool Date: Mon, 16 Nov 2020 05:02:28 +0100 Subject: [PATCH 73/93] Adding optional boot documentation --- website/pages/docs/builders/proxmox/clone.mdx | 3 +++ website/pages/docs/builders/proxmox/iso.mdx | 3 +++ 2 files changed, 6 insertions(+) diff --git a/website/pages/docs/builders/proxmox/clone.mdx b/website/pages/docs/builders/proxmox/clone.mdx index df5b3fc14..892c5e739 100644 --- a/website/pages/docs/builders/proxmox/clone.mdx +++ b/website/pages/docs/builders/proxmox/clone.mdx @@ -190,6 +190,9 @@ in the image's Cloud-Init settings for provisioning. - `full_clone` (bool) - Whether to run a full or shallow clone from the base clone_vm. Defaults to `true`. +- `boot` - (string) - Override default boot order. Format example `order=virtio0;ide2;net0`. + Prior to Proxmox 6.2-15 the format was `cdn` (c:CDROM -> d:Disk -> n:Network) + ## Example: Cloud-Init enabled Debian Here is a basic example creating a Debian 10 server image. This assumes diff --git a/website/pages/docs/builders/proxmox/iso.mdx b/website/pages/docs/builders/proxmox/iso.mdx index b290b5937..d97d1f6e2 100644 --- a/website/pages/docs/builders/proxmox/iso.mdx +++ b/website/pages/docs/builders/proxmox/iso.mdx @@ -256,6 +256,9 @@ builder. - `vm_interface` - (string) - Name of the network interface that Packer gets the VMs IP from. Defaults to the first non loopback interface. +- `boot` - (string) - Override default boot order. Format example `order=virtio0;ide2;net0`. + Prior to Proxmox 6.2-15 the format was `cdn` (c:CDROM -> d:Disk -> n:Network) + ## Boot Command The `boot_command` configuration is very important: it specifies the keys to From 4e33f99c79ea2299a2ef48e017c6761a8b486333 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Tue, 17 Nov 2020 00:51:55 +0900 Subject: [PATCH 74/93] Fix a broken link in the README (#10259) Signed-off-by: Sora Morimoto --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0bbdc3263..de3007a4e 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ from a single source configuration. Packer is lightweight, runs on every major operating system, and is highly performant, creating machine images for multiple platforms in parallel. Packer comes out of the box with support for many platforms, the full list of which can -be found at https://www.packer.io/docs/builders/index.html. +be found at https://www.packer.io/docs/builders. Support for other platforms can be added via plugins. From 94a660147e5e2e9a1350cbdda7397d85cd30af17 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 16 Nov 2020 11:49:33 -0800 Subject: [PATCH 75/93] rename retry so it doesn't stutter --- builder/osc/common/retry/retry.go | 4 ++-- builder/osc/common/retry/retry_test.go | 8 ++++---- builder/osc/common/state.go | 2 +- builder/osc/common/step_create_tags.go | 2 +- builder/osc/common/step_run_source_vm.go | 2 +- builder/osc/common/step_stop_bsu_backed_vm.go | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/builder/osc/common/retry/retry.go b/builder/osc/common/retry/retry.go index 628a86a69..531000335 100644 --- a/builder/osc/common/retry/retry.go +++ b/builder/osc/common/retry/retry.go @@ -15,7 +15,7 @@ var RetryExhaustedError error = fmt.Errorf("Function never succeeded in Retry") type RetryableFunc func(uint) (bool, error) /* -Retry retries a function up to numTries times with exponential backoff. +Run retries a function up to numTries times with exponential backoff. If numTries == 0, retry indefinitely. If interval == 0, Retry will not delay retrying and there will be no exponential backoff. @@ -24,7 +24,7 @@ Intervals are in seconds. Returns an error if initial > max intervals, if retries are exhausted, or if the passed function returns an error. */ -func Retry(initialInterval float64, maxInterval float64, numTries uint, function RetryableFunc) error { +func Run(initialInterval float64, maxInterval float64, numTries uint, function RetryableFunc) error { if maxInterval == 0 { maxInterval = math.Inf(1) } else if initialInterval < 0 || initialInterval > maxInterval { diff --git a/builder/osc/common/retry/retry_test.go b/builder/osc/common/retry/retry_test.go index bd59cb459..9936b2652 100644 --- a/builder/osc/common/retry/retry_test.go +++ b/builder/osc/common/retry/retry_test.go @@ -8,7 +8,7 @@ import ( func TestRetry(t *testing.T) { numTries := uint(0) // Test that a passing function only gets called once. - err := Retry(0, 0, 0, func(i uint) (bool, error) { + err := Run(0, 0, 0, func(i uint) (bool, error) { numTries++ return true, nil }) @@ -22,7 +22,7 @@ func TestRetry(t *testing.T) { // Test that a failing function gets retried (once in this example). numTries = 0 results := []bool{false, true} - err = Retry(0, 0, 0, func(i uint) (bool, error) { + err = Run(0, 0, 0, func(i uint) (bool, error) { result := results[numTries] numTries++ return result, nil @@ -37,7 +37,7 @@ func TestRetry(t *testing.T) { // Test that a function error gets returned, and the function does not get called again. numTries = 0 funcErr := fmt.Errorf("This function had an error!") - err = Retry(0, 0, 0, func(i uint) (bool, error) { + err = Run(0, 0, 0, func(i uint) (bool, error) { numTries++ return false, funcErr }) @@ -51,7 +51,7 @@ func TestRetry(t *testing.T) { // Test when a function exhausts its retries. numTries = 0 expectedTries := uint(3) - err = Retry(0, 0, expectedTries, func(i uint) (bool, error) { + err = Run(0, 0, expectedTries, func(i uint) (bool, error) { numTries++ return false, nil }) diff --git a/builder/osc/common/state.go b/builder/osc/common/state.go index 50afe4cce..302df6d24 100644 --- a/builder/osc/common/state.go +++ b/builder/osc/common/state.go @@ -68,7 +68,7 @@ func WaitUntilOscSnapshotDone(conn *osc.APIClient, snapshotID string) error { } func waitForState(errCh chan<- error, target string, refresh stateRefreshFunc) { - err := retry.Retry(2, 2, 0, func(_ uint) (bool, error) { + err := retry.Run(2, 2, 0, func(_ uint) (bool, error) { state, err := refresh() if err != nil { return false, err diff --git a/builder/osc/common/step_create_tags.go b/builder/osc/common/step_create_tags.go index 2a2c60961..49f784de8 100644 --- a/builder/osc/common/step_create_tags.go +++ b/builder/osc/common/step_create_tags.go @@ -90,7 +90,7 @@ func (s *StepCreateTags) Run(_ context.Context, state multistep.StateBag) multis snapshotTags.Report(ui) // Retry creating tags for about 2.5 minutes - err = retry.Retry(0.2, 30, 11, func(_ uint) (bool, error) { + err = retry.Run(0.2, 30, 11, func(_ uint) (bool, error) { // Tag images and snapshots _, _, err := regionconn.TagApi.CreateTags(context.Background(), &osc.CreateTagsOpts{ CreateTagsRequest: optional.NewInterface(osc.CreateTagsRequest{ diff --git a/builder/osc/common/step_run_source_vm.go b/builder/osc/common/step_run_source_vm.go index 0d0cb6054..d5ba558c6 100644 --- a/builder/osc/common/step_run_source_vm.go +++ b/builder/osc/common/step_run_source_vm.go @@ -234,7 +234,7 @@ func (s *StepRunSourceVm) Run(ctx context.Context, state multistep.StateBag) mul if s.IsRestricted { oscTags.Report(ui) // Retry creating tags for about 2.5 minutes - err = retry.Retry(0.2, 30, 11, func(_ uint) (bool, error) { + err = retry.Run(0.2, 30, 11, func(_ uint) (bool, error) { _, _, err := oscconn.TagApi.CreateTags(context.Background(), &osc.CreateTagsOpts{ CreateTagsRequest: optional.NewInterface(osc.CreateTagsRequest{ Tags: oscTags, diff --git a/builder/osc/common/step_stop_bsu_backed_vm.go b/builder/osc/common/step_stop_bsu_backed_vm.go index 62cd830ac..11dd2654c 100644 --- a/builder/osc/common/step_stop_bsu_backed_vm.go +++ b/builder/osc/common/step_stop_bsu_backed_vm.go @@ -41,7 +41,7 @@ func (s *StepStopBSUBackedVm) Run(ctx context.Context, state multistep.StateBag) // does not exist. // Work around this by retrying a few times, up to about 5 minutes. - err := retry.Retry(10, 60, 6, func(i uint) (bool, error) { + err := retry.Run(10, 60, 6, func(i uint) (bool, error) { ui.Message(fmt.Sprintf("Stopping vm, attempt %d", i+1)) _, _, err = oscconn.VmApi.StopVms(context.Background(), &osc.StopVmsOpts{ From 37eec09cea89be2ddb2ea4b272d874c07075f214 Mon Sep 17 00:00:00 2001 From: Ivaylo Markov Date: Mon, 16 Nov 2020 23:17:35 +0200 Subject: [PATCH 76/93] Add couple of missing LXD builder parameters to documentation --- website/pages/docs/builders/lxd.mdx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/website/pages/docs/builders/lxd.mdx b/website/pages/docs/builders/lxd.mdx index 427dd5a87..1ddfe5b8e 100644 --- a/website/pages/docs/builders/lxd.mdx +++ b/website/pages/docs/builders/lxd.mdx @@ -59,8 +59,13 @@ Below is a fully functioning example. - `init_sleep` (string) - The number of seconds to sleep between launching the LXD instance and provisioning it; defaults to 3 seconds. -- `name` (string) - The name of the started container. Defaults to - `packer-$PACKER_BUILD_NAME`. +- `name` (string) - Name of the builder. Defaults to `lxd`. + +- `container_name` (string) - Name of the build container. + Defaults to `packer-$name`. + +- `profile` - Name of the LXD profile used for the build container. + Defaults to `default`. - `output_image` (string) - The name of the output artifact. Defaults to `name`. From 6a1a22151cc0096d55060c3c300272a0fd318a51 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 16 Nov 2020 14:23:35 -0800 Subject: [PATCH 77/93] move the various flag packages from helper to command, since command is the only package that uses them. --- command/cli.go | 6 +++--- {helper => command}/enumflag/flag.go | 0 {helper => command}/flag-kv/flag.go | 0 {helper => command}/flag-kv/flag_json.go | 0 {helper => command}/flag-kv/flag_json_test.go | 0 {helper => command}/flag-kv/flag_strings.go | 0 {helper => command}/flag-kv/flag_strings_test.go | 0 {helper => command}/flag-kv/flag_test.go | 0 {helper => command}/flag-kv/test-fixtures/basic.json | 0 {helper => command}/flag-slice/flag.go | 0 {helper => command}/flag-slice/flag_test.go | 0 command/meta.go | 2 +- 12 files changed, 4 insertions(+), 4 deletions(-) rename {helper => command}/enumflag/flag.go (100%) rename {helper => command}/flag-kv/flag.go (100%) rename {helper => command}/flag-kv/flag_json.go (100%) rename {helper => command}/flag-kv/flag_json_test.go (100%) rename {helper => command}/flag-kv/flag_strings.go (100%) rename {helper => command}/flag-kv/flag_strings_test.go (100%) rename {helper => command}/flag-kv/flag_test.go (100%) rename {helper => command}/flag-kv/test-fixtures/basic.json (100%) rename {helper => command}/flag-slice/flag.go (100%) rename {helper => command}/flag-slice/flag_test.go (100%) diff --git a/command/cli.go b/command/cli.go index f273692ce..56d598d7f 100644 --- a/command/cli.go +++ b/command/cli.go @@ -4,9 +4,9 @@ import ( "flag" "strings" - "github.com/hashicorp/packer/helper/enumflag" - kvflag "github.com/hashicorp/packer/helper/flag-kv" - sliceflag "github.com/hashicorp/packer/helper/flag-slice" + "github.com/hashicorp/packer/command/enumflag" + kvflag "github.com/hashicorp/packer/command/flag-kv" + sliceflag "github.com/hashicorp/packer/command/flag-slice" ) //go:generate enumer -type configType -trimprefix ConfigType -transform snake diff --git a/helper/enumflag/flag.go b/command/enumflag/flag.go similarity index 100% rename from helper/enumflag/flag.go rename to command/enumflag/flag.go diff --git a/helper/flag-kv/flag.go b/command/flag-kv/flag.go similarity index 100% rename from helper/flag-kv/flag.go rename to command/flag-kv/flag.go diff --git a/helper/flag-kv/flag_json.go b/command/flag-kv/flag_json.go similarity index 100% rename from helper/flag-kv/flag_json.go rename to command/flag-kv/flag_json.go diff --git a/helper/flag-kv/flag_json_test.go b/command/flag-kv/flag_json_test.go similarity index 100% rename from helper/flag-kv/flag_json_test.go rename to command/flag-kv/flag_json_test.go diff --git a/helper/flag-kv/flag_strings.go b/command/flag-kv/flag_strings.go similarity index 100% rename from helper/flag-kv/flag_strings.go rename to command/flag-kv/flag_strings.go diff --git a/helper/flag-kv/flag_strings_test.go b/command/flag-kv/flag_strings_test.go similarity index 100% rename from helper/flag-kv/flag_strings_test.go rename to command/flag-kv/flag_strings_test.go diff --git a/helper/flag-kv/flag_test.go b/command/flag-kv/flag_test.go similarity index 100% rename from helper/flag-kv/flag_test.go rename to command/flag-kv/flag_test.go diff --git a/helper/flag-kv/test-fixtures/basic.json b/command/flag-kv/test-fixtures/basic.json similarity index 100% rename from helper/flag-kv/test-fixtures/basic.json rename to command/flag-kv/test-fixtures/basic.json diff --git a/helper/flag-slice/flag.go b/command/flag-slice/flag.go similarity index 100% rename from helper/flag-slice/flag.go rename to command/flag-slice/flag.go diff --git a/helper/flag-slice/flag_test.go b/command/flag-slice/flag_test.go similarity index 100% rename from helper/flag-slice/flag_test.go rename to command/flag-slice/flag_test.go diff --git a/command/meta.go b/command/meta.go index 2d35fc9ab..a57f7244b 100644 --- a/command/meta.go +++ b/command/meta.go @@ -6,7 +6,7 @@ import ( "io" "os" - kvflag "github.com/hashicorp/packer/helper/flag-kv" + kvflag "github.com/hashicorp/packer/command/flag-kv" "github.com/hashicorp/packer/helper/wrappedstreams" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template" From 1ffc358ada0a7c2f53c783981bf3da99dead07a0 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 16 Nov 2020 15:13:08 -0800 Subject: [PATCH 78/93] move tmp helper func into packer-plugin-sdk --- builder/googlecompute/step_start_tunnel.go | 2 +- builder/hyperv/common/powershell/powershell.go | 2 +- builder/hyperv/common/step_create_build_dir.go | 2 +- builder/hyperv/common/step_mount_floppydrive.go | 2 +- builder/lxc/communicator.go | 2 +- builder/openstack/step_key_pair.go | 2 +- builder/osc/chroot/communicator.go | 2 +- builder/parallels/common/driver_9.go | 2 +- builder/virtualbox/common/step_attach_floppy.go | 2 +- builder/virtualbox/common/step_download_guest_additions.go | 2 +- builder/vmware/iso/step_create_vmx.go | 2 +- builder/vmware/vmx/step_clone_vmx.go | 2 +- common/adapter/scp.go | 2 +- common/chroot/communicator.go | 2 +- common/commonsteps/step_create_cdrom.go | 2 +- common/commonsteps/step_create_floppy.go | 2 +- common/commonsteps/step_download_test.go | 2 +- common/shell-local/run.go | 2 +- helper/communicator/testing.go | 2 +- main.go | 2 +- .../sdk-internals/communicator/ssh/communicator.go | 2 +- packer-plugin-sdk/template/parse.go | 2 +- {packer => packer-plugin-sdk}/tmp/tmp.go | 0 packer/plugin/server.go | 2 +- post-processor/vagrant/post-processor.go | 2 +- post-processor/vagrant/util.go | 2 +- post-processor/vagrant/virtualbox_test.go | 2 +- provisioner/ansible-local/provisioner.go | 2 +- provisioner/ansible/provisioner.go | 2 +- provisioner/powershell/provisioner.go | 2 +- provisioner/shell/provisioner.go | 2 +- provisioner/windows-shell/provisioner.go | 2 +- 32 files changed, 31 insertions(+), 31 deletions(-) rename {packer => packer-plugin-sdk}/tmp/tmp.go (100%) diff --git a/builder/googlecompute/step_start_tunnel.go b/builder/googlecompute/step_start_tunnel.go index 4b74a2e4e..724216ebc 100644 --- a/builder/googlecompute/step_start_tunnel.go +++ b/builder/googlecompute/step_start_tunnel.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // StepStartTunnel represents a Packer build step that launches an IAP tunnel diff --git a/builder/hyperv/common/powershell/powershell.go b/builder/hyperv/common/powershell/powershell.go index 3d899ffce..5c10e991c 100644 --- a/builder/hyperv/common/powershell/powershell.go +++ b/builder/hyperv/common/powershell/powershell.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) const ( diff --git a/builder/hyperv/common/step_create_build_dir.go b/builder/hyperv/common/step_create_build_dir.go index dc6b69a04..f7a51a625 100644 --- a/builder/hyperv/common/step_create_build_dir.go +++ b/builder/hyperv/common/step_create_build_dir.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) type StepCreateBuildDir struct { diff --git a/builder/hyperv/common/step_mount_floppydrive.go b/builder/hyperv/common/step_mount_floppydrive.go index 5ded58d29..014aaf086 100644 --- a/builder/hyperv/common/step_mount_floppydrive.go +++ b/builder/hyperv/common/step_mount_floppydrive.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) const ( diff --git a/builder/lxc/communicator.go b/builder/lxc/communicator.go index 6994a2828..b91d811d0 100644 --- a/builder/lxc/communicator.go +++ b/builder/lxc/communicator.go @@ -13,7 +13,7 @@ import ( "syscall" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) type LxcAttachCommunicator struct { diff --git a/builder/openstack/step_key_pair.go b/builder/openstack/step_key_pair.go index 87a6ed011..46d22182e 100644 --- a/builder/openstack/step_key_pair.go +++ b/builder/openstack/step_key_pair.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "golang.org/x/crypto/ssh" ) diff --git a/builder/osc/chroot/communicator.go b/builder/osc/chroot/communicator.go index c5306fe2f..8fc79163e 100644 --- a/builder/osc/chroot/communicator.go +++ b/builder/osc/chroot/communicator.go @@ -14,7 +14,7 @@ import ( "syscall" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // Communicator is a special communicator that works by executing diff --git a/builder/parallels/common/driver_9.go b/builder/parallels/common/driver_9.go index 5a5d9393f..9e088f10a 100644 --- a/builder/parallels/common/driver_9.go +++ b/builder/parallels/common/driver_9.go @@ -15,7 +15,7 @@ import ( "github.com/ChrisTrenkamp/goxpath" "github.com/ChrisTrenkamp/goxpath/tree/xmltree" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // Parallels9Driver is a base type for Parallels builders. diff --git a/builder/virtualbox/common/step_attach_floppy.go b/builder/virtualbox/common/step_attach_floppy.go index 2003d4301..82a058e17 100644 --- a/builder/virtualbox/common/step_attach_floppy.go +++ b/builder/virtualbox/common/step_attach_floppy.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // This step attaches the ISO to the virtual machine. diff --git a/builder/virtualbox/common/step_download_guest_additions.go b/builder/virtualbox/common/step_download_guest_additions.go index fbe78b3ec..7da001d94 100644 --- a/builder/virtualbox/common/step_download_guest_additions.go +++ b/builder/virtualbox/common/step_download_guest_additions.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) var additionsVersionMap = map[string]string{ diff --git a/builder/vmware/iso/step_create_vmx.go b/builder/vmware/iso/step_create_vmx.go index 04c796a5e..4c67cabd6 100644 --- a/builder/vmware/iso/step_create_vmx.go +++ b/builder/vmware/iso/step_create_vmx.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) type vmxTemplateData struct { diff --git a/builder/vmware/vmx/step_clone_vmx.go b/builder/vmware/vmx/step_clone_vmx.go index b7e65e7d5..174a98249 100644 --- a/builder/vmware/vmx/step_clone_vmx.go +++ b/builder/vmware/vmx/step_clone_vmx.go @@ -11,7 +11,7 @@ import ( vmwcommon "github.com/hashicorp/packer/builder/vmware/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // StepCloneVMX takes a VMX file and clones the VM into the output directory. diff --git a/common/adapter/scp.go b/common/adapter/scp.go index 06043ff20..5fe6e45b2 100644 --- a/common/adapter/scp.go +++ b/common/adapter/scp.go @@ -13,7 +13,7 @@ import ( "time" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) const ( diff --git a/common/chroot/communicator.go b/common/chroot/communicator.go index a813baca8..7b07124af 100644 --- a/common/chroot/communicator.go +++ b/common/chroot/communicator.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // Communicator is a special communicator that works by executing diff --git a/common/commonsteps/step_create_cdrom.go b/common/commonsteps/step_create_cdrom.go index 5cecbcbb7..26b6639e5 100644 --- a/common/commonsteps/step_create_cdrom.go +++ b/common/commonsteps/step_create_cdrom.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/common/shell-local/localexec" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // StepCreateCD will create a CD disk with the given files. diff --git a/common/commonsteps/step_create_floppy.go b/common/commonsteps/step_create_floppy.go index 418df6fbf..dd6d07218 100644 --- a/common/commonsteps/step_create_floppy.go +++ b/common/commonsteps/step_create_floppy.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/mitchellh/go-fs" "github.com/mitchellh/go-fs/fat" ) diff --git a/common/commonsteps/step_download_test.go b/common/commonsteps/step_download_test.go index b6c7870c2..35e60ddf1 100644 --- a/common/commonsteps/step_download_test.go +++ b/common/commonsteps/step_download_test.go @@ -19,7 +19,7 @@ import ( urlhelper "github.com/hashicorp/go-getter/v2/helper/url" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) var _ multistep.Step = new(StepDownload) diff --git a/common/shell-local/run.go b/common/shell-local/run.go index cb3a47f83..5f67fd056 100644 --- a/common/shell-local/run.go +++ b/common/shell-local/run.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) func Run(ctx context.Context, ui packer.Ui, config *Config, generatedData map[string]interface{}) (bool, error) { diff --git a/helper/communicator/testing.go b/helper/communicator/testing.go index 4f4894b6a..176412fc7 100644 --- a/helper/communicator/testing.go +++ b/helper/communicator/testing.go @@ -3,7 +3,7 @@ package communicator import ( "testing" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) func TestPEM(t *testing.T) string { diff --git a/main.go b/main.go index 5079d9a61..d8f53845f 100644 --- a/main.go +++ b/main.go @@ -19,8 +19,8 @@ import ( "github.com/hashicorp/go-uuid" "github.com/hashicorp/packer/command" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/hashicorp/packer/packer/plugin" - "github.com/hashicorp/packer/packer/tmp" "github.com/hashicorp/packer/version" "github.com/mitchellh/cli" "github.com/mitchellh/panicwrap" diff --git a/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go index 6636f6bda..03250953d 100644 --- a/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go +++ b/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go @@ -17,7 +17,7 @@ import ( "time" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/pkg/sftp" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/packer-plugin-sdk/template/parse.go b/packer-plugin-sdk/template/parse.go index 6bd4b8fa9..b96ec9d46 100644 --- a/packer-plugin-sdk/template/parse.go +++ b/packer-plugin-sdk/template/parse.go @@ -12,7 +12,7 @@ import ( "strings" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/mitchellh/mapstructure" ) diff --git a/packer/tmp/tmp.go b/packer-plugin-sdk/tmp/tmp.go similarity index 100% rename from packer/tmp/tmp.go rename to packer-plugin-sdk/tmp/tmp.go diff --git a/packer/plugin/server.go b/packer/plugin/server.go index 96e2011ce..1ed44f893 100644 --- a/packer/plugin/server.go +++ b/packer/plugin/server.go @@ -21,8 +21,8 @@ import ( "syscall" "time" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" packrpc "github.com/hashicorp/packer/packer/rpc" - "github.com/hashicorp/packer/packer/tmp" ) // This is a count of the number of interrupts the process has received. diff --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go index 91a5344bb..f9a1d1f05 100644 --- a/post-processor/vagrant/post-processor.go +++ b/post-processor/vagrant/post-processor.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/hashicorp/packer/post-processor/artifice" "github.com/mitchellh/mapstructure" ) diff --git a/post-processor/vagrant/util.go b/post-processor/vagrant/util.go index 21f3398eb..b58e9ecfe 100644 --- a/post-processor/vagrant/util.go +++ b/post-processor/vagrant/util.go @@ -12,7 +12,7 @@ import ( "runtime" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/klauspost/pgzip" ) diff --git a/post-processor/vagrant/virtualbox_test.go b/post-processor/vagrant/virtualbox_test.go index 3e46f59fe..cd088519c 100644 --- a/post-processor/vagrant/virtualbox_test.go +++ b/post-processor/vagrant/virtualbox_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/ansible-local/provisioner.go b/provisioner/ansible-local/provisioner.go index 62077fd67..33f18435c 100644 --- a/provisioner/ansible-local/provisioner.go +++ b/provisioner/ansible-local/provisioner.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) const DefaultStagingDir = "/tmp/packer-provisioner-ansible-local" diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go index 0f09d7c19..ed7a8b378 100644 --- a/provisioner/ansible/provisioner.go +++ b/provisioner/ansible/provisioner.go @@ -36,7 +36,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) type Config struct { diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go index 714f11271..53fac0e06 100644 --- a/provisioner/powershell/provisioner.go +++ b/provisioner/powershell/provisioner.go @@ -25,7 +25,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) var retryableSleep = 2 * time.Second diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go index 7b6fdd918..e8c1aa2cb 100644 --- a/provisioner/shell/provisioner.go +++ b/provisioner/shell/provisioner.go @@ -24,7 +24,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) type Config struct { diff --git a/provisioner/windows-shell/provisioner.go b/provisioner/windows-shell/provisioner.go index 36b6c0512..17520f77f 100644 --- a/provisioner/windows-shell/provisioner.go +++ b/provisioner/windows-shell/provisioner.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) //FIXME query remote host or use %SYSTEMROOT%, %TEMP% and more creative filename From 3da99f7bdc18a6c2817320fb4d619fb6aead2e82 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Thu, 12 Nov 2020 14:01:41 -0800 Subject: [PATCH 79/93] add more documentation to the packages in common directory --- common/adapter/doc.go | 8 +++++++ common/bootcommand/doc.go | 13 +++++++++++ common/chroot/doc.go | 25 ++++++++++++++++++++++ common/command.go | 9 +++++++- common/commonsteps/doc.go | 16 ++++++++++++++ common/filelock/doc.go | 6 ++++++ common/guestexec/doc.go | 12 +++++++++++ common/net/configure_port.go | 10 ++++----- common/packer_config.go | 3 ++- common/packerbuilderdata/generated_data.go | 8 ++++--- common/random/string.go | 16 ++++++++++++-- common/retry/retry.go | 11 +++++++++- common/shell-local/doc.go | 14 ++++++++++++ common/shell/shell.go | 12 ++++++++++- common/shutdowncommand/config.go | 7 ++++++ common/template/funcs.go | 8 ++++++- 16 files changed, 163 insertions(+), 15 deletions(-) create mode 100644 common/adapter/doc.go create mode 100644 common/bootcommand/doc.go create mode 100644 common/chroot/doc.go create mode 100644 common/commonsteps/doc.go create mode 100644 common/filelock/doc.go create mode 100644 common/guestexec/doc.go create mode 100644 common/shell-local/doc.go diff --git a/common/adapter/doc.go b/common/adapter/doc.go new file mode 100644 index 000000000..f079dc594 --- /dev/null +++ b/common/adapter/doc.go @@ -0,0 +1,8 @@ +/* +Package adapter helps command line tools connect to the guest via a Packer +communicator. A typical use is for custom provisioners that wrap command line +tools. For example, the Ansible provisioner and the Inspec provisioner both +use this package to proxy communicator calls. +*/ + +package adapter diff --git a/common/bootcommand/doc.go b/common/bootcommand/doc.go new file mode 100644 index 000000000..9a908528c --- /dev/null +++ b/common/bootcommand/doc.go @@ -0,0 +1,13 @@ +/* +Package bootcommand generates and sends boot commands to the remote instance. + +This package is relevant to people who want to create new builders, particularly +builders with the capacity to build a VM from an iso. + +You can choose between three different drivers to send the command: a vnc +driver, a usb driver, and a PX-XT keyboard driver. The driver you choose will +depend on what kind of keyboard codes your hypervisor expects, and how you want +to implement the connection. +*/ + +package bootcommand diff --git a/common/chroot/doc.go b/common/chroot/doc.go new file mode 100644 index 000000000..d433e0618 --- /dev/null +++ b/common/chroot/doc.go @@ -0,0 +1,25 @@ +/* +Package chroot provides convenience tooling specific to chroot builders. + +Chroot builders work by creating a new volume from an existing source image and +attaching it into an already-running instance. Once attached, a chroot is used +to provision the system within that volume. After provisioning, the volume is +detached, snapshotted, and a cloud-specific image is made. + +Using this process, minutes can be shaved off image build processes because a +new instance doesn't need to be launched in the cloud before provisioning can +take place. + +There are some restrictions, however. The host instance where the volume is +attached to must be a similar system (generally the same OS version, kernel +versions, etc.) as the image being built. Additionally, this process is much +more expensive because the instance used to perform the build must be kept +running persistently in order to build images, whereas the other non-chroot +cloud image builders start instances on-demand to build images as needed. + +The HashiCorp-maintained Amazon and Azure builder plugins have chroot builders +which use this option and can serve as an example for how the chroot steps and +communicator are used. +*/ + +package chroot diff --git a/common/command.go b/common/command.go index eaceb75a2..cdc8f7b95 100644 --- a/common/command.go +++ b/common/command.go @@ -4,8 +4,15 @@ import ( "os/exec" ) -// CommandWrapper is a type that given a command, will possibly modify that +// CommandWrapper is a type that given a command, will modify that // command in-flight. This might return an error. +// For example, your command could be `foo` and your CommandWrapper could be +// func(s string) (string, error) { +// return fmt.Sprintf("/bin/sh/ %s", s) +// } +// Using the CommandWrapper, you can set environment variables or perform +// string interpolation once rather than many times, to save some lines of code +// if similar wrapping needs to be performed many times during a plugin run. type CommandWrapper func(string) (string, error) // ShellCommand takes a command string and returns an *exec.Cmd to execute diff --git a/common/commonsteps/doc.go b/common/commonsteps/doc.go new file mode 100644 index 000000000..b5b7e90af --- /dev/null +++ b/common/commonsteps/doc.go @@ -0,0 +1,16 @@ +/* +The commonsteps package contains the multistep runner that comprises the main +architectural convention of Packer builder plugins. It enables builders +to respect global Packer flags like "on-error" and "debug". It also contains +a selection of convenience "multistep" steps that perform globally relevant +tasks that many or most builders will want to implement -- for example, +launching Packer's internal HTTP server for serving files to the instance. + +It also provides step_provision, which contains the hooks necessary for allowing +provisioners to run inside your builder. + +While it is possible to create a simple builder without using the multistep +runner or step_provision, your builder will lack core Packer functionality. +*/ + +package commonsteps diff --git a/common/filelock/doc.go b/common/filelock/doc.go new file mode 100644 index 000000000..28a5c9ad6 --- /dev/null +++ b/common/filelock/doc.go @@ -0,0 +1,6 @@ +/* +Package filelock makes it easy to create and check file locks for concurrent +processes. +*/ + +package filelock diff --git a/common/guestexec/doc.go b/common/guestexec/doc.go new file mode 100644 index 000000000..391ee5c29 --- /dev/null +++ b/common/guestexec/doc.go @@ -0,0 +1,12 @@ +/* +Package guestexec provides a shim for running common operating system commands +on the guest/remote instance that is being provisioned. It helps provisioners +which need to perform operating-system specific calls do so in a way that is +simple and repeatable. + +Note that to successfully use this package your provisioner must have knowledge +of the guest type, which is not information that builders generally collect -- +your provisioner will have to require guest information in its config. +*/ + +package guestexec diff --git a/common/net/configure_port.go b/common/net/configure_port.go index 796acd5e6..950e7a892 100644 --- a/common/net/configure_port.go +++ b/common/net/configure_port.go @@ -17,11 +17,11 @@ import ( var _ net.Listener = &Listener{} -// Listener wraps a net.Lister with some magic packer capabilies. For example -// until you call Listener.Close, any call to ListenRangeConfig.Listen cannot -// bind to Port. Packer tries tells moving parts which port they can use, but -// often the port has to be released before a 3rd party is started, like a VNC -// server. +// Listener wraps a net.Lister with some Packer-specific capabilies. For +// example, until you call Listener.Close, any call to ListenRangeConfig.Listen +// cannot bind to a Port. Packer tries to tell moving parts which port they can +// use, but often the port has to be released before a 3rd party is started, +// like a VNC server. type Listener struct { // Listener can be closed but Port will be file locked by packer until // Close is called. diff --git a/common/packer_config.go b/common/packer_config.go index 028e58f17..2a666bc5d 100644 --- a/common/packer_config.go +++ b/common/packer_config.go @@ -2,7 +2,8 @@ package common // PackerConfig is a struct that contains the configuration keys that // are sent by packer, properly tagged already so mapstructure can load -// them. Embed this structure into your configuration class to get it. +// them. Embed this structure into your configuration class to get access to +// this information from the Packer Core. type PackerConfig struct { PackerBuildName string `mapstructure:"packer_build_name"` PackerBuilderType string `mapstructure:"packer_builder_type"` diff --git a/common/packerbuilderdata/generated_data.go b/common/packerbuilderdata/generated_data.go index de62677f6..932627297 100644 --- a/common/packerbuilderdata/generated_data.go +++ b/common/packerbuilderdata/generated_data.go @@ -7,9 +7,11 @@ import "github.com/hashicorp/packer/helper/multistep" const PlaceholderMsg = "To set this dynamically in the Packer template, " + "you must use the `build` function" -// GeneratedData manages variables exported by a builder after -// it started. It uses the builder's multistep.StateBag internally, make sure it -// is not nil before calling any functions. +// GeneratedData manages variables created and exported by a builder after +// it starts, so that provisioners and post-processors can have access to +// build data generated at runtime -- for example, instance ID or instance IP +// address. Internally, it uses the builder's multistep.StateBag. The user +// must make sure that the State field is not is not nil before calling Put(). type GeneratedData struct { // The builder's StateBag State multistep.StateBag diff --git a/common/random/string.go b/common/random/string.go index 17926c401..bac4a355b 100644 --- a/common/random/string.go +++ b/common/random/string.go @@ -19,11 +19,23 @@ var ( var rnd = rand.New(rand.NewSource(time.Now().UnixNano() + int64(os.Getpid()))) -func Numbers(length int) string { return String(PossibleNumbers, length) } -func AlphaNum(length int) string { return String(PossibleAlphaNum, length) } +// Numbers returns a random numeric string of the given length +func Numbers(length int) string { return String(PossibleNumbers, length) } + +// AlphaNum returns a random alphanumeric string of the given length. The +// returned string can contain both uppercase and lowercase letters. +func AlphaNum(length int) string { return String(PossibleAlphaNum, length) } + +// AlphaNumLower returns a random alphanumeric string of the given length. The +// returned string can contain lowercase letters, but not uppercase. func AlphaNumLower(length int) string { return String(PossibleAlphaNumLower, length) } + +// AlphaNumUpper returns a random alphanumeric string of the given length. The +// returned string can contain uppercase letters, but not lowercase. func AlphaNumUpper(length int) string { return String(PossibleAlphaNumUpper, length) } +// String returns a random string of the given length, using only the component +// characters provided in the "chooseFrom" string. func String(chooseFrom string, length int) (randomString string) { cflen := len(chooseFrom) bytes := make([]byte, length) diff --git a/common/retry/retry.go b/common/retry/retry.go index 746a6fc28..61e47050e 100644 --- a/common/retry/retry.go +++ b/common/retry/retry.go @@ -36,7 +36,16 @@ func (err *RetryExhaustedError) Error() string { return fmt.Sprintf("retry count exhausted. Last err: %s", err.Err) } -// Run fn until context is cancelled up until StartTimeout time has passed. +// Run will repeatedly retry the proivided fn within the constraints set in the +// retry Config. It will retry until one of the following conditions is met: +// - The provided context is cancelled. +// - The Config.StartTimeout time has passed. +// - The function returns without an error. +// - The maximum number of tries, Config.Tries is exceeded. +// - The function returns with an error that does not satisfy conditions +// set in the Config.ShouldRetry function. +// If the given function (fn) does not return an error, then Run will return +// nil. Otherwise, Run will return a relevant error. func (cfg Config) Run(ctx context.Context, fn func(context.Context) error) error { retryDelay := func() time.Duration { return 2 * time.Second } if cfg.RetryDelay != nil { diff --git a/common/shell-local/doc.go b/common/shell-local/doc.go new file mode 100644 index 000000000..a27dec1fe --- /dev/null +++ b/common/shell-local/doc.go @@ -0,0 +1,14 @@ +/* +Package shell-local is designed to make it easier to shell out locally on the +machine running Packer. The top level tools in this package are probably not +relevant to plugin maintainers, as they are implementation details shared +between the HashiCorp-maintained shell-local provisioner and shell-local +post-processor. + +The localexec sub-package can be used in any plugins that need local shell +access, whether that is in a driver for a hypervisor, or a command to a third +party cli tool. Please make sure that any third party tool dependencies are +noted in your plugin's documentation. +*/ + +package shell_local diff --git a/common/shell/shell.go b/common/shell/shell.go index 2484de74d..845e158eb 100644 --- a/common/shell/shell.go +++ b/common/shell/shell.go @@ -3,7 +3,17 @@ package shell import "github.com/hashicorp/packer/common" -// Provisioner contains common fields to all shell provisioners +// Provisioner contains common fields to all shell provisioners. +// It is provided as a convenience to encourage plugin developers to +// consider implementing these options, which we believe are valuable for all +// shell-type provisioners. It also helps guarantee that option names for +// similar options are the same across the various shell provisioners. +// Validation and defaulting are left to the maintainer because appropriate +// values and defaults will be different depending on which shell is used. +// To use the Provisioner struct, embed it in your shell provisioner's config +// using the `mapstructure:",squash"` struct tag. Examples can be found in the +// HashiCorp-maintained "shell", "shell-local", "windows-shell" and "powershell" +// provisioners. type Provisioner struct { common.PackerConfig `mapstructure:",squash"` diff --git a/common/shutdowncommand/config.go b/common/shutdowncommand/config.go index ba8427206..108b56d85 100644 --- a/common/shutdowncommand/config.go +++ b/common/shutdowncommand/config.go @@ -8,6 +8,13 @@ import ( "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) +// ShutdownConfig defines implementation details for shutting down a VM once it +// is done provisioned. +// It is provided as a convenience to encourage builder developers to +// consider implementing these options, which we believe are valuable for all +// builders. It also helps guarantee that option names for similar options +// are the same across the various builders. Embed it in your builder config +// using the `mapstructure:",squash"` struct tag. type ShutdownConfig struct { // The command to use to gracefully shut down the machine once all // provisioning is complete. By default this is an empty string, which diff --git a/common/template/funcs.go b/common/template/funcs.go index 01d19d25a..5c89553c0 100644 --- a/common/template/funcs.go +++ b/common/template/funcs.go @@ -26,7 +26,8 @@ func DeprecatedTemplateFunc(funcName, useInstead string, deprecated func(string) } } -// Vault retrieves a secret from an HC vault KV store +// Vault retrieves a secret from a HashiCorp Vault KV store. +// It assumes the necessary environment variables are set. func Vault(path string, key string) (string, error) { if token := os.Getenv("VAULT_TOKEN"); token == "" { @@ -64,6 +65,8 @@ func Vault(path string, key string) (string, error) { return "", errors.New("Vault path does not contain the requested key") } +// Consul retrieves a value from a HashiCorp Consul KV store. +// It assumes the necessary environment variables are set. func Consul(k string) (string, error) { consulConfig := consulapi.DefaultConfig() client, err := consulapi.NewClient(consulConfig) @@ -88,6 +91,9 @@ func Consul(k string) (string, error) { return value, nil } +// GetAwsSecret retrieves a value from an AWS Secrets Manager. +// It assumes that credentials are properly set in the AWS SDK's credential +// chain. func GetAWSSecret(name, key string) (string, error) { // Check if at least 1 parameter has been used if len(name) == 0 { From 7d658149ea392f9d5787fe367944d03ccb27c5b9 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Thu, 12 Nov 2020 14:44:02 -0800 Subject: [PATCH 80/93] update tests and website and generated partials to reflect new package format --- .github/CONTRIBUTING.md | 2 +- Makefile | 4 +-- builder/alicloud/ecs/builder.go | 4 +-- builder/alicloud/ecs/run_config.go | 2 +- builder/alicloud/ecs/step_config_eip.go | 2 +- .../ecs/step_config_security_group.go | 2 +- builder/alicloud/ecs/step_config_vpc.go | 2 +- builder/alicloud/ecs/step_config_vswitch.go | 2 +- builder/alicloud/ecs/step_create_image.go | 4 +-- builder/alicloud/ecs/step_create_instance.go | 2 +- builder/amazon/chroot/builder.go | 8 ++--- builder/amazon/chroot/copy_files_test.go | 2 +- .../amazon/chroot/step_attach_volume_test.go | 2 +- builder/amazon/chroot/step_early_unflock.go | 2 +- builder/amazon/chroot/step_flock_test.go | 2 +- builder/amazon/chroot/step_mount_device.go | 4 +-- .../amazon/chroot/step_mount_device_test.go | 2 +- builder/amazon/chroot/step_prepare_device.go | 2 +- builder/amazon/chroot/step_register_ami.go | 2 +- .../amazon/chroot/step_register_ami_test.go | 2 +- builder/amazon/common/helper_funcs.go | 2 +- .../amazon/common/interpolate_build_info.go | 2 +- .../common/interpolate_build_info_test.go | 2 +- builder/amazon/common/run_config.go | 2 +- builder/amazon/common/ssm/session.go | 4 +-- .../amazon/common/step_create_ssm_tunnel.go | 2 +- builder/amazon/common/step_create_tags.go | 2 +- builder/amazon/common/step_get_password.go | 2 +- .../common/step_iam_instance_profile.go | 2 +- builder/amazon/common/step_key_pair.go | 2 +- .../common/step_modify_ami_attributes.go | 2 +- builder/amazon/common/step_pre_validate.go | 2 +- .../amazon/common/step_run_source_instance.go | 2 +- .../amazon/common/step_run_spot_instance.go | 4 +-- builder/amazon/common/step_security_group.go | 2 +- .../amazon/common/step_set_generated_data.go | 2 +- .../amazon/common/step_stop_ebs_instance.go | 2 +- builder/amazon/common/tags.go | 2 +- builder/amazon/ebs/builder.go | 6 ++-- builder/amazon/ebs/step_create_ami.go | 4 +-- builder/amazon/ebssurrogate/builder.go | 6 ++-- .../amazon/ebssurrogate/step_register_ami.go | 2 +- builder/amazon/ebsvolume/builder.go | 6 ++-- builder/amazon/instance/builder.go | 6 ++-- builder/amazon/instance/step_register_ami.go | 2 +- .../azure/arm/azure_error_response_test.go | 2 +- builder/azure/arm/builder.go | 2 +- builder/azure/arm/config.go | 4 +-- builder/azure/arm/step_deploy_template.go | 2 +- builder/azure/arm/tempname.go | 2 +- builder/azure/arm/tempname_test.go | 2 +- builder/azure/chroot/builder.go | 6 ++-- builder/azure/chroot/step_mount_device.go | 2 +- .../azure/chroot/step_mount_device_test.go | 2 +- .../azure/dtl/azure_error_response_test.go | 2 +- builder/azure/dtl/builder.go | 2 +- builder/azure/dtl/config.go | 2 +- builder/azure/dtl/template_funcs.go | 2 +- builder/azure/dtl/tempname.go | 2 +- builder/cloudstack/builder.go | 2 +- builder/cloudstack/config.go | 6 ++-- .../cloudstack/step_create_security_group.go | 2 +- builder/digitalocean/builder.go | 2 +- builder/digitalocean/config.go | 4 +-- builder/digitalocean/step_create_ssh_key.go | 2 +- builder/docker/builder.go | 4 +-- builder/docker/config.go | 2 +- builder/docker/exec.go | 2 +- builder/docker/step_set_generated_data.go | 2 +- .../docker/step_set_generated_data_test.go | 2 +- builder/file/config.go | 2 +- builder/googlecompute/builder.go | 2 +- builder/googlecompute/config.go | 4 +-- builder/googlecompute/driver_gce.go | 2 +- builder/googlecompute/step_start_tunnel.go | 4 +-- .../googlecompute/step_wait_startup_script.go | 2 +- builder/hcloud/builder.go | 2 +- builder/hcloud/config.go | 4 +-- builder/hcloud/step_create_sshkey.go | 2 +- builder/hyperone/builder.go | 2 +- builder/hyperone/config.go | 6 ++-- builder/hyperone/step_chroot_provision.go | 2 +- builder/hyperone/token_by_ssh.go | 2 +- builder/hyperv/common/config.go | 4 +-- builder/hyperv/common/output_config.go | 2 +- builder/hyperv/common/output_config_test.go | 2 +- .../common/step_create_external_switch.go | 2 +- builder/hyperv/common/step_test.go | 2 +- .../hyperv/common/step_type_boot_command.go | 2 +- builder/hyperv/iso/builder.go | 8 ++--- builder/hyperv/iso/builder_test.go | 2 +- builder/hyperv/vmcx/builder.go | 8 ++--- builder/hyperv/vmcx/builder_test.go | 2 +- builder/jdcloud/builder.go | 2 +- builder/jdcloud/common.go | 2 +- builder/linode/builder.go | 2 +- builder/linode/config.go | 2 +- builder/lxc/builder.go | 2 +- builder/lxc/config.go | 2 +- builder/lxc/step_provision.go | 2 +- builder/lxd/builder.go | 2 +- builder/lxd/config.go | 2 +- builder/lxd/step_provision.go | 2 +- builder/ncloud/builder.go | 2 +- builder/ncloud/config.go | 2 +- builder/null/builder.go | 2 +- builder/null/config.go | 2 +- builder/oneandone/builder.go | 2 +- builder/oneandone/config.go | 2 +- builder/openstack/builder.go | 4 +-- builder/openstack/run_config.go | 2 +- builder/oracle/classic/builder.go | 2 +- builder/oracle/classic/config.go | 2 +- .../classic/step_create_ip_reservation.go | 2 +- builder/oracle/oci/builder.go | 2 +- builder/oracle/oci/config.go | 2 +- builder/osc/bsu/builder.go | 4 +-- builder/osc/bsusurrogate/builder.go | 4 +-- builder/osc/bsuvolume/builder.go | 4 +-- builder/osc/chroot/builder.go | 4 +-- builder/osc/chroot/run_local_commands.go | 2 +- builder/osc/chroot/step_chroot_provision.go | 2 +- builder/osc/common/run_config.go | 2 +- builder/osc/common/step_security_group.go | 2 +- builder/parallels/common/output_config.go | 2 +- .../parallels/common/output_config_test.go | 2 +- .../common/step_type_boot_command.go | 2 +- builder/parallels/iso/builder.go | 8 ++--- builder/parallels/iso/builder_test.go | 2 +- builder/parallels/pvm/builder.go | 2 +- builder/parallels/pvm/config.go | 8 ++--- builder/parallels/pvm/config_test.go | 2 +- builder/profitbricks/builder.go | 2 +- builder/profitbricks/config.go | 2 +- builder/proxmox/clone/step_ssh_key_pair.go | 2 +- builder/proxmox/common/bootcommand_driver.go | 2 +- builder/proxmox/common/builder.go | 2 +- builder/proxmox/common/config.go | 8 ++--- .../proxmox/common/step_type_boot_command.go | 2 +- .../common/step_type_boot_command_test.go | 2 +- builder/proxmox/iso/builder.go | 2 +- builder/proxmox/iso/config.go | 2 +- builder/proxmox/iso/step_upload_iso_test.go | 2 +- builder/qemu/builder.go | 2 +- builder/qemu/config.go | 8 ++--- builder/qemu/config_test.go | 2 +- builder/qemu/step_configure_vnc.go | 2 +- builder/qemu/step_convert_disk.go | 2 +- builder/qemu/step_port_forward.go | 2 +- builder/qemu/step_run_test.go | 2 +- builder/qemu/step_set_iso.go | 2 +- builder/qemu/step_type_boot_command.go | 2 +- builder/scaleway/builder.go | 2 +- builder/scaleway/config.go | 4 +-- builder/tencentcloud/cvm/builder.go | 4 +-- builder/tencentcloud/cvm/common.go | 2 +- builder/tencentcloud/cvm/run_config.go | 2 +- builder/triton/builder.go | 2 +- builder/triton/config.go | 2 +- builder/ucloud/common/run_config.go | 2 +- builder/ucloud/uhost/builder.go | 4 +-- builder/ucloud/uhost/step_copy_image.go | 2 +- builder/ucloud/uhost/step_create_image.go | 2 +- builder/ucloud/uhost/step_create_instance.go | 2 +- builder/ucloud/uhost/step_stop_instance.go | 2 +- builder/vagrant/builder.go | 6 ++-- builder/virtualbox/common/driver_4_2.go | 2 +- builder/virtualbox/common/output_config.go | 2 +- .../virtualbox/common/output_config_test.go | 2 +- .../virtualbox/common/step_configure_vrdp.go | 2 +- .../common/step_download_guest_additions.go | 2 +- .../virtualbox/common/step_port_forwarding.go | 2 +- .../virtualbox/common/step_remove_devices.go | 2 +- .../virtualbox/common/step_ssh_key_pair.go | 2 +- .../common/step_type_boot_command.go | 2 +- builder/virtualbox/iso/builder.go | 6 ++-- builder/virtualbox/iso/builder_test.go | 2 +- builder/virtualbox/ovf/builder.go | 2 +- builder/virtualbox/ovf/config.go | 6 ++-- builder/virtualbox/ovf/config_test.go | 2 +- builder/virtualbox/vm/builder.go | 2 +- builder/virtualbox/vm/config.go | 6 ++-- builder/vmware/common/output_config.go | 2 +- builder/vmware/common/output_config_test.go | 2 +- builder/vmware/common/run_config_test.go | 2 +- builder/vmware/common/step_configure_vnc.go | 2 +- .../vmware/common/step_vnc_boot_command.go | 2 +- builder/vmware/iso/builder.go | 2 +- builder/vmware/iso/builder_test.go | 2 +- builder/vmware/iso/config.go | 8 ++--- builder/vmware/vmx/builder.go | 2 +- builder/vmware/vmx/builder_test.go | 2 +- builder/vmware/vmx/config.go | 8 ++--- builder/vsphere/clone/builder.go | 2 +- builder/vsphere/clone/config.go | 4 +-- builder/vsphere/common/output_config.go | 2 +- builder/vsphere/common/step_boot_command.go | 2 +- builder/vsphere/common/step_export.go | 2 +- builder/vsphere/common/step_ssh_key_pair.go | 2 +- builder/vsphere/iso/builder.go | 2 +- builder/vsphere/iso/config.go | 4 +-- builder/yandex/builder.go | 4 +-- builder/yandex/config.go | 4 +-- builder/yandex/step_create_image.go | 2 +- builder/yandex/step_create_instance.go | 4 +-- builder/yandex/step_wait_cloudinit_script.go | 2 +- hcl2template/function/Consul.go | 2 +- hcl2template/function/aws_secretetkey.go | 2 +- hcl2template/function/vault.go | 2 +- helper/ssh/key_pair_test.go | 2 +- main.go | 2 +- .../adapter/adapter.go | 0 .../adapter/adapter_test.go | 0 {common => packer-plugin-sdk}/adapter/doc.go | 0 {common => packer-plugin-sdk}/adapter/scp.go | 0 .../bootcommand/boot_command.go | 0 .../bootcommand/boot_command.pigeon | 0 .../bootcommand/boot_command_ast.go | 0 .../bootcommand/boot_command_ast_test.go | 0 .../bootcommand/config.go | 0 .../bootcommand/config_test.go | 0 .../bootcommand/doc.go | 0 .../bootcommand/driver.go | 0 .../bootcommand/gen.go | 0 .../bootcommand/pc_xt_driver.go | 0 .../bootcommand/pc_xt_driver_test.go | 0 .../bootcommand/usb_driver.go | 0 .../bootcommand/usb_driver_test.go | 0 .../bootcommand/vnc_driver.go | 0 .../bootcommand/vnc_driver_test.go | 0 .../chroot/cleanup.go | 0 .../chroot/communicator.go | 2 +- .../chroot/communicator_test.go | 0 {common => packer-plugin-sdk}/chroot/doc.go | 0 .../chroot/interpolate_context_provider.go | 0 .../chroot/run_local_commands.go | 4 +-- .../chroot/step_chroot_provision.go | 4 +-- .../chroot/step_copy_files.go | 2 +- .../chroot/step_copy_files_test.go | 2 +- .../chroot/step_early_cleanup.go | 0 .../chroot/step_mount_extra.go | 2 +- .../chroot/step_mount_extra_test.go | 0 .../chroot/step_post_mount_commands.go | 2 +- .../chroot/step_pre_mount_commands.go | 2 +- .../common}/command.go | 0 .../common}/packer_config.go | 0 .../commonsteps/doc.go | 0 .../commonsteps/extra_iso_config.go | 0 .../commonsteps/extra_iso_config_test.go | 0 .../commonsteps/floppy_config.go | 0 .../commonsteps/floppy_config_test.go | 0 .../commonsteps/http_config.go | 0 .../commonsteps/http_config_test.go | 0 .../commonsteps/iso_config.go | 0 .../commonsteps/iso_config_test.go | 0 .../commonsteps/multistep_debug.go | 0 .../commonsteps/multistep_runner.go | 2 +- .../commonsteps/step_cleanup_temp_keys.go | 0 .../commonsteps/step_create_cdrom.go | 2 +- .../commonsteps/step_create_cdrom_test.go | 0 .../commonsteps/step_create_floppy.go | 0 .../commonsteps/step_create_floppy_test.go | 0 .../commonsteps/step_download.go | 2 +- .../commonsteps/step_download_test.go | 0 .../commonsteps/step_http_server.go | 2 +- .../commonsteps/step_output_dir.go | 0 .../commonsteps/step_output_dir_test.go | 0 .../commonsteps/step_provision.go | 0 .../commonsteps/step_provision_test.go | 0 .../test-fixtures/SomeDir/myfile.txt | 0 .../test-fixtures/floppy-hier/test-0/file1 | 0 .../test-fixtures/floppy-hier/test-0/file2 | 0 .../test-fixtures/floppy-hier/test-0/file3 | 0 .../floppy-hier/test-1/dir1/file1 | 0 .../floppy-hier/test-1/dir1/file2 | 0 .../floppy-hier/test-1/dir1/file3 | 0 .../floppy-hier/test-2/dir1/file1 | 0 .../floppy-hier/test-2/dir1/subdir1/file1 | 0 .../floppy-hier/test-2/dir1/subdir1/file2 | 0 .../floppy-hier/test-2/dir2/subdir1/file1 | 0 .../floppy-hier/test-2/dir2/subdir1/file2 | 0 .../test-fixtures/root/another.txt | 0 .../test-fixtures/root/another.txt.sha1sum | 0 .../commonsteps/test-fixtures/root/basic.txt | 0 .../test-fixtures/root/basic.txt.sha1sum | 0 .../test-fixtures/root/subfolder.sum | 0 {common => packer-plugin-sdk}/filelock/doc.go | 0 .../filelock/filelock.go | 0 .../filelock/filelock_solaris.go | 0 .../filelock/noop.go | 0 .../guestexec/doc.go | 0 .../guestexec/elevated.go | 2 +- .../guestexec/elevated_test.go | 0 .../guestexec/guest_commands.go | 0 .../guestexec/guest_commands_test.go | 0 .../iochan/iochan.go | 0 .../iochan/iochan_test.go | 0 .../json/unmarshal.go | 0 .../json/unmarshal_test.go | 0 .../net/configure_port.go | 4 +-- .../net/configure_port_test.go | 0 .../net/default_client.go | 0 .../packerbuilderdata/generated_data.go | 0 .../packerbuilderdata/generated_data_test.go | 0 .../random/string.go | 0 {common => packer-plugin-sdk}/retry/retry.go | 0 .../retry/retry_test.go | 0 .../retry/utils_test.go | 0 .../shell-local/communicator.go | 0 .../shell-local/communicator_test.go | 0 .../shell-local/config.go | 2 +- .../shell-local/config.hcl2spec.go | 0 .../shell-local/config_test.go | 0 .../shell-local/doc.go | 0 .../shell-local/localexec/run_and_stream.go | 2 +- .../localexec/run_and_stream_test.go | 0 .../shell-local/run.go | 2 +- .../shell/exit_code.go | 0 .../shell/exit_code_test.go | 0 {common => packer-plugin-sdk}/shell/shell.go | 2 +- .../shutdowncommand/config.go | 0 .../shutdowncommand/config_test.go | 0 .../template/funcs.go | 0 .../template/interpolate/funcs.go | 6 ++-- .../template/interpolate/funcs_test.go | 2 +- .../test-fixtures/SomeDir/myfile.txt | 0 .../decompress-tar/outside_parent.tar | Bin .../test-fixtures/floppies/bar.bat | 0 .../test-fixtures/floppies/foo.ps1 | 0 .../test-fixtures/floppy-hier/test-0/file1 | 0 .../test-fixtures/floppy-hier/test-0/file2 | 0 .../test-fixtures/floppy-hier/test-0/file3 | 0 .../floppy-hier/test-1/dir1/file1 | 0 .../floppy-hier/test-1/dir1/file2 | 0 .../floppy-hier/test-1/dir1/file3 | 0 .../floppy-hier/test-2/dir1/file1 | 0 .../floppy-hier/test-2/dir1/subdir1/file1 | 0 .../floppy-hier/test-2/dir1/subdir1/file2 | 0 .../floppy-hier/test-2/dir2/subdir1/file1 | 0 .../floppy-hier/test-2/dir2/subdir1/file2 | 0 {common => packer-plugin-sdk}/uuid/uuid.go | 0 .../uuid/uuid_test.go | 0 packer/build.go | 2 +- packer/build_test.go | 2 +- packer/communicator_test.go | 2 +- packer/provisioner.go | 2 +- packer/rpc/ui_progress_tracking.go | 2 +- .../amazon-import/post-processor.go | 4 +-- post-processor/artifice/post-processor.go | 2 +- post-processor/checksum/post-processor.go | 2 +- post-processor/compress/post-processor.go | 2 +- .../digitalocean-import/post-processor.go | 2 +- .../docker-import/post-processor.go | 2 +- post-processor/docker-push/post-processor.go | 2 +- post-processor/docker-save/post-processor.go | 2 +- post-processor/docker-tag/post-processor.go | 2 +- .../exoscale-import/post-processor.go | 2 +- .../googlecompute-export/post-processor.go | 4 +-- .../googlecompute-import/post-processor.go | 2 +- post-processor/manifest/post-processor.go | 2 +- post-processor/shell-local/post-processor.go | 2 +- .../ucloud-import/post-processor.go | 4 +-- post-processor/vagrant-cloud/client.go | 2 +- .../vagrant-cloud/post-processor.go | 4 +-- post-processor/vagrant-cloud/step_upload.go | 2 +- post-processor/vagrant/post-processor.go | 2 +- post-processor/vagrant/virtualbox_test.go | 2 +- .../vsphere-template/post-processor.go | 4 +-- post-processor/vsphere/post-processor.go | 4 +-- .../yandex-export/post-processor.go | 6 ++-- .../yandex-import/post-processor.go | 2 +- provisioner/ansible-local/provisioner.go | 4 +-- provisioner/ansible/provisioner.go | 6 ++-- provisioner/ansible/provisioner_test.go | 2 +- provisioner/azure-dtlartifact/provisioner.go | 2 +- provisioner/breakpoint/provisioner.go | 2 +- provisioner/chef-client/provisioner.go | 6 ++-- provisioner/chef-solo/provisioner.go | 4 +-- provisioner/converge/provisioner.go | 2 +- provisioner/file/provisioner.go | 2 +- provisioner/inspec/provisioner.go | 4 +-- provisioner/powershell/provisioner.go | 10 +++---- provisioner/powershell/provisioner_test.go | 2 +- provisioner/puppet-masterless/provisioner.go | 4 +-- provisioner/puppet-server/provisioner.go | 4 +-- provisioner/salt-masterless/provisioner.go | 4 +-- provisioner/shell-local/provisioner.go | 2 +- provisioner/shell/provisioner.go | 6 ++-- provisioner/shell/provisioner_test.go | 2 +- provisioner/windows-restart/provisioner.go | 4 +-- provisioner/windows-shell/provisioner.go | 6 ++-- provisioner/windows-shell/provisioner_test.go | 2 +- website/pages/docs/builders/cloudstack.mdx | 4 +-- website/pages/docs/builders/hyperv/iso.mdx | 22 +++++++------- website/pages/docs/builders/hyperv/vmcx.mdx | 14 ++++----- website/pages/docs/builders/parallels/iso.mdx | 6 ++-- website/pages/docs/builders/proxmox/iso.mdx | 4 +-- website/pages/docs/builders/qemu.mdx | 28 +++++++++--------- .../pages/docs/builders/virtualbox/iso.mdx | 22 +++++++------- .../pages/docs/builders/virtualbox/ovf.mdx | 16 +++++----- website/pages/docs/builders/virtualbox/vm.mdx | 16 +++++----- website/pages/docs/builders/vmware/iso.mdx | 26 ++++++++-------- website/pages/docs/builders/vmware/vmx.mdx | 22 +++++++------- .../docs/builders/vmware/vsphere-clone.mdx | 12 ++++---- .../docs/builders/vmware/vsphere-iso.mdx | 18 +++++------ .../bootcommand/BootConfig-not-required.mdx | 2 +- .../bootcommand/BootConfig.mdx | 2 +- .../bootcommand/VNCConfig-not-required.mdx | 2 +- .../bootcommand/VNCConfig.mdx | 2 +- .../commonsteps/CDConfig-not-required.mdx | 2 +- .../commonsteps/CDConfig.mdx | 2 +- .../commonsteps/FloppyConfig-not-required.mdx | 2 +- .../commonsteps/FloppyConfig.mdx | 2 +- .../commonsteps/HTTPConfig-not-required.mdx | 2 +- .../commonsteps/HTTPConfig.mdx | 2 +- .../commonsteps/ISOConfig-not-required.mdx | 2 +- .../commonsteps/ISOConfig-required.mdx | 2 +- .../commonsteps/ISOConfig.mdx | 2 +- .../ShutdownConfig-not-required.mdx | 2 +- .../shutdowncommand/ShutdownConfig.mdx | 9 ++++++ 420 files changed, 517 insertions(+), 508 deletions(-) rename {common => packer-plugin-sdk}/adapter/adapter.go (100%) rename {common => packer-plugin-sdk}/adapter/adapter_test.go (100%) rename {common => packer-plugin-sdk}/adapter/doc.go (100%) rename {common => packer-plugin-sdk}/adapter/scp.go (100%) rename {common => packer-plugin-sdk}/bootcommand/boot_command.go (100%) rename {common => packer-plugin-sdk}/bootcommand/boot_command.pigeon (100%) rename {common => packer-plugin-sdk}/bootcommand/boot_command_ast.go (100%) rename {common => packer-plugin-sdk}/bootcommand/boot_command_ast_test.go (100%) rename {common => packer-plugin-sdk}/bootcommand/config.go (100%) rename {common => packer-plugin-sdk}/bootcommand/config_test.go (100%) rename {common => packer-plugin-sdk}/bootcommand/doc.go (100%) rename {common => packer-plugin-sdk}/bootcommand/driver.go (100%) rename {common => packer-plugin-sdk}/bootcommand/gen.go (100%) rename {common => packer-plugin-sdk}/bootcommand/pc_xt_driver.go (100%) rename {common => packer-plugin-sdk}/bootcommand/pc_xt_driver_test.go (100%) rename {common => packer-plugin-sdk}/bootcommand/usb_driver.go (100%) rename {common => packer-plugin-sdk}/bootcommand/usb_driver_test.go (100%) rename {common => packer-plugin-sdk}/bootcommand/vnc_driver.go (100%) rename {common => packer-plugin-sdk}/bootcommand/vnc_driver_test.go (100%) rename {common => packer-plugin-sdk}/chroot/cleanup.go (100%) rename {common => packer-plugin-sdk}/chroot/communicator.go (98%) rename {common => packer-plugin-sdk}/chroot/communicator_test.go (100%) rename {common => packer-plugin-sdk}/chroot/doc.go (100%) rename {common => packer-plugin-sdk}/chroot/interpolate_context_provider.go (100%) rename {common => packer-plugin-sdk}/chroot/run_local_commands.go (89%) rename {common => packer-plugin-sdk}/chroot/step_chroot_provision.go (91%) rename {common => packer-plugin-sdk}/chroot/step_copy_files.go (97%) rename {common => packer-plugin-sdk}/chroot/step_copy_files_test.go (98%) rename {common => packer-plugin-sdk}/chroot/step_early_cleanup.go (100%) rename {common => packer-plugin-sdk}/chroot/step_mount_extra.go (98%) rename {common => packer-plugin-sdk}/chroot/step_mount_extra_test.go (100%) rename {common => packer-plugin-sdk}/chroot/step_post_mount_commands.go (95%) rename {common => packer-plugin-sdk}/chroot/step_pre_mount_commands.go (95%) rename {common => packer-plugin-sdk/common}/command.go (100%) rename {common => packer-plugin-sdk/common}/packer_config.go (100%) rename {common => packer-plugin-sdk}/commonsteps/doc.go (100%) rename {common => packer-plugin-sdk}/commonsteps/extra_iso_config.go (100%) rename {common => packer-plugin-sdk}/commonsteps/extra_iso_config_test.go (100%) rename {common => packer-plugin-sdk}/commonsteps/floppy_config.go (100%) rename {common => packer-plugin-sdk}/commonsteps/floppy_config_test.go (100%) rename {common => packer-plugin-sdk}/commonsteps/http_config.go (100%) rename {common => packer-plugin-sdk}/commonsteps/http_config_test.go (100%) rename {common => packer-plugin-sdk}/commonsteps/iso_config.go (100%) rename {common => packer-plugin-sdk}/commonsteps/iso_config_test.go (100%) rename {common => packer-plugin-sdk}/commonsteps/multistep_debug.go (100%) rename {common => packer-plugin-sdk}/commonsteps/multistep_runner.go (98%) rename {common => packer-plugin-sdk}/commonsteps/step_cleanup_temp_keys.go (100%) rename {common => packer-plugin-sdk}/commonsteps/step_create_cdrom.go (99%) rename {common => packer-plugin-sdk}/commonsteps/step_create_cdrom_test.go (100%) rename {common => packer-plugin-sdk}/commonsteps/step_create_floppy.go (100%) rename {common => packer-plugin-sdk}/commonsteps/step_create_floppy_test.go (100%) rename {common => packer-plugin-sdk}/commonsteps/step_download.go (99%) rename {common => packer-plugin-sdk}/commonsteps/step_download_test.go (100%) rename {common => packer-plugin-sdk}/commonsteps/step_http_server.go (96%) rename {common => packer-plugin-sdk}/commonsteps/step_output_dir.go (100%) rename {common => packer-plugin-sdk}/commonsteps/step_output_dir_test.go (100%) rename {common => packer-plugin-sdk}/commonsteps/step_provision.go (100%) rename {common => packer-plugin-sdk}/commonsteps/step_provision_test.go (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/SomeDir/myfile.txt (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-0/file1 (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-0/file2 (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-0/file3 (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/root/another.txt (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/root/another.txt.sha1sum (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/root/basic.txt (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/root/basic.txt.sha1sum (100%) rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/root/subfolder.sum (100%) rename {common => packer-plugin-sdk}/filelock/doc.go (100%) rename {common => packer-plugin-sdk}/filelock/filelock.go (100%) rename {common => packer-plugin-sdk}/filelock/filelock_solaris.go (100%) rename {common => packer-plugin-sdk}/filelock/noop.go (100%) rename {common => packer-plugin-sdk}/guestexec/doc.go (100%) rename {common => packer-plugin-sdk}/guestexec/elevated.go (99%) rename {common => packer-plugin-sdk}/guestexec/elevated_test.go (100%) rename {common => packer-plugin-sdk}/guestexec/guest_commands.go (100%) rename {common => packer-plugin-sdk}/guestexec/guest_commands_test.go (100%) rename {common => packer-plugin-sdk}/iochan/iochan.go (100%) rename {common => packer-plugin-sdk}/iochan/iochan_test.go (100%) rename {common => packer-plugin-sdk}/json/unmarshal.go (100%) rename {common => packer-plugin-sdk}/json/unmarshal_test.go (100%) rename {common => packer-plugin-sdk}/net/configure_port.go (96%) rename {common => packer-plugin-sdk}/net/configure_port_test.go (100%) rename {common => packer-plugin-sdk}/net/default_client.go (100%) rename {common => packer-plugin-sdk}/packerbuilderdata/generated_data.go (100%) rename {common => packer-plugin-sdk}/packerbuilderdata/generated_data_test.go (100%) rename {common => packer-plugin-sdk}/random/string.go (100%) rename {common => packer-plugin-sdk}/retry/retry.go (100%) rename {common => packer-plugin-sdk}/retry/retry_test.go (100%) rename {common => packer-plugin-sdk}/retry/utils_test.go (100%) rename {common => packer-plugin-sdk}/shell-local/communicator.go (100%) rename {common => packer-plugin-sdk}/shell-local/communicator_test.go (100%) rename {common => packer-plugin-sdk}/shell-local/config.go (99%) rename {common => packer-plugin-sdk}/shell-local/config.hcl2spec.go (100%) rename {common => packer-plugin-sdk}/shell-local/config_test.go (100%) rename {common => packer-plugin-sdk}/shell-local/doc.go (100%) rename {common => packer-plugin-sdk}/shell-local/localexec/run_and_stream.go (97%) rename {common => packer-plugin-sdk}/shell-local/localexec/run_and_stream_test.go (100%) rename {common => packer-plugin-sdk}/shell-local/run.go (99%) rename {common => packer-plugin-sdk}/shell/exit_code.go (100%) rename {common => packer-plugin-sdk}/shell/exit_code_test.go (100%) rename {common => packer-plugin-sdk}/shell/shell.go (97%) rename {common => packer-plugin-sdk}/shutdowncommand/config.go (100%) rename {common => packer-plugin-sdk}/shutdowncommand/config_test.go (100%) rename {common => packer-plugin-sdk}/template/funcs.go (100%) create mode 100644 packer-plugin-sdk/test-fixtures/SomeDir/myfile.txt rename {common => packer-plugin-sdk}/test-fixtures/decompress-tar/outside_parent.tar (100%) rename {common => packer-plugin-sdk}/test-fixtures/floppies/bar.bat (100%) rename {common => packer-plugin-sdk}/test-fixtures/floppies/foo.ps1 (100%) create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file1 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file2 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file3 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file1 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file2 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file3 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/file1 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 rename {common => packer-plugin-sdk}/uuid/uuid.go (100%) rename {common => packer-plugin-sdk}/uuid/uuid_test.go (100%) rename website/pages/partials/{common => packer-plugin-sdk}/bootcommand/BootConfig-not-required.mdx (94%) rename website/pages/partials/{common => packer-plugin-sdk}/bootcommand/BootConfig.mdx (98%) rename website/pages/partials/{common => packer-plugin-sdk}/bootcommand/VNCConfig-not-required.mdx (81%) rename website/pages/partials/{common => packer-plugin-sdk}/bootcommand/VNCConfig.mdx (87%) rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/CDConfig-not-required.mdx (95%) rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/CDConfig.mdx (86%) rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/FloppyConfig-not-required.mdx (92%) rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/FloppyConfig.mdx (88%) rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/HTTPConfig-not-required.mdx (93%) rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/HTTPConfig.mdx (83%) rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/ISOConfig-not-required.mdx (91%) rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/ISOConfig-required.mdx (94%) rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/ISOConfig.mdx (95%) rename website/pages/partials/{common => packer-plugin-sdk}/shutdowncommand/ShutdownConfig-not-required.mdx (92%) create mode 100644 website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig.mdx diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 71f86e553..7acea7daf 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -259,7 +259,7 @@ does not attempt to track the latest version for each dependency. #### Code generation Packer relies on `go generate` to generate a [peg parser for boot -commands](https://github.com/hashicorp/packer/blob/master/common/bootcommand/boot_command.go), +commands](https://github.com/hashicorp/packer/blob/master/packer-plugin-sdk/bootcommand/boot_command.go), [docs](https://github.com/hashicorp/packer/blob/master/website/pages/partials/builder/amazon/chroot/_Config-not-required.mdx) and HCL2's bridging code. Packer's testing suite will run `make check-generate` to check that all the generated files Packer needs are what they should be. diff --git a/Makefile b/Makefile index 589dde035..f4d375843 100644 --- a/Makefile +++ b/Makefile @@ -123,9 +123,9 @@ generate: install-gen-deps ## Generate dynamically generated code @echo "==> removing autogenerated markdown..." @find website/pages/ -type f | xargs grep -l '^ + - `boot_keygroup_interval` (duration string | ex: "1h5m2s") - Time to wait after sending a group of key pressses. The value of this should be a duration. Examples are `5s` and `1m30s` which will cause diff --git a/website/pages/partials/common/bootcommand/BootConfig.mdx b/website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig.mdx similarity index 98% rename from website/pages/partials/common/bootcommand/BootConfig.mdx rename to website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig.mdx index f8115899c..8d41f834f 100644 --- a/website/pages/partials/common/bootcommand/BootConfig.mdx +++ b/website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig.mdx @@ -1,4 +1,4 @@ - + The boot configuration is very important: `boot_command` specifies the keys to type when the virtual machine is first booted in order to start the OS diff --git a/website/pages/partials/common/bootcommand/VNCConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx similarity index 81% rename from website/pages/partials/common/bootcommand/VNCConfig-not-required.mdx rename to website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx index 6c532fd4f..008fdb54a 100644 --- a/website/pages/partials/common/bootcommand/VNCConfig-not-required.mdx +++ b/website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `disable_vnc` (bool) - Whether to create a VNC connection or not. A boot_command cannot be used when this is true. Defaults to false. diff --git a/website/pages/partials/common/bootcommand/VNCConfig.mdx b/website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig.mdx similarity index 87% rename from website/pages/partials/common/bootcommand/VNCConfig.mdx rename to website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig.mdx index 34a6748ac..f539a6590 100644 --- a/website/pages/partials/common/bootcommand/VNCConfig.mdx +++ b/website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig.mdx @@ -1,4 +1,4 @@ - + The boot command "typed" character for character over a VNC connection to the machine, simulating a human actually typing the keyboard. diff --git a/website/pages/partials/common/commonsteps/CDConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx similarity index 95% rename from website/pages/partials/common/commonsteps/CDConfig-not-required.mdx rename to website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx index 9fc2cdc23..9486e4f03 100644 --- a/website/pages/partials/common/commonsteps/CDConfig-not-required.mdx +++ b/website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `cd_files` ([]string) - A list of files to place onto a CD that is attached when the VM is booted. This can include either files or directories; any directories diff --git a/website/pages/partials/common/commonsteps/CDConfig.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig.mdx similarity index 86% rename from website/pages/partials/common/commonsteps/CDConfig.mdx rename to website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig.mdx index a139db6a4..e861c99f0 100644 --- a/website/pages/partials/common/commonsteps/CDConfig.mdx +++ b/website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig.mdx @@ -1,4 +1,4 @@ - + An iso (CD) containing custom files can be made available for your build. diff --git a/website/pages/partials/common/commonsteps/FloppyConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx similarity index 92% rename from website/pages/partials/common/commonsteps/FloppyConfig-not-required.mdx rename to website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx index c81d3f61f..c261f96e2 100644 --- a/website/pages/partials/common/commonsteps/FloppyConfig-not-required.mdx +++ b/website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `floppy_files` ([]string) - A list of files to place onto a floppy disk that is attached when the VM is booted. Currently, no support exists for creating sub-directories on diff --git a/website/pages/partials/common/commonsteps/FloppyConfig.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig.mdx similarity index 88% rename from website/pages/partials/common/commonsteps/FloppyConfig.mdx rename to website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig.mdx index 8db59da19..a6474cf6e 100644 --- a/website/pages/partials/common/commonsteps/FloppyConfig.mdx +++ b/website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig.mdx @@ -1,4 +1,4 @@ - + A floppy can be made available for your build. This is most useful for unattended Windows installs, which look for an Autounattend.xml file on diff --git a/website/pages/partials/common/commonsteps/HTTPConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx similarity index 93% rename from website/pages/partials/common/commonsteps/HTTPConfig-not-required.mdx rename to website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx index aece4b6de..82bf23690 100644 --- a/website/pages/partials/common/commonsteps/HTTPConfig-not-required.mdx +++ b/website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `http_directory` (string) - Path to a directory to serve using an HTTP server. The files in this directory will be available over HTTP that will be requestable from the diff --git a/website/pages/partials/common/commonsteps/HTTPConfig.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig.mdx similarity index 83% rename from website/pages/partials/common/commonsteps/HTTPConfig.mdx rename to website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig.mdx index f841432a8..8fad89d65 100644 --- a/website/pages/partials/common/commonsteps/HTTPConfig.mdx +++ b/website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig.mdx @@ -1,4 +1,4 @@ - + Packer will create an http server serving `http_directory` when it is set, a random free port will be selected and the architecture of the directory diff --git a/website/pages/partials/common/commonsteps/ISOConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx similarity index 91% rename from website/pages/partials/common/commonsteps/ISOConfig-not-required.mdx rename to website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx index 9d0744786..60e976cbb 100644 --- a/website/pages/partials/common/commonsteps/ISOConfig-not-required.mdx +++ b/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `iso_urls` ([]string) - Multiple URLs for the ISO to download. Packer will try these in order. If anything goes wrong attempting to download or while downloading a diff --git a/website/pages/partials/common/commonsteps/ISOConfig-required.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-required.mdx similarity index 94% rename from website/pages/partials/common/commonsteps/ISOConfig-required.mdx rename to website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-required.mdx index a2c27df83..5e6624577 100644 --- a/website/pages/partials/common/commonsteps/ISOConfig-required.mdx +++ b/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-required.mdx @@ -1,4 +1,4 @@ - + - `iso_checksum` (string) - The checksum for the ISO file or virtual hard drive file. The type of the checksum is specified within the checksum field as a prefix, ex: diff --git a/website/pages/partials/common/commonsteps/ISOConfig.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig.mdx similarity index 95% rename from website/pages/partials/common/commonsteps/ISOConfig.mdx rename to website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig.mdx index 548bffa0b..5e55a847e 100644 --- a/website/pages/partials/common/commonsteps/ISOConfig.mdx +++ b/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig.mdx @@ -1,4 +1,4 @@ - + By default, Packer will symlink, download or copy image files to the Packer cache into a "`hash($iso_url+$iso_checksum).$iso_target_extension`" file. diff --git a/website/pages/partials/common/shutdowncommand/ShutdownConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx similarity index 92% rename from website/pages/partials/common/shutdowncommand/ShutdownConfig-not-required.mdx rename to website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx index 2b705dd61..0cd262f0d 100644 --- a/website/pages/partials/common/shutdowncommand/ShutdownConfig-not-required.mdx +++ b/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `shutdown_command` (string) - The command to use to gracefully shut down the machine once all provisioning is complete. By default this is an empty string, which diff --git a/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig.mdx b/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig.mdx new file mode 100644 index 000000000..e958c8ca3 --- /dev/null +++ b/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig.mdx @@ -0,0 +1,9 @@ + + +ShutdownConfig defines implementation details for shutting down a VM once it +is done provisioned. +It is provided as a convenience to encourage builder developers to +consider implementing these options, which we believe are valuable for all +builders. It also helps guarantee that option names for similar options +are the same across the various builders. Embed it in your builder config +using the `mapstructure:",squash"` struct tag. From 3f6deb8828e793958cec4bb0902ef3b609a033c4 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Tue, 17 Nov 2020 16:31:03 -0800 Subject: [PATCH 81/93] move multistep into the plugin sdk --- builder/alicloud/ecs/builder.go | 4 ++-- builder/alicloud/ecs/packer_helper.go | 2 +- builder/alicloud/ecs/ssh_helper.go | 2 +- builder/alicloud/ecs/step_attach_keypair.go | 2 +- builder/alicloud/ecs/step_check_source_image.go | 2 +- builder/alicloud/ecs/step_config_eip.go | 2 +- builder/alicloud/ecs/step_config_key_pair.go | 2 +- builder/alicloud/ecs/step_config_public_ip.go | 2 +- builder/alicloud/ecs/step_config_security_group.go | 2 +- builder/alicloud/ecs/step_config_vpc.go | 2 +- builder/alicloud/ecs/step_config_vswitch.go | 2 +- builder/alicloud/ecs/step_create_image.go | 2 +- builder/alicloud/ecs/step_create_instance.go | 2 +- builder/alicloud/ecs/step_create_snapshot.go | 2 +- builder/alicloud/ecs/step_create_tags.go | 2 +- builder/alicloud/ecs/step_delete_images_snapshots.go | 2 +- builder/alicloud/ecs/step_pre_validate.go | 2 +- builder/alicloud/ecs/step_region_copy_image.go | 2 +- builder/alicloud/ecs/step_run_instance.go | 2 +- builder/alicloud/ecs/step_share_image.go | 2 +- builder/alicloud/ecs/step_stop_instance.go | 2 +- builder/amazon/chroot/builder.go | 4 ++-- builder/amazon/chroot/step_attach_volume.go | 2 +- builder/amazon/chroot/step_check_root_device.go | 2 +- builder/amazon/chroot/step_create_volume.go | 2 +- builder/amazon/chroot/step_early_unflock.go | 2 +- builder/amazon/chroot/step_flock.go | 2 +- builder/amazon/chroot/step_instance_info.go | 2 +- builder/amazon/chroot/step_mount_device.go | 2 +- builder/amazon/chroot/step_prepare_device.go | 2 +- builder/amazon/chroot/step_register_ami.go | 2 +- builder/amazon/chroot/step_snapshot.go | 2 +- builder/amazon/common/interpolate_build_info.go | 2 +- builder/amazon/common/interpolate_build_info_test.go | 2 +- builder/amazon/common/ssh.go | 2 +- builder/amazon/common/ssh_test.go | 2 +- builder/amazon/common/state.go | 2 +- builder/amazon/common/step_ami_region_copy.go | 2 +- builder/amazon/common/step_ami_region_copy_test.go | 2 +- builder/amazon/common/step_cleanup_volumes.go | 2 +- builder/amazon/common/step_create_ssm_tunnel.go | 2 +- builder/amazon/common/step_create_tags.go | 2 +- builder/amazon/common/step_deregister_ami.go | 2 +- builder/amazon/common/step_get_password.go | 2 +- builder/amazon/common/step_iam_instance_profile.go | 2 +- builder/amazon/common/step_key_pair.go | 2 +- builder/amazon/common/step_modify_ami_attributes.go | 2 +- builder/amazon/common/step_modify_ebs_instance.go | 2 +- builder/amazon/common/step_network_info.go | 2 +- builder/amazon/common/step_pre_validate.go | 2 +- builder/amazon/common/step_run_source_instance.go | 2 +- builder/amazon/common/step_run_spot_instance.go | 2 +- builder/amazon/common/step_run_spot_instance_test.go | 2 +- builder/amazon/common/step_security_group.go | 2 +- builder/amazon/common/step_set_generated_data.go | 2 +- builder/amazon/common/step_source_ami_info.go | 2 +- builder/amazon/common/step_stop_ebs_instance.go | 2 +- builder/amazon/common/tags.go | 2 +- builder/amazon/ebs/builder.go | 4 ++-- builder/amazon/ebs/step_create_ami.go | 2 +- builder/amazon/ebssurrogate/builder.go | 4 ++-- builder/amazon/ebssurrogate/step_register_ami.go | 2 +- builder/amazon/ebssurrogate/step_snapshot_volumes.go | 2 +- builder/amazon/ebsvolume/builder.go | 4 ++-- builder/amazon/ebsvolume/step_tag_ebs_volumes.go | 2 +- builder/amazon/instance/builder.go | 4 ++-- builder/amazon/instance/step_bundle_volume.go | 2 +- builder/amazon/instance/step_register_ami.go | 2 +- builder/amazon/instance/step_upload_bundle.go | 2 +- builder/amazon/instance/step_upload_x509_cert.go | 2 +- builder/azure/arm/builder.go | 4 ++-- builder/azure/arm/step.go | 2 +- builder/azure/arm/step_capture_image.go | 2 +- builder/azure/arm/step_capture_image_test.go | 2 +- builder/azure/arm/step_certificate_in_keyvault.go | 2 +- builder/azure/arm/step_certificate_in_keyvault_test.go | 2 +- builder/azure/arm/step_create_resource_group.go | 2 +- builder/azure/arm/step_create_resource_group_test.go | 2 +- builder/azure/arm/step_delete_additional_disks.go | 2 +- builder/azure/arm/step_delete_additional_disks_test.go | 2 +- builder/azure/arm/step_deploy_template.go | 2 +- builder/azure/arm/step_deploy_template_test.go | 2 +- builder/azure/arm/step_get_additional_disks.go | 2 +- builder/azure/arm/step_get_additional_disks_test.go | 2 +- builder/azure/arm/step_get_certificate.go | 2 +- builder/azure/arm/step_get_certificate_test.go | 2 +- builder/azure/arm/step_get_ip_address.go | 2 +- builder/azure/arm/step_get_ip_address_test.go | 2 +- builder/azure/arm/step_get_os_disk.go | 2 +- builder/azure/arm/step_get_os_disk_test.go | 2 +- builder/azure/arm/step_power_off_compute.go | 2 +- builder/azure/arm/step_power_off_compute_test.go | 2 +- builder/azure/arm/step_publish_to_shared_image_gallery.go | 2 +- .../azure/arm/step_publish_to_shared_image_gallery_test.go | 2 +- builder/azure/arm/step_set_certificate.go | 2 +- builder/azure/arm/step_set_certificate_test.go | 2 +- builder/azure/arm/step_snapshot_data_disks.go | 2 +- builder/azure/arm/step_snapshot_data_disks_test.go | 2 +- builder/azure/arm/step_snapshot_os_disk.go | 2 +- builder/azure/arm/step_snapshot_os_disk_test.go | 2 +- builder/azure/arm/step_test.go | 2 +- builder/azure/arm/step_validate_template.go | 2 +- builder/azure/arm/step_validate_template_test.go | 2 +- builder/azure/chroot/builder.go | 4 ++-- builder/azure/chroot/builder_test.go | 2 +- builder/azure/chroot/step_attach_disk.go | 2 +- builder/azure/chroot/step_attach_disk_test.go | 2 +- builder/azure/chroot/step_create_image.go | 2 +- builder/azure/chroot/step_create_image_test.go | 2 +- builder/azure/chroot/step_create_new_diskset.go | 2 +- builder/azure/chroot/step_create_new_diskset_test.go | 2 +- builder/azure/chroot/step_create_shared_image_version.go | 2 +- builder/azure/chroot/step_create_shared_image_version_test.go | 2 +- builder/azure/chroot/step_create_snapshotset.go | 2 +- builder/azure/chroot/step_create_snapshotset_test.go | 2 +- builder/azure/chroot/step_mount_device.go | 2 +- builder/azure/chroot/step_mount_device_test.go | 2 +- builder/azure/chroot/step_resolve_plaform_image_version.go | 2 +- .../azure/chroot/step_resolve_plaform_image_version_test.go | 2 +- builder/azure/chroot/step_verify_shared_image_destination.go | 2 +- .../azure/chroot/step_verify_shared_image_destination_test.go | 2 +- builder/azure/chroot/step_verify_shared_image_source.go | 2 +- builder/azure/chroot/step_verify_shared_image_source_test.go | 2 +- builder/azure/chroot/step_verify_source_disk.go | 2 +- builder/azure/chroot/step_verify_source_disk_test.go | 2 +- builder/azure/common/lin/ssh.go | 2 +- builder/azure/common/state_bag.go | 2 +- builder/azure/dtl/builder.go | 4 ++-- builder/azure/dtl/step.go | 2 +- builder/azure/dtl/step_capture_image.go | 2 +- builder/azure/dtl/step_delete_virtual_machine.go | 2 +- builder/azure/dtl/step_deploy_template.go | 2 +- builder/azure/dtl/step_power_off_compute.go | 2 +- builder/azure/dtl/step_publish_to_shared_image_gallery.go | 2 +- builder/azure/dtl/step_save_winrm_password.go | 2 +- builder/azure/dtl/step_test.go | 2 +- builder/cloudstack/builder.go | 4 ++-- builder/cloudstack/config.go | 2 +- builder/cloudstack/ssh.go | 2 +- builder/cloudstack/step_configure_networking.go | 2 +- builder/cloudstack/step_create_instance.go | 2 +- builder/cloudstack/step_create_security_group.go | 2 +- builder/cloudstack/step_create_template.go | 2 +- builder/cloudstack/step_detach_iso.go | 2 +- builder/cloudstack/step_keypair.go | 2 +- builder/cloudstack/step_prepare_config.go | 2 +- builder/cloudstack/step_shutdown_instance.go | 2 +- builder/digitalocean/builder.go | 4 ++-- builder/digitalocean/step_create_droplet.go | 2 +- builder/digitalocean/step_create_ssh_key.go | 2 +- builder/digitalocean/step_droplet_info.go | 2 +- builder/digitalocean/step_power_off.go | 2 +- builder/digitalocean/step_shutdown.go | 2 +- builder/digitalocean/step_snapshot.go | 2 +- builder/docker/builder.go | 4 ++-- builder/docker/comm.go | 2 +- builder/docker/step_commit.go | 2 +- builder/docker/step_commit_test.go | 2 +- builder/docker/step_connect_docker.go | 2 +- builder/docker/step_export.go | 2 +- builder/docker/step_export_test.go | 2 +- builder/docker/step_pull.go | 2 +- builder/docker/step_pull_test.go | 2 +- builder/docker/step_run.go | 2 +- builder/docker/step_run_test.go | 2 +- builder/docker/step_set_generated_data.go | 2 +- builder/docker/step_set_generated_data_test.go | 2 +- builder/docker/step_temp_dir.go | 2 +- builder/docker/step_temp_dir_test.go | 2 +- builder/docker/step_test.go | 2 +- builder/file/builder.go | 2 +- builder/googlecompute/builder.go | 4 ++-- builder/googlecompute/step_check_existing_image.go | 2 +- builder/googlecompute/step_check_existing_image_test.go | 2 +- builder/googlecompute/step_create_image.go | 2 +- builder/googlecompute/step_create_image_test.go | 2 +- builder/googlecompute/step_create_instance.go | 2 +- builder/googlecompute/step_create_instance_test.go | 2 +- builder/googlecompute/step_create_windows_password.go | 2 +- builder/googlecompute/step_create_windows_password_test.go | 2 +- builder/googlecompute/step_import_os_login_ssh_key.go | 2 +- builder/googlecompute/step_import_os_login_ssh_key_test.go | 2 +- builder/googlecompute/step_instance_info.go | 2 +- builder/googlecompute/step_instance_info_test.go | 2 +- builder/googlecompute/step_start_tunnel.go | 2 +- builder/googlecompute/step_teardown_instance.go | 2 +- builder/googlecompute/step_teardown_instance_test.go | 2 +- builder/googlecompute/step_test.go | 2 +- builder/googlecompute/step_wait_startup_script.go | 2 +- builder/googlecompute/step_wait_startup_script_test.go | 2 +- builder/googlecompute/winrm.go | 2 +- builder/hcloud/builder.go | 4 ++-- builder/hcloud/config.go | 2 +- builder/hcloud/step_create_server.go | 2 +- builder/hcloud/step_create_snapshot.go | 2 +- builder/hcloud/step_create_sshkey.go | 2 +- builder/hcloud/step_shutdown_server.go | 2 +- builder/hyperone/builder.go | 4 ++-- builder/hyperone/config.go | 2 +- builder/hyperone/step_chroot_provision.go | 4 ++-- builder/hyperone/step_copy_files.go | 2 +- builder/hyperone/step_create_image.go | 2 +- builder/hyperone/step_create_ssh_key.go | 2 +- builder/hyperone/step_create_vm.go | 2 +- builder/hyperone/step_create_vm_from_disk.go | 2 +- builder/hyperone/step_detach_disk.go | 2 +- builder/hyperone/step_mount_chroot.go | 2 +- builder/hyperone/step_mount_extra.go | 2 +- builder/hyperone/step_post_mount_commands.go | 2 +- builder/hyperone/step_pre_mount_commands.go | 2 +- builder/hyperone/step_prepare_device.go | 2 +- builder/hyperone/step_stop_vm.go | 2 +- builder/hyperone/utils.go | 2 +- builder/hyperv/common/config.go | 2 +- builder/hyperv/common/ssh.go | 2 +- builder/hyperv/common/step_clone_vm.go | 2 +- builder/hyperv/common/step_collate_artifacts.go | 2 +- builder/hyperv/common/step_collate_artifacts_test.go | 2 +- builder/hyperv/common/step_compact_disk.go | 2 +- builder/hyperv/common/step_compact_disk_test.go | 2 +- builder/hyperv/common/step_configure_ip.go | 2 +- builder/hyperv/common/step_configure_vlan.go | 2 +- builder/hyperv/common/step_create_build_dir.go | 2 +- builder/hyperv/common/step_create_build_dir_test.go | 2 +- builder/hyperv/common/step_create_external_switch.go | 2 +- builder/hyperv/common/step_create_switch.go | 2 +- builder/hyperv/common/step_create_vm.go | 2 +- builder/hyperv/common/step_create_vm_test.go | 2 +- builder/hyperv/common/step_disable_vlan.go | 2 +- builder/hyperv/common/step_enable_integration_service.go | 2 +- builder/hyperv/common/step_export_vm.go | 2 +- builder/hyperv/common/step_export_vm_test.go | 2 +- builder/hyperv/common/step_mount_dvddrive.go | 2 +- builder/hyperv/common/step_mount_floppydrive.go | 2 +- builder/hyperv/common/step_mount_guest_additions.go | 2 +- builder/hyperv/common/step_mount_secondary_dvd_images.go | 2 +- builder/hyperv/common/step_polling_installation.go | 2 +- builder/hyperv/common/step_reboot_vm.go | 2 +- builder/hyperv/common/step_run.go | 2 +- builder/hyperv/common/step_set_boot_order.go | 2 +- builder/hyperv/common/step_set_boot_order_test.go | 2 +- builder/hyperv/common/step_set_first_boot_device.go | 2 +- builder/hyperv/common/step_set_first_boot_device_test.go | 2 +- builder/hyperv/common/step_shutdown.go | 2 +- builder/hyperv/common/step_sleep.go | 2 +- builder/hyperv/common/step_test.go | 2 +- builder/hyperv/common/step_type_boot_command.go | 2 +- builder/hyperv/common/step_unmount_dvddrive.go | 2 +- builder/hyperv/common/step_unmount_floppydrive.go | 2 +- builder/hyperv/common/step_unmount_guest_additions.go | 2 +- builder/hyperv/common/step_unmount_secondary_dvd_images.go | 2 +- builder/hyperv/common/step_wait_for_install_to_complete.go | 2 +- builder/hyperv/iso/builder.go | 4 ++-- builder/hyperv/iso/builder_test.go | 2 +- builder/hyperv/vmcx/builder.go | 4 ++-- builder/hyperv/vmcx/builder_test.go | 2 +- builder/jdcloud/builder.go | 4 ++-- builder/jdcloud/common.go | 2 +- builder/jdcloud/step_config_credentials.go | 2 +- builder/jdcloud/step_create_image.go | 2 +- builder/jdcloud/step_create_instance.go | 2 +- builder/jdcloud/step_stop_instance.go | 2 +- builder/jdcloud/step_validate_parameters.go | 2 +- builder/linode/builder.go | 4 ++-- builder/linode/step_create_image.go | 2 +- builder/linode/step_create_linode.go | 2 +- builder/linode/step_create_ssh_key.go | 2 +- builder/linode/step_shutdown_linode.go | 2 +- builder/lxc/builder.go | 4 ++-- builder/lxc/step_export.go | 2 +- builder/lxc/step_lxc_create.go | 2 +- builder/lxc/step_prepare_output_dir.go | 2 +- builder/lxc/step_provision.go | 4 ++-- builder/lxc/step_wait_init.go | 2 +- builder/lxd/builder.go | 4 ++-- builder/lxd/step_lxd_launch.go | 2 +- builder/lxd/step_provision.go | 4 ++-- builder/lxd/step_publish.go | 2 +- builder/ncloud/builder.go | 4 ++-- builder/ncloud/step.go | 2 +- builder/ncloud/step_create_block_storage_instance.go | 2 +- builder/ncloud/step_create_block_storage_instance_test.go | 2 +- builder/ncloud/step_create_login_key.go | 2 +- builder/ncloud/step_create_login_key_test.go | 2 +- builder/ncloud/step_create_public_ip_instance.go | 2 +- builder/ncloud/step_create_public_ip_instance_test.go | 2 +- builder/ncloud/step_create_server_image.go | 2 +- builder/ncloud/step_create_server_image_test.go | 2 +- builder/ncloud/step_create_server_instance.go | 2 +- builder/ncloud/step_create_server_instance_test.go | 2 +- builder/ncloud/step_delete_block_storage_instance.go | 2 +- builder/ncloud/step_delete_block_storage_instance_test.go | 2 +- builder/ncloud/step_get_rootpassword.go | 2 +- builder/ncloud/step_get_rootpassword_test.go | 2 +- builder/ncloud/step_stop_server_instance.go | 2 +- builder/ncloud/step_stop_server_instance_test.go | 2 +- builder/ncloud/step_terminate_server_instance.go | 2 +- builder/ncloud/step_terminate_server_instance_test.go | 2 +- builder/ncloud/step_validate_template.go | 2 +- builder/ncloud/step_validate_template_test.go | 2 +- builder/null/builder.go | 4 ++-- builder/null/ssh.go | 2 +- builder/oneandone/builder.go | 4 ++-- builder/oneandone/step_create_server.go | 2 +- builder/oneandone/step_create_sshkey.go | 2 +- builder/oneandone/step_take_snapshot.go | 2 +- builder/openstack/builder.go | 4 ++-- builder/openstack/server.go | 2 +- builder/openstack/ssh.go | 2 +- builder/openstack/step_add_image_members.go | 2 +- builder/openstack/step_allocate_ip.go | 2 +- builder/openstack/step_create_image.go | 2 +- builder/openstack/step_create_volume.go | 2 +- builder/openstack/step_detach_volume.go | 2 +- builder/openstack/step_discover_network.go | 2 +- builder/openstack/step_get_password.go | 2 +- builder/openstack/step_key_pair.go | 2 +- builder/openstack/step_load_flavor.go | 2 +- builder/openstack/step_run_source_server.go | 2 +- builder/openstack/step_source_image_info.go | 2 +- builder/openstack/step_stop_server.go | 2 +- builder/openstack/step_update_image_mindisk.go | 2 +- builder/openstack/step_update_image_tags.go | 2 +- builder/openstack/step_update_image_visibility.go | 2 +- builder/openstack/step_wait_for_rackconnect.go | 2 +- builder/oracle/classic/builder.go | 4 ++-- builder/oracle/classic/step_add_keys.go | 2 +- builder/oracle/classic/step_attach_volume.go | 2 +- builder/oracle/classic/step_connect_builder.go | 2 +- builder/oracle/classic/step_create_image.go | 2 +- builder/oracle/classic/step_create_instance.go | 2 +- builder/oracle/classic/step_create_ip_reservation.go | 2 +- builder/oracle/classic/step_create_persistent_volume.go | 2 +- builder/oracle/classic/step_create_pv_builder.go | 2 +- builder/oracle/classic/step_create_pv_master.go | 2 +- builder/oracle/classic/step_list_images.go | 2 +- builder/oracle/classic/step_security.go | 2 +- builder/oracle/classic/step_snapshot.go | 2 +- builder/oracle/classic/step_terminate_pv_master.go | 2 +- builder/oracle/classic/step_upload_image.go | 2 +- builder/oracle/common/step_ssh_key_pair.go | 2 +- builder/oracle/oci/builder.go | 4 ++-- builder/oracle/oci/step_create_instance.go | 2 +- builder/oracle/oci/step_create_instance_test.go | 2 +- builder/oracle/oci/step_get_default_credentials.go | 2 +- builder/oracle/oci/step_image.go | 2 +- builder/oracle/oci/step_image_test.go | 2 +- builder/oracle/oci/step_instance_info.go | 2 +- builder/oracle/oci/step_instance_info_test.go | 2 +- builder/oracle/oci/step_test.go | 2 +- builder/osc/bsu/builder.go | 4 ++-- builder/osc/bsu/step_create_omi.go | 2 +- builder/osc/bsusurrogate/builder.go | 4 ++-- builder/osc/bsusurrogate/step_register_omi.go | 2 +- builder/osc/bsusurrogate/step_snapshop_volumes.go | 2 +- builder/osc/bsuvolume/builder.go | 4 ++-- builder/osc/bsuvolume/step_tag_bsu_volumes.go | 2 +- builder/osc/chroot/builder.go | 4 ++-- builder/osc/chroot/cleanup.go | 2 +- builder/osc/chroot/step_check_root_device.go | 2 +- builder/osc/chroot/step_chroot_provision.go | 4 ++-- builder/osc/chroot/step_copy_files.go | 2 +- builder/osc/chroot/step_create_omi.go | 2 +- builder/osc/chroot/step_create_volume.go | 2 +- builder/osc/chroot/step_early_cleanup.go | 2 +- builder/osc/chroot/step_early_unflock.go | 2 +- builder/osc/chroot/step_flock.go | 2 +- builder/osc/chroot/step_link_volume.go | 2 +- builder/osc/chroot/step_mount_device.go | 2 +- builder/osc/chroot/step_mount_extra.go | 2 +- builder/osc/chroot/step_post_mount_commands.go | 2 +- builder/osc/chroot/step_pre_mount_commands.go | 2 +- builder/osc/chroot/step_prepare_device.go | 2 +- builder/osc/chroot/step_snapshot.go | 2 +- builder/osc/chroot/step_vm_info.go | 2 +- builder/osc/common/interpolate_build_info.go | 2 +- builder/osc/common/interpolate_build_info_test.go | 2 +- builder/osc/common/ssh.go | 2 +- builder/osc/common/step_cleanup_volumes.go | 2 +- builder/osc/common/step_create_tags.go | 2 +- builder/osc/common/step_deregister_omi.go | 2 +- builder/osc/common/step_get_password.go | 2 +- builder/osc/common/step_key_pair.go | 2 +- builder/osc/common/step_network_info.go | 2 +- builder/osc/common/step_pre_validate.go | 2 +- builder/osc/common/step_public_ip.go | 2 +- builder/osc/common/step_run_source_vm.go | 2 +- builder/osc/common/step_security_group.go | 2 +- builder/osc/common/step_source_omi_info.go | 2 +- builder/osc/common/step_stop_bsu_backed_vm.go | 2 +- builder/osc/common/step_update_bsu_vm.go | 2 +- builder/osc/common/step_update_omi.go | 2 +- builder/osc/common/tags.go | 2 +- builder/parallels/common/ssh.go | 2 +- builder/parallels/common/step_attach_floppy.go | 2 +- builder/parallels/common/step_attach_floppy_test.go | 2 +- builder/parallels/common/step_attach_parallels_tools.go | 2 +- builder/parallels/common/step_compact_disk.go | 2 +- builder/parallels/common/step_compact_disk_test.go | 2 +- builder/parallels/common/step_output_dir.go | 2 +- builder/parallels/common/step_output_dir_test.go | 2 +- builder/parallels/common/step_prepare_parallels_tools.go | 2 +- builder/parallels/common/step_prepare_parallels_tools_test.go | 2 +- builder/parallels/common/step_prlctl.go | 2 +- builder/parallels/common/step_run.go | 2 +- builder/parallels/common/step_shutdown.go | 2 +- builder/parallels/common/step_shutdown_test.go | 2 +- builder/parallels/common/step_test.go | 2 +- builder/parallels/common/step_type_boot_command.go | 2 +- builder/parallels/common/step_upload_parallels_tools.go | 2 +- builder/parallels/common/step_upload_parallels_tools_test.go | 2 +- builder/parallels/common/step_upload_version.go | 2 +- builder/parallels/common/step_upload_version_test.go | 2 +- builder/parallels/iso/builder.go | 4 ++-- builder/parallels/iso/step_attach_iso.go | 2 +- builder/parallels/iso/step_create_disk.go | 2 +- builder/parallels/iso/step_create_vm.go | 2 +- builder/parallels/iso/step_set_boot_order.go | 2 +- builder/parallels/pvm/builder.go | 4 ++-- builder/parallels/pvm/config.go | 2 +- builder/parallels/pvm/step_import.go | 2 +- builder/parallels/pvm/step_test.go | 2 +- builder/profitbricks/builder.go | 4 ++-- builder/profitbricks/step_create_server.go | 2 +- builder/profitbricks/step_create_ssh_key.go | 2 +- builder/profitbricks/step_take_snapshot.go | 2 +- builder/proxmox/clone/builder.go | 2 +- builder/proxmox/clone/step_ssh_key_pair.go | 2 +- builder/proxmox/common/builder.go | 4 ++-- builder/proxmox/common/config.go | 2 +- builder/proxmox/common/step_convert_to_template.go | 2 +- builder/proxmox/common/step_convert_to_template_test.go | 2 +- builder/proxmox/common/step_finalize_template_config.go | 2 +- builder/proxmox/common/step_finalize_template_config_test.go | 2 +- builder/proxmox/common/step_start_vm.go | 2 +- builder/proxmox/common/step_start_vm_test.go | 2 +- builder/proxmox/common/step_success.go | 2 +- builder/proxmox/common/step_type_boot_command.go | 2 +- builder/proxmox/common/step_type_boot_command_test.go | 2 +- builder/proxmox/iso/builder.go | 4 ++-- builder/proxmox/iso/config.go | 2 +- builder/proxmox/iso/step_finalize_iso.go | 2 +- builder/proxmox/iso/step_finalize_iso_test.go | 2 +- builder/proxmox/iso/step_upload_additional_isos.go | 2 +- builder/proxmox/iso/step_upload_iso.go | 2 +- builder/proxmox/iso/step_upload_iso_test.go | 4 ++-- builder/qemu/builder.go | 4 ++-- builder/qemu/config.go | 2 +- builder/qemu/driver.go | 2 +- builder/qemu/ssh.go | 2 +- builder/qemu/step_configure_qmp.go | 2 +- builder/qemu/step_configure_vnc.go | 2 +- builder/qemu/step_convert_disk.go | 2 +- builder/qemu/step_copy_disk.go | 2 +- builder/qemu/step_copy_disk_test.go | 2 +- builder/qemu/step_create_disk.go | 2 +- builder/qemu/step_create_disk_test.go | 2 +- builder/qemu/step_http_ip_discover.go | 2 +- builder/qemu/step_http_ip_discover_test.go | 2 +- builder/qemu/step_port_forward.go | 2 +- builder/qemu/step_prepare_output_dir.go | 2 +- builder/qemu/step_resize_disk.go | 2 +- builder/qemu/step_resize_disk_test.go | 2 +- builder/qemu/step_run.go | 2 +- builder/qemu/step_run_test.go | 4 ++-- builder/qemu/step_set_iso.go | 2 +- builder/qemu/step_shutdown.go | 2 +- builder/qemu/step_shutdown_test.go | 2 +- builder/qemu/step_test.go | 2 +- builder/qemu/step_type_boot_command.go | 2 +- builder/qemu/step_wait_guest_address.go | 2 +- builder/scaleway/builder.go | 4 ++-- builder/scaleway/step_create_image.go | 2 +- builder/scaleway/step_create_server.go | 2 +- builder/scaleway/step_create_ssh_key.go | 2 +- builder/scaleway/step_pre_validate.go | 2 +- builder/scaleway/step_pre_validate_test.go | 2 +- builder/scaleway/step_remove_volume.go | 2 +- builder/scaleway/step_server_info.go | 2 +- builder/scaleway/step_shutdown.go | 2 +- builder/scaleway/step_snapshot.go | 2 +- builder/tencentcloud/cvm/builder.go | 4 ++-- builder/tencentcloud/cvm/common.go | 2 +- builder/tencentcloud/cvm/step_check_source_image.go | 2 +- builder/tencentcloud/cvm/step_config_key_pair.go | 2 +- builder/tencentcloud/cvm/step_config_security_group.go | 2 +- builder/tencentcloud/cvm/step_config_subnet.go | 2 +- builder/tencentcloud/cvm/step_config_vpc.go | 2 +- builder/tencentcloud/cvm/step_copy_image.go | 2 +- builder/tencentcloud/cvm/step_create_image.go | 2 +- builder/tencentcloud/cvm/step_detach_temp_key_pair.go | 2 +- builder/tencentcloud/cvm/step_pre_validate.go | 2 +- builder/tencentcloud/cvm/step_run_instance.go | 2 +- builder/tencentcloud/cvm/step_share_image.go | 2 +- builder/triton/builder.go | 4 ++-- builder/triton/ssh.go | 2 +- builder/triton/step_create_image_from_machine.go | 2 +- builder/triton/step_create_image_from_machine_test.go | 2 +- builder/triton/step_create_source_machine.go | 2 +- builder/triton/step_create_source_machine_test.go | 2 +- builder/triton/step_delete_machine.go | 2 +- builder/triton/step_delete_machine_test.go | 2 +- builder/triton/step_stop_machine.go | 2 +- builder/triton/step_stop_machine_test.go | 2 +- builder/triton/step_test.go | 2 +- builder/triton/step_wait_for_stop_to_not_fail.go | 2 +- builder/ucloud/common/utils.go | 2 +- builder/ucloud/uhost/builder.go | 4 ++-- builder/ucloud/uhost/step_check_source_image.go | 3 ++- builder/ucloud/uhost/step_config_security_group.go | 2 +- builder/ucloud/uhost/step_config_subnet.go | 2 +- builder/ucloud/uhost/step_config_vpc.go | 2 +- builder/ucloud/uhost/step_copy_image.go | 2 +- builder/ucloud/uhost/step_create_image.go | 2 +- builder/ucloud/uhost/step_create_instance.go | 2 +- builder/ucloud/uhost/step_pre_validate.go | 2 +- builder/ucloud/uhost/step_stop_instance.go | 2 +- builder/vagrant/builder.go | 4 ++-- builder/vagrant/ssh.go | 2 +- builder/vagrant/step_add_box.go | 2 +- builder/vagrant/step_add_box_test.go | 2 +- builder/vagrant/step_create_vagrantfile.go | 2 +- builder/vagrant/step_create_vagrantfile_test.go | 2 +- builder/vagrant/step_package.go | 2 +- builder/vagrant/step_ssh_config.go | 2 +- builder/vagrant/step_ssh_config_test.go | 2 +- builder/vagrant/step_up.go | 2 +- builder/virtualbox/common/comm.go | 2 +- builder/virtualbox/common/step_attach_floppy.go | 2 +- builder/virtualbox/common/step_attach_floppy_test.go | 2 +- builder/virtualbox/common/step_attach_isos.go | 2 +- builder/virtualbox/common/step_configure_vrdp.go | 2 +- builder/virtualbox/common/step_download_guest_additions.go | 4 ++-- builder/virtualbox/common/step_export.go | 2 +- builder/virtualbox/common/step_export_test.go | 2 +- builder/virtualbox/common/step_http_ip_discover.go | 3 ++- builder/virtualbox/common/step_http_ip_discover_test.go | 3 ++- builder/virtualbox/common/step_port_forwarding.go | 2 +- builder/virtualbox/common/step_remove_devices.go | 2 +- builder/virtualbox/common/step_remove_devices_test.go | 2 +- builder/virtualbox/common/step_run.go | 2 +- builder/virtualbox/common/step_shutdown.go | 2 +- builder/virtualbox/common/step_shutdown_test.go | 2 +- builder/virtualbox/common/step_ssh_key_pair.go | 2 +- builder/virtualbox/common/step_suppress_messages.go | 2 +- builder/virtualbox/common/step_suppress_messages_test.go | 2 +- builder/virtualbox/common/step_test.go | 2 +- builder/virtualbox/common/step_type_boot_command.go | 2 +- builder/virtualbox/common/step_upload_guest_additions.go | 2 +- builder/virtualbox/common/step_upload_version.go | 2 +- builder/virtualbox/common/step_upload_version_test.go | 2 +- builder/virtualbox/common/step_vboxmanage.go | 2 +- builder/virtualbox/iso/builder.go | 4 ++-- builder/virtualbox/iso/step_create_disk.go | 2 +- builder/virtualbox/iso/step_create_vm.go | 2 +- builder/virtualbox/ovf/builder.go | 4 ++-- builder/virtualbox/ovf/config.go | 2 +- builder/virtualbox/ovf/step_import.go | 2 +- builder/virtualbox/ovf/step_import_test.go | 2 +- builder/virtualbox/ovf/step_test.go | 2 +- builder/virtualbox/vm/builder.go | 4 ++-- builder/virtualbox/vm/config.go | 2 +- builder/virtualbox/vm/step_create_snapshot.go | 2 +- builder/virtualbox/vm/step_import.go | 2 +- builder/virtualbox/vm/step_set_snapshot.go | 2 +- builder/vmware/common/artifact.go | 2 +- builder/vmware/common/driver.go | 2 +- builder/vmware/common/driver_esx5.go | 2 +- builder/vmware/common/driver_esx5_test.go | 2 +- builder/vmware/common/driver_fusion5.go | 2 +- builder/vmware/common/driver_mock.go | 2 +- builder/vmware/common/driver_player5.go | 2 +- builder/vmware/common/driver_workstation9.go | 2 +- builder/vmware/common/ssh.go | 2 +- builder/vmware/common/step_clean_files.go | 2 +- builder/vmware/common/step_clean_vmx.go | 2 +- builder/vmware/common/step_clean_vmx_test.go | 2 +- builder/vmware/common/step_compact_disk.go | 2 +- builder/vmware/common/step_compact_disk_test.go | 2 +- builder/vmware/common/step_configure_vmx.go | 2 +- builder/vmware/common/step_configure_vmx_test.go | 2 +- builder/vmware/common/step_configure_vnc.go | 2 +- builder/vmware/common/step_create_disks.go | 2 +- builder/vmware/common/step_create_disks_test.go | 2 +- builder/vmware/common/step_export.go | 2 +- builder/vmware/common/step_export_test.go | 2 +- builder/vmware/common/step_http_ip_discover.go | 2 +- builder/vmware/common/step_http_ip_discover_test.go | 2 +- builder/vmware/common/step_output_dir.go | 2 +- builder/vmware/common/step_output_dir_test.go | 2 +- builder/vmware/common/step_prepare_tools.go | 2 +- builder/vmware/common/step_prepare_tools_test.go | 2 +- builder/vmware/common/step_register.go | 2 +- builder/vmware/common/step_register_test.go | 2 +- builder/vmware/common/step_remote_upload.go | 2 +- builder/vmware/common/step_remote_upload_test.go | 2 +- builder/vmware/common/step_run.go | 2 +- builder/vmware/common/step_run_test.go | 2 +- builder/vmware/common/step_shutdown.go | 2 +- builder/vmware/common/step_shutdown_test.go | 2 +- builder/vmware/common/step_suppress_messages.go | 2 +- builder/vmware/common/step_suppress_messages_test.go | 2 +- builder/vmware/common/step_test.go | 2 +- builder/vmware/common/step_upload_tools.go | 2 +- builder/vmware/common/step_upload_vmx.go | 2 +- builder/vmware/common/step_vnc_boot_command.go | 2 +- builder/vmware/common/step_vnc_connect.go | 2 +- builder/vmware/iso/builder.go | 4 ++-- builder/vmware/iso/config.go | 2 +- builder/vmware/iso/step_create_vmx.go | 2 +- builder/vmware/vmx/builder.go | 4 ++-- builder/vmware/vmx/config.go | 2 +- builder/vmware/vmx/step_clone_vmx.go | 2 +- builder/vmware/vmx/step_clone_vmx_test.go | 2 +- builder/vmware/vmx/step_test.go | 2 +- builder/vsphere/clone/builder.go | 4 ++-- builder/vsphere/clone/config.go | 2 +- builder/vsphere/clone/step_clone.go | 2 +- builder/vsphere/clone/step_customize.go | 2 +- builder/vsphere/common/cleanup_vm.go | 2 +- builder/vsphere/common/cleanup_vm_test.go | 2 +- builder/vsphere/common/common_test.go | 2 +- builder/vsphere/common/config_ssh.go | 2 +- builder/vsphere/common/step_add_cdrom.go | 2 +- builder/vsphere/common/step_add_cdrom_test.go | 2 +- builder/vsphere/common/step_add_floppy.go | 2 +- builder/vsphere/common/step_add_floppy_test.go | 2 +- builder/vsphere/common/step_boot_command.go | 2 +- builder/vsphere/common/step_config_params.go | 2 +- builder/vsphere/common/step_connect.go | 2 +- builder/vsphere/common/step_download.go | 2 +- builder/vsphere/common/step_download_test.go | 2 +- builder/vsphere/common/step_export.go | 2 +- builder/vsphere/common/step_hardware.go | 2 +- builder/vsphere/common/step_hardware_test.go | 2 +- builder/vsphere/common/step_http_ip_discover.go | 2 +- builder/vsphere/common/step_http_ip_discover_test.go | 2 +- builder/vsphere/common/step_import_to_content_library.go | 2 +- builder/vsphere/common/step_remote_upload.go | 2 +- builder/vsphere/common/step_remote_upload_test.go | 2 +- builder/vsphere/common/step_remove_cdrom.go | 2 +- builder/vsphere/common/step_remove_cdrom_test.go | 2 +- builder/vsphere/common/step_remove_floppy.go | 2 +- builder/vsphere/common/step_remove_floppy_test.go | 2 +- builder/vsphere/common/step_run.go | 2 +- builder/vsphere/common/step_shutdown.go | 2 +- builder/vsphere/common/step_snapshot.go | 2 +- builder/vsphere/common/step_ssh_key_pair.go | 2 +- builder/vsphere/common/step_template.go | 2 +- builder/vsphere/common/step_wait_for_ip.go | 2 +- builder/vsphere/iso/builder.go | 4 ++-- builder/vsphere/iso/common_test.go | 2 +- builder/vsphere/iso/config.go | 2 +- builder/vsphere/iso/step_create.go | 2 +- builder/vsphere/iso/step_create_test.go | 2 +- builder/yandex/builder.go | 4 ++-- builder/yandex/ssh.go | 2 +- builder/yandex/step_create_image.go | 2 +- builder/yandex/step_create_instance.go | 2 +- builder/yandex/step_create_instance_test.go | 2 +- builder/yandex/step_create_ssh_key.go | 2 +- builder/yandex/step_instance_info.go | 2 +- builder/yandex/step_teardown_instance.go | 2 +- builder/yandex/step_wait_cloudinit_script.go | 2 +- builder/yandex/util.go | 2 +- helper/communicator/comm_host.go | 2 +- helper/communicator/config.go | 2 +- helper/communicator/config_test.go | 2 +- helper/communicator/step_connect.go | 2 +- helper/communicator/step_connect_ssh.go | 2 +- helper/communicator/step_connect_test.go | 2 +- helper/communicator/step_connect_winrm.go | 2 +- helper/communicator/step_debug_ssh_keys.go | 2 +- helper/communicator/step_ssh_keygen.go | 2 +- packer-plugin-sdk/chroot/cleanup.go | 2 +- packer-plugin-sdk/chroot/step_chroot_provision.go | 4 ++-- packer-plugin-sdk/chroot/step_copy_files.go | 2 +- packer-plugin-sdk/chroot/step_copy_files_test.go | 2 +- packer-plugin-sdk/chroot/step_early_cleanup.go | 2 +- packer-plugin-sdk/chroot/step_mount_extra.go | 2 +- packer-plugin-sdk/chroot/step_post_mount_commands.go | 2 +- packer-plugin-sdk/chroot/step_pre_mount_commands.go | 2 +- {helper => packer-plugin-sdk}/multistep/LICENSE.md | 0 {helper => packer-plugin-sdk}/multistep/basic_runner.go | 0 {helper => packer-plugin-sdk}/multistep/basic_runner_test.go | 0 packer-plugin-sdk/{ => multistep}/commonsteps/doc.go | 0 .../{ => multistep}/commonsteps/extra_iso_config.go | 0 .../{ => multistep}/commonsteps/extra_iso_config_test.go | 0 .../{ => multistep}/commonsteps/floppy_config.go | 0 .../{ => multistep}/commonsteps/floppy_config_test.go | 0 packer-plugin-sdk/{ => multistep}/commonsteps/http_config.go | 0 .../{ => multistep}/commonsteps/http_config_test.go | 0 packer-plugin-sdk/{ => multistep}/commonsteps/iso_config.go | 0 .../{ => multistep}/commonsteps/iso_config_test.go | 0 .../{ => multistep}/commonsteps/multistep_debug.go | 2 +- .../{ => multistep}/commonsteps/multistep_runner.go | 2 +- .../{ => multistep}/commonsteps/step_cleanup_temp_keys.go | 2 +- .../{ => multistep}/commonsteps/step_create_cdrom.go | 2 +- .../{ => multistep}/commonsteps/step_create_cdrom_test.go | 2 +- .../{ => multistep}/commonsteps/step_create_floppy.go | 2 +- .../{ => multistep}/commonsteps/step_create_floppy_test.go | 2 +- .../{ => multistep}/commonsteps/step_download.go | 2 +- .../{ => multistep}/commonsteps/step_download_test.go | 2 +- .../{ => multistep}/commonsteps/step_http_server.go | 2 +- .../{ => multistep}/commonsteps/step_output_dir.go | 2 +- .../{ => multistep}/commonsteps/step_output_dir_test.go | 2 +- .../{ => multistep}/commonsteps/step_provision.go | 2 +- .../{ => multistep}/commonsteps/step_provision_test.go | 2 +- .../commonsteps/test-fixtures/SomeDir/myfile.txt | 0 .../commonsteps/test-fixtures/floppy-hier/test-0/file1 | 0 .../commonsteps/test-fixtures/floppy-hier/test-0/file2 | 0 .../commonsteps/test-fixtures/floppy-hier/test-0/file3 | 0 .../commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 | 0 .../commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 | 0 .../commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 | 0 .../commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 | 0 .../test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 | 0 .../test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 | 0 .../test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 | 0 .../test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 | 0 .../commonsteps/test-fixtures/root/another.txt | 0 .../commonsteps/test-fixtures/root/another.txt.sha1sum | 0 .../{ => multistep}/commonsteps/test-fixtures/root/basic.txt | 0 .../commonsteps/test-fixtures/root/basic.txt.sha1sum | 0 .../commonsteps/test-fixtures/root/subfolder.sum | 0 {helper => packer-plugin-sdk}/multistep/debug_runner.go | 0 {helper => packer-plugin-sdk}/multistep/debug_runner_test.go | 0 {helper => packer-plugin-sdk}/multistep/doc.go | 0 {helper => packer-plugin-sdk}/multistep/if.go | 0 {helper => packer-plugin-sdk}/multistep/multistep.go | 0 {helper => packer-plugin-sdk}/multistep/multistep_test.go | 0 {helper => packer-plugin-sdk}/multistep/statebag.go | 0 {helper => packer-plugin-sdk}/multistep/statebag_test.go | 0 packer-plugin-sdk/packerbuilderdata/generated_data.go | 2 +- packer-plugin-sdk/packerbuilderdata/generated_data_test.go | 2 +- packer-plugin-sdk/shell-local/run.go | 2 +- post-processor/googlecompute-export/post-processor.go | 4 ++-- post-processor/vagrant-cloud/post-processor.go | 4 ++-- post-processor/vagrant-cloud/step_confirm_upload.go | 2 +- post-processor/vagrant-cloud/step_create_provider.go | 2 +- post-processor/vagrant-cloud/step_create_version.go | 2 +- post-processor/vagrant-cloud/step_prepare_upload.go | 2 +- post-processor/vagrant-cloud/step_release_version.go | 2 +- post-processor/vagrant-cloud/step_upload.go | 2 +- post-processor/vagrant-cloud/step_verify_box.go | 2 +- post-processor/vsphere-template/post-processor.go | 4 ++-- post-processor/vsphere-template/step_choose_datacenter.go | 2 +- post-processor/vsphere-template/step_create_folder.go | 2 +- post-processor/vsphere-template/step_create_snapshot.go | 2 +- post-processor/vsphere-template/step_mark_as_template.go | 2 +- post-processor/yandex-export/post-processor.go | 4 ++-- post-processor/yandex-export/post-processor_test.go | 2 +- provisioner/ansible/provisioner.go | 2 +- provisioner/ansible/provisioner_test.go | 2 +- provisioner/powershell/provisioner.go | 2 +- provisioner/powershell/provisioner_test.go | 2 +- provisioner/shell/provisioner.go | 2 +- provisioner/shell/provisioner_test.go | 2 +- provisioner/windows-shell/provisioner.go | 2 +- provisioner/windows-shell/provisioner_test.go | 2 +- 760 files changed, 788 insertions(+), 785 deletions(-) rename {helper => packer-plugin-sdk}/multistep/LICENSE.md (100%) rename {helper => packer-plugin-sdk}/multistep/basic_runner.go (100%) rename {helper => packer-plugin-sdk}/multistep/basic_runner_test.go (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/doc.go (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/extra_iso_config.go (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/extra_iso_config_test.go (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/floppy_config.go (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/floppy_config_test.go (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/http_config.go (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/http_config_test.go (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/iso_config.go (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/iso_config_test.go (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/multistep_debug.go (94%) rename packer-plugin-sdk/{ => multistep}/commonsteps/multistep_runner.go (98%) rename packer-plugin-sdk/{ => multistep}/commonsteps/step_cleanup_temp_keys.go (97%) rename packer-plugin-sdk/{ => multistep}/commonsteps/step_create_cdrom.go (99%) rename packer-plugin-sdk/{ => multistep}/commonsteps/step_create_cdrom_test.go (97%) rename packer-plugin-sdk/{ => multistep}/commonsteps/step_create_floppy.go (99%) rename packer-plugin-sdk/{ => multistep}/commonsteps/step_create_floppy_test.go (99%) rename packer-plugin-sdk/{ => multistep}/commonsteps/step_download.go (99%) rename packer-plugin-sdk/{ => multistep}/commonsteps/step_download_test.go (99%) rename packer-plugin-sdk/{ => multistep}/commonsteps/step_http_server.go (96%) rename packer-plugin-sdk/{ => multistep}/commonsteps/step_output_dir.go (96%) rename packer-plugin-sdk/{ => multistep}/commonsteps/step_output_dir_test.go (98%) rename packer-plugin-sdk/{ => multistep}/commonsteps/step_provision.go (98%) rename packer-plugin-sdk/{ => multistep}/commonsteps/step_provision_test.go (98%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/SomeDir/myfile.txt (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/floppy-hier/test-0/file1 (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/floppy-hier/test-0/file2 (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/floppy-hier/test-0/file3 (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/root/another.txt (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/root/another.txt.sha1sum (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/root/basic.txt (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/root/basic.txt.sha1sum (100%) rename packer-plugin-sdk/{ => multistep}/commonsteps/test-fixtures/root/subfolder.sum (100%) rename {helper => packer-plugin-sdk}/multistep/debug_runner.go (100%) rename {helper => packer-plugin-sdk}/multistep/debug_runner_test.go (100%) rename {helper => packer-plugin-sdk}/multistep/doc.go (100%) rename {helper => packer-plugin-sdk}/multistep/if.go (100%) rename {helper => packer-plugin-sdk}/multistep/multistep.go (100%) rename {helper => packer-plugin-sdk}/multistep/multistep_test.go (100%) rename {helper => packer-plugin-sdk}/multistep/statebag.go (100%) rename {helper => packer-plugin-sdk}/multistep/statebag_test.go (100%) diff --git a/builder/alicloud/ecs/builder.go b/builder/alicloud/ecs/builder.go index acf768e60..f509767ca 100644 --- a/builder/alicloud/ecs/builder.go +++ b/builder/alicloud/ecs/builder.go @@ -11,10 +11,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/alicloud/ecs/packer_helper.go b/builder/alicloud/ecs/packer_helper.go index 5ea704278..4074d7ad7 100644 --- a/builder/alicloud/ecs/packer_helper.go +++ b/builder/alicloud/ecs/packer_helper.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func cleanUpMessage(state multistep.StateBag, module string) { diff --git a/builder/alicloud/ecs/ssh_helper.go b/builder/alicloud/ecs/ssh_helper.go index 21354d017..d400b9347 100644 --- a/builder/alicloud/ecs/ssh_helper.go +++ b/builder/alicloud/ecs/ssh_helper.go @@ -3,7 +3,7 @@ package ecs import ( "time" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) var ( diff --git a/builder/alicloud/ecs/step_attach_keypair.go b/builder/alicloud/ecs/step_attach_keypair.go index d2a2a9c02..16596eef1 100644 --- a/builder/alicloud/ecs/step_attach_keypair.go +++ b/builder/alicloud/ecs/step_attach_keypair.go @@ -6,8 +6,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepAttachKeyPair struct { diff --git a/builder/alicloud/ecs/step_check_source_image.go b/builder/alicloud/ecs/step_check_source_image.go index 3eedec595..66c26dc96 100644 --- a/builder/alicloud/ecs/step_check_source_image.go +++ b/builder/alicloud/ecs/step_check_source_image.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCheckAlicloudSourceImage struct { diff --git a/builder/alicloud/ecs/step_config_eip.go b/builder/alicloud/ecs/step_config_eip.go index a04efabb1..4053a6bcd 100644 --- a/builder/alicloud/ecs/step_config_eip.go +++ b/builder/alicloud/ecs/step_config_eip.go @@ -9,8 +9,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConfigAlicloudEIP struct { diff --git a/builder/alicloud/ecs/step_config_key_pair.go b/builder/alicloud/ecs/step_config_key_pair.go index 767c50aa1..428198bec 100644 --- a/builder/alicloud/ecs/step_config_key_pair.go +++ b/builder/alicloud/ecs/step_config_key_pair.go @@ -8,8 +8,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConfigAlicloudKeyPair struct { diff --git a/builder/alicloud/ecs/step_config_public_ip.go b/builder/alicloud/ecs/step_config_public_ip.go index a83b55115..8d8c7403e 100644 --- a/builder/alicloud/ecs/step_config_public_ip.go +++ b/builder/alicloud/ecs/step_config_public_ip.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConfigAlicloudPublicIP struct { diff --git a/builder/alicloud/ecs/step_config_security_group.go b/builder/alicloud/ecs/step_config_security_group.go index 5913198b6..694a10817 100644 --- a/builder/alicloud/ecs/step_config_security_group.go +++ b/builder/alicloud/ecs/step_config_security_group.go @@ -6,8 +6,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/alicloud/ecs/step_config_vpc.go b/builder/alicloud/ecs/step_config_vpc.go index 0ccfed678..53ecb8476 100644 --- a/builder/alicloud/ecs/step_config_vpc.go +++ b/builder/alicloud/ecs/step_config_vpc.go @@ -7,8 +7,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/alicloud/ecs/step_config_vswitch.go b/builder/alicloud/ecs/step_config_vswitch.go index ee85c6c07..38e51a346 100644 --- a/builder/alicloud/ecs/step_config_vswitch.go +++ b/builder/alicloud/ecs/step_config_vswitch.go @@ -6,8 +6,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/alicloud/ecs/step_create_image.go b/builder/alicloud/ecs/step_create_image.go index 970c6783a..a1f47b61a 100644 --- a/builder/alicloud/ecs/step_create_image.go +++ b/builder/alicloud/ecs/step_create_image.go @@ -9,8 +9,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/alicloud/ecs/step_create_instance.go b/builder/alicloud/ecs/step_create_instance.go index 81ee510ff..da6696e25 100644 --- a/builder/alicloud/ecs/step_create_instance.go +++ b/builder/alicloud/ecs/step_create_instance.go @@ -13,8 +13,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateAlicloudInstance struct { diff --git a/builder/alicloud/ecs/step_create_snapshot.go b/builder/alicloud/ecs/step_create_snapshot.go index 32f155e08..056a4ba87 100644 --- a/builder/alicloud/ecs/step_create_snapshot.go +++ b/builder/alicloud/ecs/step_create_snapshot.go @@ -7,8 +7,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateAlicloudSnapshot struct { diff --git a/builder/alicloud/ecs/step_create_tags.go b/builder/alicloud/ecs/step_create_tags.go index fd6b2b712..f374dcba4 100644 --- a/builder/alicloud/ecs/step_create_tags.go +++ b/builder/alicloud/ecs/step_create_tags.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateTags struct { diff --git a/builder/alicloud/ecs/step_delete_images_snapshots.go b/builder/alicloud/ecs/step_delete_images_snapshots.go index cd79229bd..bffbb5068 100644 --- a/builder/alicloud/ecs/step_delete_images_snapshots.go +++ b/builder/alicloud/ecs/step_delete_images_snapshots.go @@ -6,8 +6,8 @@ import ( "log" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepDeleteAlicloudImageSnapshots struct { diff --git a/builder/alicloud/ecs/step_pre_validate.go b/builder/alicloud/ecs/step_pre_validate.go index 283a6b334..8481f34f4 100644 --- a/builder/alicloud/ecs/step_pre_validate.go +++ b/builder/alicloud/ecs/step_pre_validate.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepPreValidate struct { diff --git a/builder/alicloud/ecs/step_region_copy_image.go b/builder/alicloud/ecs/step_region_copy_image.go index ae5ebc693..c0ec5e3f3 100644 --- a/builder/alicloud/ecs/step_region_copy_image.go +++ b/builder/alicloud/ecs/step_region_copy_image.go @@ -8,8 +8,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepRegionCopyAlicloudImage struct { diff --git a/builder/alicloud/ecs/step_run_instance.go b/builder/alicloud/ecs/step_run_instance.go index 559dfff63..d84d2028c 100644 --- a/builder/alicloud/ecs/step_run_instance.go +++ b/builder/alicloud/ecs/step_run_instance.go @@ -6,8 +6,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepRunAlicloudInstance struct { diff --git a/builder/alicloud/ecs/step_share_image.go b/builder/alicloud/ecs/step_share_image.go index 7a4f6b675..552f41de4 100644 --- a/builder/alicloud/ecs/step_share_image.go +++ b/builder/alicloud/ecs/step_share_image.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepShareAlicloudImage struct { diff --git a/builder/alicloud/ecs/step_stop_instance.go b/builder/alicloud/ecs/step_stop_instance.go index f7d561cf9..7b6daaaab 100644 --- a/builder/alicloud/ecs/step_stop_instance.go +++ b/builder/alicloud/ecs/step_stop_instance.go @@ -8,8 +8,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepStopAlicloudInstance struct { diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index f41272f2f..8964ec157 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -17,11 +17,11 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/chroot" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/chroot/step_attach_volume.go b/builder/amazon/chroot/step_attach_volume.go index 651a2ff8a..d87b03ca0 100644 --- a/builder/amazon/chroot/step_attach_volume.go +++ b/builder/amazon/chroot/step_attach_volume.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepAttachVolume attaches the previously created volume to an diff --git a/builder/amazon/chroot/step_check_root_device.go b/builder/amazon/chroot/step_check_root_device.go index 3933680e3..cb1d06d8e 100644 --- a/builder/amazon/chroot/step_check_root_device.go +++ b/builder/amazon/chroot/step_check_root_device.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCheckRootDevice makes sure the root device on the AMI is EBS-backed. diff --git a/builder/amazon/chroot/step_create_volume.go b/builder/amazon/chroot/step_create_volume.go index 36c6414d7..f59bf689d 100644 --- a/builder/amazon/chroot/step_create_volume.go +++ b/builder/amazon/chroot/step_create_volume.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/chroot/step_early_unflock.go b/builder/amazon/chroot/step_early_unflock.go index e08dc672f..a5378557f 100644 --- a/builder/amazon/chroot/step_early_unflock.go +++ b/builder/amazon/chroot/step_early_unflock.go @@ -5,9 +5,9 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/chroot" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepEarlyUnflock unlocks the flock. diff --git a/builder/amazon/chroot/step_flock.go b/builder/amazon/chroot/step_flock.go index f3fd9d29e..5465a72fe 100644 --- a/builder/amazon/chroot/step_flock.go +++ b/builder/amazon/chroot/step_flock.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepFlock provisions the instance within a chroot. diff --git a/builder/amazon/chroot/step_instance_info.go b/builder/amazon/chroot/step_instance_info.go index 01b0d0ac7..618577146 100644 --- a/builder/amazon/chroot/step_instance_info.go +++ b/builder/amazon/chroot/step_instance_info.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepInstanceInfo verifies that this builder is running on an EC2 instance. diff --git a/builder/amazon/chroot/step_mount_device.go b/builder/amazon/chroot/step_mount_device.go index c9dcfc042..d167e73eb 100644 --- a/builder/amazon/chroot/step_mount_device.go +++ b/builder/amazon/chroot/step_mount_device.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/chroot/step_prepare_device.go b/builder/amazon/chroot/step_prepare_device.go index a6a27eb95..970c29b13 100644 --- a/builder/amazon/chroot/step_prepare_device.go +++ b/builder/amazon/chroot/step_prepare_device.go @@ -6,8 +6,8 @@ import ( "log" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/amazon/chroot/step_register_ami.go b/builder/amazon/chroot/step_register_ami.go index b44692cb4..628a62f7b 100644 --- a/builder/amazon/chroot/step_register_ami.go +++ b/builder/amazon/chroot/step_register_ami.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" ) diff --git a/builder/amazon/chroot/step_snapshot.go b/builder/amazon/chroot/step_snapshot.go index 408c1f0c5..ba7391516 100644 --- a/builder/amazon/chroot/step_snapshot.go +++ b/builder/amazon/chroot/step_snapshot.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepSnapshot creates a snapshot of the created volume. diff --git a/builder/amazon/common/interpolate_build_info.go b/builder/amazon/common/interpolate_build_info.go index 8087a88c9..5617db61f 100644 --- a/builder/amazon/common/interpolate_build_info.go +++ b/builder/amazon/common/interpolate_build_info.go @@ -3,7 +3,7 @@ package common import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/amazon/common/interpolate_build_info_test.go b/builder/amazon/common/interpolate_build_info_test.go index 1dac35894..ea98bb417 100644 --- a/builder/amazon/common/interpolate_build_info_test.go +++ b/builder/amazon/common/interpolate_build_info_test.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go index 959f3ce2c..add5308ec 100644 --- a/builder/amazon/common/ssh.go +++ b/builder/amazon/common/ssh.go @@ -7,7 +7,7 @@ import ( "time" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type ec2Describer interface { diff --git a/builder/amazon/common/ssh_test.go b/builder/amazon/common/ssh_test.go index f098613a0..73099b7ef 100644 --- a/builder/amazon/common/ssh_test.go +++ b/builder/amazon/common/ssh_test.go @@ -5,7 +5,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const ( diff --git a/builder/amazon/common/state.go b/builder/amazon/common/state.go index 113a36ab8..07ad956fe 100644 --- a/builder/amazon/common/state.go +++ b/builder/amazon/common/state.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StateRefreshFunc is a function type used for StateChangeConf that is diff --git a/builder/amazon/common/step_ami_region_copy.go b/builder/amazon/common/step_ami_region_copy.go index c38db6771..01a9bea21 100644 --- a/builder/amazon/common/step_ami_region_copy.go +++ b/builder/amazon/common/step_ami_region_copy.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepAMIRegionCopy struct { diff --git a/builder/amazon/common/step_ami_region_copy_test.go b/builder/amazon/common/step_ami_region_copy_test.go index 9fc636519..93e370307 100644 --- a/builder/amazon/common/step_ami_region_copy_test.go +++ b/builder/amazon/common/step_ami_region_copy_test.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Define a mock struct to be used in unit tests for common aws steps. diff --git a/builder/amazon/common/step_cleanup_volumes.go b/builder/amazon/common/step_cleanup_volumes.go index cfe7a7574..67c0a7939 100644 --- a/builder/amazon/common/step_cleanup_volumes.go +++ b/builder/amazon/common/step_cleanup_volumes.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepCleanupVolumes cleans up any orphaned volumes that were not designated to diff --git a/builder/amazon/common/step_create_ssm_tunnel.go b/builder/amazon/common/step_create_ssm_tunnel.go index 1086f477c..2b1de42af 100644 --- a/builder/amazon/common/step_create_ssm_tunnel.go +++ b/builder/amazon/common/step_create_ssm_tunnel.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ssm" pssm "github.com/hashicorp/packer/builder/amazon/common/ssm" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/amazon/common/step_create_tags.go b/builder/amazon/common/step_create_tags.go index a6a97c4c8..c875f5e49 100644 --- a/builder/amazon/common/step_create_tags.go +++ b/builder/amazon/common/step_create_tags.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/common/step_deregister_ami.go b/builder/amazon/common/step_deregister_ami.go index c593862e0..8ab5685c7 100644 --- a/builder/amazon/common/step_deregister_ami.go +++ b/builder/amazon/common/step_deregister_ami.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDeregisterAMI struct { diff --git a/builder/amazon/common/step_get_password.go b/builder/amazon/common/step_get_password.go index cbdca2814..007f8c5f2 100644 --- a/builder/amazon/common/step_get_password.go +++ b/builder/amazon/common/step_get_password.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/amazon/common/step_iam_instance_profile.go b/builder/amazon/common/step_iam_instance_profile.go index d743c4e16..91a6ec2b0 100644 --- a/builder/amazon/common/step_iam_instance_profile.go +++ b/builder/amazon/common/step_iam_instance_profile.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/amazon/common/step_key_pair.go b/builder/amazon/common/step_key_pair.go index 2f70d3a35..a477524de 100644 --- a/builder/amazon/common/step_key_pair.go +++ b/builder/amazon/common/step_key_pair.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/amazon/common/step_modify_ami_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go index d4ab8f5c1..b60caff4c 100644 --- a/builder/amazon/common/step_modify_ami_attributes.go +++ b/builder/amazon/common/step_modify_ami_attributes.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/common/step_modify_ebs_instance.go b/builder/amazon/common/step_modify_ebs_instance.go index 6b2492b7a..e3a08e5d0 100644 --- a/builder/amazon/common/step_modify_ebs_instance.go +++ b/builder/amazon/common/step_modify_ebs_instance.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepModifyEBSBackedInstance struct { diff --git a/builder/amazon/common/step_network_info.go b/builder/amazon/common/step_network_info.go index 89d63590d..b66bef233 100644 --- a/builder/amazon/common/step_network_info.go +++ b/builder/amazon/common/step_network_info.go @@ -8,8 +8,8 @@ import ( "sort" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepNetworkInfo queries AWS for information about diff --git a/builder/amazon/common/step_pre_validate.go b/builder/amazon/common/step_pre_validate.go index 197676fa2..993b4d940 100644 --- a/builder/amazon/common/step_pre_validate.go +++ b/builder/amazon/common/step_pre_validate.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go index 23e8981ff..10a5f4af8 100644 --- a/builder/amazon/common/step_run_source_instance.go +++ b/builder/amazon/common/step_run_source_instance.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/packer/builder/amazon/common/awserrors" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/common/step_run_spot_instance.go b/builder/amazon/common/step_run_spot_instance.go index 24ee1d70e..039198f78 100644 --- a/builder/amazon/common/step_run_spot_instance.go +++ b/builder/amazon/common/step_run_spot_instance.go @@ -14,8 +14,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/hashicorp/packer/builder/amazon/common/awserrors" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" diff --git a/builder/amazon/common/step_run_spot_instance_test.go b/builder/amazon/common/step_run_spot_instance_test.go index d00bf74dd..5df8070f1 100644 --- a/builder/amazon/common/step_run_spot_instance_test.go +++ b/builder/amazon/common/step_run_spot_instance_test.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Create statebag for running test diff --git a/builder/amazon/common/step_security_group.go b/builder/amazon/common/step_security_group.go index 5e4dc2301..d77f4bfb4 100644 --- a/builder/amazon/common/step_security_group.go +++ b/builder/amazon/common/step_security_group.go @@ -11,8 +11,8 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/amazon/common/step_set_generated_data.go b/builder/amazon/common/step_set_generated_data.go index cf6a52694..f90b669b2 100644 --- a/builder/amazon/common/step_set_generated_data.go +++ b/builder/amazon/common/step_set_generated_data.go @@ -4,7 +4,7 @@ import ( "context" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/amazon/common/step_source_ami_info.go b/builder/amazon/common/step_source_ami_info.go index a3e4de37f..53b609dc7 100644 --- a/builder/amazon/common/step_source_ami_info.go +++ b/builder/amazon/common/step_source_ami_info.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepSourceAMIInfo extracts critical information from the source AMI diff --git a/builder/amazon/common/step_stop_ebs_instance.go b/builder/amazon/common/step_stop_ebs_instance.go index 21363470f..db0591e44 100644 --- a/builder/amazon/common/step_stop_ebs_instance.go +++ b/builder/amazon/common/step_stop_ebs_instance.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/amazon/common/tags.go b/builder/amazon/common/tags.go index 20aec10b8..299574c25 100644 --- a/builder/amazon/common/tags.go +++ b/builder/amazon/common/tags.go @@ -5,8 +5,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 726d4bba9..5c37146f0 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -19,10 +19,10 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/ebs/step_create_ami.go b/builder/amazon/ebs/step_create_ami.go index a17455125..25efa7666 100644 --- a/builder/amazon/ebs/step_create_ami.go +++ b/builder/amazon/ebs/step_create_ami.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index 60522be96..53073100c 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -17,10 +17,10 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/ebssurrogate/step_register_ami.go b/builder/amazon/ebssurrogate/step_register_ami.go index 445c34f2a..69a696a7f 100644 --- a/builder/amazon/ebssurrogate/step_register_ami.go +++ b/builder/amazon/ebssurrogate/step_register_ami.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" ) diff --git a/builder/amazon/ebssurrogate/step_snapshot_volumes.go b/builder/amazon/ebssurrogate/step_snapshot_volumes.go index 9facef0e0..3888fddce 100644 --- a/builder/amazon/ebssurrogate/step_snapshot_volumes.go +++ b/builder/amazon/ebssurrogate/step_snapshot_volumes.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" multierror "github.com/hashicorp/go-multierror" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index c79cf2ee1..7bd18bd3e 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/builder/amazon/ebsvolume/builder.go @@ -16,10 +16,10 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go index ecbf2c56d..911b2c138 100644 --- a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go +++ b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index 1b798c002..ebd9ad339 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -18,10 +18,10 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/instance/step_bundle_volume.go b/builder/amazon/instance/step_bundle_volume.go index affbe0845..6bcee9b43 100644 --- a/builder/amazon/instance/step_bundle_volume.go +++ b/builder/amazon/instance/step_bundle_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/instance/step_register_ami.go b/builder/amazon/instance/step_register_ami.go index d6075cf48..513baa4bd 100644 --- a/builder/amazon/instance/step_register_ami.go +++ b/builder/amazon/instance/step_register_ami.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" ) diff --git a/builder/amazon/instance/step_upload_bundle.go b/builder/amazon/instance/step_upload_bundle.go index 794ba593e..8ff2d18c4 100644 --- a/builder/amazon/instance/step_upload_bundle.go +++ b/builder/amazon/instance/step_upload_bundle.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/instance/step_upload_x509_cert.go b/builder/amazon/instance/step_upload_x509_cert.go index 9295d50df..37cf4ae6a 100644 --- a/builder/amazon/instance/step_upload_x509_cert.go +++ b/builder/amazon/instance/step_upload_x509_cert.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUploadX509Cert struct{} diff --git a/builder/azure/arm/builder.go b/builder/azure/arm/builder.go index 09c3e900c..bee0539a1 100644 --- a/builder/azure/arm/builder.go +++ b/builder/azure/arm/builder.go @@ -19,9 +19,9 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" "github.com/hashicorp/packer/builder/azure/common/lin" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type Builder struct { diff --git a/builder/azure/arm/step.go b/builder/azure/arm/step.go index 7fc7396b6..a9f53a34e 100644 --- a/builder/azure/arm/step.go +++ b/builder/azure/arm/step.go @@ -2,7 +2,7 @@ package arm import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func processStepResult( diff --git a/builder/azure/arm/step_capture_image.go b/builder/azure/arm/step_capture_image.go index f8fe17b59..025fc96d3 100644 --- a/builder/azure/arm/step_capture_image.go +++ b/builder/azure/arm/step_capture_image.go @@ -6,8 +6,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCaptureImage struct { diff --git a/builder/azure/arm/step_capture_image_test.go b/builder/azure/arm/step_capture_image_test.go index bd898b039..4f4d0f0fb 100644 --- a/builder/azure/arm/step_capture_image_test.go +++ b/builder/azure/arm/step_capture_image_test.go @@ -7,7 +7,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCaptureImageShouldFailIfCaptureFails(t *testing.T) { diff --git a/builder/azure/arm/step_certificate_in_keyvault.go b/builder/azure/arm/step_certificate_in_keyvault.go index d646acead..1d1b5800d 100644 --- a/builder/azure/arm/step_certificate_in_keyvault.go +++ b/builder/azure/arm/step_certificate_in_keyvault.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCertificateInKeyVault struct { diff --git a/builder/azure/arm/step_certificate_in_keyvault_test.go b/builder/azure/arm/step_certificate_in_keyvault_test.go index a246a7746..ce0dcfa79 100644 --- a/builder/azure/arm/step_certificate_in_keyvault_test.go +++ b/builder/azure/arm/step_certificate_in_keyvault_test.go @@ -7,8 +7,8 @@ import ( azcommon "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestNewStepCertificateInKeyVault(t *testing.T) { diff --git a/builder/azure/arm/step_create_resource_group.go b/builder/azure/arm/step_create_resource_group.go index f745d5054..ff0bab59c 100644 --- a/builder/azure/arm/step_create_resource_group.go +++ b/builder/azure/arm/step_create_resource_group.go @@ -7,8 +7,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-02-01/resources" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateResourceGroup struct { diff --git a/builder/azure/arm/step_create_resource_group_test.go b/builder/azure/arm/step_create_resource_group_test.go index 2073aa32c..9ee79a550 100644 --- a/builder/azure/arm/step_create_resource_group_test.go +++ b/builder/azure/arm/step_create_resource_group_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateResourceGroupShouldFailIfBothGroupNames(t *testing.T) { diff --git a/builder/azure/arm/step_delete_additional_disks.go b/builder/azure/arm/step_delete_additional_disks.go index c51155242..6ff15a893 100644 --- a/builder/azure/arm/step_delete_additional_disks.go +++ b/builder/azure/arm/step_delete_additional_disks.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDeleteAdditionalDisk struct { diff --git a/builder/azure/arm/step_delete_additional_disks_test.go b/builder/azure/arm/step_delete_additional_disks_test.go index 3d249fd0d..9aba4b3fe 100644 --- a/builder/azure/arm/step_delete_additional_disks_test.go +++ b/builder/azure/arm/step_delete_additional_disks_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepDeleteAdditionalDiskShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_deploy_template.go b/builder/azure/arm/step_deploy_template.go index 3a2564f6d..481af6156 100644 --- a/builder/azure/arm/step_deploy_template.go +++ b/builder/azure/arm/step_deploy_template.go @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/azure/arm/step_deploy_template_test.go b/builder/azure/arm/step_deploy_template_test.go index 329a36fde..92e43177f 100644 --- a/builder/azure/arm/step_deploy_template_test.go +++ b/builder/azure/arm/step_deploy_template_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepDeployTemplateShouldFailIfDeployFails(t *testing.T) { diff --git a/builder/azure/arm/step_get_additional_disks.go b/builder/azure/arm/step_get_additional_disks.go index 23d16f425..51468a3cd 100644 --- a/builder/azure/arm/step_get_additional_disks.go +++ b/builder/azure/arm/step_get_additional_disks.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepGetDataDisk struct { diff --git a/builder/azure/arm/step_get_additional_disks_test.go b/builder/azure/arm/step_get_additional_disks_test.go index f9685bef4..454fa1792 100644 --- a/builder/azure/arm/step_get_additional_disks_test.go +++ b/builder/azure/arm/step_get_additional_disks_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepGetAdditionalDiskShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_get_certificate.go b/builder/azure/arm/step_get_certificate.go index 2c05bf191..ca19b262e 100644 --- a/builder/azure/arm/step_get_certificate.go +++ b/builder/azure/arm/step_get_certificate.go @@ -6,8 +6,8 @@ import ( "time" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepGetCertificate struct { diff --git a/builder/azure/arm/step_get_certificate_test.go b/builder/azure/arm/step_get_certificate_test.go index 5ce807afe..61574e126 100644 --- a/builder/azure/arm/step_get_certificate_test.go +++ b/builder/azure/arm/step_get_certificate_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepGetCertificateShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_get_ip_address.go b/builder/azure/arm/step_get_ip_address.go index ef838b339..03620ae00 100644 --- a/builder/azure/arm/step_get_ip_address.go +++ b/builder/azure/arm/step_get_ip_address.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type EndpointType int diff --git a/builder/azure/arm/step_get_ip_address_test.go b/builder/azure/arm/step_get_ip_address_test.go index 38b71fa5f..a23cecddd 100644 --- a/builder/azure/arm/step_get_ip_address_test.go +++ b/builder/azure/arm/step_get_ip_address_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepGetIPAddressShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_get_os_disk.go b/builder/azure/arm/step_get_os_disk.go index 62337fa2a..78eda273b 100644 --- a/builder/azure/arm/step_get_os_disk.go +++ b/builder/azure/arm/step_get_os_disk.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepGetOSDisk struct { diff --git a/builder/azure/arm/step_get_os_disk_test.go b/builder/azure/arm/step_get_os_disk_test.go index f9e633319..7e27b7ab1 100644 --- a/builder/azure/arm/step_get_os_disk_test.go +++ b/builder/azure/arm/step_get_os_disk_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepGetOSDiskShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_power_off_compute.go b/builder/azure/arm/step_power_off_compute.go index 86f51935b..f6100ae9a 100644 --- a/builder/azure/arm/step_power_off_compute.go +++ b/builder/azure/arm/step_power_off_compute.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPowerOffCompute struct { diff --git a/builder/azure/arm/step_power_off_compute_test.go b/builder/azure/arm/step_power_off_compute_test.go index 8239f2122..991a603ce 100644 --- a/builder/azure/arm/step_power_off_compute_test.go +++ b/builder/azure/arm/step_power_off_compute_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepPowerOffComputeShouldFailIfPowerOffFails(t *testing.T) { diff --git a/builder/azure/arm/step_publish_to_shared_image_gallery.go b/builder/azure/arm/step_publish_to_shared_image_gallery.go index 5f0a0f158..ed7f050b9 100644 --- a/builder/azure/arm/step_publish_to_shared_image_gallery.go +++ b/builder/azure/arm/step_publish_to_shared_image_gallery.go @@ -7,8 +7,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute" "github.com/Azure/go-autorest/autorest/date" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPublishToSharedImageGallery struct { diff --git a/builder/azure/arm/step_publish_to_shared_image_gallery_test.go b/builder/azure/arm/step_publish_to_shared_image_gallery_test.go index d11fb052b..ad87b47d4 100644 --- a/builder/azure/arm/step_publish_to_shared_image_gallery_test.go +++ b/builder/azure/arm/step_publish_to_shared_image_gallery_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepPublishToSharedImageGalleryShouldNotPublishForVhd(t *testing.T) { diff --git a/builder/azure/arm/step_set_certificate.go b/builder/azure/arm/step_set_certificate.go index 46621e306..563cc55c1 100644 --- a/builder/azure/arm/step_set_certificate.go +++ b/builder/azure/arm/step_set_certificate.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSetCertificate struct { diff --git a/builder/azure/arm/step_set_certificate_test.go b/builder/azure/arm/step_set_certificate_test.go index 387d620a9..69d5377fd 100644 --- a/builder/azure/arm/step_set_certificate_test.go +++ b/builder/azure/arm/step_set_certificate_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSetCertificateShouldPassIfGetPasses(t *testing.T) { diff --git a/builder/azure/arm/step_snapshot_data_disks.go b/builder/azure/arm/step_snapshot_data_disks.go index dba6f7634..63e9b0f71 100644 --- a/builder/azure/arm/step_snapshot_data_disks.go +++ b/builder/azure/arm/step_snapshot_data_disks.go @@ -8,8 +8,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSnapshotDataDisks struct { diff --git a/builder/azure/arm/step_snapshot_data_disks_test.go b/builder/azure/arm/step_snapshot_data_disks_test.go index 9f34f0cce..88b1dfaf6 100644 --- a/builder/azure/arm/step_snapshot_data_disks_test.go +++ b/builder/azure/arm/step_snapshot_data_disks_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSnapshotDataDisksShouldFailIfSnapshotFails(t *testing.T) { diff --git a/builder/azure/arm/step_snapshot_os_disk.go b/builder/azure/arm/step_snapshot_os_disk.go index 28fc844a9..bc84d0d94 100644 --- a/builder/azure/arm/step_snapshot_os_disk.go +++ b/builder/azure/arm/step_snapshot_os_disk.go @@ -7,8 +7,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSnapshotOSDisk struct { diff --git a/builder/azure/arm/step_snapshot_os_disk_test.go b/builder/azure/arm/step_snapshot_os_disk_test.go index 7148a6eb0..7e0e99aa1 100644 --- a/builder/azure/arm/step_snapshot_os_disk_test.go +++ b/builder/azure/arm/step_snapshot_os_disk_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSnapshotOSDiskShouldFailIfSnapshotFails(t *testing.T) { diff --git a/builder/azure/arm/step_test.go b/builder/azure/arm/step_test.go index 1f75b1936..1c6b37e70 100644 --- a/builder/azure/arm/step_test.go +++ b/builder/azure/arm/step_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestProcessStepResultShouldContinueForNonErrors(t *testing.T) { diff --git a/builder/azure/arm/step_validate_template.go b/builder/azure/arm/step_validate_template.go index 30ec3728b..4f3204659 100644 --- a/builder/azure/arm/step_validate_template.go +++ b/builder/azure/arm/step_validate_template.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepValidateTemplate struct { diff --git a/builder/azure/arm/step_validate_template_test.go b/builder/azure/arm/step_validate_template_test.go index 22251f489..7e127a2aa 100644 --- a/builder/azure/arm/step_validate_template_test.go +++ b/builder/azure/arm/step_validate_template_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepValidateTemplateShouldFailIfValidateFails(t *testing.T) { diff --git a/builder/azure/chroot/builder.go b/builder/azure/chroot/builder.go index 3e97083ae..6387e5603 100644 --- a/builder/azure/chroot/builder.go +++ b/builder/azure/chroot/builder.go @@ -19,11 +19,11 @@ import ( azcommon "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/client" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/chroot" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" diff --git a/builder/azure/chroot/builder_test.go b/builder/azure/chroot/builder_test.go index dee9436a9..08e6132e5 100644 --- a/builder/azure/chroot/builder_test.go +++ b/builder/azure/chroot/builder_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" ) diff --git a/builder/azure/chroot/step_attach_disk.go b/builder/azure/chroot/step_attach_disk.go index efbc2b430..53a0b16c3 100644 --- a/builder/azure/chroot/step_attach_disk.go +++ b/builder/azure/chroot/step_attach_disk.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) var _ multistep.Step = &StepAttachDisk{} diff --git a/builder/azure/chroot/step_attach_disk_test.go b/builder/azure/chroot/step_attach_disk_test.go index acbdfa4e1..69261b298 100644 --- a/builder/azure/chroot/step_attach_disk_test.go +++ b/builder/azure/chroot/step_attach_disk_test.go @@ -12,8 +12,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepAttachDisk_Run(t *testing.T) { diff --git a/builder/azure/chroot/step_create_image.go b/builder/azure/chroot/step_create_image.go index a818c4cd7..952374f7d 100644 --- a/builder/azure/chroot/step_create_image.go +++ b/builder/azure/chroot/step_create_image.go @@ -10,8 +10,8 @@ import ( "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) var _ multistep.Step = &StepCreateImage{} diff --git a/builder/azure/chroot/step_create_image_test.go b/builder/azure/chroot/step_create_image_test.go index 43bbebd50..4bb32e9cd 100644 --- a/builder/azure/chroot/step_create_image_test.go +++ b/builder/azure/chroot/step_create_image_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_create_new_diskset.go b/builder/azure/chroot/step_create_new_diskset.go index 3d188b2a5..ad690ecad 100644 --- a/builder/azure/chroot/step_create_new_diskset.go +++ b/builder/azure/chroot/step_create_new_diskset.go @@ -8,8 +8,8 @@ import ( "time" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" diff --git a/builder/azure/chroot/step_create_new_diskset_test.go b/builder/azure/chroot/step_create_new_diskset_test.go index 596752e2e..f85ea0d1f 100644 --- a/builder/azure/chroot/step_create_new_diskset_test.go +++ b/builder/azure/chroot/step_create_new_diskset_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_create_shared_image_version.go b/builder/azure/chroot/step_create_shared_image_version.go index 614ad100f..d32da7e92 100644 --- a/builder/azure/chroot/step_create_shared_image_version.go +++ b/builder/azure/chroot/step_create_shared_image_version.go @@ -10,8 +10,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateSharedImageVersion struct { diff --git a/builder/azure/chroot/step_create_shared_image_version_test.go b/builder/azure/chroot/step_create_shared_image_version_test.go index 4b8be5542..e08265a41 100644 --- a/builder/azure/chroot/step_create_shared_image_version_test.go +++ b/builder/azure/chroot/step_create_shared_image_version_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_create_snapshotset.go b/builder/azure/chroot/step_create_snapshotset.go index a03fbe5c9..6af98710a 100644 --- a/builder/azure/chroot/step_create_snapshotset.go +++ b/builder/azure/chroot/step_create_snapshotset.go @@ -8,8 +8,8 @@ import ( "time" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" diff --git a/builder/azure/chroot/step_create_snapshotset_test.go b/builder/azure/chroot/step_create_snapshotset_test.go index c7baf74e5..861edcb2c 100644 --- a/builder/azure/chroot/step_create_snapshotset_test.go +++ b/builder/azure/chroot/step_create_snapshotset_test.go @@ -11,8 +11,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateSnapshot_Run(t *testing.T) { diff --git a/builder/azure/chroot/step_mount_device.go b/builder/azure/chroot/step_mount_device.go index e6833075d..315b61d5b 100644 --- a/builder/azure/chroot/step_mount_device.go +++ b/builder/azure/chroot/step_mount_device.go @@ -12,9 +12,9 @@ import ( "runtime" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/azure/chroot/step_mount_device_test.go b/builder/azure/chroot/step_mount_device_test.go index fa46b4806..ee601ef52 100644 --- a/builder/azure/chroot/step_mount_device_test.go +++ b/builder/azure/chroot/step_mount_device_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepMountDevice_Run(t *testing.T) { diff --git a/builder/azure/chroot/step_resolve_plaform_image_version.go b/builder/azure/chroot/step_resolve_plaform_image_version.go index 77a2e7531..d0f4a9ed2 100644 --- a/builder/azure/chroot/step_resolve_plaform_image_version.go +++ b/builder/azure/chroot/step_resolve_plaform_image_version.go @@ -8,8 +8,8 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepResolvePlatformImageVersion resolves the exact PIR version when the version is 'latest' diff --git a/builder/azure/chroot/step_resolve_plaform_image_version_test.go b/builder/azure/chroot/step_resolve_plaform_image_version_test.go index 0030b8090..687037f64 100644 --- a/builder/azure/chroot/step_resolve_plaform_image_version_test.go +++ b/builder/azure/chroot/step_resolve_plaform_image_version_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_verify_shared_image_destination.go b/builder/azure/chroot/step_verify_shared_image_destination.go index 7877948fe..156e8413f 100644 --- a/builder/azure/chroot/step_verify_shared_image_destination.go +++ b/builder/azure/chroot/step_verify_shared_image_destination.go @@ -9,8 +9,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) var _ multistep.Step = &StepVerifySharedImageDestination{} diff --git a/builder/azure/chroot/step_verify_shared_image_destination_test.go b/builder/azure/chroot/step_verify_shared_image_destination_test.go index b34d24840..22dafaf94 100644 --- a/builder/azure/chroot/step_verify_shared_image_destination_test.go +++ b/builder/azure/chroot/step_verify_shared_image_destination_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_verify_shared_image_source.go b/builder/azure/chroot/step_verify_shared_image_source.go index ff64a565a..5f6d243c6 100644 --- a/builder/azure/chroot/step_verify_shared_image_source.go +++ b/builder/azure/chroot/step_verify_shared_image_source.go @@ -9,8 +9,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) var _ multistep.Step = &StepVerifySharedImageSource{} diff --git a/builder/azure/chroot/step_verify_shared_image_source_test.go b/builder/azure/chroot/step_verify_shared_image_source_test.go index 69ad4065d..d29b8042a 100644 --- a/builder/azure/chroot/step_verify_shared_image_source_test.go +++ b/builder/azure/chroot/step_verify_shared_image_source_test.go @@ -12,8 +12,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepVerifySharedImageSource_Run(t *testing.T) { diff --git a/builder/azure/chroot/step_verify_source_disk.go b/builder/azure/chroot/step_verify_source_disk.go index 43a0343ef..1bf65a436 100644 --- a/builder/azure/chroot/step_verify_source_disk.go +++ b/builder/azure/chroot/step_verify_source_disk.go @@ -10,8 +10,8 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepVerifySourceDisk struct { diff --git a/builder/azure/chroot/step_verify_source_disk_test.go b/builder/azure/chroot/step_verify_source_disk_test.go index dd3732b10..d0149a439 100644 --- a/builder/azure/chroot/step_verify_source_disk_test.go +++ b/builder/azure/chroot/step_verify_source_disk_test.go @@ -12,8 +12,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func Test_StepVerifySourceDisk_Run(t *testing.T) { diff --git a/builder/azure/common/lin/ssh.go b/builder/azure/common/lin/ssh.go index c8b09c45e..5e48273d9 100644 --- a/builder/azure/common/lin/ssh.go +++ b/builder/azure/common/lin/ssh.go @@ -2,7 +2,7 @@ package lin import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func SSHHost(state multistep.StateBag) (string, error) { diff --git a/builder/azure/common/state_bag.go b/builder/azure/common/state_bag.go index 57889c03f..ced0362f1 100644 --- a/builder/azure/common/state_bag.go +++ b/builder/azure/common/state_bag.go @@ -1,6 +1,6 @@ package common -import "github.com/hashicorp/packer/helper/multistep" +import "github.com/hashicorp/packer/packer-plugin-sdk/multistep" func IsStateCancelled(stateBag multistep.StateBag) bool { _, ok := stateBag.GetOk(multistep.StateCancelled) diff --git a/builder/azure/dtl/builder.go b/builder/azure/dtl/builder.go index fb840dc3d..ad32a4d83 100644 --- a/builder/azure/dtl/builder.go +++ b/builder/azure/dtl/builder.go @@ -18,9 +18,9 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" "github.com/hashicorp/packer/builder/azure/common/lin" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type Builder struct { diff --git a/builder/azure/dtl/step.go b/builder/azure/dtl/step.go index 6418e5c15..39320e5bd 100644 --- a/builder/azure/dtl/step.go +++ b/builder/azure/dtl/step.go @@ -2,7 +2,7 @@ package dtl import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func processStepResult( diff --git a/builder/azure/dtl/step_capture_image.go b/builder/azure/dtl/step_capture_image.go index 30f726a7d..6e0f84fb3 100644 --- a/builder/azure/dtl/step_capture_image.go +++ b/builder/azure/dtl/step_capture_image.go @@ -7,8 +7,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCaptureImage struct { diff --git a/builder/azure/dtl/step_delete_virtual_machine.go b/builder/azure/dtl/step_delete_virtual_machine.go index a94f72d6a..d85d18407 100644 --- a/builder/azure/dtl/step_delete_virtual_machine.go +++ b/builder/azure/dtl/step_delete_virtual_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDeleteVirtualMachine struct { diff --git a/builder/azure/dtl/step_deploy_template.go b/builder/azure/dtl/step_deploy_template.go index 0cface5ff..cae494bd6 100644 --- a/builder/azure/dtl/step_deploy_template.go +++ b/builder/azure/dtl/step_deploy_template.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDeployTemplate struct { diff --git a/builder/azure/dtl/step_power_off_compute.go b/builder/azure/dtl/step_power_off_compute.go index 794c3b751..2bc224c34 100644 --- a/builder/azure/dtl/step_power_off_compute.go +++ b/builder/azure/dtl/step_power_off_compute.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPowerOffCompute struct { diff --git a/builder/azure/dtl/step_publish_to_shared_image_gallery.go b/builder/azure/dtl/step_publish_to_shared_image_gallery.go index 3ed56794e..e4c6d8231 100644 --- a/builder/azure/dtl/step_publish_to_shared_image_gallery.go +++ b/builder/azure/dtl/step_publish_to_shared_image_gallery.go @@ -6,8 +6,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPublishToSharedImageGallery struct { diff --git a/builder/azure/dtl/step_save_winrm_password.go b/builder/azure/dtl/step_save_winrm_password.go index 241396228..ab81bcc80 100644 --- a/builder/azure/dtl/step_save_winrm_password.go +++ b/builder/azure/dtl/step_save_winrm_password.go @@ -3,8 +3,8 @@ package dtl import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSaveWinRMPassword struct { diff --git a/builder/azure/dtl/step_test.go b/builder/azure/dtl/step_test.go index 71ebb2b7a..1dedc7e85 100644 --- a/builder/azure/dtl/step_test.go +++ b/builder/azure/dtl/step_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestProcessStepResultShouldContinueForNonErrors(t *testing.T) { diff --git a/builder/cloudstack/builder.go b/builder/cloudstack/builder.go index 7a4f0cdc4..9dde567e3 100644 --- a/builder/cloudstack/builder.go +++ b/builder/cloudstack/builder.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/config.go b/builder/cloudstack/config.go index ce2760438..99adfa718 100644 --- a/builder/cloudstack/config.go +++ b/builder/cloudstack/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/cloudstack/ssh.go b/builder/cloudstack/ssh.go index 269c2a583..3be57e3e9 100644 --- a/builder/cloudstack/ssh.go +++ b/builder/cloudstack/ssh.go @@ -3,7 +3,7 @@ package cloudstack import ( "fmt" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func commPort(state multistep.StateBag) (int, error) { diff --git a/builder/cloudstack/step_configure_networking.go b/builder/cloudstack/step_configure_networking.go index 17ee7d92f..7de5a0a35 100644 --- a/builder/cloudstack/step_configure_networking.go +++ b/builder/cloudstack/step_configure_networking.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_create_instance.go b/builder/cloudstack/step_create_instance.go index aaba68bd6..682f0659b 100644 --- a/builder/cloudstack/step_create_instance.go +++ b/builder/cloudstack/step_create_instance.go @@ -8,8 +8,8 @@ import ( "net" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_create_security_group.go b/builder/cloudstack/step_create_security_group.go index 816948397..e479d0558 100644 --- a/builder/cloudstack/step_create_security_group.go +++ b/builder/cloudstack/step_create_security_group.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_create_template.go b/builder/cloudstack/step_create_template.go index 4b72d206d..f3f0ad03f 100644 --- a/builder/cloudstack/step_create_template.go +++ b/builder/cloudstack/step_create_template.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_detach_iso.go b/builder/cloudstack/step_detach_iso.go index 444293c2c..9e0a17d7c 100644 --- a/builder/cloudstack/step_detach_iso.go +++ b/builder/cloudstack/step_detach_iso.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_keypair.go b/builder/cloudstack/step_keypair.go index b47655596..41761c976 100644 --- a/builder/cloudstack/step_keypair.go +++ b/builder/cloudstack/step_keypair.go @@ -7,8 +7,8 @@ import ( "runtime" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_prepare_config.go b/builder/cloudstack/step_prepare_config.go index 7c6e1a4ff..f7cbcd637 100644 --- a/builder/cloudstack/step_prepare_config.go +++ b/builder/cloudstack/step_prepare_config.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "regexp" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_shutdown_instance.go b/builder/cloudstack/step_shutdown_instance.go index 77186e13b..c14a41f82 100644 --- a/builder/cloudstack/step_shutdown_instance.go +++ b/builder/cloudstack/step_shutdown_instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/digitalocean/builder.go b/builder/digitalocean/builder.go index 836f7b6b8..76cf9fbc3 100644 --- a/builder/digitalocean/builder.go +++ b/builder/digitalocean/builder.go @@ -12,9 +12,9 @@ import ( "github.com/digitalocean/godo" "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "golang.org/x/oauth2" ) diff --git a/builder/digitalocean/step_create_droplet.go b/builder/digitalocean/step_create_droplet.go index e246abf5e..021534677 100644 --- a/builder/digitalocean/step_create_droplet.go +++ b/builder/digitalocean/step_create_droplet.go @@ -9,8 +9,8 @@ import ( "io/ioutil" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateDroplet struct { diff --git a/builder/digitalocean/step_create_ssh_key.go b/builder/digitalocean/step_create_ssh_key.go index 5e104b506..36eaf0ed3 100644 --- a/builder/digitalocean/step_create_ssh_key.go +++ b/builder/digitalocean/step_create_ssh_key.go @@ -12,8 +12,8 @@ import ( "runtime" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "golang.org/x/crypto/ssh" ) diff --git a/builder/digitalocean/step_droplet_info.go b/builder/digitalocean/step_droplet_info.go index dc7a9ed8a..7f4c50149 100644 --- a/builder/digitalocean/step_droplet_info.go +++ b/builder/digitalocean/step_droplet_info.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepDropletInfo struct{} diff --git a/builder/digitalocean/step_power_off.go b/builder/digitalocean/step_power_off.go index fab35569a..f75fe898b 100644 --- a/builder/digitalocean/step_power_off.go +++ b/builder/digitalocean/step_power_off.go @@ -6,8 +6,8 @@ import ( "log" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepPowerOff struct{} diff --git a/builder/digitalocean/step_shutdown.go b/builder/digitalocean/step_shutdown.go index 339e034b7..8076ad539 100644 --- a/builder/digitalocean/step_shutdown.go +++ b/builder/digitalocean/step_shutdown.go @@ -7,8 +7,8 @@ import ( "time" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepShutdown struct{} diff --git a/builder/digitalocean/step_snapshot.go b/builder/digitalocean/step_snapshot.go index 511c3a377..b28a5e38c 100644 --- a/builder/digitalocean/step_snapshot.go +++ b/builder/digitalocean/step_snapshot.go @@ -8,8 +8,8 @@ import ( "time" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepSnapshot struct { diff --git a/builder/docker/builder.go b/builder/docker/builder.go index d5e7dcf41..87b29680e 100644 --- a/builder/docker/builder.go +++ b/builder/docker/builder.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/docker/comm.go b/builder/docker/comm.go index 6feabc3b2..dbc4198fb 100644 --- a/builder/docker/comm.go +++ b/builder/docker/comm.go @@ -3,7 +3,7 @@ package docker import ( "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func commHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/docker/step_commit.go b/builder/docker/step_commit.go index 33ccb090b..ca5948336 100644 --- a/builder/docker/step_commit.go +++ b/builder/docker/step_commit.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCommit commits the container to a image. diff --git a/builder/docker/step_commit_test.go b/builder/docker/step_commit_test.go index 16548b069..c7c9e7067 100644 --- a/builder/docker/step_commit_test.go +++ b/builder/docker/step_commit_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testStepCommitState(t *testing.T) multistep.StateBag { diff --git a/builder/docker/step_connect_docker.go b/builder/docker/step_connect_docker.go index 0d064b269..bff5108eb 100644 --- a/builder/docker/step_connect_docker.go +++ b/builder/docker/step_connect_docker.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepConnectDocker struct{} diff --git a/builder/docker/step_export.go b/builder/docker/step_export.go index 99a8a1d11..107761ce8 100644 --- a/builder/docker/step_export.go +++ b/builder/docker/step_export.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepExport exports the container to a flat tar file. diff --git a/builder/docker/step_export_test.go b/builder/docker/step_export_test.go index aa3fd124b..cdffcc4b6 100644 --- a/builder/docker/step_export_test.go +++ b/builder/docker/step_export_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testStepExportState(t *testing.T) multistep.StateBag { diff --git a/builder/docker/step_pull.go b/builder/docker/step_pull.go index d2cf3cdda..b18d01444 100644 --- a/builder/docker/step_pull.go +++ b/builder/docker/step_pull.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPull struct{} diff --git a/builder/docker/step_pull_test.go b/builder/docker/step_pull_test.go index b01b42107..c921612dd 100644 --- a/builder/docker/step_pull_test.go +++ b/builder/docker/step_pull_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepPull_impl(t *testing.T) { diff --git a/builder/docker/step_run.go b/builder/docker/step_run.go index 89f953dd2..ce9c46a40 100644 --- a/builder/docker/step_run.go +++ b/builder/docker/step_run.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRun struct { diff --git a/builder/docker/step_run_test.go b/builder/docker/step_run_test.go index c76c7c637..cc5908951 100644 --- a/builder/docker/step_run_test.go +++ b/builder/docker/step_run_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testStepRunState(t *testing.T) multistep.StateBag { diff --git a/builder/docker/step_set_generated_data.go b/builder/docker/step_set_generated_data.go index 972dd6495..9576cab17 100644 --- a/builder/docker/step_set_generated_data.go +++ b/builder/docker/step_set_generated_data.go @@ -3,7 +3,7 @@ package docker import ( "context" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/docker/step_set_generated_data_test.go b/builder/docker/step_set_generated_data_test.go index 9fa826129..930956095 100644 --- a/builder/docker/step_set_generated_data_test.go +++ b/builder/docker/step_set_generated_data_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/docker/step_temp_dir.go b/builder/docker/step_temp_dir.go index 39808cdd2..9879939d7 100644 --- a/builder/docker/step_temp_dir.go +++ b/builder/docker/step_temp_dir.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepTempDir creates a temporary directory that we use in order to diff --git a/builder/docker/step_temp_dir_test.go b/builder/docker/step_temp_dir_test.go index ee7245150..d58906df9 100644 --- a/builder/docker/step_temp_dir_test.go +++ b/builder/docker/step_temp_dir_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepTempDir_impl(t *testing.T) { diff --git a/builder/docker/step_test.go b/builder/docker/step_test.go index 0c7d56649..b048c3f6e 100644 --- a/builder/docker/step_test.go +++ b/builder/docker/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/file/builder.go b/builder/file/builder.go index 0f5b78734..f2a8d2969 100644 --- a/builder/file/builder.go +++ b/builder/file/builder.go @@ -14,8 +14,8 @@ import ( "path/filepath" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const BuilderId = "packer.file" diff --git a/builder/googlecompute/builder.go b/builder/googlecompute/builder.go index f8d7a896b..f3b73d0ef 100644 --- a/builder/googlecompute/builder.go +++ b/builder/googlecompute/builder.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // The unique ID for this builder. diff --git a/builder/googlecompute/step_check_existing_image.go b/builder/googlecompute/step_check_existing_image.go index 0574a0234..faabae456 100644 --- a/builder/googlecompute/step_check_existing_image.go +++ b/builder/googlecompute/step_check_existing_image.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCheckExistingImage represents a Packer build step that checks if the diff --git a/builder/googlecompute/step_check_existing_image_test.go b/builder/googlecompute/step_check_existing_image_test.go index d4b9a9541..162d6188b 100644 --- a/builder/googlecompute/step_check_existing_image_test.go +++ b/builder/googlecompute/step_check_existing_image_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCheckExistingImage_impl(t *testing.T) { diff --git a/builder/googlecompute/step_create_image.go b/builder/googlecompute/step_create_image.go index 0de8211b0..0c37d6acf 100644 --- a/builder/googlecompute/step_create_image.go +++ b/builder/googlecompute/step_create_image.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCreateImage represents a Packer build step that creates GCE machine diff --git a/builder/googlecompute/step_create_image_test.go b/builder/googlecompute/step_create_image_test.go index 2a3017f0a..f8084412c 100644 --- a/builder/googlecompute/step_create_image_test.go +++ b/builder/googlecompute/step_create_image_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/googlecompute/step_create_instance.go b/builder/googlecompute/step_create_instance.go index 6c892da60..371fee64a 100644 --- a/builder/googlecompute/step_create_instance.go +++ b/builder/googlecompute/step_create_instance.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCreateInstance represents a Packer build step that creates GCE instances. diff --git a/builder/googlecompute/step_create_instance_test.go b/builder/googlecompute/step_create_instance_test.go index 82ccfe881..791c6ffbe 100644 --- a/builder/googlecompute/step_create_instance_test.go +++ b/builder/googlecompute/step_create_instance_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/googlecompute/step_create_windows_password.go b/builder/googlecompute/step_create_windows_password.go index 6f1aeb22f..d86116091 100644 --- a/builder/googlecompute/step_create_windows_password.go +++ b/builder/googlecompute/step_create_windows_password.go @@ -13,8 +13,8 @@ import ( "os" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCreateWindowsPassword represents a Packer build step that sets the windows password on a Windows GCE instance. diff --git a/builder/googlecompute/step_create_windows_password_test.go b/builder/googlecompute/step_create_windows_password_test.go index 6abb6243d..03dd188dd 100644 --- a/builder/googlecompute/step_create_windows_password_test.go +++ b/builder/googlecompute/step_create_windows_password_test.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "os" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "testing" ) diff --git a/builder/googlecompute/step_import_os_login_ssh_key.go b/builder/googlecompute/step_import_os_login_ssh_key.go index 84bfb8b8c..833e73fb0 100644 --- a/builder/googlecompute/step_import_os_login_ssh_key.go +++ b/builder/googlecompute/step_import_os_login_ssh_key.go @@ -6,8 +6,8 @@ import ( "encoding/hex" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "google.golang.org/api/oauth2/v2" ) diff --git a/builder/googlecompute/step_import_os_login_ssh_key_test.go b/builder/googlecompute/step_import_os_login_ssh_key_test.go index f31df1b0d..0ed20bb1a 100644 --- a/builder/googlecompute/step_import_os_login_ssh_key_test.go +++ b/builder/googlecompute/step_import_os_login_ssh_key_test.go @@ -6,7 +6,7 @@ import ( "encoding/hex" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "google.golang.org/api/oauth2/v2" ) diff --git a/builder/googlecompute/step_instance_info.go b/builder/googlecompute/step_instance_info.go index b36d2f1d8..cd388df9f 100644 --- a/builder/googlecompute/step_instance_info.go +++ b/builder/googlecompute/step_instance_info.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepInstanceInfo represents a Packer build step that gathers GCE instance info. diff --git a/builder/googlecompute/step_instance_info_test.go b/builder/googlecompute/step_instance_info_test.go index 7435df7fc..502bbedfd 100644 --- a/builder/googlecompute/step_instance_info_test.go +++ b/builder/googlecompute/step_instance_info_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepInstanceInfo_impl(t *testing.T) { diff --git a/builder/googlecompute/step_start_tunnel.go b/builder/googlecompute/step_start_tunnel.go index 34a5d1e67..bda9e8d32 100644 --- a/builder/googlecompute/step_start_tunnel.go +++ b/builder/googlecompute/step_start_tunnel.go @@ -19,8 +19,8 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" diff --git a/builder/googlecompute/step_teardown_instance.go b/builder/googlecompute/step_teardown_instance.go index e7757862b..b545634f4 100644 --- a/builder/googlecompute/step_teardown_instance.go +++ b/builder/googlecompute/step_teardown_instance.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepTeardownInstance represents a Packer build step that tears down GCE diff --git a/builder/googlecompute/step_teardown_instance_test.go b/builder/googlecompute/step_teardown_instance_test.go index 129c4e596..96db676f6 100644 --- a/builder/googlecompute/step_teardown_instance_test.go +++ b/builder/googlecompute/step_teardown_instance_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepTeardownInstance_impl(t *testing.T) { diff --git a/builder/googlecompute/step_test.go b/builder/googlecompute/step_test.go index a50bde49f..db9ff3dab 100644 --- a/builder/googlecompute/step_test.go +++ b/builder/googlecompute/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/googlecompute/step_wait_startup_script.go b/builder/googlecompute/step_wait_startup_script.go index 82f7e4b16..25c64988b 100644 --- a/builder/googlecompute/step_wait_startup_script.go +++ b/builder/googlecompute/step_wait_startup_script.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/googlecompute/step_wait_startup_script_test.go b/builder/googlecompute/step_wait_startup_script_test.go index 0bbe242ba..d22fbbd61 100644 --- a/builder/googlecompute/step_wait_startup_script_test.go +++ b/builder/googlecompute/step_wait_startup_script_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/googlecompute/winrm.go b/builder/googlecompute/winrm.go index 767787401..7d5370866 100644 --- a/builder/googlecompute/winrm.go +++ b/builder/googlecompute/winrm.go @@ -2,7 +2,7 @@ package googlecompute import ( "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // winrmConfig returns the WinRM configuration. diff --git a/builder/hcloud/builder.go b/builder/hcloud/builder.go index a07378c58..f46b62c33 100644 --- a/builder/hcloud/builder.go +++ b/builder/hcloud/builder.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hetznercloud/hcloud-go/hcloud" ) diff --git a/builder/hcloud/config.go b/builder/hcloud/config.go index 349743b1b..5bdee0ee7 100644 --- a/builder/hcloud/config.go +++ b/builder/hcloud/config.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/hetznercloud/hcloud-go/hcloud" diff --git a/builder/hcloud/step_create_server.go b/builder/hcloud/step_create_server.go index f0d2f863a..05d84407a 100644 --- a/builder/hcloud/step_create_server.go +++ b/builder/hcloud/step_create_server.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hetznercloud/hcloud-go/hcloud" ) diff --git a/builder/hcloud/step_create_snapshot.go b/builder/hcloud/step_create_snapshot.go index f2365fc1e..26550d66e 100644 --- a/builder/hcloud/step_create_snapshot.go +++ b/builder/hcloud/step_create_snapshot.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hetznercloud/hcloud-go/hcloud" ) diff --git a/builder/hcloud/step_create_sshkey.go b/builder/hcloud/step_create_sshkey.go index 757efda4e..fa6a05e68 100644 --- a/builder/hcloud/step_create_sshkey.go +++ b/builder/hcloud/step_create_sshkey.go @@ -11,8 +11,8 @@ import ( "os" "runtime" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/hetznercloud/hcloud-go/hcloud" "golang.org/x/crypto/ssh" diff --git a/builder/hcloud/step_shutdown_server.go b/builder/hcloud/step_shutdown_server.go index 4aafd5852..25cba2de8 100644 --- a/builder/hcloud/step_shutdown_server.go +++ b/builder/hcloud/step_shutdown_server.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hetznercloud/hcloud-go/hcloud" ) diff --git a/builder/hyperone/builder.go b/builder/hyperone/builder.go index 15f3716dc..d1cb42047 100644 --- a/builder/hyperone/builder.go +++ b/builder/hyperone/builder.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/config.go b/builder/hyperone/config.go index 1b677ed29..4b5b5ee06 100644 --- a/builder/hyperone/config.go +++ b/builder/hyperone/config.go @@ -13,10 +13,10 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/json" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/mitchellh/go-homedir" diff --git a/builder/hyperone/step_chroot_provision.go b/builder/hyperone/step_chroot_provision.go index ffbc5a6fc..7efa606ed 100644 --- a/builder/hyperone/step_chroot_provision.go +++ b/builder/hyperone/step_chroot_provision.go @@ -3,9 +3,9 @@ package hyperone import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type stepChrootProvision struct{} diff --git a/builder/hyperone/step_copy_files.go b/builder/hyperone/step_copy_files.go index 739b76e62..7eade9313 100644 --- a/builder/hyperone/step_copy_files.go +++ b/builder/hyperone/step_copy_files.go @@ -6,8 +6,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCopyFiles struct{} diff --git a/builder/hyperone/step_create_image.go b/builder/hyperone/step_create_image.go index 923566cd1..9b12e3a53 100644 --- a/builder/hyperone/step_create_image.go +++ b/builder/hyperone/step_create_image.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/step_create_ssh_key.go b/builder/hyperone/step_create_ssh_key.go index 3bf19fe33..1180ae61f 100644 --- a/builder/hyperone/step_create_ssh_key.go +++ b/builder/hyperone/step_create_ssh_key.go @@ -10,8 +10,8 @@ import ( "os" "runtime" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/hyperone/step_create_vm.go b/builder/hyperone/step_create_vm.go index b1e1f0c9b..05b4b340b 100644 --- a/builder/hyperone/step_create_vm.go +++ b/builder/hyperone/step_create_vm.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/step_create_vm_from_disk.go b/builder/hyperone/step_create_vm_from_disk.go index b81a93b32..39969e780 100644 --- a/builder/hyperone/step_create_vm_from_disk.go +++ b/builder/hyperone/step_create_vm_from_disk.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/step_detach_disk.go b/builder/hyperone/step_detach_disk.go index 0a1451ae1..d258cabb2 100644 --- a/builder/hyperone/step_detach_disk.go +++ b/builder/hyperone/step_detach_disk.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/step_mount_chroot.go b/builder/hyperone/step_mount_chroot.go index a4e01a09c..c4b5dd0d6 100644 --- a/builder/hyperone/step_mount_chroot.go +++ b/builder/hyperone/step_mount_chroot.go @@ -6,8 +6,8 @@ import ( "log" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepMountChroot struct{} diff --git a/builder/hyperone/step_mount_extra.go b/builder/hyperone/step_mount_extra.go index ae798526e..318803746 100644 --- a/builder/hyperone/step_mount_extra.go +++ b/builder/hyperone/step_mount_extra.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepMountExtra struct{} diff --git a/builder/hyperone/step_post_mount_commands.go b/builder/hyperone/step_post_mount_commands.go index 5fc074263..7d943f34a 100644 --- a/builder/hyperone/step_post_mount_commands.go +++ b/builder/hyperone/step_post_mount_commands.go @@ -3,8 +3,8 @@ package hyperone import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type postMountCommandsData struct { diff --git a/builder/hyperone/step_pre_mount_commands.go b/builder/hyperone/step_pre_mount_commands.go index 4a1e4dd11..b96551af2 100644 --- a/builder/hyperone/step_pre_mount_commands.go +++ b/builder/hyperone/step_pre_mount_commands.go @@ -3,8 +3,8 @@ package hyperone import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type preMountCommandsData struct { diff --git a/builder/hyperone/step_prepare_device.go b/builder/hyperone/step_prepare_device.go index c0d42852c..a4474fe3a 100644 --- a/builder/hyperone/step_prepare_device.go +++ b/builder/hyperone/step_prepare_device.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const ( diff --git a/builder/hyperone/step_stop_vm.go b/builder/hyperone/step_stop_vm.go index 7d83334d4..4189cf15b 100644 --- a/builder/hyperone/step_stop_vm.go +++ b/builder/hyperone/step_stop_vm.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/utils.go b/builder/hyperone/utils.go index 594e6a164..8d83d26c0 100644 --- a/builder/hyperone/utils.go +++ b/builder/hyperone/utils.go @@ -7,8 +7,8 @@ import ( "log" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperv/common/config.go b/builder/hyperv/common/config.go index 3502bd2ab..dc12a27cb 100644 --- a/builder/hyperv/common/config.go +++ b/builder/hyperv/common/config.go @@ -11,7 +11,7 @@ import ( powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell" "github.com/hashicorp/packer/builder/hyperv/common/powershell/hyperv" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/hyperv/common/ssh.go b/builder/hyperv/common/ssh.go index c152e419c..c116f2f3f 100644 --- a/builder/hyperv/common/ssh.go +++ b/builder/hyperv/common/ssh.go @@ -3,7 +3,7 @@ package common import ( "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CommHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/hyperv/common/step_clone_vm.go b/builder/hyperv/common/step_clone_vm.go index 5213574e1..a6a101e4f 100644 --- a/builder/hyperv/common/step_clone_vm.go +++ b/builder/hyperv/common/step_clone_vm.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step clones an existing virtual machine. diff --git a/builder/hyperv/common/step_collate_artifacts.go b/builder/hyperv/common/step_collate_artifacts.go index 580ba28d0..7f0561e90 100644 --- a/builder/hyperv/common/step_collate_artifacts.go +++ b/builder/hyperv/common/step_collate_artifacts.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCollateArtifacts struct { diff --git a/builder/hyperv/common/step_collate_artifacts_test.go b/builder/hyperv/common/step_collate_artifacts_test.go index d88ca59bc..88fa325ad 100644 --- a/builder/hyperv/common/step_collate_artifacts_test.go +++ b/builder/hyperv/common/step_collate_artifacts_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCollateArtifacts_impl(t *testing.T) { diff --git a/builder/hyperv/common/step_compact_disk.go b/builder/hyperv/common/step_compact_disk.go index 437473b16..75f174d22 100644 --- a/builder/hyperv/common/step_compact_disk.go +++ b/builder/hyperv/common/step_compact_disk.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCompactDisk struct { diff --git a/builder/hyperv/common/step_compact_disk_test.go b/builder/hyperv/common/step_compact_disk_test.go index f8943d25f..a88a637e2 100644 --- a/builder/hyperv/common/step_compact_disk_test.go +++ b/builder/hyperv/common/step_compact_disk_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCompactDisk_impl(t *testing.T) { diff --git a/builder/hyperv/common/step_configure_ip.go b/builder/hyperv/common/step_configure_ip.go index 5e5baac31..70682a6df 100644 --- a/builder/hyperv/common/step_configure_ip.go +++ b/builder/hyperv/common/step_configure_ip.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepConfigureIp struct { diff --git a/builder/hyperv/common/step_configure_vlan.go b/builder/hyperv/common/step_configure_vlan.go index 60d8fdf3a..810c200c2 100644 --- a/builder/hyperv/common/step_configure_vlan.go +++ b/builder/hyperv/common/step_configure_vlan.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepConfigureVlan struct { diff --git a/builder/hyperv/common/step_create_build_dir.go b/builder/hyperv/common/step_create_build_dir.go index f7a51a625..d66257bac 100644 --- a/builder/hyperv/common/step_create_build_dir.go +++ b/builder/hyperv/common/step_create_build_dir.go @@ -7,8 +7,8 @@ import ( "log" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/builder/hyperv/common/step_create_build_dir_test.go b/builder/hyperv/common/step_create_build_dir_test.go index ab0c0c49a..80e4d391f 100644 --- a/builder/hyperv/common/step_create_build_dir_test.go +++ b/builder/hyperv/common/step_create_build_dir_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateBuildDir_imp(t *testing.T) { diff --git a/builder/hyperv/common/step_create_external_switch.go b/builder/hyperv/common/step_create_external_switch.go index 04c4d2d4c..ec8d41339 100644 --- a/builder/hyperv/common/step_create_external_switch.go +++ b/builder/hyperv/common/step_create_external_switch.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/hyperv/common/step_create_switch.go b/builder/hyperv/common/step_create_switch.go index 7ea5f5c24..2e46036cd 100644 --- a/builder/hyperv/common/step_create_switch.go +++ b/builder/hyperv/common/step_create_switch.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const ( diff --git a/builder/hyperv/common/step_create_vm.go b/builder/hyperv/common/step_create_vm.go index 920edfa45..1b5e22c73 100644 --- a/builder/hyperv/common/step_create_vm.go +++ b/builder/hyperv/common/step_create_vm.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step creates the actual virtual machine. diff --git a/builder/hyperv/common/step_create_vm_test.go b/builder/hyperv/common/step_create_vm_test.go index 93725d9cb..d97623895 100644 --- a/builder/hyperv/common/step_create_vm_test.go +++ b/builder/hyperv/common/step_create_vm_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateVM_impl(t *testing.T) { diff --git a/builder/hyperv/common/step_disable_vlan.go b/builder/hyperv/common/step_disable_vlan.go index 3bae16d7c..f2caf89a4 100644 --- a/builder/hyperv/common/step_disable_vlan.go +++ b/builder/hyperv/common/step_disable_vlan.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDisableVlan struct { diff --git a/builder/hyperv/common/step_enable_integration_service.go b/builder/hyperv/common/step_enable_integration_service.go index 25675b749..4a1a3a7d5 100644 --- a/builder/hyperv/common/step_enable_integration_service.go +++ b/builder/hyperv/common/step_enable_integration_service.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepEnableIntegrationService struct { diff --git a/builder/hyperv/common/step_export_vm.go b/builder/hyperv/common/step_export_vm.go index 08513d0f7..f94d4f7e1 100644 --- a/builder/hyperv/common/step_export_vm.go +++ b/builder/hyperv/common/step_export_vm.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepExportVm struct { diff --git a/builder/hyperv/common/step_export_vm_test.go b/builder/hyperv/common/step_export_vm_test.go index 81cc34af9..dcffa5bc2 100644 --- a/builder/hyperv/common/step_export_vm_test.go +++ b/builder/hyperv/common/step_export_vm_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepExportVm_impl(t *testing.T) { diff --git a/builder/hyperv/common/step_mount_dvddrive.go b/builder/hyperv/common/step_mount_dvddrive.go index f0eeaba61..37b10bf8e 100644 --- a/builder/hyperv/common/step_mount_dvddrive.go +++ b/builder/hyperv/common/step_mount_dvddrive.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepMountDvdDrive struct { diff --git a/builder/hyperv/common/step_mount_floppydrive.go b/builder/hyperv/common/step_mount_floppydrive.go index 014aaf086..e2cb9e1b1 100644 --- a/builder/hyperv/common/step_mount_floppydrive.go +++ b/builder/hyperv/common/step_mount_floppydrive.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/builder/hyperv/common/step_mount_guest_additions.go b/builder/hyperv/common/step_mount_guest_additions.go index 852e8e274..4f215220d 100644 --- a/builder/hyperv/common/step_mount_guest_additions.go +++ b/builder/hyperv/common/step_mount_guest_additions.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepMountGuestAdditions struct { diff --git a/builder/hyperv/common/step_mount_secondary_dvd_images.go b/builder/hyperv/common/step_mount_secondary_dvd_images.go index a6cbd7e6b..fe1921ff8 100644 --- a/builder/hyperv/common/step_mount_secondary_dvd_images.go +++ b/builder/hyperv/common/step_mount_secondary_dvd_images.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepMountSecondaryDvdImages struct { diff --git a/builder/hyperv/common/step_polling_installation.go b/builder/hyperv/common/step_polling_installation.go index 40754f725..a2db5f9cb 100644 --- a/builder/hyperv/common/step_polling_installation.go +++ b/builder/hyperv/common/step_polling_installation.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const port string = "13000" diff --git a/builder/hyperv/common/step_reboot_vm.go b/builder/hyperv/common/step_reboot_vm.go index b2053804f..335f66c1f 100644 --- a/builder/hyperv/common/step_reboot_vm.go +++ b/builder/hyperv/common/step_reboot_vm.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRebootVm struct { diff --git a/builder/hyperv/common/step_run.go b/builder/hyperv/common/step_run.go index 41a0be191..035aa35bf 100644 --- a/builder/hyperv/common/step_run.go +++ b/builder/hyperv/common/step_run.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRun struct { diff --git a/builder/hyperv/common/step_set_boot_order.go b/builder/hyperv/common/step_set_boot_order.go index ab94ce968..7e4b9d3d1 100644 --- a/builder/hyperv/common/step_set_boot_order.go +++ b/builder/hyperv/common/step_set_boot_order.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSetBootOrder struct { diff --git a/builder/hyperv/common/step_set_boot_order_test.go b/builder/hyperv/common/step_set_boot_order_test.go index 0c1b1e539..bd1916ac9 100644 --- a/builder/hyperv/common/step_set_boot_order_test.go +++ b/builder/hyperv/common/step_set_boot_order_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type bootOrderTest struct { diff --git a/builder/hyperv/common/step_set_first_boot_device.go b/builder/hyperv/common/step_set_first_boot_device.go index c8b56f8f0..cf3c60fa4 100644 --- a/builder/hyperv/common/step_set_first_boot_device.go +++ b/builder/hyperv/common/step_set_first_boot_device.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSetFirstBootDevice struct { diff --git a/builder/hyperv/common/step_set_first_boot_device_test.go b/builder/hyperv/common/step_set_first_boot_device_test.go index 264363e98..80e4b28b3 100644 --- a/builder/hyperv/common/step_set_first_boot_device_test.go +++ b/builder/hyperv/common/step_set_first_boot_device_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type parseBootDeviceIdentifierTest struct { diff --git a/builder/hyperv/common/step_shutdown.go b/builder/hyperv/common/step_shutdown.go index 6620b901f..741c6d815 100644 --- a/builder/hyperv/common/step_shutdown.go +++ b/builder/hyperv/common/step_shutdown.go @@ -8,8 +8,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step shuts down the machine. It first attempts to do so gracefully, diff --git a/builder/hyperv/common/step_sleep.go b/builder/hyperv/common/step_sleep.go index 1bbcfac56..5420c7f0d 100644 --- a/builder/hyperv/common/step_sleep.go +++ b/builder/hyperv/common/step_sleep.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSleep struct { diff --git a/builder/hyperv/common/step_test.go b/builder/hyperv/common/step_test.go index 34c8eea3e..30691fa20 100644 --- a/builder/hyperv/common/step_test.go +++ b/builder/hyperv/common/step_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/hyperv/common/step_type_boot_command.go b/builder/hyperv/common/step_type_boot_command.go index 84fed0a5a..3fbd0871f 100644 --- a/builder/hyperv/common/step_type_boot_command.go +++ b/builder/hyperv/common/step_type_boot_command.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/hyperv/common/step_unmount_dvddrive.go b/builder/hyperv/common/step_unmount_dvddrive.go index 665d00808..bdd98e30f 100644 --- a/builder/hyperv/common/step_unmount_dvddrive.go +++ b/builder/hyperv/common/step_unmount_dvddrive.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUnmountDvdDrive struct { diff --git a/builder/hyperv/common/step_unmount_floppydrive.go b/builder/hyperv/common/step_unmount_floppydrive.go index 7c212ce5c..eccfb5dc4 100644 --- a/builder/hyperv/common/step_unmount_floppydrive.go +++ b/builder/hyperv/common/step_unmount_floppydrive.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUnmountFloppyDrive struct { diff --git a/builder/hyperv/common/step_unmount_guest_additions.go b/builder/hyperv/common/step_unmount_guest_additions.go index bb51eb7ce..663d64077 100644 --- a/builder/hyperv/common/step_unmount_guest_additions.go +++ b/builder/hyperv/common/step_unmount_guest_additions.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUnmountGuestAdditions struct { diff --git a/builder/hyperv/common/step_unmount_secondary_dvd_images.go b/builder/hyperv/common/step_unmount_secondary_dvd_images.go index 9cf192d4d..c33617fe0 100644 --- a/builder/hyperv/common/step_unmount_secondary_dvd_images.go +++ b/builder/hyperv/common/step_unmount_secondary_dvd_images.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUnmountSecondaryDvdImages struct { diff --git a/builder/hyperv/common/step_wait_for_install_to_complete.go b/builder/hyperv/common/step_wait_for_install_to_complete.go index 265eb6572..da4ac90ba 100644 --- a/builder/hyperv/common/step_wait_for_install_to_complete.go +++ b/builder/hyperv/common/step_wait_for_install_to_complete.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const ( diff --git a/builder/hyperv/iso/builder.go b/builder/hyperv/iso/builder.go index c398b1b3e..dcbdae5af 100644 --- a/builder/hyperv/iso/builder.go +++ b/builder/hyperv/iso/builder.go @@ -15,11 +15,11 @@ import ( hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/hyperv/iso/builder_test.go b/builder/hyperv/iso/builder_test.go index 54c05477a..0103b656a 100644 --- a/builder/hyperv/iso/builder_test.go +++ b/builder/hyperv/iso/builder_test.go @@ -10,8 +10,8 @@ import ( "testing" hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testConfig() map[string]interface{} { diff --git a/builder/hyperv/vmcx/builder.go b/builder/hyperv/vmcx/builder.go index d61d8794e..8c57ad792 100644 --- a/builder/hyperv/vmcx/builder.go +++ b/builder/hyperv/vmcx/builder.go @@ -15,11 +15,11 @@ import ( powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/hyperv/vmcx/builder_test.go b/builder/hyperv/vmcx/builder_test.go index b9b1ffc8c..e6c25b9f5 100644 --- a/builder/hyperv/vmcx/builder_test.go +++ b/builder/hyperv/vmcx/builder_test.go @@ -10,8 +10,8 @@ import ( "os" hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testConfig() map[string]interface{} { diff --git a/builder/jdcloud/builder.go b/builder/jdcloud/builder.go index e5f0c45ac..c226ca01b 100644 --- a/builder/jdcloud/builder.go +++ b/builder/jdcloud/builder.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/jdcloud/common.go b/builder/jdcloud/common.go index 540863dd9..f60889450 100644 --- a/builder/jdcloud/common.go +++ b/builder/jdcloud/common.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client" vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client" diff --git a/builder/jdcloud/step_config_credentials.go b/builder/jdcloud/step_config_credentials.go index 360a27629..848f44874 100644 --- a/builder/jdcloud/step_config_credentials.go +++ b/builder/jdcloud/step_config_credentials.go @@ -5,8 +5,8 @@ import ( "fmt" "io/ioutil" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" ) diff --git a/builder/jdcloud/step_create_image.go b/builder/jdcloud/step_create_image.go index c126d8047..4e1fde048 100644 --- a/builder/jdcloud/step_create_image.go +++ b/builder/jdcloud/step_create_image.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" ) diff --git a/builder/jdcloud/step_create_instance.go b/builder/jdcloud/step_create_instance.go index 4395b1932..745b98085 100644 --- a/builder/jdcloud/step_create_instance.go +++ b/builder/jdcloud/step_create_instance.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/jdcloud-api/jdcloud-sdk-go/core" "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" diff --git a/builder/jdcloud/step_stop_instance.go b/builder/jdcloud/step_stop_instance.go index 0468b7469..a167b0fc6 100644 --- a/builder/jdcloud/step_stop_instance.go +++ b/builder/jdcloud/step_stop_instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" ) diff --git a/builder/jdcloud/step_validate_parameters.go b/builder/jdcloud/step_validate_parameters.go index adfab5e14..708617957 100644 --- a/builder/jdcloud/step_validate_parameters.go +++ b/builder/jdcloud/step_validate_parameters.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis" ) diff --git a/builder/linode/builder.go b/builder/linode/builder.go index 771ba8123..670cc2d35 100644 --- a/builder/linode/builder.go +++ b/builder/linode/builder.go @@ -12,9 +12,9 @@ import ( "github.com/linode/linodego" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // The unique ID for this builder. diff --git a/builder/linode/step_create_image.go b/builder/linode/step_create_image.go index 4e5ea5a64..58da16e73 100644 --- a/builder/linode/step_create_image.go +++ b/builder/linode/step_create_image.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/linode/linodego" ) diff --git a/builder/linode/step_create_linode.go b/builder/linode/step_create_linode.go index 90dc6342a..50db58696 100644 --- a/builder/linode/step_create_linode.go +++ b/builder/linode/step_create_linode.go @@ -5,8 +5,8 @@ import ( "errors" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/linode/linodego" ) diff --git a/builder/linode/step_create_ssh_key.go b/builder/linode/step_create_ssh_key.go index 2e0776ade..c5f7ad4cb 100644 --- a/builder/linode/step_create_ssh_key.go +++ b/builder/linode/step_create_ssh_key.go @@ -10,8 +10,8 @@ import ( "io/ioutil" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/linode/step_shutdown_linode.go b/builder/linode/step_shutdown_linode.go index 30ca39c57..82069e19c 100644 --- a/builder/linode/step_shutdown_linode.go +++ b/builder/linode/step_shutdown_linode.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/linode/linodego" ) diff --git a/builder/lxc/builder.go b/builder/lxc/builder.go index a888cb77b..53195c764 100644 --- a/builder/lxc/builder.go +++ b/builder/lxc/builder.go @@ -6,9 +6,9 @@ import ( "path/filepath" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/lxc/step_export.go b/builder/lxc/step_export.go index 890949bde..f017f551a 100644 --- a/builder/lxc/step_export.go +++ b/builder/lxc/step_export.go @@ -9,8 +9,8 @@ import ( "os/user" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepExport struct{} diff --git a/builder/lxc/step_lxc_create.go b/builder/lxc/step_lxc_create.go index c09626cd1..afcc2da79 100644 --- a/builder/lxc/step_lxc_create.go +++ b/builder/lxc/step_lxc_create.go @@ -7,8 +7,8 @@ import ( "os/user" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepLxcCreate struct{} diff --git a/builder/lxc/step_prepare_output_dir.go b/builder/lxc/step_prepare_output_dir.go index 5537c5a8c..65e7b40b0 100644 --- a/builder/lxc/step_prepare_output_dir.go +++ b/builder/lxc/step_prepare_output_dir.go @@ -6,8 +6,8 @@ import ( "os" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepPrepareOutputDir struct{} diff --git a/builder/lxc/step_provision.go b/builder/lxc/step_provision.go index 578b25906..5d8beae4c 100644 --- a/builder/lxc/step_provision.go +++ b/builder/lxc/step_provision.go @@ -4,9 +4,9 @@ import ( "context" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // StepProvision provisions the instance within a chroot. diff --git a/builder/lxc/step_wait_init.go b/builder/lxc/step_wait_init.go index 5b7873cb4..c4e733edc 100644 --- a/builder/lxc/step_wait_init.go +++ b/builder/lxc/step_wait_init.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepWaitInit struct { diff --git a/builder/lxd/builder.go b/builder/lxd/builder.go index e0f168b4d..34be34e62 100644 --- a/builder/lxd/builder.go +++ b/builder/lxd/builder.go @@ -4,9 +4,9 @@ import ( "context" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/lxd/step_lxd_launch.go b/builder/lxd/step_lxd_launch.go index 7bff6fd42..420c6564a 100644 --- a/builder/lxd/step_lxd_launch.go +++ b/builder/lxd/step_lxd_launch.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepLxdLaunch struct{} diff --git a/builder/lxd/step_provision.go b/builder/lxd/step_provision.go index 7c57d7e5b..1fa1b47c0 100644 --- a/builder/lxd/step_provision.go +++ b/builder/lxd/step_provision.go @@ -4,9 +4,9 @@ import ( "context" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // StepProvision provisions the container diff --git a/builder/lxd/step_publish.go b/builder/lxd/step_publish.go index 461f3a9bd..7f7d838b1 100644 --- a/builder/lxd/step_publish.go +++ b/builder/lxd/step_publish.go @@ -5,8 +5,8 @@ import ( "fmt" "regexp" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepPublish struct{} diff --git a/builder/ncloud/builder.go b/builder/ncloud/builder.go index 6562b69ff..284a881d3 100644 --- a/builder/ncloud/builder.go +++ b/builder/ncloud/builder.go @@ -6,9 +6,9 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // Builder assume this implements packer.Builder diff --git a/builder/ncloud/step.go b/builder/ncloud/step.go index 8b312fae7..537692de8 100644 --- a/builder/ncloud/step.go +++ b/builder/ncloud/step.go @@ -1,7 +1,7 @@ package ncloud import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func processStepResult(err error, sayError func(error), state multistep.StateBag) multistep.StepAction { diff --git a/builder/ncloud/step_create_block_storage_instance.go b/builder/ncloud/step_create_block_storage_instance.go index 17ac68ba1..d0f584507 100644 --- a/builder/ncloud/step_create_block_storage_instance.go +++ b/builder/ncloud/step_create_block_storage_instance.go @@ -9,8 +9,8 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCreateBlockStorageInstance struct is for making extra block storage diff --git a/builder/ncloud/step_create_block_storage_instance_test.go b/builder/ncloud/step_create_block_storage_instance_test.go index 1731eec6d..f5fb575a0 100644 --- a/builder/ncloud/step_create_block_storage_instance_test.go +++ b/builder/ncloud/step_create_block_storage_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateBlockStorageInstanceShouldFailIfOperationCreateBlockStorageInstanceFails(t *testing.T) { diff --git a/builder/ncloud/step_create_login_key.go b/builder/ncloud/step_create_login_key.go index 1a302c665..7cf7ae505 100644 --- a/builder/ncloud/step_create_login_key.go +++ b/builder/ncloud/step_create_login_key.go @@ -6,8 +6,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type LoginKey struct { diff --git a/builder/ncloud/step_create_login_key_test.go b/builder/ncloud/step_create_login_key_test.go index 3583f47a5..df6cedd44 100644 --- a/builder/ncloud/step_create_login_key_test.go +++ b/builder/ncloud/step_create_login_key_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateLoginKeyShouldFailIfOperationCreateLoginKeyFails(t *testing.T) { diff --git a/builder/ncloud/step_create_public_ip_instance.go b/builder/ncloud/step_create_public_ip_instance.go index 4a0900a9a..17820c241 100644 --- a/builder/ncloud/step_create_public_ip_instance.go +++ b/builder/ncloud/step_create_public_ip_instance.go @@ -8,8 +8,8 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreatePublicIPInstance struct { diff --git a/builder/ncloud/step_create_public_ip_instance_test.go b/builder/ncloud/step_create_public_ip_instance_test.go index 25b4d3c11..c4045fd03 100644 --- a/builder/ncloud/step_create_public_ip_instance_test.go +++ b/builder/ncloud/step_create_public_ip_instance_test.go @@ -8,7 +8,7 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreatePublicIPInstanceShouldFailIfOperationCreatePublicIPInstanceFails(t *testing.T) { diff --git a/builder/ncloud/step_create_server_image.go b/builder/ncloud/step_create_server_image.go index 12e20478e..9b36b3ffc 100644 --- a/builder/ncloud/step_create_server_image.go +++ b/builder/ncloud/step_create_server_image.go @@ -7,8 +7,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateServerImage struct { diff --git a/builder/ncloud/step_create_server_image_test.go b/builder/ncloud/step_create_server_image_test.go index cfe31b91b..3d42a2a26 100644 --- a/builder/ncloud/step_create_server_image_test.go +++ b/builder/ncloud/step_create_server_image_test.go @@ -7,7 +7,7 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateServerImageShouldFailIfOperationCreateServerImageFails(t *testing.T) { diff --git a/builder/ncloud/step_create_server_instance.go b/builder/ncloud/step_create_server_instance.go index 7c1e7382e..48b1b11ef 100644 --- a/builder/ncloud/step_create_server_instance.go +++ b/builder/ncloud/step_create_server_instance.go @@ -10,8 +10,8 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateServerInstance struct { diff --git a/builder/ncloud/step_create_server_instance_test.go b/builder/ncloud/step_create_server_instance_test.go index 676c3fa3f..b740f1466 100644 --- a/builder/ncloud/step_create_server_instance_test.go +++ b/builder/ncloud/step_create_server_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateServerInstanceShouldFailIfOperationCreateFails(t *testing.T) { diff --git a/builder/ncloud/step_delete_block_storage_instance.go b/builder/ncloud/step_delete_block_storage_instance.go index fb4bc892b..a3cdc70a5 100644 --- a/builder/ncloud/step_delete_block_storage_instance.go +++ b/builder/ncloud/step_delete_block_storage_instance.go @@ -8,8 +8,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDeleteBlockStorageInstance struct { diff --git a/builder/ncloud/step_delete_block_storage_instance_test.go b/builder/ncloud/step_delete_block_storage_instance_test.go index 9f4d6de80..e5448bbb4 100644 --- a/builder/ncloud/step_delete_block_storage_instance_test.go +++ b/builder/ncloud/step_delete_block_storage_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepDeleteBlockStorageInstanceShouldFailIfOperationDeleteBlockStorageInstanceFails(t *testing.T) { diff --git a/builder/ncloud/step_get_rootpassword.go b/builder/ncloud/step_get_rootpassword.go index 0de8cf351..94daf1382 100644 --- a/builder/ncloud/step_get_rootpassword.go +++ b/builder/ncloud/step_get_rootpassword.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepGetRootPassword struct { diff --git a/builder/ncloud/step_get_rootpassword_test.go b/builder/ncloud/step_get_rootpassword_test.go index c048a8144..4bff59c1d 100644 --- a/builder/ncloud/step_get_rootpassword_test.go +++ b/builder/ncloud/step_get_rootpassword_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepGetRootPasswordShouldFailIfOperationGetRootPasswordFails(t *testing.T) { diff --git a/builder/ncloud/step_stop_server_instance.go b/builder/ncloud/step_stop_server_instance.go index a4fad0bf3..b95dca774 100644 --- a/builder/ncloud/step_stop_server_instance.go +++ b/builder/ncloud/step_stop_server_instance.go @@ -7,8 +7,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepStopServerInstance struct { diff --git a/builder/ncloud/step_stop_server_instance_test.go b/builder/ncloud/step_stop_server_instance_test.go index 4b5afe605..f63386349 100644 --- a/builder/ncloud/step_stop_server_instance_test.go +++ b/builder/ncloud/step_stop_server_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepStopServerInstanceShouldFailIfOperationStopFails(t *testing.T) { diff --git a/builder/ncloud/step_terminate_server_instance.go b/builder/ncloud/step_terminate_server_instance.go index 12e6da11b..b8de7b79f 100644 --- a/builder/ncloud/step_terminate_server_instance.go +++ b/builder/ncloud/step_terminate_server_instance.go @@ -6,8 +6,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepTerminateServerInstance struct { diff --git a/builder/ncloud/step_terminate_server_instance_test.go b/builder/ncloud/step_terminate_server_instance_test.go index 3db5f3ec8..ff5fafd59 100644 --- a/builder/ncloud/step_terminate_server_instance_test.go +++ b/builder/ncloud/step_terminate_server_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepTerminateServerInstanceShouldFailIfOperationTerminationFails(t *testing.T) { diff --git a/builder/ncloud/step_validate_template.go b/builder/ncloud/step_validate_template.go index fbc21f9a3..52866e5ee 100644 --- a/builder/ncloud/step_validate_template.go +++ b/builder/ncloud/step_validate_template.go @@ -9,8 +9,8 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/olekukonko/tablewriter" ) diff --git a/builder/ncloud/step_validate_template_test.go b/builder/ncloud/step_validate_template_test.go index 7e9212c7f..42d582561 100644 --- a/builder/ncloud/step_validate_template_test.go +++ b/builder/ncloud/step_validate_template_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepValidateTemplateShouldFailIfValidateFails(t *testing.T) { diff --git a/builder/null/builder.go b/builder/null/builder.go index 3fd7606dd..a48da95fb 100644 --- a/builder/null/builder.go +++ b/builder/null/builder.go @@ -5,9 +5,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) const BuilderId = "fnoeding.null" diff --git a/builder/null/ssh.go b/builder/null/ssh.go index 373f8158b..335c93dca 100644 --- a/builder/null/ssh.go +++ b/builder/null/ssh.go @@ -1,7 +1,7 @@ package null import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CommHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/oneandone/builder.go b/builder/oneandone/builder.go index 01b24ec40..915d1c470 100644 --- a/builder/oneandone/builder.go +++ b/builder/oneandone/builder.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) const BuilderId = "packer.oneandone" diff --git a/builder/oneandone/step_create_server.go b/builder/oneandone/step_create_server.go index 6d70db862..3cd1e7de7 100644 --- a/builder/oneandone/step_create_server.go +++ b/builder/oneandone/step_create_server.go @@ -7,8 +7,8 @@ import ( "time" "github.com/1and1/oneandone-cloudserver-sdk-go" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateServer struct{} diff --git a/builder/oneandone/step_create_sshkey.go b/builder/oneandone/step_create_sshkey.go index 8a3613560..2da8f5839 100644 --- a/builder/oneandone/step_create_sshkey.go +++ b/builder/oneandone/step_create_sshkey.go @@ -7,8 +7,8 @@ import ( "fmt" "io/ioutil" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/oneandone/step_take_snapshot.go b/builder/oneandone/step_take_snapshot.go index d5c3c757f..c5b128ef5 100644 --- a/builder/oneandone/step_take_snapshot.go +++ b/builder/oneandone/step_take_snapshot.go @@ -4,8 +4,8 @@ import ( "context" "github.com/1and1/oneandone-cloudserver-sdk-go" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepTakeSnapshot struct{} diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go index 69c4c780e..ddc9adad6 100644 --- a/builder/openstack/builder.go +++ b/builder/openstack/builder.go @@ -12,10 +12,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/openstack/server.go b/builder/openstack/server.go index f509452d6..af7b3c3dc 100644 --- a/builder/openstack/server.go +++ b/builder/openstack/server.go @@ -8,7 +8,7 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StateRefreshFunc is a function type used for StateChangeConf that is diff --git a/builder/openstack/ssh.go b/builder/openstack/ssh.go index dab50dc24..95fb1e32c 100644 --- a/builder/openstack/ssh.go +++ b/builder/openstack/ssh.go @@ -9,7 +9,7 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // CommHost looks up the host for the communicator. diff --git a/builder/openstack/step_add_image_members.go b/builder/openstack/step_add_image_members.go index d8087c542..cbbb9f5e6 100644 --- a/builder/openstack/step_add_image_members.go +++ b/builder/openstack/step_add_image_members.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/members" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepAddImageMembers struct{} diff --git a/builder/openstack/step_allocate_ip.go b/builder/openstack/step_allocate_ip.go index 8b0701491..6ba8c0262 100644 --- a/builder/openstack/step_allocate_ip.go +++ b/builder/openstack/step_allocate_ip.go @@ -6,8 +6,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepAllocateIp struct { diff --git a/builder/openstack/step_create_image.go b/builder/openstack/step_create_image.go index 637e3c70e..b2f792d0d 100644 --- a/builder/openstack/step_create_image.go +++ b/builder/openstack/step_create_image.go @@ -11,8 +11,8 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateImage struct { diff --git a/builder/openstack/step_create_volume.go b/builder/openstack/step_create_volume.go index 1e74ba1e9..687d92a54 100644 --- a/builder/openstack/step_create_volume.go +++ b/builder/openstack/step_create_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateVolume struct { diff --git a/builder/openstack/step_detach_volume.go b/builder/openstack/step_detach_volume.go index fe6d76922..d711e87a2 100644 --- a/builder/openstack/step_detach_volume.go +++ b/builder/openstack/step_detach_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDetachVolume struct { diff --git a/builder/openstack/step_discover_network.go b/builder/openstack/step_discover_network.go index 4f653685a..811c98a55 100644 --- a/builder/openstack/step_discover_network.go +++ b/builder/openstack/step_discover_network.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDiscoverNetwork struct { diff --git a/builder/openstack/step_get_password.go b/builder/openstack/step_get_password.go index fd9bfa156..f039198fb 100644 --- a/builder/openstack/step_get_password.go +++ b/builder/openstack/step_get_password.go @@ -9,8 +9,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/openstack/step_key_pair.go b/builder/openstack/step_key_pair.go index 46d22182e..1faa67787 100644 --- a/builder/openstack/step_key_pair.go +++ b/builder/openstack/step_key_pair.go @@ -11,8 +11,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "golang.org/x/crypto/ssh" ) diff --git a/builder/openstack/step_load_flavor.go b/builder/openstack/step_load_flavor.go index bc9d4aa35..7e7176640 100644 --- a/builder/openstack/step_load_flavor.go +++ b/builder/openstack/step_load_flavor.go @@ -7,8 +7,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/flavors" flavors_utils "github.com/gophercloud/utils/openstack/compute/v2/flavors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepLoadFlavor gets the FlavorRef from a Flavor. It first assumes diff --git a/builder/openstack/step_run_source_server.go b/builder/openstack/step_run_source_server.go index 59cf63afe..007023de8 100644 --- a/builder/openstack/step_run_source_server.go +++ b/builder/openstack/step_run_source_server.go @@ -9,8 +9,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/bootfromvolume" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRunSourceServer struct { diff --git a/builder/openstack/step_source_image_info.go b/builder/openstack/step_source_image_info.go index 5344431fd..3b7c5b798 100644 --- a/builder/openstack/step_source_image_info.go +++ b/builder/openstack/step_source_image_info.go @@ -9,8 +9,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/imageservice/v2/imageimport" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" "github.com/gophercloud/gophercloud/pagination" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSourceImageInfo struct { diff --git a/builder/openstack/step_stop_server.go b/builder/openstack/step_stop_server.go index 9e6f35b74..f4e00e25e 100644 --- a/builder/openstack/step_stop_server.go +++ b/builder/openstack/step_stop_server.go @@ -8,8 +8,8 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/startstop" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepStopServer struct{} diff --git a/builder/openstack/step_update_image_mindisk.go b/builder/openstack/step_update_image_mindisk.go index 63ec2709d..15412f29b 100644 --- a/builder/openstack/step_update_image_mindisk.go +++ b/builder/openstack/step_update_image_mindisk.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepUpdateImageMinDisk struct{} diff --git a/builder/openstack/step_update_image_tags.go b/builder/openstack/step_update_image_tags.go index 31d0c767f..8f0adf582 100644 --- a/builder/openstack/step_update_image_tags.go +++ b/builder/openstack/step_update_image_tags.go @@ -6,8 +6,8 @@ import ( "strings" imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepUpdateImageTags struct{} diff --git a/builder/openstack/step_update_image_visibility.go b/builder/openstack/step_update_image_visibility.go index a3ecaae18..fb2ab9fd1 100644 --- a/builder/openstack/step_update_image_visibility.go +++ b/builder/openstack/step_update_image_visibility.go @@ -5,8 +5,8 @@ import ( "fmt" imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepUpdateImageVisibility struct{} diff --git a/builder/openstack/step_wait_for_rackconnect.go b/builder/openstack/step_wait_for_rackconnect.go index 3816962bf..3386642f5 100644 --- a/builder/openstack/step_wait_for_rackconnect.go +++ b/builder/openstack/step_wait_for_rackconnect.go @@ -6,8 +6,8 @@ import ( "time" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepWaitForRackConnect struct { diff --git a/builder/oracle/classic/builder.go b/builder/oracle/classic/builder.go index 3b086bbe0..fc97066f1 100644 --- a/builder/oracle/classic/builder.go +++ b/builder/oracle/classic/builder.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" ocommon "github.com/hashicorp/packer/builder/oracle/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // BuilderId uniquely identifies the builder diff --git a/builder/oracle/classic/step_add_keys.go b/builder/oracle/classic/step_add_keys.go index c68574d16..60a448560 100644 --- a/builder/oracle/classic/step_add_keys.go +++ b/builder/oracle/classic/step_add_keys.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepAddKeysToAPI struct { diff --git a/builder/oracle/classic/step_attach_volume.go b/builder/oracle/classic/step_attach_volume.go index ffa525aa6..e0882f35b 100644 --- a/builder/oracle/classic/step_attach_volume.go +++ b/builder/oracle/classic/step_attach_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepAttachVolume struct { diff --git a/builder/oracle/classic/step_connect_builder.go b/builder/oracle/classic/step_connect_builder.go index 1e8aa021e..88639c793 100644 --- a/builder/oracle/classic/step_connect_builder.go +++ b/builder/oracle/classic/step_connect_builder.go @@ -4,7 +4,7 @@ import ( "context" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConnectBuilder struct { diff --git a/builder/oracle/classic/step_create_image.go b/builder/oracle/classic/step_create_image.go index abff43c4d..481d03406 100644 --- a/builder/oracle/classic/step_create_image.go +++ b/builder/oracle/classic/step_create_image.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateImage struct { diff --git a/builder/oracle/classic/step_create_instance.go b/builder/oracle/classic/step_create_instance.go index 0d685a983..35fd4e9b6 100644 --- a/builder/oracle/classic/step_create_instance.go +++ b/builder/oracle/classic/step_create_instance.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateInstance struct{} diff --git a/builder/oracle/classic/step_create_ip_reservation.go b/builder/oracle/classic/step_create_ip_reservation.go index 7f3a1b3e7..367ba9221 100644 --- a/builder/oracle/classic/step_create_ip_reservation.go +++ b/builder/oracle/classic/step_create_ip_reservation.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/oracle/classic/step_create_persistent_volume.go b/builder/oracle/classic/step_create_persistent_volume.go index 02438d343..349fc0b8b 100644 --- a/builder/oracle/classic/step_create_persistent_volume.go +++ b/builder/oracle/classic/step_create_persistent_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreatePersistentVolume struct { diff --git a/builder/oracle/classic/step_create_pv_builder.go b/builder/oracle/classic/step_create_pv_builder.go index b1f991f35..a544c9615 100644 --- a/builder/oracle/classic/step_create_pv_builder.go +++ b/builder/oracle/classic/step_create_pv_builder.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreatePVBuilder struct { diff --git a/builder/oracle/classic/step_create_pv_master.go b/builder/oracle/classic/step_create_pv_master.go index e9f16903f..28e85fe6d 100644 --- a/builder/oracle/classic/step_create_pv_master.go +++ b/builder/oracle/classic/step_create_pv_master.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreatePVMaster struct { diff --git a/builder/oracle/classic/step_list_images.go b/builder/oracle/classic/step_list_images.go index 0248bae84..8b30d2cbb 100644 --- a/builder/oracle/classic/step_list_images.go +++ b/builder/oracle/classic/step_list_images.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepListImages struct{} diff --git a/builder/oracle/classic/step_security.go b/builder/oracle/classic/step_security.go index f69b6c9b0..d6ad9252c 100644 --- a/builder/oracle/classic/step_security.go +++ b/builder/oracle/classic/step_security.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepSecurity struct { diff --git a/builder/oracle/classic/step_snapshot.go b/builder/oracle/classic/step_snapshot.go index f11f718e0..993bc2835 100644 --- a/builder/oracle/classic/step_snapshot.go +++ b/builder/oracle/classic/step_snapshot.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepSnapshot struct { diff --git a/builder/oracle/classic/step_terminate_pv_master.go b/builder/oracle/classic/step_terminate_pv_master.go index 527d63ba6..0d4d2a013 100644 --- a/builder/oracle/classic/step_terminate_pv_master.go +++ b/builder/oracle/classic/step_terminate_pv_master.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepTerminatePVMaster struct { diff --git a/builder/oracle/classic/step_upload_image.go b/builder/oracle/classic/step_upload_image.go index 5833ebfaf..04fd1e896 100644 --- a/builder/oracle/classic/step_upload_image.go +++ b/builder/oracle/classic/step_upload_image.go @@ -6,8 +6,8 @@ import ( "log" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/oracle/common/step_ssh_key_pair.go b/builder/oracle/common/step_ssh_key_pair.go index 187eb28af..3a87a824a 100644 --- a/builder/oracle/common/step_ssh_key_pair.go +++ b/builder/oracle/common/step_ssh_key_pair.go @@ -11,8 +11,8 @@ import ( "runtime" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/oracle/oci/builder.go b/builder/oracle/oci/builder.go index 97704068b..0368ac678 100644 --- a/builder/oracle/oci/builder.go +++ b/builder/oracle/oci/builder.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" ocommon "github.com/hashicorp/packer/builder/oracle/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/oracle/oci-go-sdk/core" ) diff --git a/builder/oracle/oci/step_create_instance.go b/builder/oracle/oci/step_create_instance.go index 6746fdad4..0ebe41eab 100644 --- a/builder/oracle/oci/step_create_instance.go +++ b/builder/oracle/oci/step_create_instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateInstance struct{} diff --git a/builder/oracle/oci/step_create_instance_test.go b/builder/oracle/oci/step_create_instance_test.go index 6ab2ceb67..436802c69 100644 --- a/builder/oracle/oci/step_create_instance_test.go +++ b/builder/oracle/oci/step_create_instance_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateInstance(t *testing.T) { diff --git a/builder/oracle/oci/step_get_default_credentials.go b/builder/oracle/oci/step_get_default_credentials.go index 0ed44b7f6..602565050 100644 --- a/builder/oracle/oci/step_get_default_credentials.go +++ b/builder/oracle/oci/step_get_default_credentials.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepGetDefaultCredentials struct { diff --git a/builder/oracle/oci/step_image.go b/builder/oracle/oci/step_image.go index b3d37da0a..460aa9c91 100644 --- a/builder/oracle/oci/step_image.go +++ b/builder/oracle/oci/step_image.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepImage struct{} diff --git a/builder/oracle/oci/step_image_test.go b/builder/oracle/oci/step_image_test.go index 955d557a9..c142872ec 100644 --- a/builder/oracle/oci/step_image_test.go +++ b/builder/oracle/oci/step_image_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepImage(t *testing.T) { diff --git a/builder/oracle/oci/step_instance_info.go b/builder/oracle/oci/step_instance_info.go index 63b9120c1..e1052b5ed 100644 --- a/builder/oracle/oci/step_instance_info.go +++ b/builder/oracle/oci/step_instance_info.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepInstanceInfo struct{} diff --git a/builder/oracle/oci/step_instance_info_test.go b/builder/oracle/oci/step_instance_info_test.go index d4e18dd44..6b13cc1a7 100644 --- a/builder/oracle/oci/step_instance_info_test.go +++ b/builder/oracle/oci/step_instance_info_test.go @@ -6,8 +6,8 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestInstanceInfo(t *testing.T) { diff --git a/builder/oracle/oci/step_test.go b/builder/oracle/oci/step_test.go index deeff1b1a..1c95870fd 100644 --- a/builder/oracle/oci/step_test.go +++ b/builder/oracle/oci/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // TODO(apryde): It would be good not to have to write a key file to disk to diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go index b0dee623d..5d0d1124a 100644 --- a/builder/osc/bsu/builder.go +++ b/builder/osc/bsu/builder.go @@ -15,10 +15,10 @@ import ( osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/bsu/step_create_omi.go b/builder/osc/bsu/step_create_omi.go index 015a1008f..0b7935173 100644 --- a/builder/osc/bsu/step_create_omi.go +++ b/builder/osc/bsu/step_create_omi.go @@ -7,8 +7,8 @@ import ( "github.com/antihax/optional" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/bsusurrogate/builder.go b/builder/osc/bsusurrogate/builder.go index d8c033ea1..dde2cf8d7 100644 --- a/builder/osc/bsusurrogate/builder.go +++ b/builder/osc/bsusurrogate/builder.go @@ -13,10 +13,10 @@ import ( osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/bsusurrogate/step_register_omi.go b/builder/osc/bsusurrogate/step_register_omi.go index 3d8541df8..f63a87135 100644 --- a/builder/osc/bsusurrogate/step_register_omi.go +++ b/builder/osc/bsusurrogate/step_register_omi.go @@ -6,8 +6,8 @@ import ( "github.com/antihax/optional" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/bsusurrogate/step_snapshop_volumes.go b/builder/osc/bsusurrogate/step_snapshop_volumes.go index cc0743e38..2f1d027dd 100644 --- a/builder/osc/bsusurrogate/step_snapshop_volumes.go +++ b/builder/osc/bsusurrogate/step_snapshop_volumes.go @@ -9,8 +9,8 @@ import ( "github.com/antihax/optional" multierror "github.com/hashicorp/go-multierror" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/bsuvolume/builder.go b/builder/osc/bsuvolume/builder.go index 798cec71a..57a78253c 100644 --- a/builder/osc/bsuvolume/builder.go +++ b/builder/osc/bsuvolume/builder.go @@ -13,10 +13,10 @@ import ( osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/bsuvolume/step_tag_bsu_volumes.go b/builder/osc/bsuvolume/step_tag_bsu_volumes.go index 400916c95..4d313ffd3 100644 --- a/builder/osc/bsuvolume/step_tag_bsu_volumes.go +++ b/builder/osc/bsuvolume/step_tag_bsu_volumes.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/builder.go b/builder/osc/chroot/builder.go index fe382f04f..7d049385f 100644 --- a/builder/osc/chroot/builder.go +++ b/builder/osc/chroot/builder.go @@ -14,10 +14,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/chroot/cleanup.go b/builder/osc/chroot/cleanup.go index 0befac174..37691305a 100644 --- a/builder/osc/chroot/cleanup.go +++ b/builder/osc/chroot/cleanup.go @@ -1,7 +1,7 @@ package chroot import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Cleanup is an interface that some steps implement for early cleanup. diff --git a/builder/osc/chroot/step_check_root_device.go b/builder/osc/chroot/step_check_root_device.go index 22ec04c29..418fd3909 100644 --- a/builder/osc/chroot/step_check_root_device.go +++ b/builder/osc/chroot/step_check_root_device.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_chroot_provision.go b/builder/osc/chroot/step_chroot_provision.go index 1f35d88e6..ef659c41b 100644 --- a/builder/osc/chroot/step_chroot_provision.go +++ b/builder/osc/chroot/step_chroot_provision.go @@ -4,9 +4,9 @@ import ( "context" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // StepChrootProvision provisions the instance within a chroot. diff --git a/builder/osc/chroot/step_copy_files.go b/builder/osc/chroot/step_copy_files.go index 78625a8d3..a7c7adbcb 100644 --- a/builder/osc/chroot/step_copy_files.go +++ b/builder/osc/chroot/step_copy_files.go @@ -7,8 +7,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCopyFiles copies some files from the host into the chroot environment. diff --git a/builder/osc/chroot/step_create_omi.go b/builder/osc/chroot/step_create_omi.go index b9f65ea28..cfd43fdb4 100644 --- a/builder/osc/chroot/step_create_omi.go +++ b/builder/osc/chroot/step_create_omi.go @@ -6,8 +6,8 @@ import ( "github.com/antihax/optional" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_create_volume.go b/builder/osc/chroot/step_create_volume.go index b60263003..f2fdc7ab3 100644 --- a/builder/osc/chroot/step_create_volume.go +++ b/builder/osc/chroot/step_create_volume.go @@ -8,8 +8,8 @@ import ( "github.com/antihax/optional" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_early_cleanup.go b/builder/osc/chroot/step_early_cleanup.go index 42d7d66c5..e84ac77e2 100644 --- a/builder/osc/chroot/step_early_cleanup.go +++ b/builder/osc/chroot/step_early_cleanup.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepEarlyCleanup performs some of the cleanup steps early in order to diff --git a/builder/osc/chroot/step_early_unflock.go b/builder/osc/chroot/step_early_unflock.go index b16becc61..3a39fb7fe 100644 --- a/builder/osc/chroot/step_early_unflock.go +++ b/builder/osc/chroot/step_early_unflock.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepEarlyUnflock unlocks the flock. diff --git a/builder/osc/chroot/step_flock.go b/builder/osc/chroot/step_flock.go index f3fd9d29e..5465a72fe 100644 --- a/builder/osc/chroot/step_flock.go +++ b/builder/osc/chroot/step_flock.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepFlock provisions the instance within a chroot. diff --git a/builder/osc/chroot/step_link_volume.go b/builder/osc/chroot/step_link_volume.go index 7e51caebd..6940e64c4 100644 --- a/builder/osc/chroot/step_link_volume.go +++ b/builder/osc/chroot/step_link_volume.go @@ -6,8 +6,8 @@ import ( "github.com/antihax/optional" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_mount_device.go b/builder/osc/chroot/step_mount_device.go index 5007a339e..936425ac0 100644 --- a/builder/osc/chroot/step_mount_device.go +++ b/builder/osc/chroot/step_mount_device.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/chroot/step_mount_extra.go b/builder/osc/chroot/step_mount_extra.go index 089bf7e75..f9b70dc4f 100644 --- a/builder/osc/chroot/step_mount_extra.go +++ b/builder/osc/chroot/step_mount_extra.go @@ -8,8 +8,8 @@ import ( "os/exec" "syscall" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepMountExtra mounts the attached device. diff --git a/builder/osc/chroot/step_post_mount_commands.go b/builder/osc/chroot/step_post_mount_commands.go index 704af428f..303ddeee5 100644 --- a/builder/osc/chroot/step_post_mount_commands.go +++ b/builder/osc/chroot/step_post_mount_commands.go @@ -3,8 +3,8 @@ package chroot import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type postMountCommandsData struct { diff --git a/builder/osc/chroot/step_pre_mount_commands.go b/builder/osc/chroot/step_pre_mount_commands.go index 9a60256fe..26e93adf3 100644 --- a/builder/osc/chroot/step_pre_mount_commands.go +++ b/builder/osc/chroot/step_pre_mount_commands.go @@ -3,8 +3,8 @@ package chroot import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type preMountCommandsData struct { diff --git a/builder/osc/chroot/step_prepare_device.go b/builder/osc/chroot/step_prepare_device.go index 0939d33cd..65af71acf 100644 --- a/builder/osc/chroot/step_prepare_device.go +++ b/builder/osc/chroot/step_prepare_device.go @@ -6,8 +6,8 @@ import ( "log" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepPrepareDevice finds an available device and sets it. diff --git a/builder/osc/chroot/step_snapshot.go b/builder/osc/chroot/step_snapshot.go index cb9ee6add..04e036462 100644 --- a/builder/osc/chroot/step_snapshot.go +++ b/builder/osc/chroot/step_snapshot.go @@ -7,8 +7,8 @@ import ( "github.com/antihax/optional" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_vm_info.go b/builder/osc/chroot/step_vm_info.go index 3662ad9a8..fa9d6079e 100644 --- a/builder/osc/chroot/step_vm_info.go +++ b/builder/osc/chroot/step_vm_info.go @@ -6,8 +6,8 @@ import ( "log" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/interpolate_build_info.go b/builder/osc/common/interpolate_build_info.go index 00f530319..820c63296 100644 --- a/builder/osc/common/interpolate_build_info.go +++ b/builder/osc/common/interpolate_build_info.go @@ -1,7 +1,7 @@ package common import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/interpolate_build_info_test.go b/builder/osc/common/interpolate_build_info_test.go index 5e2deef3a..949e73c04 100644 --- a/builder/osc/common/interpolate_build_info_test.go +++ b/builder/osc/common/interpolate_build_info_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/ssh.go b/builder/osc/common/ssh.go index 38d0c0f8a..46cc4368f 100644 --- a/builder/osc/common/ssh.go +++ b/builder/osc/common/ssh.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_cleanup_volumes.go b/builder/osc/common/step_cleanup_volumes.go index 92bda011d..171dfaa40 100644 --- a/builder/osc/common/step_cleanup_volumes.go +++ b/builder/osc/common/step_cleanup_volumes.go @@ -6,8 +6,8 @@ import ( "reflect" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_create_tags.go b/builder/osc/common/step_create_tags.go index 49f784de8..db06dec96 100644 --- a/builder/osc/common/step_create_tags.go +++ b/builder/osc/common/step_create_tags.go @@ -7,8 +7,8 @@ import ( "github.com/antihax/optional" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/hashicorp/packer/builder/osc/common/retry" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_deregister_omi.go b/builder/osc/common/step_deregister_omi.go index 390810092..f080d3d3c 100644 --- a/builder/osc/common/step_deregister_omi.go +++ b/builder/osc/common/step_deregister_omi.go @@ -8,8 +8,8 @@ import ( "github.com/antihax/optional" "github.com/outscale/osc-sdk-go/osc" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDeregisterOMI struct { diff --git a/builder/osc/common/step_get_password.go b/builder/osc/common/step_get_password.go index df1e42740..ccef02481 100644 --- a/builder/osc/common/step_get_password.go +++ b/builder/osc/common/step_get_password.go @@ -13,8 +13,8 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_key_pair.go b/builder/osc/common/step_key_pair.go index 006499acd..6589c4831 100644 --- a/builder/osc/common/step_key_pair.go +++ b/builder/osc/common/step_key_pair.go @@ -8,8 +8,8 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_network_info.go b/builder/osc/common/step_network_info.go index 20372a362..e1fdb8bfe 100644 --- a/builder/osc/common/step_network_info.go +++ b/builder/osc/common/step_network_info.go @@ -8,8 +8,8 @@ import ( "sort" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_pre_validate.go b/builder/osc/common/step_pre_validate.go index a5d44e030..7c3151505 100644 --- a/builder/osc/common/step_pre_validate.go +++ b/builder/osc/common/step_pre_validate.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_public_ip.go b/builder/osc/common/step_public_ip.go index 9702a0b91..51d4f2c8c 100644 --- a/builder/osc/common/step_public_ip.go +++ b/builder/osc/common/step_public_ip.go @@ -6,8 +6,8 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_run_source_vm.go b/builder/osc/common/step_run_source_vm.go index d5ba558c6..36188058a 100644 --- a/builder/osc/common/step_run_source_vm.go +++ b/builder/osc/common/step_run_source_vm.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/packer/builder/osc/common/retry" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/common/step_security_group.go b/builder/osc/common/step_security_group.go index 8c368cc34..789f101e7 100644 --- a/builder/osc/common/step_security_group.go +++ b/builder/osc/common/step_security_group.go @@ -8,8 +8,8 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_source_omi_info.go b/builder/osc/common/step_source_omi_info.go index 1bc6e05cb..64e1df704 100644 --- a/builder/osc/common/step_source_omi_info.go +++ b/builder/osc/common/step_source_omi_info.go @@ -8,8 +8,8 @@ import ( "time" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_stop_bsu_backed_vm.go b/builder/osc/common/step_stop_bsu_backed_vm.go index 11dd2654c..5c45a126b 100644 --- a/builder/osc/common/step_stop_bsu_backed_vm.go +++ b/builder/osc/common/step_stop_bsu_backed_vm.go @@ -7,8 +7,8 @@ import ( "github.com/antihax/optional" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/hashicorp/packer/builder/osc/common/retry" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_update_bsu_vm.go b/builder/osc/common/step_update_bsu_vm.go index e348916a8..48cbbcd13 100644 --- a/builder/osc/common/step_update_bsu_vm.go +++ b/builder/osc/common/step_update_bsu_vm.go @@ -3,7 +3,7 @@ package common import ( "context" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUpdateBSUBackedVm struct { diff --git a/builder/osc/common/step_update_omi.go b/builder/osc/common/step_update_omi.go index 9857d8482..d523426de 100644 --- a/builder/osc/common/step_update_omi.go +++ b/builder/osc/common/step_update_omi.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/tags.go b/builder/osc/common/tags.go index bcb78451b..446c191bb 100644 --- a/builder/osc/common/tags.go +++ b/builder/osc/common/tags.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/parallels/common/ssh.go b/builder/parallels/common/ssh.go index 50f4e4e9c..6059b4a42 100644 --- a/builder/parallels/common/ssh.go +++ b/builder/parallels/common/ssh.go @@ -3,7 +3,7 @@ package common import ( "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // CommHost returns the VM's IP address which should be used to access it by SSH. diff --git a/builder/parallels/common/step_attach_floppy.go b/builder/parallels/common/step_attach_floppy.go index cdedb9922..7d310ab75 100644 --- a/builder/parallels/common/step_attach_floppy.go +++ b/builder/parallels/common/step_attach_floppy.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepAttachFloppy is a step that attaches a floppy to the virtual machine. diff --git a/builder/parallels/common/step_attach_floppy_test.go b/builder/parallels/common/step_attach_floppy_test.go index 2d951cf05..87b07d0f5 100644 --- a/builder/parallels/common/step_attach_floppy_test.go +++ b/builder/parallels/common/step_attach_floppy_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepAttachFloppy_impl(t *testing.T) { diff --git a/builder/parallels/common/step_attach_parallels_tools.go b/builder/parallels/common/step_attach_parallels_tools.go index 5745ce4f9..638408115 100644 --- a/builder/parallels/common/step_attach_parallels_tools.go +++ b/builder/parallels/common/step_attach_parallels_tools.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepAttachParallelsTools is a step that attaches Parallels Tools ISO image diff --git a/builder/parallels/common/step_compact_disk.go b/builder/parallels/common/step_compact_disk.go index 14c6fa49d..e757336ef 100644 --- a/builder/parallels/common/step_compact_disk.go +++ b/builder/parallels/common/step_compact_disk.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCompactDisk is a step that removes all empty blocks from expanding diff --git a/builder/parallels/common/step_compact_disk_test.go b/builder/parallels/common/step_compact_disk_test.go index e32ef217b..79b54d6f0 100644 --- a/builder/parallels/common/step_compact_disk_test.go +++ b/builder/parallels/common/step_compact_disk_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCompactDisk_impl(t *testing.T) { diff --git a/builder/parallels/common/step_output_dir.go b/builder/parallels/common/step_output_dir.go index c71f61bce..97115d8e4 100644 --- a/builder/parallels/common/step_output_dir.go +++ b/builder/parallels/common/step_output_dir.go @@ -8,8 +8,8 @@ import ( "path/filepath" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepOutputDir sets up the output directory by creating it if it does diff --git a/builder/parallels/common/step_output_dir_test.go b/builder/parallels/common/step_output_dir_test.go index 53c1d885c..70380fd51 100644 --- a/builder/parallels/common/step_output_dir_test.go +++ b/builder/parallels/common/step_output_dir_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testStepOutputDir(t *testing.T) *StepOutputDir { diff --git a/builder/parallels/common/step_prepare_parallels_tools.go b/builder/parallels/common/step_prepare_parallels_tools.go index 251018cea..075f36bfe 100644 --- a/builder/parallels/common/step_prepare_parallels_tools.go +++ b/builder/parallels/common/step_prepare_parallels_tools.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepPrepareParallelsTools is a step that prepares parameters related diff --git a/builder/parallels/common/step_prepare_parallels_tools_test.go b/builder/parallels/common/step_prepare_parallels_tools_test.go index 4f46fc642..5fd2e065c 100644 --- a/builder/parallels/common/step_prepare_parallels_tools_test.go +++ b/builder/parallels/common/step_prepare_parallels_tools_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepPrepareParallelsTools_impl(t *testing.T) { diff --git a/builder/parallels/common/step_prlctl.go b/builder/parallels/common/step_prlctl.go index 43f9941d2..5f31812b6 100644 --- a/builder/parallels/common/step_prlctl.go +++ b/builder/parallels/common/step_prlctl.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/common/step_run.go b/builder/parallels/common/step_run.go index 062312069..a0772fdd0 100644 --- a/builder/parallels/common/step_run.go +++ b/builder/parallels/common/step_run.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepRun is a step that starts the virtual machine. diff --git a/builder/parallels/common/step_shutdown.go b/builder/parallels/common/step_shutdown.go index f2c7b7e5a..cd1f5a232 100644 --- a/builder/parallels/common/step_shutdown.go +++ b/builder/parallels/common/step_shutdown.go @@ -8,8 +8,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepShutdown is a step that shuts down the machine. It first attempts to do diff --git a/builder/parallels/common/step_shutdown_test.go b/builder/parallels/common/step_shutdown_test.go index 0d137431f..861be6cd7 100644 --- a/builder/parallels/common/step_shutdown_test.go +++ b/builder/parallels/common/step_shutdown_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepShutdown_impl(t *testing.T) { diff --git a/builder/parallels/common/step_test.go b/builder/parallels/common/step_test.go index 0964784f7..4dc7bd18b 100644 --- a/builder/parallels/common/step_test.go +++ b/builder/parallels/common/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/parallels/common/step_type_boot_command.go b/builder/parallels/common/step_type_boot_command.go index dbf90c46a..31f55e8f7 100644 --- a/builder/parallels/common/step_type_boot_command.go +++ b/builder/parallels/common/step_type_boot_command.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/common/step_upload_parallels_tools.go b/builder/parallels/common/step_upload_parallels_tools.go index b1c2f10dd..f70e7b60b 100644 --- a/builder/parallels/common/step_upload_parallels_tools.go +++ b/builder/parallels/common/step_upload_parallels_tools.go @@ -6,8 +6,8 @@ import ( "log" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/common/step_upload_parallels_tools_test.go b/builder/parallels/common/step_upload_parallels_tools_test.go index aeff516d3..5e8b3f8d7 100644 --- a/builder/parallels/common/step_upload_parallels_tools_test.go +++ b/builder/parallels/common/step_upload_parallels_tools_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepUploadParallelsTools_impl(t *testing.T) { diff --git a/builder/parallels/common/step_upload_version.go b/builder/parallels/common/step_upload_version.go index 6731b8c32..072bece70 100644 --- a/builder/parallels/common/step_upload_version.go +++ b/builder/parallels/common/step_upload_version.go @@ -6,8 +6,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepUploadVersion is a step that uploads a file containing the version of diff --git a/builder/parallels/common/step_upload_version_test.go b/builder/parallels/common/step_upload_version_test.go index 998d35f0e..ddce60e3c 100644 --- a/builder/parallels/common/step_upload_version_test.go +++ b/builder/parallels/common/step_upload_version_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepUploadVersion_impl(t *testing.T) { diff --git a/builder/parallels/iso/builder.go b/builder/parallels/iso/builder.go index f05094fa4..ff67ebddd 100644 --- a/builder/parallels/iso/builder.go +++ b/builder/parallels/iso/builder.go @@ -12,11 +12,11 @@ import ( parallelscommon "github.com/hashicorp/packer/builder/parallels/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/iso/step_attach_iso.go b/builder/parallels/iso/step_attach_iso.go index 509fcbdd2..ccaced1c0 100644 --- a/builder/parallels/iso/step_attach_iso.go +++ b/builder/parallels/iso/step_attach_iso.go @@ -6,8 +6,8 @@ import ( "log" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step attaches the ISO to the virtual machine. diff --git a/builder/parallels/iso/step_create_disk.go b/builder/parallels/iso/step_create_disk.go index d7b62fbf2..dbe71e4b7 100644 --- a/builder/parallels/iso/step_create_disk.go +++ b/builder/parallels/iso/step_create_disk.go @@ -6,8 +6,8 @@ import ( "strconv" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step creates the virtual disk that will be used as the diff --git a/builder/parallels/iso/step_create_vm.go b/builder/parallels/iso/step_create_vm.go index 801f83899..ad7a32f81 100644 --- a/builder/parallels/iso/step_create_vm.go +++ b/builder/parallels/iso/step_create_vm.go @@ -6,8 +6,8 @@ import ( "strconv" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step creates the actual virtual machine. diff --git a/builder/parallels/iso/step_set_boot_order.go b/builder/parallels/iso/step_set_boot_order.go index 3b052407c..7d50251be 100644 --- a/builder/parallels/iso/step_set_boot_order.go +++ b/builder/parallels/iso/step_set_boot_order.go @@ -5,8 +5,8 @@ import ( "fmt" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step sets the device boot order for the virtual machine. diff --git a/builder/parallels/pvm/builder.go b/builder/parallels/pvm/builder.go index 757b5b9a4..532c37658 100644 --- a/builder/parallels/pvm/builder.go +++ b/builder/parallels/pvm/builder.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // Builder implements packer.Builder and builds the actual Parallels diff --git a/builder/parallels/pvm/config.go b/builder/parallels/pvm/config.go index 651f64419..3b5aafdce 100644 --- a/builder/parallels/pvm/config.go +++ b/builder/parallels/pvm/config.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/pvm/step_import.go b/builder/parallels/pvm/step_import.go index dcbc1cf6e..1530ee301 100644 --- a/builder/parallels/pvm/step_import.go +++ b/builder/parallels/pvm/step_import.go @@ -5,8 +5,8 @@ import ( "fmt" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step imports an PVM VM into Parallels. diff --git a/builder/parallels/pvm/step_test.go b/builder/parallels/pvm/step_test.go index 9d891c637..6c9983a82 100644 --- a/builder/parallels/pvm/step_test.go +++ b/builder/parallels/pvm/step_test.go @@ -5,8 +5,8 @@ import ( "testing" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/profitbricks/builder.go b/builder/profitbricks/builder.go index dada47170..2261a96f5 100644 --- a/builder/profitbricks/builder.go +++ b/builder/profitbricks/builder.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) const BuilderId = "packer.profitbricks" diff --git a/builder/profitbricks/step_create_server.go b/builder/profitbricks/step_create_server.go index 7798ace73..21464c673 100644 --- a/builder/profitbricks/step_create_server.go +++ b/builder/profitbricks/step_create_server.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/profitbricks/profitbricks-sdk-go" ) diff --git a/builder/profitbricks/step_create_ssh_key.go b/builder/profitbricks/step_create_ssh_key.go index 8490dffc3..19d8a2044 100644 --- a/builder/profitbricks/step_create_ssh_key.go +++ b/builder/profitbricks/step_create_ssh_key.go @@ -6,8 +6,8 @@ import ( "encoding/pem" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/profitbricks/step_take_snapshot.go b/builder/profitbricks/step_take_snapshot.go index dfb1ff61a..c545f8521 100644 --- a/builder/profitbricks/step_take_snapshot.go +++ b/builder/profitbricks/step_take_snapshot.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/profitbricks/profitbricks-sdk-go" ) diff --git a/builder/proxmox/clone/builder.go b/builder/proxmox/clone/builder.go index 178f73587..f84fb216e 100644 --- a/builder/proxmox/clone/builder.go +++ b/builder/proxmox/clone/builder.go @@ -4,8 +4,8 @@ import ( proxmoxapi "github.com/Telmate/proxmox-api-go/proxmox" "github.com/hashicorp/hcl/v2/hcldec" proxmox "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "context" "fmt" diff --git a/builder/proxmox/clone/step_ssh_key_pair.go b/builder/proxmox/clone/step_ssh_key_pair.go index 1fd0844d0..c963986a4 100644 --- a/builder/proxmox/clone/step_ssh_key_pair.go +++ b/builder/proxmox/clone/step_ssh_key_pair.go @@ -6,9 +6,9 @@ import ( "os" common "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/proxmox/common/builder.go b/builder/proxmox/common/builder.go index bbb5e7c9d..b592a6fdb 100644 --- a/builder/proxmox/common/builder.go +++ b/builder/proxmox/common/builder.go @@ -8,9 +8,9 @@ import ( "github.com/Telmate/proxmox-api-go/proxmox" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) func NewSharedBuilder(id string, config Config, preSteps []multistep.Step, postSteps []multistep.Step, vmCreator ProxmoxVMCreator) *Builder { diff --git a/builder/proxmox/common/config.go b/builder/proxmox/common/config.go index 4a3184282..66d17a318 100644 --- a/builder/proxmox/common/config.go +++ b/builder/proxmox/common/config.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/mitchellh/mapstructure" diff --git a/builder/proxmox/common/step_convert_to_template.go b/builder/proxmox/common/step_convert_to_template.go index b0fc13b47..3d177bfc9 100644 --- a/builder/proxmox/common/step_convert_to_template.go +++ b/builder/proxmox/common/step_convert_to_template.go @@ -6,8 +6,8 @@ import ( "log" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepConvertToTemplate takes the running VM configured in earlier steps, stops it, and diff --git a/builder/proxmox/common/step_convert_to_template_test.go b/builder/proxmox/common/step_convert_to_template_test.go index a7f472e3a..26fc7dfb3 100644 --- a/builder/proxmox/common/step_convert_to_template_test.go +++ b/builder/proxmox/common/step_convert_to_template_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type converterMock struct { diff --git a/builder/proxmox/common/step_finalize_template_config.go b/builder/proxmox/common/step_finalize_template_config.go index 0aebb9aca..901d30bff 100644 --- a/builder/proxmox/common/step_finalize_template_config.go +++ b/builder/proxmox/common/step_finalize_template_config.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepFinalizeTemplateConfig does any required modifications to the configuration _after_ diff --git a/builder/proxmox/common/step_finalize_template_config_test.go b/builder/proxmox/common/step_finalize_template_config_test.go index 646e6f73d..38c691e17 100644 --- a/builder/proxmox/common/step_finalize_template_config_test.go +++ b/builder/proxmox/common/step_finalize_template_config_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type finalizerMock struct { diff --git a/builder/proxmox/common/step_start_vm.go b/builder/proxmox/common/step_start_vm.go index d5877a6a2..09951660f 100644 --- a/builder/proxmox/common/step_start_vm.go +++ b/builder/proxmox/common/step_start_vm.go @@ -7,8 +7,8 @@ import ( "strconv" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepStartVM takes the given configuration and starts a VM on the given Proxmox node. diff --git a/builder/proxmox/common/step_start_vm_test.go b/builder/proxmox/common/step_start_vm_test.go index cb19670f5..e51577297 100644 --- a/builder/proxmox/common/step_start_vm_test.go +++ b/builder/proxmox/common/step_start_vm_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type startedVMCleanerMock struct { diff --git a/builder/proxmox/common/step_success.go b/builder/proxmox/common/step_success.go index 06de9f21d..cbedd1684 100644 --- a/builder/proxmox/common/step_success.go +++ b/builder/proxmox/common/step_success.go @@ -3,7 +3,7 @@ package proxmox import ( "context" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepSuccess runs after the full build has succeeded. diff --git a/builder/proxmox/common/step_type_boot_command.go b/builder/proxmox/common/step_type_boot_command.go index fafdd8e9d..878d9b837 100644 --- a/builder/proxmox/common/step_type_boot_command.go +++ b/builder/proxmox/common/step_type_boot_command.go @@ -9,9 +9,9 @@ import ( "time" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/proxmox/common/step_type_boot_command_test.go b/builder/proxmox/common/step_type_boot_command_test.go index 7070b312d..104c3fd60 100644 --- a/builder/proxmox/common/step_type_boot_command_test.go +++ b/builder/proxmox/common/step_type_boot_command_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type commandTyperMock struct { diff --git a/builder/proxmox/iso/builder.go b/builder/proxmox/iso/builder.go index 4f17e213f..8cc248aec 100644 --- a/builder/proxmox/iso/builder.go +++ b/builder/proxmox/iso/builder.go @@ -6,9 +6,9 @@ import ( proxmoxapi "github.com/Telmate/proxmox-api-go/proxmox" "github.com/hashicorp/hcl/v2/hcldec" proxmox "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // The unique id for the builder diff --git a/builder/proxmox/iso/config.go b/builder/proxmox/iso/config.go index 331f0ff08..a5545f9eb 100644 --- a/builder/proxmox/iso/config.go +++ b/builder/proxmox/iso/config.go @@ -11,7 +11,7 @@ import ( proxmox "github.com/hashicorp/packer/builder/proxmox/common" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type Config struct { diff --git a/builder/proxmox/iso/step_finalize_iso.go b/builder/proxmox/iso/step_finalize_iso.go index 88ef44bd2..ee504c0e7 100644 --- a/builder/proxmox/iso/step_finalize_iso.go +++ b/builder/proxmox/iso/step_finalize_iso.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepFinalizeISOTemplate does any ISO-builder specific modifications after diff --git a/builder/proxmox/iso/step_finalize_iso_test.go b/builder/proxmox/iso/step_finalize_iso_test.go index a35a7f5a2..6556bb495 100644 --- a/builder/proxmox/iso/step_finalize_iso_test.go +++ b/builder/proxmox/iso/step_finalize_iso_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type finalizerMock struct { diff --git a/builder/proxmox/iso/step_upload_additional_isos.go b/builder/proxmox/iso/step_upload_additional_isos.go index f23b949be..e2b7af894 100644 --- a/builder/proxmox/iso/step_upload_additional_isos.go +++ b/builder/proxmox/iso/step_upload_additional_isos.go @@ -7,8 +7,8 @@ import ( "path/filepath" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepUploadAdditionalISOs uploads all additional ISO files that are mountet diff --git a/builder/proxmox/iso/step_upload_iso.go b/builder/proxmox/iso/step_upload_iso.go index 79096bfe0..3edef379a 100644 --- a/builder/proxmox/iso/step_upload_iso.go +++ b/builder/proxmox/iso/step_upload_iso.go @@ -8,8 +8,8 @@ import ( "path/filepath" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepUploadISO uploads an ISO file to Proxmox so we can boot from it diff --git a/builder/proxmox/iso/step_upload_iso_test.go b/builder/proxmox/iso/step_upload_iso_test.go index 0099c1271..d747594f8 100644 --- a/builder/proxmox/iso/step_upload_iso_test.go +++ b/builder/proxmox/iso/step_upload_iso_test.go @@ -6,9 +6,9 @@ import ( "io" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type uploaderMock struct { diff --git a/builder/qemu/builder.go b/builder/qemu/builder.go index d382c7b8e..fc24b592c 100644 --- a/builder/qemu/builder.go +++ b/builder/qemu/builder.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) const BuilderId = "transcend.qemu" diff --git a/builder/qemu/config.go b/builder/qemu/config.go index db294ec01..358a26589 100644 --- a/builder/qemu/config.go +++ b/builder/qemu/config.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/qemu/driver.go b/builder/qemu/driver.go index d4b600c11..9aeb8f279 100644 --- a/builder/qemu/driver.go +++ b/builder/qemu/driver.go @@ -15,7 +15,7 @@ import ( "time" "unicode" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type DriverCancelCallback func(state multistep.StateBag) bool diff --git a/builder/qemu/ssh.go b/builder/qemu/ssh.go index d722df9e1..25778c021 100644 --- a/builder/qemu/ssh.go +++ b/builder/qemu/ssh.go @@ -3,7 +3,7 @@ package qemu import ( "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func commHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/qemu/step_configure_qmp.go b/builder/qemu/step_configure_qmp.go index 8a2d10249..de87d99bf 100644 --- a/builder/qemu/step_configure_qmp.go +++ b/builder/qemu/step_configure_qmp.go @@ -8,8 +8,8 @@ import ( "time" "github.com/digitalocean/go-qemu/qmp" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step configures the VM to enable the QMP listener. diff --git a/builder/qemu/step_configure_vnc.go b/builder/qemu/step_configure_vnc.go index 0a8c34590..87a095dc7 100644 --- a/builder/qemu/step_configure_vnc.go +++ b/builder/qemu/step_configure_vnc.go @@ -6,8 +6,8 @@ import ( "log" "math/rand" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/qemu/step_convert_disk.go b/builder/qemu/step_convert_disk.go index cb0f17ea3..1f7952248 100644 --- a/builder/qemu/step_convert_disk.go +++ b/builder/qemu/step_convert_disk.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "os" diff --git a/builder/qemu/step_copy_disk.go b/builder/qemu/step_copy_disk.go index 28a091426..c5600a31b 100644 --- a/builder/qemu/step_copy_disk.go +++ b/builder/qemu/step_copy_disk.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step copies the virtual disk that will be used as the diff --git a/builder/qemu/step_copy_disk_test.go b/builder/qemu/step_copy_disk_test.go index b7241621e..efeb53401 100644 --- a/builder/qemu/step_copy_disk_test.go +++ b/builder/qemu/step_copy_disk_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/qemu/step_create_disk.go b/builder/qemu/step_create_disk.go index 288bb02dc..03de4fe7e 100644 --- a/builder/qemu/step_create_disk.go +++ b/builder/qemu/step_create_disk.go @@ -6,8 +6,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step creates the virtual disk that will be used as the diff --git a/builder/qemu/step_create_disk_test.go b/builder/qemu/step_create_disk_test.go index 22fa59283..6756d7e58 100644 --- a/builder/qemu/step_create_disk_test.go +++ b/builder/qemu/step_create_disk_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/qemu/step_http_ip_discover.go b/builder/qemu/step_http_ip_discover.go index dd0f88dea..416cdac56 100644 --- a/builder/qemu/step_http_ip_discover.go +++ b/builder/qemu/step_http_ip_discover.go @@ -5,8 +5,8 @@ import ( "fmt" "net" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Step to discover the http ip diff --git a/builder/qemu/step_http_ip_discover_test.go b/builder/qemu/step_http_ip_discover_test.go index 456602f8a..263bcb752 100644 --- a/builder/qemu/step_http_ip_discover_test.go +++ b/builder/qemu/step_http_ip_discover_test.go @@ -5,8 +5,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepHTTPIPDiscover_Run(t *testing.T) { diff --git a/builder/qemu/step_port_forward.go b/builder/qemu/step_port_forward.go index 537043973..77dcc1248 100644 --- a/builder/qemu/step_port_forward.go +++ b/builder/qemu/step_port_forward.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/qemu/step_prepare_output_dir.go b/builder/qemu/step_prepare_output_dir.go index 09a3087ec..75118fdf0 100644 --- a/builder/qemu/step_prepare_output_dir.go +++ b/builder/qemu/step_prepare_output_dir.go @@ -6,8 +6,8 @@ import ( "os" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepPrepareOutputDir struct{} diff --git a/builder/qemu/step_resize_disk.go b/builder/qemu/step_resize_disk.go index 09863e327..c2daf20cf 100644 --- a/builder/qemu/step_resize_disk.go +++ b/builder/qemu/step_resize_disk.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step resizes the virtual disk that will be used as the diff --git a/builder/qemu/step_resize_disk_test.go b/builder/qemu/step_resize_disk_test.go index 796ec20cb..ecfa5b6ea 100644 --- a/builder/qemu/step_resize_disk_test.go +++ b/builder/qemu/step_resize_disk_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/qemu/step_run.go b/builder/qemu/step_run.go index 1273a846e..ab2b36886 100644 --- a/builder/qemu/step_run.go +++ b/builder/qemu/step_run.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/hashicorp/go-version" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/qemu/step_run_test.go b/builder/qemu/step_run_test.go index d025a8063..7f3bfe4c5 100644 --- a/builder/qemu/step_run_test.go +++ b/builder/qemu/step_run_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/stretchr/testify/assert" ) diff --git a/builder/qemu/step_set_iso.go b/builder/qemu/step_set_iso.go index b912574b5..3f6263be7 100644 --- a/builder/qemu/step_set_iso.go +++ b/builder/qemu/step_set_iso.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/qemu/step_shutdown.go b/builder/qemu/step_shutdown.go index 7fde1de77..3dbe1743a 100644 --- a/builder/qemu/step_shutdown.go +++ b/builder/qemu/step_shutdown.go @@ -8,8 +8,8 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step shuts down the machine. It first attempts to do so gracefully, diff --git a/builder/qemu/step_shutdown_test.go b/builder/qemu/step_shutdown_test.go index 46ea3efb8..47214b4ee 100644 --- a/builder/qemu/step_shutdown_test.go +++ b/builder/qemu/step_shutdown_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func Test_Shutdown_Null_success(t *testing.T) { diff --git a/builder/qemu/step_test.go b/builder/qemu/step_test.go index 4a782d1d4..ff015f747 100644 --- a/builder/qemu/step_test.go +++ b/builder/qemu/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/qemu/step_type_boot_command.go b/builder/qemu/step_type_boot_command.go index 70446bde3..27a6f8e48 100644 --- a/builder/qemu/step_type_boot_command.go +++ b/builder/qemu/step_type_boot_command.go @@ -7,9 +7,9 @@ import ( "net" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-vnc" ) diff --git a/builder/qemu/step_wait_guest_address.go b/builder/qemu/step_wait_guest_address.go index 7e6f9ad1e..938083e5b 100644 --- a/builder/qemu/step_wait_guest_address.go +++ b/builder/qemu/step_wait_guest_address.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/digitalocean/go-qemu/qmp" ) diff --git a/builder/scaleway/builder.go b/builder/scaleway/builder.go index f1f222f1f..9db7423cd 100644 --- a/builder/scaleway/builder.go +++ b/builder/scaleway/builder.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_create_image.go b/builder/scaleway/step_create_image.go index 98085d3af..5875700d6 100644 --- a/builder/scaleway/step_create_image.go +++ b/builder/scaleway/step_create_image.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/api/marketplace/v1" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/builder/scaleway/step_create_server.go b/builder/scaleway/step_create_server.go index 3342305b1..52c802b5f 100644 --- a/builder/scaleway/step_create_server.go +++ b/builder/scaleway/step_create_server.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_create_ssh_key.go b/builder/scaleway/step_create_ssh_key.go index 308913a7b..5d746029f 100644 --- a/builder/scaleway/step_create_ssh_key.go +++ b/builder/scaleway/step_create_ssh_key.go @@ -11,8 +11,8 @@ import ( "os" "runtime" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/scaleway/step_pre_validate.go b/builder/scaleway/step_pre_validate.go index 0e32b2e5d..c1926a41f 100644 --- a/builder/scaleway/step_pre_validate.go +++ b/builder/scaleway/step_pre_validate.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_pre_validate_test.go b/builder/scaleway/step_pre_validate_test.go index 51e7d927c..fb40998ab 100644 --- a/builder/scaleway/step_pre_validate_test.go +++ b/builder/scaleway/step_pre_validate_test.go @@ -10,8 +10,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_remove_volume.go b/builder/scaleway/step_remove_volume.go index a9abc2d3b..451047b3c 100644 --- a/builder/scaleway/step_remove_volume.go +++ b/builder/scaleway/step_remove_volume.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_server_info.go b/builder/scaleway/step_server_info.go index 7d5f7d1ba..28dec4cd5 100644 --- a/builder/scaleway/step_server_info.go +++ b/builder/scaleway/step_server_info.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_shutdown.go b/builder/scaleway/step_shutdown.go index 60d76d907..9cb016e5a 100644 --- a/builder/scaleway/step_shutdown.go +++ b/builder/scaleway/step_shutdown.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_snapshot.go b/builder/scaleway/step_snapshot.go index 8b4fab470..29f56d97a 100644 --- a/builder/scaleway/step_snapshot.go +++ b/builder/scaleway/step_snapshot.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/tencentcloud/cvm/builder.go b/builder/tencentcloud/cvm/builder.go index ff9526a81..18e86175b 100644 --- a/builder/tencentcloud/cvm/builder.go +++ b/builder/tencentcloud/cvm/builder.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/tencentcloud/cvm/common.go b/builder/tencentcloud/cvm/common.go index 020ae4390..d3fd7c398 100644 --- a/builder/tencentcloud/cvm/common.go +++ b/builder/tencentcloud/cvm/common.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" diff --git a/builder/tencentcloud/cvm/step_check_source_image.go b/builder/tencentcloud/cvm/step_check_source_image.go index 156525c2c..f2fc01265 100644 --- a/builder/tencentcloud/cvm/step_check_source_image.go +++ b/builder/tencentcloud/cvm/step_check_source_image.go @@ -5,7 +5,7 @@ import ( "fmt" "regexp" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_config_key_pair.go b/builder/tencentcloud/cvm/step_config_key_pair.go index a4ae97159..7d0534273 100644 --- a/builder/tencentcloud/cvm/step_config_key_pair.go +++ b/builder/tencentcloud/cvm/step_config_key_pair.go @@ -8,7 +8,7 @@ import ( "runtime" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_config_security_group.go b/builder/tencentcloud/cvm/step_config_security_group.go index 97d70e3c1..97af73848 100644 --- a/builder/tencentcloud/cvm/step_config_security_group.go +++ b/builder/tencentcloud/cvm/step_config_security_group.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_config_subnet.go b/builder/tencentcloud/cvm/step_config_subnet.go index 91ab42b7f..10c9b01d3 100644 --- a/builder/tencentcloud/cvm/step_config_subnet.go +++ b/builder/tencentcloud/cvm/step_config_subnet.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_config_vpc.go b/builder/tencentcloud/cvm/step_config_vpc.go index 707afb467..e89ec86f6 100644 --- a/builder/tencentcloud/cvm/step_config_vpc.go +++ b/builder/tencentcloud/cvm/step_config_vpc.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_copy_image.go b/builder/tencentcloud/cvm/step_copy_image.go index abc30d86b..bcfbd171f 100644 --- a/builder/tencentcloud/cvm/step_copy_image.go +++ b/builder/tencentcloud/cvm/step_copy_image.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_create_image.go b/builder/tencentcloud/cvm/step_create_image.go index f0fee3bc2..f55ad28ce 100644 --- a/builder/tencentcloud/cvm/step_create_image.go +++ b/builder/tencentcloud/cvm/step_create_image.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_detach_temp_key_pair.go b/builder/tencentcloud/cvm/step_detach_temp_key_pair.go index 6c5533e4d..b8cc2ca67 100644 --- a/builder/tencentcloud/cvm/step_detach_temp_key_pair.go +++ b/builder/tencentcloud/cvm/step_detach_temp_key_pair.go @@ -3,7 +3,7 @@ package cvm import ( "context" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_pre_validate.go b/builder/tencentcloud/cvm/step_pre_validate.go index 400535579..d07d8f058 100644 --- a/builder/tencentcloud/cvm/step_pre_validate.go +++ b/builder/tencentcloud/cvm/step_pre_validate.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_run_instance.go b/builder/tencentcloud/cvm/step_run_instance.go index 09e889d3e..811b71ed9 100644 --- a/builder/tencentcloud/cvm/step_run_instance.go +++ b/builder/tencentcloud/cvm/step_run_instance.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_share_image.go b/builder/tencentcloud/cvm/step_share_image.go index b7ae237f7..d83bb9fa5 100644 --- a/builder/tencentcloud/cvm/step_share_image.go +++ b/builder/tencentcloud/cvm/step_share_image.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/triton/builder.go b/builder/triton/builder.go index d9fd2b335..26d1274cd 100644 --- a/builder/triton/builder.go +++ b/builder/triton/builder.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) const ( diff --git a/builder/triton/ssh.go b/builder/triton/ssh.go index bc34fd6a9..0adf15c45 100644 --- a/builder/triton/ssh.go +++ b/builder/triton/ssh.go @@ -3,7 +3,7 @@ package triton import ( "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func commHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/triton/step_create_image_from_machine.go b/builder/triton/step_create_image_from_machine.go index b7df6a0f6..bb2d66255 100644 --- a/builder/triton/step_create_image_from_machine.go +++ b/builder/triton/step_create_image_from_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCreateImageFromMachine creates an image with the specified attributes diff --git a/builder/triton/step_create_image_from_machine_test.go b/builder/triton/step_create_image_from_machine_test.go index 34eb95c8c..8423e85d5 100644 --- a/builder/triton/step_create_image_from_machine_test.go +++ b/builder/triton/step_create_image_from_machine_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateImageFromMachine(t *testing.T) { diff --git a/builder/triton/step_create_source_machine.go b/builder/triton/step_create_source_machine.go index 24080ba23..0da7f603e 100644 --- a/builder/triton/step_create_source_machine.go +++ b/builder/triton/step_create_source_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCreateSourceMachine creates an machine with the specified attributes diff --git a/builder/triton/step_create_source_machine_test.go b/builder/triton/step_create_source_machine_test.go index 78d97ad5e..d70bfd6a0 100644 --- a/builder/triton/step_create_source_machine_test.go +++ b/builder/triton/step_create_source_machine_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateSourceMachine(t *testing.T) { diff --git a/builder/triton/step_delete_machine.go b/builder/triton/step_delete_machine.go index aacb0d426..d1d005c25 100644 --- a/builder/triton/step_delete_machine.go +++ b/builder/triton/step_delete_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepDeleteMachine deletes the machine with the ID specified in state["machine"] diff --git a/builder/triton/step_delete_machine_test.go b/builder/triton/step_delete_machine_test.go index 421024d58..1615f4f7d 100644 --- a/builder/triton/step_delete_machine_test.go +++ b/builder/triton/step_delete_machine_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepDeleteMachine(t *testing.T) { diff --git a/builder/triton/step_stop_machine.go b/builder/triton/step_stop_machine.go index 2e859dec6..f6b243a23 100644 --- a/builder/triton/step_stop_machine.go +++ b/builder/triton/step_stop_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepStopMachine stops the machine with the given Machine ID, and waits diff --git a/builder/triton/step_stop_machine_test.go b/builder/triton/step_stop_machine_test.go index 8f0f39d2d..ded3e5053 100644 --- a/builder/triton/step_stop_machine_test.go +++ b/builder/triton/step_stop_machine_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepStopMachine(t *testing.T) { diff --git a/builder/triton/step_test.go b/builder/triton/step_test.go index bccc398c7..448a33a8f 100644 --- a/builder/triton/step_test.go +++ b/builder/triton/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/triton/step_wait_for_stop_to_not_fail.go b/builder/triton/step_wait_for_stop_to_not_fail.go index e6c6ced64..ce226c871 100644 --- a/builder/triton/step_wait_for_stop_to_not_fail.go +++ b/builder/triton/step_wait_for_stop_to_not_fail.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepWaitForStopNotToFail waits for 10 seconds before returning with continue diff --git a/builder/ucloud/common/utils.go b/builder/ucloud/common/utils.go index b922608d1..71d2bb04b 100644 --- a/builder/ucloud/common/utils.go +++ b/builder/ucloud/common/utils.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/ucloud/ucloud-sdk-go/services/uhost" ) diff --git a/builder/ucloud/uhost/builder.go b/builder/ucloud/uhost/builder.go index 8ec378d54..8d7c7de0d 100644 --- a/builder/ucloud/uhost/builder.go +++ b/builder/ucloud/uhost/builder.go @@ -11,10 +11,10 @@ import ( ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/ucloud/uhost/step_check_source_image.go b/builder/ucloud/uhost/step_check_source_image.go index d1feae7b6..afeec3978 100644 --- a/builder/ucloud/uhost/step_check_source_image.go +++ b/builder/ucloud/uhost/step_check_source_image.go @@ -3,9 +3,10 @@ package uhost import ( "context" "fmt" + ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCheckSourceImageId struct { diff --git a/builder/ucloud/uhost/step_config_security_group.go b/builder/ucloud/uhost/step_config_security_group.go index f561bd003..297f7d002 100644 --- a/builder/ucloud/uhost/step_config_security_group.go +++ b/builder/ucloud/uhost/step_config_security_group.go @@ -5,8 +5,8 @@ import ( "fmt" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/uhost/step_config_subnet.go b/builder/ucloud/uhost/step_config_subnet.go index affb43ccd..6170b3f95 100644 --- a/builder/ucloud/uhost/step_config_subnet.go +++ b/builder/ucloud/uhost/step_config_subnet.go @@ -5,8 +5,8 @@ import ( "fmt" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConfigSubnet struct { diff --git a/builder/ucloud/uhost/step_config_vpc.go b/builder/ucloud/uhost/step_config_vpc.go index b6792318c..dc54ddcf7 100644 --- a/builder/ucloud/uhost/step_config_vpc.go +++ b/builder/ucloud/uhost/step_config_vpc.go @@ -6,8 +6,8 @@ import ( ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConfigVPC struct { diff --git a/builder/ucloud/uhost/step_copy_image.go b/builder/ucloud/uhost/step_copy_image.go index 55c9f0c62..4f8eec37e 100644 --- a/builder/ucloud/uhost/step_copy_image.go +++ b/builder/ucloud/uhost/step_copy_image.go @@ -9,8 +9,8 @@ import ( ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/uhost/step_create_image.go b/builder/ucloud/uhost/step_create_image.go index 42207ee2a..58e5da238 100644 --- a/builder/ucloud/uhost/step_create_image.go +++ b/builder/ucloud/uhost/step_create_image.go @@ -8,8 +8,8 @@ import ( ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/ucloud/ucloud-sdk-go/services/uhost" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/uhost/step_create_instance.go b/builder/ucloud/uhost/step_create_instance.go index bb6738569..03d863a40 100644 --- a/builder/ucloud/uhost/step_create_instance.go +++ b/builder/ucloud/uhost/step_create_instance.go @@ -10,8 +10,8 @@ import ( "time" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/ucloud/ucloud-sdk-go/services/uhost" "github.com/ucloud/ucloud-sdk-go/ucloud" diff --git a/builder/ucloud/uhost/step_pre_validate.go b/builder/ucloud/uhost/step_pre_validate.go index becb80b29..41b50e9a6 100644 --- a/builder/ucloud/uhost/step_pre_validate.go +++ b/builder/ucloud/uhost/step_pre_validate.go @@ -4,8 +4,8 @@ import ( "context" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepPreValidate struct { diff --git a/builder/ucloud/uhost/step_stop_instance.go b/builder/ucloud/uhost/step_stop_instance.go index 15daea961..214d5e312 100644 --- a/builder/ucloud/uhost/step_stop_instance.go +++ b/builder/ucloud/uhost/step_stop_instance.go @@ -8,8 +8,8 @@ import ( ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/ucloud/ucloud-sdk-go/services/uhost" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/vagrant/builder.go b/builder/vagrant/builder.go index f8ff77497..3bc7a1200 100644 --- a/builder/vagrant/builder.go +++ b/builder/vagrant/builder.go @@ -16,11 +16,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vagrant/ssh.go b/builder/vagrant/ssh.go index d4a56cb17..4d15819cb 100644 --- a/builder/vagrant/ssh.go +++ b/builder/vagrant/ssh.go @@ -1,7 +1,7 @@ package vagrant import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CommHost() func(multistep.StateBag) (string, error) { diff --git a/builder/vagrant/step_add_box.go b/builder/vagrant/step_add_box.go index 00b8af9b9..43693d184 100644 --- a/builder/vagrant/step_add_box.go +++ b/builder/vagrant/step_add_box.go @@ -5,8 +5,8 @@ import ( "log" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepAddBox struct { diff --git a/builder/vagrant/step_add_box_test.go b/builder/vagrant/step_add_box_test.go index 29feca5d1..475bcf501 100644 --- a/builder/vagrant/step_add_box_test.go +++ b/builder/vagrant/step_add_box_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepAdd_Impl(t *testing.T) { diff --git a/builder/vagrant/step_create_vagrantfile.go b/builder/vagrant/step_create_vagrantfile.go index ec6262dcc..b6ec461af 100644 --- a/builder/vagrant/step_create_vagrantfile.go +++ b/builder/vagrant/step_create_vagrantfile.go @@ -8,8 +8,8 @@ import ( "path/filepath" "text/template" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateVagrantfile struct { diff --git a/builder/vagrant/step_create_vagrantfile_test.go b/builder/vagrant/step_create_vagrantfile_test.go index 58df30284..2d8ff805c 100644 --- a/builder/vagrant/step_create_vagrantfile_test.go +++ b/builder/vagrant/step_create_vagrantfile_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateVagrantfile_Impl(t *testing.T) { diff --git a/builder/vagrant/step_package.go b/builder/vagrant/step_package.go index 4cb9e2c18..8b2bd023f 100644 --- a/builder/vagrant/step_package.go +++ b/builder/vagrant/step_package.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPackage struct { diff --git a/builder/vagrant/step_ssh_config.go b/builder/vagrant/step_ssh_config.go index cdeab0361..e5a6c96d2 100644 --- a/builder/vagrant/step_ssh_config.go +++ b/builder/vagrant/step_ssh_config.go @@ -5,7 +5,7 @@ import ( "log" "strconv" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Vagrant already sets up ssh on the guests; our job is to find out what diff --git a/builder/vagrant/step_ssh_config_test.go b/builder/vagrant/step_ssh_config_test.go index d781ef338..cf7f42a56 100644 --- a/builder/vagrant/step_ssh_config_test.go +++ b/builder/vagrant/step_ssh_config_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSSHConfig_Impl(t *testing.T) { diff --git a/builder/vagrant/step_up.go b/builder/vagrant/step_up.go index e78834f36..d427de57a 100644 --- a/builder/vagrant/step_up.go +++ b/builder/vagrant/step_up.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUp struct { diff --git a/builder/virtualbox/common/comm.go b/builder/virtualbox/common/comm.go index cd43522db..a8811ae8d 100644 --- a/builder/virtualbox/common/comm.go +++ b/builder/virtualbox/common/comm.go @@ -1,7 +1,7 @@ package common import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CommHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/virtualbox/common/step_attach_floppy.go b/builder/virtualbox/common/step_attach_floppy.go index 82a058e17..c607fbe32 100644 --- a/builder/virtualbox/common/step_attach_floppy.go +++ b/builder/virtualbox/common/step_attach_floppy.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/builder/virtualbox/common/step_attach_floppy_test.go b/builder/virtualbox/common/step_attach_floppy_test.go index 75d51c333..e34308799 100644 --- a/builder/virtualbox/common/step_attach_floppy_test.go +++ b/builder/virtualbox/common/step_attach_floppy_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepAttachFloppy_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_attach_isos.go b/builder/virtualbox/common/step_attach_isos.go index efbe26254..b72d9eccf 100644 --- a/builder/virtualbox/common/step_attach_isos.go +++ b/builder/virtualbox/common/step_attach_isos.go @@ -6,8 +6,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step attaches the boot ISO, cd_files iso, and guest additions to the diff --git a/builder/virtualbox/common/step_configure_vrdp.go b/builder/virtualbox/common/step_configure_vrdp.go index 626cb12ee..77a6a7aca 100644 --- a/builder/virtualbox/common/step_configure_vrdp.go +++ b/builder/virtualbox/common/step_configure_vrdp.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/virtualbox/common/step_download_guest_additions.go b/builder/virtualbox/common/step_download_guest_additions.go index e47d99dc7..e812ab436 100644 --- a/builder/virtualbox/common/step_download_guest_additions.go +++ b/builder/virtualbox/common/step_download_guest_additions.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/builder/virtualbox/common/step_export.go b/builder/virtualbox/common/step_export.go index 7a3dd13f4..b1c5d6987 100644 --- a/builder/virtualbox/common/step_export.go +++ b/builder/virtualbox/common/step_export.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step cleans up forwarded ports and exports the VM to an OVF. diff --git a/builder/virtualbox/common/step_export_test.go b/builder/virtualbox/common/step_export_test.go index c5adc0a45..71fabf56b 100644 --- a/builder/virtualbox/common/step_export_test.go +++ b/builder/virtualbox/common/step_export_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepExport_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_http_ip_discover.go b/builder/virtualbox/common/step_http_ip_discover.go index ce4c2d7f5..17bbe42b9 100644 --- a/builder/virtualbox/common/step_http_ip_discover.go +++ b/builder/virtualbox/common/step_http_ip_discover.go @@ -2,7 +2,8 @@ package common import ( "context" - "github.com/hashicorp/packer/helper/multistep" + + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Step to discover the http ip diff --git a/builder/virtualbox/common/step_http_ip_discover_test.go b/builder/virtualbox/common/step_http_ip_discover_test.go index dbdccdb96..0a5bc8d47 100644 --- a/builder/virtualbox/common/step_http_ip_discover_test.go +++ b/builder/virtualbox/common/step_http_ip_discover_test.go @@ -2,8 +2,9 @@ package common import ( "context" - "github.com/hashicorp/packer/helper/multistep" "testing" + + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepHTTPIPDiscover_Run(t *testing.T) { diff --git a/builder/virtualbox/common/step_port_forwarding.go b/builder/virtualbox/common/step_port_forwarding.go index be96667b2..19b3a6689 100644 --- a/builder/virtualbox/common/step_port_forwarding.go +++ b/builder/virtualbox/common/step_port_forwarding.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/virtualbox/common/step_remove_devices.go b/builder/virtualbox/common/step_remove_devices.go index 4ff9aad3b..fbbce66da 100644 --- a/builder/virtualbox/common/step_remove_devices.go +++ b/builder/virtualbox/common/step_remove_devices.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/virtualbox/common/step_remove_devices_test.go b/builder/virtualbox/common/step_remove_devices_test.go index d28de98c4..95174bec5 100644 --- a/builder/virtualbox/common/step_remove_devices_test.go +++ b/builder/virtualbox/common/step_remove_devices_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRemoveDevices_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_run.go b/builder/virtualbox/common/step_run.go index 8144087b2..ca148a876 100644 --- a/builder/virtualbox/common/step_run.go +++ b/builder/virtualbox/common/step_run.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step starts the virtual machine. diff --git a/builder/virtualbox/common/step_shutdown.go b/builder/virtualbox/common/step_shutdown.go index 75d570977..acc3c3513 100644 --- a/builder/virtualbox/common/step_shutdown.go +++ b/builder/virtualbox/common/step_shutdown.go @@ -7,8 +7,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step shuts down the machine. It first attempts to do so gracefully, diff --git a/builder/virtualbox/common/step_shutdown_test.go b/builder/virtualbox/common/step_shutdown_test.go index c0cec95ed..001195bbb 100644 --- a/builder/virtualbox/common/step_shutdown_test.go +++ b/builder/virtualbox/common/step_shutdown_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepShutdown_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_ssh_key_pair.go b/builder/virtualbox/common/step_ssh_key_pair.go index d23143dcd..e0e851756 100644 --- a/builder/virtualbox/common/step_ssh_key_pair.go +++ b/builder/virtualbox/common/step_ssh_key_pair.go @@ -6,9 +6,9 @@ import ( "os" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/virtualbox/common/step_suppress_messages.go b/builder/virtualbox/common/step_suppress_messages.go index 0a9def96c..52d69d5f9 100644 --- a/builder/virtualbox/common/step_suppress_messages.go +++ b/builder/virtualbox/common/step_suppress_messages.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step sets some variables in VirtualBox so that annoying diff --git a/builder/virtualbox/common/step_suppress_messages_test.go b/builder/virtualbox/common/step_suppress_messages_test.go index c37af7826..e93ca958b 100644 --- a/builder/virtualbox/common/step_suppress_messages_test.go +++ b/builder/virtualbox/common/step_suppress_messages_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSuppressMessages_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_test.go b/builder/virtualbox/common/step_test.go index c8a12abb6..7cb9dd45e 100644 --- a/builder/virtualbox/common/step_test.go +++ b/builder/virtualbox/common/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/virtualbox/common/step_type_boot_command.go b/builder/virtualbox/common/step_type_boot_command.go index b2f11d632..4e7587eae 100644 --- a/builder/virtualbox/common/step_type_boot_command.go +++ b/builder/virtualbox/common/step_type_boot_command.go @@ -6,9 +6,9 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/common/step_upload_guest_additions.go b/builder/virtualbox/common/step_upload_guest_additions.go index 739f20c8c..272ac5f1f 100644 --- a/builder/virtualbox/common/step_upload_guest_additions.go +++ b/builder/virtualbox/common/step_upload_guest_additions.go @@ -6,8 +6,8 @@ import ( "log" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/common/step_upload_version.go b/builder/virtualbox/common/step_upload_version.go index 3d84e00ba..638aa1dac 100644 --- a/builder/virtualbox/common/step_upload_version.go +++ b/builder/virtualbox/common/step_upload_version.go @@ -6,8 +6,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step uploads a file containing the VirtualBox version, which diff --git a/builder/virtualbox/common/step_upload_version_test.go b/builder/virtualbox/common/step_upload_version_test.go index 998d35f0e..ddce60e3c 100644 --- a/builder/virtualbox/common/step_upload_version_test.go +++ b/builder/virtualbox/common/step_upload_version_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepUploadVersion_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_vboxmanage.go b/builder/virtualbox/common/step_vboxmanage.go index 1428a9d21..6950fcb4f 100644 --- a/builder/virtualbox/common/step_vboxmanage.go +++ b/builder/virtualbox/common/step_vboxmanage.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go index f901ef763..e6fd54587 100644 --- a/builder/virtualbox/iso/builder.go +++ b/builder/virtualbox/iso/builder.go @@ -12,11 +12,11 @@ import ( vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/iso/step_create_disk.go b/builder/virtualbox/iso/step_create_disk.go index 1a8a80ad6..14869ce71 100644 --- a/builder/virtualbox/iso/step_create_disk.go +++ b/builder/virtualbox/iso/step_create_disk.go @@ -5,8 +5,8 @@ import ( "fmt" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "path/filepath" "strconv" diff --git a/builder/virtualbox/iso/step_create_vm.go b/builder/virtualbox/iso/step_create_vm.go index 604ce8fea..2a6597b18 100644 --- a/builder/virtualbox/iso/step_create_vm.go +++ b/builder/virtualbox/iso/step_create_vm.go @@ -7,8 +7,8 @@ import ( "strings" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step creates the actual virtual machine. diff --git a/builder/virtualbox/ovf/builder.go b/builder/virtualbox/ovf/builder.go index c6b6b7814..e15dd870b 100644 --- a/builder/virtualbox/ovf/builder.go +++ b/builder/virtualbox/ovf/builder.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // Builder implements packer.Builder and builds the actual VirtualBox diff --git a/builder/virtualbox/ovf/config.go b/builder/virtualbox/ovf/config.go index 29cf5c5ac..1851ec94c 100644 --- a/builder/virtualbox/ovf/config.go +++ b/builder/virtualbox/ovf/config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/ovf/step_import.go b/builder/virtualbox/ovf/step_import.go index b3dd53a19..fcb081a9c 100644 --- a/builder/virtualbox/ovf/step_import.go +++ b/builder/virtualbox/ovf/step_import.go @@ -5,8 +5,8 @@ import ( "fmt" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step imports an OVF VM into VirtualBox. diff --git a/builder/virtualbox/ovf/step_import_test.go b/builder/virtualbox/ovf/step_import_test.go index ae7425a22..69c2d5462 100644 --- a/builder/virtualbox/ovf/step_import_test.go +++ b/builder/virtualbox/ovf/step_import_test.go @@ -5,7 +5,7 @@ import ( "testing" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepImport_impl(t *testing.T) { diff --git a/builder/virtualbox/ovf/step_test.go b/builder/virtualbox/ovf/step_test.go index 4f9a0f9d8..59b251a99 100644 --- a/builder/virtualbox/ovf/step_test.go +++ b/builder/virtualbox/ovf/step_test.go @@ -5,8 +5,8 @@ import ( "testing" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/virtualbox/vm/builder.go b/builder/virtualbox/vm/builder.go index 6611753ec..4118d8827 100644 --- a/builder/virtualbox/vm/builder.go +++ b/builder/virtualbox/vm/builder.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // Builder implements packer.Builder and builds the actual VirtualBox diff --git a/builder/virtualbox/vm/config.go b/builder/virtualbox/vm/config.go index c1ec25dbe..ce3f71e3d 100644 --- a/builder/virtualbox/vm/config.go +++ b/builder/virtualbox/vm/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/vm/step_create_snapshot.go b/builder/virtualbox/vm/step_create_snapshot.go index 8252c6f82..05a10177a 100644 --- a/builder/virtualbox/vm/step_create_snapshot.go +++ b/builder/virtualbox/vm/step_create_snapshot.go @@ -6,8 +6,8 @@ import ( "log" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateSnapshot struct { diff --git a/builder/virtualbox/vm/step_import.go b/builder/virtualbox/vm/step_import.go index 3e0a11fe4..6efdbe115 100644 --- a/builder/virtualbox/vm/step_import.go +++ b/builder/virtualbox/vm/step_import.go @@ -3,7 +3,7 @@ package vm import ( "context" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step imports an OVF VM into VirtualBox. diff --git a/builder/virtualbox/vm/step_set_snapshot.go b/builder/virtualbox/vm/step_set_snapshot.go index 401bacf15..2158a5187 100644 --- a/builder/virtualbox/vm/step_set_snapshot.go +++ b/builder/virtualbox/vm/step_set_snapshot.go @@ -5,8 +5,8 @@ import ( "fmt" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSetSnapshot struct { diff --git a/builder/vmware/common/artifact.go b/builder/vmware/common/artifact.go index fedb70a84..39949716b 100644 --- a/builder/vmware/common/artifact.go +++ b/builder/vmware/common/artifact.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const ( diff --git a/builder/vmware/common/driver.go b/builder/vmware/common/driver.go index 9ff431320..6f3a40393 100644 --- a/builder/vmware/common/driver.go +++ b/builder/vmware/common/driver.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // A driver is able to talk to VMware, control virtual machines, etc. diff --git a/builder/vmware/common/driver_esx5.go b/builder/vmware/common/driver_esx5.go index d713a5cc4..710752258 100644 --- a/builder/vmware/common/driver_esx5.go +++ b/builder/vmware/common/driver_esx5.go @@ -29,9 +29,9 @@ import ( "github.com/hashicorp/go-getter/v2" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" gossh "golang.org/x/crypto/ssh" ) diff --git a/builder/vmware/common/driver_esx5_test.go b/builder/vmware/common/driver_esx5_test.go index ebe8a0f71..fd17fc73a 100644 --- a/builder/vmware/common/driver_esx5_test.go +++ b/builder/vmware/common/driver_esx5_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestESX5Driver_implDriver(t *testing.T) { diff --git a/builder/vmware/common/driver_fusion5.go b/builder/vmware/common/driver_fusion5.go index 02fdf8cf9..57f2bbda5 100644 --- a/builder/vmware/common/driver_fusion5.go +++ b/builder/vmware/common/driver_fusion5.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Fusion5Driver is a driver that can run VMware Fusion 5. diff --git a/builder/vmware/common/driver_mock.go b/builder/vmware/common/driver_mock.go index 9ece83841..66bac08af 100644 --- a/builder/vmware/common/driver_mock.go +++ b/builder/vmware/common/driver_mock.go @@ -4,7 +4,7 @@ import ( "net" "sync" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type DriverMock struct { diff --git a/builder/vmware/common/driver_player5.go b/builder/vmware/common/driver_player5.go index a8616c089..4ce3b5c7a 100644 --- a/builder/vmware/common/driver_player5.go +++ b/builder/vmware/common/driver_player5.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Player5Driver is a driver that can run VMware Player 5 on Linux. diff --git a/builder/vmware/common/driver_workstation9.go b/builder/vmware/common/driver_workstation9.go index c11733460..a64543b2e 100644 --- a/builder/vmware/common/driver_workstation9.go +++ b/builder/vmware/common/driver_workstation9.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Workstation9Driver is a driver that can run VMware Workstation 9 diff --git a/builder/vmware/common/ssh.go b/builder/vmware/common/ssh.go index 31e1a7eab..5f093605f 100644 --- a/builder/vmware/common/ssh.go +++ b/builder/vmware/common/ssh.go @@ -6,7 +6,7 @@ import ( "log" "net" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CommHost(config *SSHConfig) func(multistep.StateBag) (string, error) { diff --git a/builder/vmware/common/step_clean_files.go b/builder/vmware/common/step_clean_files.go index a9644d225..93072441f 100644 --- a/builder/vmware/common/step_clean_files.go +++ b/builder/vmware/common/step_clean_files.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // These are the extensions of files that are important for the function diff --git a/builder/vmware/common/step_clean_vmx.go b/builder/vmware/common/step_clean_vmx.go index e913fa165..f89865a06 100644 --- a/builder/vmware/common/step_clean_vmx.go +++ b/builder/vmware/common/step_clean_vmx.go @@ -6,8 +6,8 @@ import ( "log" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step cleans up the VMX by removing or changing this prior to diff --git a/builder/vmware/common/step_clean_vmx_test.go b/builder/vmware/common/step_clean_vmx_test.go index 3987fb2c4..3ef263729 100644 --- a/builder/vmware/common/step_clean_vmx_test.go +++ b/builder/vmware/common/step_clean_vmx_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCleanVMX_impl(t *testing.T) { diff --git a/builder/vmware/common/step_compact_disk.go b/builder/vmware/common/step_compact_disk.go index 957f4a254..7605af6ca 100644 --- a/builder/vmware/common/step_compact_disk.go +++ b/builder/vmware/common/step_compact_disk.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step compacts the virtual disk for the VM unless the "skip_compaction" diff --git a/builder/vmware/common/step_compact_disk_test.go b/builder/vmware/common/step_compact_disk_test.go index df0fc5fca..575cd869d 100644 --- a/builder/vmware/common/step_compact_disk_test.go +++ b/builder/vmware/common/step_compact_disk_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCompactDisk_impl(t *testing.T) { diff --git a/builder/vmware/common/step_configure_vmx.go b/builder/vmware/common/step_configure_vmx.go index 833008291..68dc5709b 100644 --- a/builder/vmware/common/step_configure_vmx.go +++ b/builder/vmware/common/step_configure_vmx.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step configures a VMX by setting some default settings as well diff --git a/builder/vmware/common/step_configure_vmx_test.go b/builder/vmware/common/step_configure_vmx_test.go index 09926acd7..136931161 100644 --- a/builder/vmware/common/step_configure_vmx_test.go +++ b/builder/vmware/common/step_configure_vmx_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/vmware/common/step_configure_vnc.go b/builder/vmware/common/step_configure_vnc.go index 6cc7ad3a7..4b8823f4f 100644 --- a/builder/vmware/common/step_configure_vnc.go +++ b/builder/vmware/common/step_configure_vnc.go @@ -6,8 +6,8 @@ import ( "log" "math/rand" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/vmware/common/step_create_disks.go b/builder/vmware/common/step_create_disks.go index 4bca0f453..6038f1234 100644 --- a/builder/vmware/common/step_create_disks.go +++ b/builder/vmware/common/step_create_disks.go @@ -6,8 +6,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step creates the virtual disks for the VM. diff --git a/builder/vmware/common/step_create_disks_test.go b/builder/vmware/common/step_create_disks_test.go index 9fd0ad14d..9791fc026 100644 --- a/builder/vmware/common/step_create_disks_test.go +++ b/builder/vmware/common/step_create_disks_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/vmware/common/step_export.go b/builder/vmware/common/step_export.go index 52ff1a210..4ab7b4431 100644 --- a/builder/vmware/common/step_export.go +++ b/builder/vmware/common/step_export.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step exports a VM built on ESXi using ovftool diff --git a/builder/vmware/common/step_export_test.go b/builder/vmware/common/step_export_test.go index 9c8b3f740..93c3fc276 100644 --- a/builder/vmware/common/step_export_test.go +++ b/builder/vmware/common/step_export_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/vmware/common/step_http_ip_discover.go b/builder/vmware/common/step_http_ip_discover.go index 38928fb36..8d80ebe24 100644 --- a/builder/vmware/common/step_http_ip_discover.go +++ b/builder/vmware/common/step_http_ip_discover.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Step to discover the http ip diff --git a/builder/vmware/common/step_http_ip_discover_test.go b/builder/vmware/common/step_http_ip_discover_test.go index 5678bdd20..009f61972 100644 --- a/builder/vmware/common/step_http_ip_discover_test.go +++ b/builder/vmware/common/step_http_ip_discover_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepHTTPIPDiscover_Run(t *testing.T) { diff --git a/builder/vmware/common/step_output_dir.go b/builder/vmware/common/step_output_dir.go index f063e1f08..5123754d5 100644 --- a/builder/vmware/common/step_output_dir.go +++ b/builder/vmware/common/step_output_dir.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepOutputDir sets up the output directory by creating it if it does diff --git a/builder/vmware/common/step_output_dir_test.go b/builder/vmware/common/step_output_dir_test.go index 51a5d9348..79610b7f7 100644 --- a/builder/vmware/common/step_output_dir_test.go +++ b/builder/vmware/common/step_output_dir_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testOutputDir(t *testing.T) string { diff --git a/builder/vmware/common/step_prepare_tools.go b/builder/vmware/common/step_prepare_tools.go index bd64f8885..3a1070070 100644 --- a/builder/vmware/common/step_prepare_tools.go +++ b/builder/vmware/common/step_prepare_tools.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPrepareTools struct { diff --git a/builder/vmware/common/step_prepare_tools_test.go b/builder/vmware/common/step_prepare_tools_test.go index e70f7d43b..0e4db027b 100644 --- a/builder/vmware/common/step_prepare_tools_test.go +++ b/builder/vmware/common/step_prepare_tools_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepPrepareTools_impl(t *testing.T) { diff --git a/builder/vmware/common/step_register.go b/builder/vmware/common/step_register.go index 76de180f4..baf33268d 100644 --- a/builder/vmware/common/step_register.go +++ b/builder/vmware/common/step_register.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRegister struct { diff --git a/builder/vmware/common/step_register_test.go b/builder/vmware/common/step_register_test.go index a9bcc7b61..1d48f3486 100644 --- a/builder/vmware/common/step_register_test.go +++ b/builder/vmware/common/step_register_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRegister_impl(t *testing.T) { diff --git a/builder/vmware/common/step_remote_upload.go b/builder/vmware/common/step_remote_upload.go index 8790c2659..c54ed9072 100644 --- a/builder/vmware/common/step_remote_upload.go +++ b/builder/vmware/common/step_remote_upload.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepRemoteUpload uploads some thing from the state bag to a remote driver diff --git a/builder/vmware/common/step_remote_upload_test.go b/builder/vmware/common/step_remote_upload_test.go index aab618f57..518f4dd7e 100644 --- a/builder/vmware/common/step_remote_upload_test.go +++ b/builder/vmware/common/step_remote_upload_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRemoteUpload_Cleanup(t *testing.T) { diff --git a/builder/vmware/common/step_run.go b/builder/vmware/common/step_run.go index e9ac27331..090a36262 100644 --- a/builder/vmware/common/step_run.go +++ b/builder/vmware/common/step_run.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step runs the created virtual machine. diff --git a/builder/vmware/common/step_run_test.go b/builder/vmware/common/step_run_test.go index e89dcb1cf..176bdc8c5 100644 --- a/builder/vmware/common/step_run_test.go +++ b/builder/vmware/common/step_run_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRun_impl(t *testing.T) { diff --git a/builder/vmware/common/step_shutdown.go b/builder/vmware/common/step_shutdown.go index 3c3855ab3..a75514a29 100644 --- a/builder/vmware/common/step_shutdown.go +++ b/builder/vmware/common/step_shutdown.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step shuts down the machine. It first attempts to do so gracefully, diff --git a/builder/vmware/common/step_shutdown_test.go b/builder/vmware/common/step_shutdown_test.go index 952a0914e..707de7012 100644 --- a/builder/vmware/common/step_shutdown_test.go +++ b/builder/vmware/common/step_shutdown_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testLocalOutputDir(t *testing.T) *LocalOutputDir { diff --git a/builder/vmware/common/step_suppress_messages.go b/builder/vmware/common/step_suppress_messages.go index 30e49fe8a..0ab45c27c 100644 --- a/builder/vmware/common/step_suppress_messages.go +++ b/builder/vmware/common/step_suppress_messages.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step suppresses any messages that VMware product might show. diff --git a/builder/vmware/common/step_suppress_messages_test.go b/builder/vmware/common/step_suppress_messages_test.go index 24044d470..ff5d1d767 100644 --- a/builder/vmware/common/step_suppress_messages_test.go +++ b/builder/vmware/common/step_suppress_messages_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSuppressMessages_impl(t *testing.T) { diff --git a/builder/vmware/common/step_test.go b/builder/vmware/common/step_test.go index d1daffab5..56ba540c3 100644 --- a/builder/vmware/common/step_test.go +++ b/builder/vmware/common/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/vmware/common/step_upload_tools.go b/builder/vmware/common/step_upload_tools.go index 94f7072f4..5282a7191 100644 --- a/builder/vmware/common/step_upload_tools.go +++ b/builder/vmware/common/step_upload_tools.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vmware/common/step_upload_vmx.go b/builder/vmware/common/step_upload_vmx.go index 861ab900e..764c3c439 100644 --- a/builder/vmware/common/step_upload_vmx.go +++ b/builder/vmware/common/step_upload_vmx.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step upload the VMX to the remote host diff --git a/builder/vmware/common/step_vnc_boot_command.go b/builder/vmware/common/step_vnc_boot_command.go index 5e7837d8b..5841ba4c2 100644 --- a/builder/vmware/common/step_vnc_boot_command.go +++ b/builder/vmware/common/step_vnc_boot_command.go @@ -6,9 +6,9 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-vnc" ) diff --git a/builder/vmware/common/step_vnc_connect.go b/builder/vmware/common/step_vnc_connect.go index 7499c8279..85c3ab365 100644 --- a/builder/vmware/common/step_vnc_connect.go +++ b/builder/vmware/common/step_vnc_connect.go @@ -8,8 +8,8 @@ import ( "net" "net/url" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/mitchellh/go-vnc" "golang.org/x/net/websocket" ) diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go index 4110e1778..e12edd4ee 100644 --- a/builder/vmware/iso/builder.go +++ b/builder/vmware/iso/builder.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type Builder struct { diff --git a/builder/vmware/iso/config.go b/builder/vmware/iso/config.go index 508204a2d..9443394cd 100644 --- a/builder/vmware/iso/config.go +++ b/builder/vmware/iso/config.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vmware/iso/step_create_vmx.go b/builder/vmware/iso/step_create_vmx.go index 4c67cabd6..e2dd96af9 100644 --- a/builder/vmware/iso/step_create_vmx.go +++ b/builder/vmware/iso/step_create_vmx.go @@ -10,8 +10,8 @@ import ( "strings" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/builder/vmware/vmx/builder.go b/builder/vmware/vmx/builder.go index d849dd613..fe6594e86 100644 --- a/builder/vmware/vmx/builder.go +++ b/builder/vmware/vmx/builder.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // Builder implements packer.Builder and builds the actual VMware diff --git a/builder/vmware/vmx/config.go b/builder/vmware/vmx/config.go index f9f38e52e..2d613d138 100644 --- a/builder/vmware/vmx/config.go +++ b/builder/vmware/vmx/config.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vmware/vmx/step_clone_vmx.go b/builder/vmware/vmx/step_clone_vmx.go index 174a98249..76bcdc73c 100644 --- a/builder/vmware/vmx/step_clone_vmx.go +++ b/builder/vmware/vmx/step_clone_vmx.go @@ -9,8 +9,8 @@ import ( "regexp" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/builder/vmware/vmx/step_clone_vmx_test.go b/builder/vmware/vmx/step_clone_vmx_test.go index da2828061..a3033c35b 100644 --- a/builder/vmware/vmx/step_clone_vmx_test.go +++ b/builder/vmware/vmx/step_clone_vmx_test.go @@ -9,7 +9,7 @@ import ( "testing" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/vmware/vmx/step_test.go b/builder/vmware/vmx/step_test.go index 81439b3c4..a30b06418 100644 --- a/builder/vmware/vmx/step_test.go +++ b/builder/vmware/vmx/step_test.go @@ -5,8 +5,8 @@ import ( "testing" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/vsphere/clone/builder.go b/builder/vsphere/clone/builder.go index 18ebe85a1..cec0ee29d 100644 --- a/builder/vsphere/clone/builder.go +++ b/builder/vsphere/clone/builder.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type Builder struct { diff --git a/builder/vsphere/clone/config.go b/builder/vsphere/clone/config.go index 8ac7a0f43..3de3be585 100644 --- a/builder/vsphere/clone/config.go +++ b/builder/vsphere/clone/config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" packerCommon "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vsphere/clone/step_clone.go b/builder/vsphere/clone/step_clone.go index e0a504b54..8a8ca1ccf 100644 --- a/builder/vsphere/clone/step_clone.go +++ b/builder/vsphere/clone/step_clone.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type vAppConfig struct { diff --git a/builder/vsphere/clone/step_customize.go b/builder/vsphere/clone/step_customize.go index 109be74ae..e05cb38b4 100644 --- a/builder/vsphere/clone/step_customize.go +++ b/builder/vsphere/clone/step_customize.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/vmware/govmomi/vim25/types" ) diff --git a/builder/vsphere/common/cleanup_vm.go b/builder/vsphere/common/cleanup_vm.go index 51c76c571..c5055c5fc 100644 --- a/builder/vsphere/common/cleanup_vm.go +++ b/builder/vsphere/common/cleanup_vm.go @@ -2,8 +2,8 @@ package common import ( "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CleanupVM(state multistep.StateBag) { diff --git a/builder/vsphere/common/cleanup_vm_test.go b/builder/vsphere/common/cleanup_vm_test.go index cdec04ab9..ad6bb3b02 100644 --- a/builder/vsphere/common/cleanup_vm_test.go +++ b/builder/vsphere/common/cleanup_vm_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func cleanupTestState(mockVM driver.VirtualMachine) multistep.StateBag { diff --git a/builder/vsphere/common/common_test.go b/builder/vsphere/common/common_test.go index 6242ca4b6..e96110ef7 100644 --- a/builder/vsphere/common/common_test.go +++ b/builder/vsphere/common/common_test.go @@ -4,8 +4,8 @@ import ( "bytes" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func basicStateBag(errorBuffer *strings.Builder) *multistep.BasicStateBag { diff --git a/builder/vsphere/common/config_ssh.go b/builder/vsphere/common/config_ssh.go index d4104a4e8..db6c5ea4c 100644 --- a/builder/vsphere/common/config_ssh.go +++ b/builder/vsphere/common/config_ssh.go @@ -1,7 +1,7 @@ package common import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CommHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/vsphere/common/step_add_cdrom.go b/builder/vsphere/common/step_add_cdrom.go index d6a6f62b8..f272736dc 100644 --- a/builder/vsphere/common/step_add_cdrom.go +++ b/builder/vsphere/common/step_add_cdrom.go @@ -8,8 +8,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type CDRomConfig struct { diff --git a/builder/vsphere/common/step_add_cdrom_test.go b/builder/vsphere/common/step_add_cdrom_test.go index e1116660c..c5752fec7 100644 --- a/builder/vsphere/common/step_add_cdrom_test.go +++ b/builder/vsphere/common/step_add_cdrom_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestCDRomConfig_Prepare(t *testing.T) { diff --git a/builder/vsphere/common/step_add_floppy.go b/builder/vsphere/common/step_add_floppy.go index 213f08429..c82b08850 100644 --- a/builder/vsphere/common/step_add_floppy.go +++ b/builder/vsphere/common/step_add_floppy.go @@ -8,8 +8,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type FloppyConfig struct { diff --git a/builder/vsphere/common/step_add_floppy_test.go b/builder/vsphere/common/step_add_floppy_test.go index 52963526a..63f742fae 100644 --- a/builder/vsphere/common/step_add_floppy_test.go +++ b/builder/vsphere/common/step_add_floppy_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepAddFloppy_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_boot_command.go b/builder/vsphere/common/step_boot_command.go index a0eff022a..8d6658ad9 100644 --- a/builder/vsphere/common/step_boot_command.go +++ b/builder/vsphere/common/step_boot_command.go @@ -7,9 +7,9 @@ import ( "time" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "golang.org/x/mobile/event/key" ) diff --git a/builder/vsphere/common/step_config_params.go b/builder/vsphere/common/step_config_params.go index 54e92082b..c317f25f5 100644 --- a/builder/vsphere/common/step_config_params.go +++ b/builder/vsphere/common/step_config_params.go @@ -10,8 +10,8 @@ import ( "github.com/vmware/govmomi/vim25/types" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type ConfigParamsConfig struct { diff --git a/builder/vsphere/common/step_connect.go b/builder/vsphere/common/step_connect.go index b651eda06..e67762976 100644 --- a/builder/vsphere/common/step_connect.go +++ b/builder/vsphere/common/step_connect.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type ConnectConfig struct { diff --git a/builder/vsphere/common/step_download.go b/builder/vsphere/common/step_download.go index 25b980356..5b1adbda6 100644 --- a/builder/vsphere/common/step_download.go +++ b/builder/vsphere/common/step_download.go @@ -6,8 +6,8 @@ import ( "net/url" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Defining this interface ensures that we use the common step download, or the diff --git a/builder/vsphere/common/step_download_test.go b/builder/vsphere/common/step_download_test.go index 631006655..fd7a8a0ca 100644 --- a/builder/vsphere/common/step_download_test.go +++ b/builder/vsphere/common/step_download_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) /// create mock step diff --git a/builder/vsphere/common/step_export.go b/builder/vsphere/common/step_export.go index c6a01c5a7..d3c857304 100644 --- a/builder/vsphere/common/step_export.go +++ b/builder/vsphere/common/step_export.go @@ -17,9 +17,9 @@ import ( "strings" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/pkg/errors" "github.com/vmware/govmomi/nfc" diff --git a/builder/vsphere/common/step_hardware.go b/builder/vsphere/common/step_hardware.go index 43f0f60d3..654a4145d 100644 --- a/builder/vsphere/common/step_hardware.go +++ b/builder/vsphere/common/step_hardware.go @@ -8,8 +8,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type HardwareConfig struct { diff --git a/builder/vsphere/common/step_hardware_test.go b/builder/vsphere/common/step_hardware_test.go index 08eb22c50..e3b965bfe 100644 --- a/builder/vsphere/common/step_hardware_test.go +++ b/builder/vsphere/common/step_hardware_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestHardwareConfig_Prepare(t *testing.T) { diff --git a/builder/vsphere/common/step_http_ip_discover.go b/builder/vsphere/common/step_http_ip_discover.go index 0168ddf1b..c0d6e8cd0 100644 --- a/builder/vsphere/common/step_http_ip_discover.go +++ b/builder/vsphere/common/step_http_ip_discover.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Step to discover the http ip diff --git a/builder/vsphere/common/step_http_ip_discover_test.go b/builder/vsphere/common/step_http_ip_discover_test.go index a4225774f..1f03353eb 100644 --- a/builder/vsphere/common/step_http_ip_discover_test.go +++ b/builder/vsphere/common/step_http_ip_discover_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepHTTPIPDiscover_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_import_to_content_library.go b/builder/vsphere/common/step_import_to_content_library.go index 91720389c..9eacdd5ec 100644 --- a/builder/vsphere/common/step_import_to_content_library.go +++ b/builder/vsphere/common/step_import_to_content_library.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/vmware/govmomi/vapi/vcenter" ) diff --git a/builder/vsphere/common/step_remote_upload.go b/builder/vsphere/common/step_remote_upload.go index 413d0c051..631ab0924 100644 --- a/builder/vsphere/common/step_remote_upload.go +++ b/builder/vsphere/common/step_remote_upload.go @@ -7,8 +7,8 @@ import ( "path/filepath" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRemoteUpload struct { diff --git a/builder/vsphere/common/step_remote_upload_test.go b/builder/vsphere/common/step_remote_upload_test.go index 44188dbfe..c1f5ef7c9 100644 --- a/builder/vsphere/common/step_remote_upload_test.go +++ b/builder/vsphere/common/step_remote_upload_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRemoteUpload_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_remove_cdrom.go b/builder/vsphere/common/step_remove_cdrom.go index 00bd6dc94..c3920ec29 100644 --- a/builder/vsphere/common/step_remove_cdrom.go +++ b/builder/vsphere/common/step_remove_cdrom.go @@ -7,8 +7,8 @@ import ( "context" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type RemoveCDRomConfig struct { diff --git a/builder/vsphere/common/step_remove_cdrom_test.go b/builder/vsphere/common/step_remove_cdrom_test.go index 1017e48b0..2442ab796 100644 --- a/builder/vsphere/common/step_remove_cdrom_test.go +++ b/builder/vsphere/common/step_remove_cdrom_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRemoveCDRom_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_remove_floppy.go b/builder/vsphere/common/step_remove_floppy.go index 7141e04b9..4662c18b4 100644 --- a/builder/vsphere/common/step_remove_floppy.go +++ b/builder/vsphere/common/step_remove_floppy.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRemoveFloppy struct { diff --git a/builder/vsphere/common/step_remove_floppy_test.go b/builder/vsphere/common/step_remove_floppy_test.go index 1b76bb0fa..86a3e33b5 100644 --- a/builder/vsphere/common/step_remove_floppy_test.go +++ b/builder/vsphere/common/step_remove_floppy_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRemoveFloppy_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_run.go b/builder/vsphere/common/step_run.go index 9fcdadb1e..9262cb31e 100644 --- a/builder/vsphere/common/step_run.go +++ b/builder/vsphere/common/step_run.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type RunConfig struct { diff --git a/builder/vsphere/common/step_shutdown.go b/builder/vsphere/common/step_shutdown.go index 8c71cc2d3..089aba26f 100644 --- a/builder/vsphere/common/step_shutdown.go +++ b/builder/vsphere/common/step_shutdown.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type ShutdownConfig struct { diff --git a/builder/vsphere/common/step_snapshot.go b/builder/vsphere/common/step_snapshot.go index 09a698698..ed595621d 100644 --- a/builder/vsphere/common/step_snapshot.go +++ b/builder/vsphere/common/step_snapshot.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateSnapshot struct { diff --git a/builder/vsphere/common/step_ssh_key_pair.go b/builder/vsphere/common/step_ssh_key_pair.go index 643d4f09c..3b2769461 100644 --- a/builder/vsphere/common/step_ssh_key_pair.go +++ b/builder/vsphere/common/step_ssh_key_pair.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/vsphere/common/step_template.go b/builder/vsphere/common/step_template.go index 96dc57408..91c14ff58 100644 --- a/builder/vsphere/common/step_template.go +++ b/builder/vsphere/common/step_template.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepConvertToTemplate struct { diff --git a/builder/vsphere/common/step_wait_for_ip.go b/builder/vsphere/common/step_wait_for_ip.go index d3ddb4ee8..9a37534c4 100644 --- a/builder/vsphere/common/step_wait_for_ip.go +++ b/builder/vsphere/common/step_wait_for_ip.go @@ -11,8 +11,8 @@ import ( "time" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type WaitIpConfig struct { diff --git a/builder/vsphere/iso/builder.go b/builder/vsphere/iso/builder.go index 5db736fea..837f4d7a6 100644 --- a/builder/vsphere/iso/builder.go +++ b/builder/vsphere/iso/builder.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type Builder struct { diff --git a/builder/vsphere/iso/common_test.go b/builder/vsphere/iso/common_test.go index 583660a92..531e9dd73 100644 --- a/builder/vsphere/iso/common_test.go +++ b/builder/vsphere/iso/common_test.go @@ -3,8 +3,8 @@ package iso import ( "bytes" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func basicStateBag() *multistep.BasicStateBag { diff --git a/builder/vsphere/iso/config.go b/builder/vsphere/iso/config.go index 21e78b58e..e3bb7849b 100644 --- a/builder/vsphere/iso/config.go +++ b/builder/vsphere/iso/config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" packerCommon "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vsphere/iso/step_create.go b/builder/vsphere/iso/step_create.go index fa47f284f..562d2cf24 100644 --- a/builder/vsphere/iso/step_create.go +++ b/builder/vsphere/iso/step_create.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Defines a Network Adapter diff --git a/builder/vsphere/iso/step_create_test.go b/builder/vsphere/iso/step_create_test.go index dbe530778..aca46d155 100644 --- a/builder/vsphere/iso/step_create_test.go +++ b/builder/vsphere/iso/step_create_test.go @@ -11,8 +11,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestCreateConfig_Prepare(t *testing.T) { diff --git a/builder/yandex/builder.go b/builder/yandex/builder.go index 590579173..bbde04e84 100644 --- a/builder/yandex/builder.go +++ b/builder/yandex/builder.go @@ -7,9 +7,9 @@ import ( "github.com/google/uuid" "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" diff --git a/builder/yandex/ssh.go b/builder/yandex/ssh.go index c32f16b53..ffebeab41 100644 --- a/builder/yandex/ssh.go +++ b/builder/yandex/ssh.go @@ -1,7 +1,7 @@ package yandex import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func commHost(state multistep.StateBag) (string, error) { diff --git a/builder/yandex/step_create_image.go b/builder/yandex/step_create_image.go index 86ad11371..429888a92 100644 --- a/builder/yandex/step_create_image.go +++ b/builder/yandex/step_create_image.go @@ -6,8 +6,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" diff --git a/builder/yandex/step_create_instance.go b/builder/yandex/step_create_instance.go index 2ae35f71d..757b24c2a 100644 --- a/builder/yandex/step_create_instance.go +++ b/builder/yandex/step_create_instance.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "github.com/c2h5oh/datasize" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" diff --git a/builder/yandex/step_create_instance_test.go b/builder/yandex/step_create_instance_test.go index af8ee67af..b0f9cf6d7 100644 --- a/builder/yandex/step_create_instance_test.go +++ b/builder/yandex/step_create_instance_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/builder/yandex/step_create_ssh_key.go b/builder/yandex/step_create_ssh_key.go index 1a66af9f9..19178848a 100644 --- a/builder/yandex/step_create_ssh_key.go +++ b/builder/yandex/step_create_ssh_key.go @@ -10,8 +10,8 @@ import ( "io/ioutil" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/yandex/step_instance_info.go b/builder/yandex/step_instance_info.go index fa85c052d..3e7f0e3d5 100644 --- a/builder/yandex/step_instance_info.go +++ b/builder/yandex/step_instance_info.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" ycsdk "github.com/yandex-cloud/go-sdk" diff --git a/builder/yandex/step_teardown_instance.go b/builder/yandex/step_teardown_instance.go index 291fa004e..0d34afe21 100644 --- a/builder/yandex/step_teardown_instance.go +++ b/builder/yandex/step_teardown_instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" ycsdk "github.com/yandex-cloud/go-sdk" diff --git a/builder/yandex/step_wait_cloudinit_script.go b/builder/yandex/step_wait_cloudinit_script.go index dcfdccd6e..593def95c 100644 --- a/builder/yandex/step_wait_cloudinit_script.go +++ b/builder/yandex/step_wait_cloudinit_script.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/yandex/util.go b/builder/yandex/util.go index 9c10aa842..f11905f5a 100644 --- a/builder/yandex/util.go +++ b/builder/yandex/util.go @@ -2,8 +2,8 @@ package yandex import ( "github.com/c2h5oh/datasize" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func stepHaltWithError(state multistep.StateBag, err error) multistep.StepAction { diff --git a/helper/communicator/comm_host.go b/helper/communicator/comm_host.go index 8bebcc888..6c7e55eb5 100644 --- a/helper/communicator/comm_host.go +++ b/helper/communicator/comm_host.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Generic commHost function that should work for most cloud builders. diff --git a/helper/communicator/config.go b/helper/communicator/config.go index 62b0fafde..25b1e074f 100644 --- a/helper/communicator/config.go +++ b/helper/communicator/config.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" packerssh "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/masterzen/winrm" diff --git a/helper/communicator/config_test.go b/helper/communicator/config_test.go index a6bbba87f..6eed1848f 100644 --- a/helper/communicator/config_test.go +++ b/helper/communicator/config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/masterzen/winrm" ) diff --git a/helper/communicator/step_connect.go b/helper/communicator/step_connect.go index 6fed68d23..8ecaa6b0e 100644 --- a/helper/communicator/step_connect.go +++ b/helper/communicator/step_connect.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/none" gossh "golang.org/x/crypto/ssh" ) diff --git a/helper/communicator/step_connect_ssh.go b/helper/communicator/step_connect_ssh.go index 80ccf3422..7e6edb05c 100644 --- a/helper/communicator/step_connect_ssh.go +++ b/helper/communicator/step_connect_ssh.go @@ -13,9 +13,9 @@ import ( "golang.org/x/crypto/ssh/terminal" - "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" gossh "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/helper/communicator/step_connect_test.go b/helper/communicator/step_connect_test.go index fb61f6463..e31741b86 100644 --- a/helper/communicator/step_connect_test.go +++ b/helper/communicator/step_connect_test.go @@ -5,8 +5,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepConnect_impl(t *testing.T) { diff --git a/helper/communicator/step_connect_winrm.go b/helper/communicator/step_connect_winrm.go index 21c6fef7b..62d248701 100644 --- a/helper/communicator/step_connect_winrm.go +++ b/helper/communicator/step_connect_winrm.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/winrm" winrmcmd "github.com/masterzen/winrm" "golang.org/x/net/http/httpproxy" diff --git a/helper/communicator/step_debug_ssh_keys.go b/helper/communicator/step_debug_ssh_keys.go index e6623fdf1..cd67e0641 100644 --- a/helper/communicator/step_debug_ssh_keys.go +++ b/helper/communicator/step_debug_ssh_keys.go @@ -5,8 +5,8 @@ import ( "fmt" "io/ioutil" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepDumpSSHKey is a multistep Step implementation that writes the ssh diff --git a/helper/communicator/step_ssh_keygen.go b/helper/communicator/step_ssh_keygen.go index 3bdf2899b..73e340529 100644 --- a/helper/communicator/step_ssh_keygen.go +++ b/helper/communicator/step_ssh_keygen.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/packer/helper/communicator/sshkey" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepSSHKeyGen is a Packer build step that generates SSH key pairs. diff --git a/packer-plugin-sdk/chroot/cleanup.go b/packer-plugin-sdk/chroot/cleanup.go index 0befac174..37691305a 100644 --- a/packer-plugin-sdk/chroot/cleanup.go +++ b/packer-plugin-sdk/chroot/cleanup.go @@ -1,7 +1,7 @@ package chroot import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Cleanup is an interface that some steps implement for early cleanup. diff --git a/packer-plugin-sdk/chroot/step_chroot_provision.go b/packer-plugin-sdk/chroot/step_chroot_provision.go index 5c0ab810a..e3e9030a7 100644 --- a/packer-plugin-sdk/chroot/step_chroot_provision.go +++ b/packer-plugin-sdk/chroot/step_chroot_provision.go @@ -4,10 +4,10 @@ import ( "context" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // StepChrootProvision provisions the instance within a chroot. diff --git a/packer-plugin-sdk/chroot/step_copy_files.go b/packer-plugin-sdk/chroot/step_copy_files.go index a4f71f84f..1d2efa7cf 100644 --- a/packer-plugin-sdk/chroot/step_copy_files.go +++ b/packer-plugin-sdk/chroot/step_copy_files.go @@ -8,9 +8,9 @@ import ( "path/filepath" "runtime" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCopyFiles copies some files from the host into the chroot environment. diff --git a/packer-plugin-sdk/chroot/step_copy_files_test.go b/packer-plugin-sdk/chroot/step_copy_files_test.go index 40d5e46f4..e5ebabc85 100644 --- a/packer-plugin-sdk/chroot/step_copy_files_test.go +++ b/packer-plugin-sdk/chroot/step_copy_files_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // testUI returns a test ui plus a function to retrieve the errors written to the ui diff --git a/packer-plugin-sdk/chroot/step_early_cleanup.go b/packer-plugin-sdk/chroot/step_early_cleanup.go index 42d7d66c5..e84ac77e2 100644 --- a/packer-plugin-sdk/chroot/step_early_cleanup.go +++ b/packer-plugin-sdk/chroot/step_early_cleanup.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepEarlyCleanup performs some of the cleanup steps early in order to diff --git a/packer-plugin-sdk/chroot/step_mount_extra.go b/packer-plugin-sdk/chroot/step_mount_extra.go index f3f194f9b..8d460718c 100644 --- a/packer-plugin-sdk/chroot/step_mount_extra.go +++ b/packer-plugin-sdk/chroot/step_mount_extra.go @@ -8,9 +8,9 @@ import ( "os/exec" "syscall" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepMountExtra mounts the attached device. diff --git a/packer-plugin-sdk/chroot/step_post_mount_commands.go b/packer-plugin-sdk/chroot/step_post_mount_commands.go index 4391795f5..d6ee85968 100644 --- a/packer-plugin-sdk/chroot/step_post_mount_commands.go +++ b/packer-plugin-sdk/chroot/step_post_mount_commands.go @@ -3,9 +3,9 @@ package chroot import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type postMountCommandsData struct { diff --git a/packer-plugin-sdk/chroot/step_pre_mount_commands.go b/packer-plugin-sdk/chroot/step_pre_mount_commands.go index c71ad96c7..20404659f 100644 --- a/packer-plugin-sdk/chroot/step_pre_mount_commands.go +++ b/packer-plugin-sdk/chroot/step_pre_mount_commands.go @@ -3,9 +3,9 @@ package chroot import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type preMountCommandsData struct { diff --git a/helper/multistep/LICENSE.md b/packer-plugin-sdk/multistep/LICENSE.md similarity index 100% rename from helper/multistep/LICENSE.md rename to packer-plugin-sdk/multistep/LICENSE.md diff --git a/helper/multistep/basic_runner.go b/packer-plugin-sdk/multistep/basic_runner.go similarity index 100% rename from helper/multistep/basic_runner.go rename to packer-plugin-sdk/multistep/basic_runner.go diff --git a/helper/multistep/basic_runner_test.go b/packer-plugin-sdk/multistep/basic_runner_test.go similarity index 100% rename from helper/multistep/basic_runner_test.go rename to packer-plugin-sdk/multistep/basic_runner_test.go diff --git a/packer-plugin-sdk/commonsteps/doc.go b/packer-plugin-sdk/multistep/commonsteps/doc.go similarity index 100% rename from packer-plugin-sdk/commonsteps/doc.go rename to packer-plugin-sdk/multistep/commonsteps/doc.go diff --git a/packer-plugin-sdk/commonsteps/extra_iso_config.go b/packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go similarity index 100% rename from packer-plugin-sdk/commonsteps/extra_iso_config.go rename to packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go diff --git a/packer-plugin-sdk/commonsteps/extra_iso_config_test.go b/packer-plugin-sdk/multistep/commonsteps/extra_iso_config_test.go similarity index 100% rename from packer-plugin-sdk/commonsteps/extra_iso_config_test.go rename to packer-plugin-sdk/multistep/commonsteps/extra_iso_config_test.go diff --git a/packer-plugin-sdk/commonsteps/floppy_config.go b/packer-plugin-sdk/multistep/commonsteps/floppy_config.go similarity index 100% rename from packer-plugin-sdk/commonsteps/floppy_config.go rename to packer-plugin-sdk/multistep/commonsteps/floppy_config.go diff --git a/packer-plugin-sdk/commonsteps/floppy_config_test.go b/packer-plugin-sdk/multistep/commonsteps/floppy_config_test.go similarity index 100% rename from packer-plugin-sdk/commonsteps/floppy_config_test.go rename to packer-plugin-sdk/multistep/commonsteps/floppy_config_test.go diff --git a/packer-plugin-sdk/commonsteps/http_config.go b/packer-plugin-sdk/multistep/commonsteps/http_config.go similarity index 100% rename from packer-plugin-sdk/commonsteps/http_config.go rename to packer-plugin-sdk/multistep/commonsteps/http_config.go diff --git a/packer-plugin-sdk/commonsteps/http_config_test.go b/packer-plugin-sdk/multistep/commonsteps/http_config_test.go similarity index 100% rename from packer-plugin-sdk/commonsteps/http_config_test.go rename to packer-plugin-sdk/multistep/commonsteps/http_config_test.go diff --git a/packer-plugin-sdk/commonsteps/iso_config.go b/packer-plugin-sdk/multistep/commonsteps/iso_config.go similarity index 100% rename from packer-plugin-sdk/commonsteps/iso_config.go rename to packer-plugin-sdk/multistep/commonsteps/iso_config.go diff --git a/packer-plugin-sdk/commonsteps/iso_config_test.go b/packer-plugin-sdk/multistep/commonsteps/iso_config_test.go similarity index 100% rename from packer-plugin-sdk/commonsteps/iso_config_test.go rename to packer-plugin-sdk/multistep/commonsteps/iso_config_test.go diff --git a/packer-plugin-sdk/commonsteps/multistep_debug.go b/packer-plugin-sdk/multistep/commonsteps/multistep_debug.go similarity index 94% rename from packer-plugin-sdk/commonsteps/multistep_debug.go rename to packer-plugin-sdk/multistep/commonsteps/multistep_debug.go index 9ef48f4d4..74b45a61c 100644 --- a/packer-plugin-sdk/commonsteps/multistep_debug.go +++ b/packer-plugin-sdk/multistep/commonsteps/multistep_debug.go @@ -5,8 +5,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // MultistepDebugFn will return a proper multistep.DebugPauseFn to diff --git a/packer-plugin-sdk/commonsteps/multistep_runner.go b/packer-plugin-sdk/multistep/commonsteps/multistep_runner.go similarity index 98% rename from packer-plugin-sdk/commonsteps/multistep_runner.go rename to packer-plugin-sdk/multistep/commonsteps/multistep_runner.go index 7eecffbe4..d9654cc6c 100644 --- a/packer-plugin-sdk/commonsteps/multistep_runner.go +++ b/packer-plugin-sdk/multistep/commonsteps/multistep_runner.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func newRunner(steps []multistep.Step, config common.PackerConfig, ui packer.Ui) (multistep.Runner, multistep.DebugPauseFn) { diff --git a/packer-plugin-sdk/commonsteps/step_cleanup_temp_keys.go b/packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go similarity index 97% rename from packer-plugin-sdk/commonsteps/step_cleanup_temp_keys.go rename to packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go index aa1c7c4f8..0bb41c342 100644 --- a/packer-plugin-sdk/commonsteps/step_cleanup_temp_keys.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCleanupTempKeys struct { diff --git a/packer-plugin-sdk/commonsteps/step_create_cdrom.go b/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go similarity index 99% rename from packer-plugin-sdk/commonsteps/step_create_cdrom.go rename to packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go index 151468514..0729ae09c 100644 --- a/packer-plugin-sdk/commonsteps/step_create_cdrom.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go @@ -11,8 +11,8 @@ import ( "runtime" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/shell-local/localexec" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/packer-plugin-sdk/commonsteps/step_create_cdrom_test.go b/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom_test.go similarity index 97% rename from packer-plugin-sdk/commonsteps/step_create_cdrom_test.go rename to packer-plugin-sdk/multistep/commonsteps/step_create_cdrom_test.go index cfdf05404..efec6b9fc 100644 --- a/packer-plugin-sdk/commonsteps/step_create_cdrom_test.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom_test.go @@ -8,8 +8,8 @@ import ( "path" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateCD_Impl(t *testing.T) { diff --git a/packer-plugin-sdk/commonsteps/step_create_floppy.go b/packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go similarity index 99% rename from packer-plugin-sdk/commonsteps/step_create_floppy.go rename to packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go index dd6d07218..5354143df 100644 --- a/packer-plugin-sdk/commonsteps/step_create_floppy.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/mitchellh/go-fs" "github.com/mitchellh/go-fs/fat" diff --git a/packer-plugin-sdk/commonsteps/step_create_floppy_test.go b/packer-plugin-sdk/multistep/commonsteps/step_create_floppy_test.go similarity index 99% rename from packer-plugin-sdk/commonsteps/step_create_floppy_test.go rename to packer-plugin-sdk/multistep/commonsteps/step_create_floppy_test.go index 78bc135d7..d4cde0c94 100644 --- a/packer-plugin-sdk/commonsteps/step_create_floppy_test.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_create_floppy_test.go @@ -12,8 +12,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const TestFixtures = "test-fixtures" diff --git a/packer-plugin-sdk/commonsteps/step_download.go b/packer-plugin-sdk/multistep/commonsteps/step_download.go similarity index 99% rename from packer-plugin-sdk/commonsteps/step_download.go rename to packer-plugin-sdk/multistep/commonsteps/step_download.go index b90bd3ef3..36a38ae7c 100644 --- a/packer-plugin-sdk/commonsteps/step_download.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_download.go @@ -17,9 +17,9 @@ import ( getter "github.com/hashicorp/go-getter/v2" urlhelper "github.com/hashicorp/go-getter/v2/helper/url" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/filelock" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepDownload downloads a remote file using the download client within diff --git a/packer-plugin-sdk/commonsteps/step_download_test.go b/packer-plugin-sdk/multistep/commonsteps/step_download_test.go similarity index 99% rename from packer-plugin-sdk/commonsteps/step_download_test.go rename to packer-plugin-sdk/multistep/commonsteps/step_download_test.go index 35e60ddf1..77ae98a68 100644 --- a/packer-plugin-sdk/commonsteps/step_download_test.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_download_test.go @@ -17,8 +17,8 @@ import ( "github.com/google/go-cmp/cmp" urlhelper "github.com/hashicorp/go-getter/v2/helper/url" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/packer-plugin-sdk/commonsteps/step_http_server.go b/packer-plugin-sdk/multistep/commonsteps/step_http_server.go similarity index 96% rename from packer-plugin-sdk/commonsteps/step_http_server.go rename to packer-plugin-sdk/multistep/commonsteps/step_http_server.go index f2c1e08c0..6da16718e 100644 --- a/packer-plugin-sdk/commonsteps/step_http_server.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_http_server.go @@ -6,8 +6,8 @@ import ( "net/http" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/packer-plugin-sdk/commonsteps/step_output_dir.go b/packer-plugin-sdk/multistep/commonsteps/step_output_dir.go similarity index 96% rename from packer-plugin-sdk/commonsteps/step_output_dir.go rename to packer-plugin-sdk/multistep/commonsteps/step_output_dir.go index 2dbdda596..c1e43716a 100644 --- a/packer-plugin-sdk/commonsteps/step_output_dir.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_output_dir.go @@ -8,8 +8,8 @@ import ( "path/filepath" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepOutputDir sets up the output directory by creating it if it does diff --git a/packer-plugin-sdk/commonsteps/step_output_dir_test.go b/packer-plugin-sdk/multistep/commonsteps/step_output_dir_test.go similarity index 98% rename from packer-plugin-sdk/commonsteps/step_output_dir_test.go rename to packer-plugin-sdk/multistep/commonsteps/step_output_dir_test.go index cf658e8a1..f10e2ddd3 100644 --- a/packer-plugin-sdk/commonsteps/step_output_dir_test.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_output_dir_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/packer-plugin-sdk/commonsteps/step_provision.go b/packer-plugin-sdk/multistep/commonsteps/step_provision.go similarity index 98% rename from packer-plugin-sdk/commonsteps/step_provision.go rename to packer-plugin-sdk/multistep/commonsteps/step_provision.go index 1ec20e365..9b7cc47e2 100644 --- a/packer-plugin-sdk/commonsteps/step_provision.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_provision.go @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepProvision runs the provisioners. diff --git a/packer-plugin-sdk/commonsteps/step_provision_test.go b/packer-plugin-sdk/multistep/commonsteps/step_provision_test.go similarity index 98% rename from packer-plugin-sdk/commonsteps/step_provision_test.go rename to packer-plugin-sdk/multistep/commonsteps/step_provision_test.go index ddca131fe..903fea023 100644 --- a/packer-plugin-sdk/commonsteps/step_provision_test.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_provision_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testCommConfig() *communicator.Config { diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/SomeDir/myfile.txt b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/SomeDir/myfile.txt similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/SomeDir/myfile.txt rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/SomeDir/myfile.txt diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file1 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file1 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file1 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file2 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file2 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file2 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file2 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file3 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file3 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file3 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file3 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/root/another.txt b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/another.txt similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/root/another.txt rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/another.txt diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/root/another.txt.sha1sum b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/another.txt.sha1sum similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/root/another.txt.sha1sum rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/another.txt.sha1sum diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/root/basic.txt b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/basic.txt similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/root/basic.txt rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/basic.txt diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/root/basic.txt.sha1sum b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/basic.txt.sha1sum similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/root/basic.txt.sha1sum rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/basic.txt.sha1sum diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/root/subfolder.sum b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/subfolder.sum similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/root/subfolder.sum rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/subfolder.sum diff --git a/helper/multistep/debug_runner.go b/packer-plugin-sdk/multistep/debug_runner.go similarity index 100% rename from helper/multistep/debug_runner.go rename to packer-plugin-sdk/multistep/debug_runner.go diff --git a/helper/multistep/debug_runner_test.go b/packer-plugin-sdk/multistep/debug_runner_test.go similarity index 100% rename from helper/multistep/debug_runner_test.go rename to packer-plugin-sdk/multistep/debug_runner_test.go diff --git a/helper/multistep/doc.go b/packer-plugin-sdk/multistep/doc.go similarity index 100% rename from helper/multistep/doc.go rename to packer-plugin-sdk/multistep/doc.go diff --git a/helper/multistep/if.go b/packer-plugin-sdk/multistep/if.go similarity index 100% rename from helper/multistep/if.go rename to packer-plugin-sdk/multistep/if.go diff --git a/helper/multistep/multistep.go b/packer-plugin-sdk/multistep/multistep.go similarity index 100% rename from helper/multistep/multistep.go rename to packer-plugin-sdk/multistep/multistep.go diff --git a/helper/multistep/multistep_test.go b/packer-plugin-sdk/multistep/multistep_test.go similarity index 100% rename from helper/multistep/multistep_test.go rename to packer-plugin-sdk/multistep/multistep_test.go diff --git a/helper/multistep/statebag.go b/packer-plugin-sdk/multistep/statebag.go similarity index 100% rename from helper/multistep/statebag.go rename to packer-plugin-sdk/multistep/statebag.go diff --git a/helper/multistep/statebag_test.go b/packer-plugin-sdk/multistep/statebag_test.go similarity index 100% rename from helper/multistep/statebag_test.go rename to packer-plugin-sdk/multistep/statebag_test.go diff --git a/packer-plugin-sdk/packerbuilderdata/generated_data.go b/packer-plugin-sdk/packerbuilderdata/generated_data.go index 932627297..c8b986081 100644 --- a/packer-plugin-sdk/packerbuilderdata/generated_data.go +++ b/packer-plugin-sdk/packerbuilderdata/generated_data.go @@ -1,6 +1,6 @@ package packerbuilderdata -import "github.com/hashicorp/packer/helper/multistep" +import "github.com/hashicorp/packer/packer-plugin-sdk/multistep" // This is used in the BasicPlaceholderData() func in the packer/provisioner.go // To force users to access generated data via the "generated" func. diff --git a/packer-plugin-sdk/packerbuilderdata/generated_data_test.go b/packer-plugin-sdk/packerbuilderdata/generated_data_test.go index 6cd5761f8..001754f76 100644 --- a/packer-plugin-sdk/packerbuilderdata/generated_data_test.go +++ b/packer-plugin-sdk/packerbuilderdata/generated_data_test.go @@ -3,7 +3,7 @@ package packerbuilderdata import ( "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestGeneratedData_Put(t *testing.T) { diff --git a/packer-plugin-sdk/shell-local/run.go b/packer-plugin-sdk/shell-local/run.go index 4713b0827..8e52f5a09 100644 --- a/packer-plugin-sdk/shell-local/run.go +++ b/packer-plugin-sdk/shell-local/run.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/post-processor/googlecompute-export/post-processor.go b/post-processor/googlecompute-export/post-processor.go index c5707266c..3f8b6071a 100644 --- a/post-processor/googlecompute-export/post-processor.go +++ b/post-processor/googlecompute-export/post-processor.go @@ -13,10 +13,10 @@ import ( "github.com/hashicorp/packer/builder/googlecompute" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" ) diff --git a/post-processor/vagrant-cloud/post-processor.go b/post-processor/vagrant-cloud/post-processor.go index 8c91d5f3a..dfc74e8ad 100644 --- a/post-processor/vagrant-cloud/post-processor.go +++ b/post-processor/vagrant-cloud/post-processor.go @@ -20,10 +20,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/vagrant-cloud/step_confirm_upload.go b/post-processor/vagrant-cloud/step_confirm_upload.go index 6216f5be3..e338fcf8f 100644 --- a/post-processor/vagrant-cloud/step_confirm_upload.go +++ b/post-processor/vagrant-cloud/step_confirm_upload.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConfirmUpload struct { diff --git a/post-processor/vagrant-cloud/step_create_provider.go b/post-processor/vagrant-cloud/step_create_provider.go index da0c297e3..a6cfaa02f 100644 --- a/post-processor/vagrant-cloud/step_create_provider.go +++ b/post-processor/vagrant-cloud/step_create_provider.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type Provider struct { diff --git a/post-processor/vagrant-cloud/step_create_version.go b/post-processor/vagrant-cloud/step_create_version.go index 6830dc4a4..75bd3f0a4 100644 --- a/post-processor/vagrant-cloud/step_create_version.go +++ b/post-processor/vagrant-cloud/step_create_version.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type Version struct { diff --git a/post-processor/vagrant-cloud/step_prepare_upload.go b/post-processor/vagrant-cloud/step_prepare_upload.go index fcf8b46eb..463b5afbc 100644 --- a/post-processor/vagrant-cloud/step_prepare_upload.go +++ b/post-processor/vagrant-cloud/step_prepare_upload.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type Upload struct { diff --git a/post-processor/vagrant-cloud/step_release_version.go b/post-processor/vagrant-cloud/step_release_version.go index 18ec9efd7..d8e41a05a 100644 --- a/post-processor/vagrant-cloud/step_release_version.go +++ b/post-processor/vagrant-cloud/step_release_version.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepReleaseVersion struct { diff --git a/post-processor/vagrant-cloud/step_upload.go b/post-processor/vagrant-cloud/step_upload.go index ef0b59d19..669011520 100644 --- a/post-processor/vagrant-cloud/step_upload.go +++ b/post-processor/vagrant-cloud/step_upload.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/post-processor/vagrant-cloud/step_verify_box.go b/post-processor/vagrant-cloud/step_verify_box.go index 573815986..4cf25a62e 100644 --- a/post-processor/vagrant-cloud/step_verify_box.go +++ b/post-processor/vagrant-cloud/step_verify_box.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type Box struct { diff --git a/post-processor/vsphere-template/post-processor.go b/post-processor/vsphere-template/post-processor.go index 017529604..437a90dfb 100644 --- a/post-processor/vsphere-template/post-processor.go +++ b/post-processor/vsphere-template/post-processor.go @@ -14,10 +14,10 @@ import ( vmwcommon "github.com/hashicorp/packer/builder/vmware/common" vsphere "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" vspherepost "github.com/hashicorp/packer/post-processor/vsphere" diff --git a/post-processor/vsphere-template/step_choose_datacenter.go b/post-processor/vsphere-template/step_choose_datacenter.go index f7ba17803..0dd9f8b55 100644 --- a/post-processor/vsphere-template/step_choose_datacenter.go +++ b/post-processor/vsphere-template/step_choose_datacenter.go @@ -3,8 +3,8 @@ package vsphere_template import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/vmware/govmomi" "github.com/vmware/govmomi/find" ) diff --git a/post-processor/vsphere-template/step_create_folder.go b/post-processor/vsphere-template/step_create_folder.go index 181cca0a7..8d16506ac 100644 --- a/post-processor/vsphere-template/step_create_folder.go +++ b/post-processor/vsphere-template/step_create_folder.go @@ -5,8 +5,8 @@ import ( "fmt" "path" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/vmware/govmomi" "github.com/vmware/govmomi/object" ) diff --git a/post-processor/vsphere-template/step_create_snapshot.go b/post-processor/vsphere-template/step_create_snapshot.go index 7fd0bdde1..6a091e841 100644 --- a/post-processor/vsphere-template/step_create_snapshot.go +++ b/post-processor/vsphere-template/step_create_snapshot.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/post-processor/vsphere" "github.com/vmware/govmomi" ) diff --git a/post-processor/vsphere-template/step_mark_as_template.go b/post-processor/vsphere-template/step_mark_as_template.go index 4bb231c88..664b60e9b 100644 --- a/post-processor/vsphere-template/step_mark_as_template.go +++ b/post-processor/vsphere-template/step_mark_as_template.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/post-processor/vsphere" "github.com/vmware/govmomi" "github.com/vmware/govmomi/object" diff --git a/post-processor/yandex-export/post-processor.go b/post-processor/yandex-export/post-processor.go index 48bf1b30e..0586f6009 100644 --- a/post-processor/yandex-export/post-processor.go +++ b/post-processor/yandex-export/post-processor.go @@ -14,10 +14,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/yandex" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" diff --git a/post-processor/yandex-export/post-processor_test.go b/post-processor/yandex-export/post-processor_test.go index 83f2cb8b8..ac5e850a0 100644 --- a/post-processor/yandex-export/post-processor_test.go +++ b/post-processor/yandex-export/post-processor_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/packer/builder/yandex" "github.com/stretchr/testify/require" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestPostProcessor_Configure(t *testing.T) { diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go index a0e5318ba..3cf28ce8a 100644 --- a/provisioner/ansible/provisioner.go +++ b/provisioner/ansible/provisioner.go @@ -34,7 +34,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/adapter" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/provisioner/ansible/provisioner_test.go b/provisioner/ansible/provisioner_test.go index b3ebb2380..076ebd2c9 100644 --- a/provisioner/ansible/provisioner_test.go +++ b/provisioner/ansible/provisioner_test.go @@ -16,7 +16,7 @@ import ( confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go index 843093005..cb7d03da5 100644 --- a/provisioner/powershell/provisioner.go +++ b/provisioner/powershell/provisioner.go @@ -19,8 +19,8 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/shell" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" diff --git a/provisioner/powershell/provisioner_test.go b/provisioner/powershell/provisioner_test.go index 6d395d285..e5611385b 100644 --- a/provisioner/powershell/provisioner_test.go +++ b/provisioner/powershell/provisioner_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go index 90db6131c..826d0f99f 100644 --- a/provisioner/shell/provisioner.go +++ b/provisioner/shell/provisioner.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/shell" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" diff --git a/provisioner/shell/provisioner_test.go b/provisioner/shell/provisioner_test.go index e6bc5a9d4..8f88bcc53 100644 --- a/provisioner/shell/provisioner_test.go +++ b/provisioner/shell/provisioner_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) func testConfig() map[string]interface{} { diff --git a/provisioner/windows-shell/provisioner.go b/provisioner/windows-shell/provisioner.go index 5fc36f9c6..28b633e69 100644 --- a/provisioner/windows-shell/provisioner.go +++ b/provisioner/windows-shell/provisioner.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/shell" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" diff --git a/provisioner/windows-shell/provisioner_test.go b/provisioner/windows-shell/provisioner_test.go index 378e22d46..1e33eb639 100644 --- a/provisioner/windows-shell/provisioner_test.go +++ b/provisioner/windows-shell/provisioner_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) func testConfig() map[string]interface{} { From 3a11954d96ec63c775a1784518eb19d1331c165c Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Tue, 17 Nov 2020 17:07:02 -0800 Subject: [PATCH 82/93] fix generated files and website --- website/pages/docs/builders/hyperv/iso.mdx | 2 +- website/pages/docs/builders/hyperv/vmcx.mdx | 2 +- website/pages/docs/builders/qemu.mdx | 2 +- website/pages/docs/builders/virtualbox/iso.mdx | 2 +- website/pages/docs/builders/virtualbox/ovf.mdx | 2 +- website/pages/docs/builders/virtualbox/vm.mdx | 2 +- website/pages/docs/builders/vmware/iso.mdx | 2 +- website/pages/docs/builders/vmware/vmx.mdx | 2 +- website/pages/docs/builders/vmware/vsphere-clone.mdx | 2 +- website/pages/docs/builders/vmware/vsphere-iso.mdx | 2 +- .../{ => multistep}/commonsteps/CDConfig-not-required.mdx | 2 +- .../packer-plugin-sdk/{ => multistep}/commonsteps/CDConfig.mdx | 2 +- .../{ => multistep}/commonsteps/FloppyConfig-not-required.mdx | 2 +- .../{ => multistep}/commonsteps/FloppyConfig.mdx | 2 +- .../{ => multistep}/commonsteps/HTTPConfig-not-required.mdx | 2 +- .../{ => multistep}/commonsteps/HTTPConfig.mdx | 2 +- .../{ => multistep}/commonsteps/ISOConfig-not-required.mdx | 2 +- .../{ => multistep}/commonsteps/ISOConfig-required.mdx | 2 +- .../packer-plugin-sdk/{ => multistep}/commonsteps/ISOConfig.mdx | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) rename website/pages/partials/packer-plugin-sdk/{ => multistep}/commonsteps/CDConfig-not-required.mdx (94%) rename website/pages/partials/packer-plugin-sdk/{ => multistep}/commonsteps/CDConfig.mdx (84%) rename website/pages/partials/packer-plugin-sdk/{ => multistep}/commonsteps/FloppyConfig-not-required.mdx (91%) rename website/pages/partials/packer-plugin-sdk/{ => multistep}/commonsteps/FloppyConfig.mdx (87%) rename website/pages/partials/packer-plugin-sdk/{ => multistep}/commonsteps/HTTPConfig-not-required.mdx (93%) rename website/pages/partials/packer-plugin-sdk/{ => multistep}/commonsteps/HTTPConfig.mdx (81%) rename website/pages/partials/packer-plugin-sdk/{ => multistep}/commonsteps/ISOConfig-not-required.mdx (90%) rename website/pages/partials/packer-plugin-sdk/{ => multistep}/commonsteps/ISOConfig-required.mdx (94%) rename website/pages/partials/packer-plugin-sdk/{ => multistep}/commonsteps/ISOConfig.mdx (95%) diff --git a/website/pages/docs/builders/hyperv/iso.mdx b/website/pages/docs/builders/hyperv/iso.mdx index a9ff7fd86..e04fabeb9 100644 --- a/website/pages/docs/builders/hyperv/iso.mdx +++ b/website/pages/docs/builders/hyperv/iso.mdx @@ -107,7 +107,7 @@ builder. ### CD configuration reference -@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx' ## Communicator configuration reference diff --git a/website/pages/docs/builders/hyperv/vmcx.mdx b/website/pages/docs/builders/hyperv/vmcx.mdx index 5bcf09b5f..ee4da82f8 100644 --- a/website/pages/docs/builders/hyperv/vmcx.mdx +++ b/website/pages/docs/builders/hyperv/vmcx.mdx @@ -125,7 +125,7 @@ builder. #### Optional: -@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx' ## Boot Command diff --git a/website/pages/docs/builders/qemu.mdx b/website/pages/docs/builders/qemu.mdx index ea7ec1794..268950f08 100644 --- a/website/pages/docs/builders/qemu.mdx +++ b/website/pages/docs/builders/qemu.mdx @@ -150,7 +150,7 @@ necessary for this build to succeed and can be found further down the page. #### Optional: -@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx' ## Shutdown configuration diff --git a/website/pages/docs/builders/virtualbox/iso.mdx b/website/pages/docs/builders/virtualbox/iso.mdx index c08af93c4..8e65026f5 100644 --- a/website/pages/docs/builders/virtualbox/iso.mdx +++ b/website/pages/docs/builders/virtualbox/iso.mdx @@ -127,7 +127,7 @@ necessary for this build to succeed and can be found further down the page. #### Optional: -@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx' ### Export configuration diff --git a/website/pages/docs/builders/virtualbox/ovf.mdx b/website/pages/docs/builders/virtualbox/ovf.mdx index 5f8dfe159..5da2de0a8 100644 --- a/website/pages/docs/builders/virtualbox/ovf.mdx +++ b/website/pages/docs/builders/virtualbox/ovf.mdx @@ -129,7 +129,7 @@ necessary for this build to succeed and can be found further down the page. #### Optional: -@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx' ### Export configuration diff --git a/website/pages/docs/builders/virtualbox/vm.mdx b/website/pages/docs/builders/virtualbox/vm.mdx index 626ad7a33..d48dc1648 100644 --- a/website/pages/docs/builders/virtualbox/vm.mdx +++ b/website/pages/docs/builders/virtualbox/vm.mdx @@ -140,7 +140,7 @@ builder. #### Optional: -@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx' ### Export configuration diff --git a/website/pages/docs/builders/vmware/iso.mdx b/website/pages/docs/builders/vmware/iso.mdx index 955c8be5e..9dbd04371 100644 --- a/website/pages/docs/builders/vmware/iso.mdx +++ b/website/pages/docs/builders/vmware/iso.mdx @@ -131,7 +131,7 @@ necessary for this build to succeed and can be found further down the page. @include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration -@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx' ### Shutdown configuration diff --git a/website/pages/docs/builders/vmware/vmx.mdx b/website/pages/docs/builders/vmware/vmx.mdx index a1b7d8b76..be94b6793 100644 --- a/website/pages/docs/builders/vmware/vmx.mdx +++ b/website/pages/docs/builders/vmware/vmx.mdx @@ -125,7 +125,7 @@ necessary for this build to succeed and can be found further down the page. #### Optional: -@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx' ### Export configuration diff --git a/website/pages/docs/builders/vmware/vsphere-clone.mdx b/website/pages/docs/builders/vmware/vsphere-clone.mdx index ed2dbbecc..883fc9ba3 100644 --- a/website/pages/docs/builders/vmware/vsphere-clone.mdx +++ b/website/pages/docs/builders/vmware/vsphere-clone.mdx @@ -202,7 +202,7 @@ can be done via environment variable: #### Optional: -@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx' @include 'builder/vsphere/common/CDRomConfig-not-required.mdx' diff --git a/website/pages/docs/builders/vmware/vsphere-iso.mdx b/website/pages/docs/builders/vmware/vsphere-iso.mdx index 47c58db59..3ca15b508 100644 --- a/website/pages/docs/builders/vmware/vsphere-iso.mdx +++ b/website/pages/docs/builders/vmware/vsphere-iso.mdx @@ -180,7 +180,7 @@ iso_paths = [ #### Optional: -@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx' ### Create Configuration diff --git a/website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx similarity index 94% rename from website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx index 9486e4f03..e06fe94d6 100644 --- a/website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx +++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `cd_files` ([]string) - A list of files to place onto a CD that is attached when the VM is booted. This can include either files or directories; any directories diff --git a/website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx similarity index 84% rename from website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig.mdx rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx index e861c99f0..d8778c6ee 100644 --- a/website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig.mdx +++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx @@ -1,4 +1,4 @@ - + An iso (CD) containing custom files can be made available for your build. diff --git a/website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx similarity index 91% rename from website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx index c261f96e2..aacdc62f4 100644 --- a/website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx +++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `floppy_files` ([]string) - A list of files to place onto a floppy disk that is attached when the VM is booted. Currently, no support exists for creating sub-directories on diff --git a/website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx similarity index 87% rename from website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig.mdx rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx index a6474cf6e..fe2645506 100644 --- a/website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig.mdx +++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx @@ -1,4 +1,4 @@ - + A floppy can be made available for your build. This is most useful for unattended Windows installs, which look for an Autounattend.xml file on diff --git a/website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx similarity index 93% rename from website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx index 82bf23690..a44424f45 100644 --- a/website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx +++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `http_directory` (string) - Path to a directory to serve using an HTTP server. The files in this directory will be available over HTTP that will be requestable from the diff --git a/website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx similarity index 81% rename from website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig.mdx rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx index 8fad89d65..3ef715056 100644 --- a/website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig.mdx +++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx @@ -1,4 +1,4 @@ - + Packer will create an http server serving `http_directory` when it is set, a random free port will be selected and the architecture of the directory diff --git a/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx similarity index 90% rename from website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx index 60e976cbb..a0c584c3a 100644 --- a/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx +++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx @@ -1,4 +1,4 @@ - + - `iso_urls` ([]string) - Multiple URLs for the ISO to download. Packer will try these in order. If anything goes wrong attempting to download or while downloading a diff --git a/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-required.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx similarity index 94% rename from website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-required.mdx rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx index 5e6624577..f5f6654d5 100644 --- a/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-required.mdx +++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx @@ -1,4 +1,4 @@ - + - `iso_checksum` (string) - The checksum for the ISO file or virtual hard drive file. The type of the checksum is specified within the checksum field as a prefix, ex: diff --git a/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx similarity index 95% rename from website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig.mdx rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx index 5e55a847e..98eca88b2 100644 --- a/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig.mdx +++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx @@ -1,4 +1,4 @@ - + By default, Packer will symlink, download or copy image files to the Packer cache into a "`hash($iso_url+$iso_checksum).$iso_target_extension`" file. From da0e478044534e78c3bb8dcd69b26681452c6782 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Tue, 17 Nov 2020 17:18:45 -0800 Subject: [PATCH 83/93] fix imports --- website/pages/docs/builders/cloudstack.mdx | 4 ++-- website/pages/docs/builders/hyperv/iso.mdx | 14 +++++++------- website/pages/docs/builders/hyperv/vmcx.mdx | 12 ++++++------ website/pages/docs/builders/parallels/iso.mdx | 6 +++--- website/pages/docs/builders/proxmox/iso.mdx | 4 ++-- website/pages/docs/builders/qemu.mdx | 16 ++++++++-------- website/pages/docs/builders/virtualbox/iso.mdx | 16 ++++++++-------- website/pages/docs/builders/virtualbox/ovf.mdx | 10 +++++----- website/pages/docs/builders/virtualbox/vm.mdx | 10 +++++----- website/pages/docs/builders/vmware/iso.mdx | 14 +++++++------- website/pages/docs/builders/vmware/vmx.mdx | 10 +++++----- .../pages/docs/builders/vmware/vsphere-clone.mdx | 6 +++--- .../pages/docs/builders/vmware/vsphere-iso.mdx | 12 ++++++------ 13 files changed, 67 insertions(+), 67 deletions(-) diff --git a/website/pages/docs/builders/cloudstack.mdx b/website/pages/docs/builders/cloudstack.mdx index 0f59a8d98..3cffc4440 100644 --- a/website/pages/docs/builders/cloudstack.mdx +++ b/website/pages/docs/builders/cloudstack.mdx @@ -215,11 +215,11 @@ The available variables are: ## Http directory configuration -@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx' ### Optional: -@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx' ## Basic Example diff --git a/website/pages/docs/builders/hyperv/iso.mdx b/website/pages/docs/builders/hyperv/iso.mdx index e04fabeb9..856bab291 100644 --- a/website/pages/docs/builders/hyperv/iso.mdx +++ b/website/pages/docs/builders/hyperv/iso.mdx @@ -49,15 +49,15 @@ power off the VM. ## ISO Configuration Reference -@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx' ### Required: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx' ### Optional: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx' ## Configuration Reference @@ -85,11 +85,11 @@ builder. ## Http directory configuration reference -@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx' ### Optional: -@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx' ## Shutdown configuration reference @@ -99,11 +99,11 @@ builder. ## Floppy configuration reference -@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx' ### Optional: -@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration reference diff --git a/website/pages/docs/builders/hyperv/vmcx.mdx b/website/pages/docs/builders/hyperv/vmcx.mdx index ee4da82f8..7769d660e 100644 --- a/website/pages/docs/builders/hyperv/vmcx.mdx +++ b/website/pages/docs/builders/hyperv/vmcx.mdx @@ -72,15 +72,15 @@ builder. ## ISO Configuration Reference -@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx' ### Required: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx' ### Optional: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx' ### Required for virtual machine import: @@ -121,7 +121,7 @@ builder. ### CD configuration -@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx' #### Optional: @@ -165,11 +165,11 @@ For more examples of various boot commands, see the sample projects from our ## Http directory configuration -@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx' ### Optional: -@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx' ## Integration Services diff --git a/website/pages/docs/builders/parallels/iso.mdx b/website/pages/docs/builders/parallels/iso.mdx index df7b07efc..ecb4db4ca 100644 --- a/website/pages/docs/builders/parallels/iso.mdx +++ b/website/pages/docs/builders/parallels/iso.mdx @@ -62,15 +62,15 @@ can also be supplied to override the typical auto-generated key: ## ISO Configuration Reference -@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx' ### Required: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx' ### Optional: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx' ### Required: diff --git a/website/pages/docs/builders/proxmox/iso.mdx b/website/pages/docs/builders/proxmox/iso.mdx index 81515f579..1f261f62c 100644 --- a/website/pages/docs/builders/proxmox/iso.mdx +++ b/website/pages/docs/builders/proxmox/iso.mdx @@ -297,11 +297,11 @@ For more examples of various boot commands, see the sample projects from our ## Http directory configuration -@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx' ### Optional: -@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx' ## Example: Fedora with kickstart diff --git a/website/pages/docs/builders/qemu.mdx b/website/pages/docs/builders/qemu.mdx index 268950f08..56b276b09 100644 --- a/website/pages/docs/builders/qemu.mdx +++ b/website/pages/docs/builders/qemu.mdx @@ -118,35 +118,35 @@ necessary for this build to succeed and can be found further down the page. ## ISO Configuration -@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx' ### Required: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx' ### Optional: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx' ## Http directory configuration -@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx' ### Optional: -@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx' ## Floppy configuration -@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx' ### Optional: -@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration -@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx' #### Optional: diff --git a/website/pages/docs/builders/virtualbox/iso.mdx b/website/pages/docs/builders/virtualbox/iso.mdx index 8e65026f5..cc42397db 100644 --- a/website/pages/docs/builders/virtualbox/iso.mdx +++ b/website/pages/docs/builders/virtualbox/iso.mdx @@ -95,35 +95,35 @@ necessary for this build to succeed and can be found further down the page. ### ISO Configuration -@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx' #### Required: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx' ### Http directory configuration -@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration -@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration -@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx' #### Optional: diff --git a/website/pages/docs/builders/virtualbox/ovf.mdx b/website/pages/docs/builders/virtualbox/ovf.mdx index 5da2de0a8..379ba8b6f 100644 --- a/website/pages/docs/builders/virtualbox/ovf.mdx +++ b/website/pages/docs/builders/virtualbox/ovf.mdx @@ -109,23 +109,23 @@ necessary for this build to succeed and can be found further down the page. ### Http directory configuration -@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration -@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration -@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx' #### Optional: diff --git a/website/pages/docs/builders/virtualbox/vm.mdx b/website/pages/docs/builders/virtualbox/vm.mdx index d48dc1648..c62894b77 100644 --- a/website/pages/docs/builders/virtualbox/vm.mdx +++ b/website/pages/docs/builders/virtualbox/vm.mdx @@ -120,23 +120,23 @@ builder. ### Http directory configuration -@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration -@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration -@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx' #### Optional: diff --git a/website/pages/docs/builders/vmware/iso.mdx b/website/pages/docs/builders/vmware/iso.mdx index 9dbd04371..842437f64 100644 --- a/website/pages/docs/builders/vmware/iso.mdx +++ b/website/pages/docs/builders/vmware/iso.mdx @@ -104,31 +104,31 @@ necessary for this build to succeed and can be found further down the page. ### ISO Configuration -@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx' #### Required: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx' ### Http directory configuration -@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration -@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration @include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx' diff --git a/website/pages/docs/builders/vmware/vmx.mdx b/website/pages/docs/builders/vmware/vmx.mdx index be94b6793..80b24ca72 100644 --- a/website/pages/docs/builders/vmware/vmx.mdx +++ b/website/pages/docs/builders/vmware/vmx.mdx @@ -105,23 +105,23 @@ necessary for this build to succeed and can be found further down the page. ### Http directory configuration -@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration -@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx' ### CD configuration -@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx' #### Optional: diff --git a/website/pages/docs/builders/vmware/vsphere-clone.mdx b/website/pages/docs/builders/vmware/vsphere-clone.mdx index 883fc9ba3..e91bf3734 100644 --- a/website/pages/docs/builders/vmware/vsphere-clone.mdx +++ b/website/pages/docs/builders/vmware/vsphere-clone.mdx @@ -162,11 +162,11 @@ can be done via environment variable: ### Http directory configuration -@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration @@ -198,7 +198,7 @@ can be done via environment variable: ### CDRom Configuration -@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx' #### Optional: diff --git a/website/pages/docs/builders/vmware/vsphere-iso.mdx b/website/pages/docs/builders/vmware/vsphere-iso.mdx index 3ca15b508..34c5db6f2 100644 --- a/website/pages/docs/builders/vmware/vsphere-iso.mdx +++ b/website/pages/docs/builders/vmware/vsphere-iso.mdx @@ -89,11 +89,11 @@ source "vsphere-iso" "example" { ### Http directory configuration -@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx' ### Floppy configuration @@ -125,15 +125,15 @@ source "vsphere-iso" "example" { ### ISO Configuration -@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx' #### Required: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx' #### Optional: -@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx' ### CDRom Configuration @@ -176,7 +176,7 @@ iso_paths = [ @include 'builder/vsphere/common/RemoveCDRomConfig-not-required.mdx' -@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx' +@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx' #### Optional: From ecb72663f3636689ae8102dd48aa975090003566 Mon Sep 17 00:00:00 2001 From: Anish Bhatt Date: Tue, 27 Oct 2020 01:11:39 -0700 Subject: [PATCH 84/93] Add support for creating shielded VMs to GCP --- .../googlecompute-import/post-processor.go | 100 ++++++++++++++++-- .../post-processor.hcl2spec.go | 92 ++++++++-------- .../Config-not-required.mdx | 10 +- 3 files changed, 149 insertions(+), 53 deletions(-) diff --git a/post-processor/googlecompute-import/post-processor.go b/post-processor/googlecompute-import/post-processor.go index c86ddbac3..5d8e8c61a 100644 --- a/post-processor/googlecompute-import/post-processor.go +++ b/post-processor/googlecompute-import/post-processor.go @@ -5,7 +5,11 @@ package googlecomputeimport import ( "context" + "crypto/x509" + "encoding/base64" + "encoding/pem" "fmt" + "io/ioutil" "os" "strings" "time" @@ -48,7 +52,7 @@ type Config struct { //The name of the image family to which the resulting image belongs. ImageFamily string `mapstructure:"image_family"` //A list of features to enable on the guest operating system. Applicable only for bootable images. Valid - //values are `MULTI_IP_SUBNET`, `SECURE_BOOT`, `UEFI_COMPATIBLE`, + //values are `MULTI_IP_SUBNET`, `UEFI_COMPATIBLE`, //`VIRTIO_SCSI_MULTIQUEUE` and `WINDOWS` currently. ImageGuestOsFeatures []string `mapstructure:"image_guest_os_features"` //Key/value pair labels to apply to the created image. @@ -61,6 +65,14 @@ type Config struct { //`false`. SkipClean bool `mapstructure:"skip_clean"` VaultGCPOauthEngine string `mapstructure:"vault_gcp_oauth_engine"` + //A key used to establish the trust relationship between the platform owner and the firmware. You may only specify one platform key, and it must be a valid X.509 certificate. + ImagePlatformKey string `mapstructure:"image_platform_key"` + //A key used to establish a trust relationship between the firmware and the OS. You may specify multiple comma-separated keys for this value. + ImageKeyExchangeKey []string `mapstructure:"image_key_exchange_key"` + //A database of certificates that have been revoked and will cause the system to stop booting if a boot file is signed with one of them. You may specify single or multiple comma-separated values for this value. + ImageSignaturesDB []string `mapstructure:"image_signatures_db"` + //A database of certificates that are trusted and can be used to sign boot files. You may specify single or multiple comma-separated values for this value. + ImageForbiddenSignaturesDB []string `mapstructure:"image_forbidden_signatures_db"` account *googlecompute.ServiceAccount ctx interpolate.Context @@ -165,7 +177,12 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact return nil, false, false, err } - gceImageArtifact, err := CreateGceImage(opts, ui, p.config.ProjectId, rawImageGcsPath, p.config.ImageName, p.config.ImageDescription, p.config.ImageFamily, p.config.ImageLabels, p.config.ImageGuestOsFeatures) + shieldedVMStateConfig, err := CreateShieldedVMStateConfig(p.config.ImageGuestOsFeatures, p.config.ImagePlatformKey, p.config.ImageKeyExchangeKey, p.config.ImageSignaturesDB, p.config.ImageForbiddenSignaturesDB) + if err != nil { + return nil, false, false, err + } + + gceImageArtifact, err := CreateGceImage(opts, ui, p.config.ProjectId, rawImageGcsPath, p.config.ImageName, p.config.ImageDescription, p.config.ImageFamily, p.config.ImageLabels, p.config.ImageGuestOsFeatures, shieldedVMStateConfig) if err != nil { return nil, false, false, err } @@ -180,6 +197,68 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact return gceImageArtifact, false, false, nil } +func FillFileContentBuffer(certOrKeyFile string) (*compute.FileContentBuffer, error) { + data, err := ioutil.ReadFile(certOrKeyFile) + if err != nil { + err := fmt.Errorf("Unable to read Certificate or Key file %s", certOrKeyFile) + return nil, err + } + shield := &compute.FileContentBuffer{ + Content: base64.StdEncoding.EncodeToString(data), + FileType: "X509", + } + block, _ := pem.Decode(data) + + if block == nil || block.Type != "CERTIFICATE" { + _, err = x509.ParseCertificate(data) + } else { + _, err = x509.ParseCertificate(block.Bytes) + } + if err != nil { + shield.FileType = "BIN" + } + return shield, nil + +} + +func CreateShieldedVMStateConfig(imageGuestOsFeatures []string, imagePlatformKey string, imageKeyExchangeKey []string, imageSignaturesDB []string, imageForbiddenSignaturesDB []string) (*compute.InitialStateConfig, error) { + shieldedVMStateConfig := &compute.InitialStateConfig{} + for _, v := range imageGuestOsFeatures { + if v == "UEFI_COMPATIBLE" { + if imagePlatformKey != "" { + shieldedData, err := FillFileContentBuffer(imagePlatformKey) + if err != nil { + return nil, err + } + shieldedVMStateConfig.Pk = shieldedData + } + for _, v := range imageKeyExchangeKey { + shieldedData, err := FillFileContentBuffer(v) + if err != nil { + return nil, err + } + shieldedVMStateConfig.Keks = append(shieldedVMStateConfig.Keks, shieldedData) + } + for _, v := range imageSignaturesDB { + shieldedData, err := FillFileContentBuffer(v) + if err != nil { + return nil, err + } + shieldedVMStateConfig.Dbs = append(shieldedVMStateConfig.Dbs, shieldedData) + } + for _, v := range imageForbiddenSignaturesDB { + shieldedData, err := FillFileContentBuffer(v) + if err != nil { + return nil, err + } + shieldedVMStateConfig.Dbxs = append(shieldedVMStateConfig.Dbxs, shieldedData) + } + + } + } + return shieldedVMStateConfig, nil +} + func UploadToBucket(opts option.ClientOption, ui packer.Ui, artifact packer.Artifact, bucket string, gcsObjectName string) (string, error) { service, err := storage.NewService(context.TODO(), opts) if err != nil { @@ -216,7 +295,7 @@ func UploadToBucket(opts option.ClientOption, ui packer.Ui, artifact packer.Arti return storageObject.SelfLink, nil } -func CreateGceImage(opts option.ClientOption, ui packer.Ui, project string, rawImageURL string, imageName string, imageDescription string, imageFamily string, imageLabels map[string]string, imageGuestOsFeatures []string) (packer.Artifact, error) { +func CreateGceImage(opts option.ClientOption, ui packer.Ui, project string, rawImageURL string, imageName string, imageDescription string, imageFamily string, imageLabels map[string]string, imageGuestOsFeatures []string, shieldedVMStateConfig *compute.InitialStateConfig) (packer.Artifact, error) { service, err := compute.NewService(context.TODO(), opts) if err != nil { @@ -232,13 +311,14 @@ func CreateGceImage(opts option.ClientOption, ui packer.Ui, project string, rawI } gceImage := &compute.Image{ - Description: imageDescription, - Family: imageFamily, - GuestOsFeatures: imageFeatures, - Labels: imageLabels, - Name: imageName, - RawDisk: &compute.ImageRawDisk{Source: rawImageURL}, - SourceType: "RAW", + Description: imageDescription, + Family: imageFamily, + GuestOsFeatures: imageFeatures, + Labels: imageLabels, + Name: imageName, + RawDisk: &compute.ImageRawDisk{Source: rawImageURL}, + SourceType: "RAW", + ShieldedInstanceInitialState: shieldedVMStateConfig, } ui.Say(fmt.Sprintf("Creating GCE image %v...", imageName)) diff --git a/post-processor/googlecompute-import/post-processor.hcl2spec.go b/post-processor/googlecompute-import/post-processor.hcl2spec.go index aeed85a0f..2c0a726d2 100644 --- a/post-processor/googlecompute-import/post-processor.hcl2spec.go +++ b/post-processor/googlecompute-import/post-processor.hcl2spec.go @@ -9,27 +9,31 @@ import ( // FlatConfig is an auto-generated flat version of Config. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatConfig struct { - PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` - PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` - PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` - PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` - PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` - PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` - PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"` - PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"` - AccountFile *string `mapstructure:"account_file" required:"true" cty:"account_file" hcl:"account_file"` - ImpersonateServiceAccount *string `mapstructure:"impersonate_service_account" required:"false" cty:"impersonate_service_account" hcl:"impersonate_service_account"` - ProjectId *string `mapstructure:"project_id" required:"true" cty:"project_id" hcl:"project_id"` - IAP *bool `mapstructure-to-hcl:",skip" cty:"iap" hcl:"iap"` - Bucket *string `mapstructure:"bucket" required:"true" cty:"bucket" hcl:"bucket"` - GCSObjectName *string `mapstructure:"gcs_object_name" cty:"gcs_object_name" hcl:"gcs_object_name"` - ImageDescription *string `mapstructure:"image_description" cty:"image_description" hcl:"image_description"` - ImageFamily *string `mapstructure:"image_family" cty:"image_family" hcl:"image_family"` - ImageGuestOsFeatures []string `mapstructure:"image_guest_os_features" cty:"image_guest_os_features" hcl:"image_guest_os_features"` - ImageLabels map[string]string `mapstructure:"image_labels" cty:"image_labels" hcl:"image_labels"` - ImageName *string `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"` - SkipClean *bool `mapstructure:"skip_clean" cty:"skip_clean" hcl:"skip_clean"` - VaultGCPOauthEngine *string `mapstructure:"vault_gcp_oauth_engine" cty:"vault_gcp_oauth_engine" hcl:"vault_gcp_oauth_engine"` + PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` + PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` + PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` + PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` + PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` + PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"` + PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"` + AccountFile *string `mapstructure:"account_file" required:"true" cty:"account_file" hcl:"account_file"` + ImpersonateServiceAccount *string `mapstructure:"impersonate_service_account" required:"false" cty:"impersonate_service_account" hcl:"impersonate_service_account"` + ProjectId *string `mapstructure:"project_id" required:"true" cty:"project_id" hcl:"project_id"` + IAP *bool `mapstructure-to-hcl:",skip" cty:"iap" hcl:"iap"` + Bucket *string `mapstructure:"bucket" required:"true" cty:"bucket" hcl:"bucket"` + GCSObjectName *string `mapstructure:"gcs_object_name" cty:"gcs_object_name" hcl:"gcs_object_name"` + ImageDescription *string `mapstructure:"image_description" cty:"image_description" hcl:"image_description"` + ImageFamily *string `mapstructure:"image_family" cty:"image_family" hcl:"image_family"` + ImageGuestOsFeatures []string `mapstructure:"image_guest_os_features" cty:"image_guest_os_features" hcl:"image_guest_os_features"` + ImageLabels map[string]string `mapstructure:"image_labels" cty:"image_labels" hcl:"image_labels"` + ImageName *string `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"` + SkipClean *bool `mapstructure:"skip_clean" cty:"skip_clean" hcl:"skip_clean"` + VaultGCPOauthEngine *string `mapstructure:"vault_gcp_oauth_engine" cty:"vault_gcp_oauth_engine" hcl:"vault_gcp_oauth_engine"` + ImagePlatformKey *string `mapstructure:"image_platform_key" cty:"image_platform_key" hcl:"image_platform_key"` + ImageKeyExchangeKey []string `mapstructure:"image_key_exchange_key" cty:"image_key_exchange_key" hcl:"image_key_exchange_key"` + ImageSignaturesDB []string `mapstructure:"image_signatures_db" cty:"image_signatures_db" hcl:"image_signatures_db"` + ImageForbiddenSignaturesDB []string `mapstructure:"image_forbidden_signatures_db" cty:"image_forbidden_signatures_db" hcl:"image_forbidden_signatures_db"` } // FlatMapstructure returns a new FlatConfig. @@ -44,27 +48,31 @@ func (*Config) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } // The decoded values from this spec will then be applied to a FlatConfig. func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ - "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, - "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, - "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, - "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, - "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, - "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, - "packer_user_variables": &hcldec.AttrSpec{Name: "packer_user_variables", Type: cty.Map(cty.String), Required: false}, - "packer_sensitive_variables": &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false}, - "account_file": &hcldec.AttrSpec{Name: "account_file", Type: cty.String, Required: false}, - "impersonate_service_account": &hcldec.AttrSpec{Name: "impersonate_service_account", Type: cty.String, Required: false}, - "project_id": &hcldec.AttrSpec{Name: "project_id", Type: cty.String, Required: false}, - "iap": &hcldec.AttrSpec{Name: "iap", Type: cty.Bool, Required: false}, - "bucket": &hcldec.AttrSpec{Name: "bucket", Type: cty.String, Required: false}, - "gcs_object_name": &hcldec.AttrSpec{Name: "gcs_object_name", Type: cty.String, Required: false}, - "image_description": &hcldec.AttrSpec{Name: "image_description", Type: cty.String, Required: false}, - "image_family": &hcldec.AttrSpec{Name: "image_family", Type: cty.String, Required: false}, - "image_guest_os_features": &hcldec.AttrSpec{Name: "image_guest_os_features", Type: cty.List(cty.String), Required: false}, - "image_labels": &hcldec.AttrSpec{Name: "image_labels", Type: cty.Map(cty.String), Required: false}, - "image_name": &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false}, - "skip_clean": &hcldec.AttrSpec{Name: "skip_clean", Type: cty.Bool, Required: false}, - "vault_gcp_oauth_engine": &hcldec.AttrSpec{Name: "vault_gcp_oauth_engine", Type: cty.String, Required: false}, + "packer_build_name": &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false}, + "packer_builder_type": &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false}, + "packer_core_version": &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false}, + "packer_debug": &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false}, + "packer_force": &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false}, + "packer_on_error": &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false}, + "packer_user_variables": &hcldec.AttrSpec{Name: "packer_user_variables", Type: cty.Map(cty.String), Required: false}, + "packer_sensitive_variables": &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false}, + "account_file": &hcldec.AttrSpec{Name: "account_file", Type: cty.String, Required: false}, + "impersonate_service_account": &hcldec.AttrSpec{Name: "impersonate_service_account", Type: cty.String, Required: false}, + "project_id": &hcldec.AttrSpec{Name: "project_id", Type: cty.String, Required: false}, + "iap": &hcldec.AttrSpec{Name: "iap", Type: cty.Bool, Required: false}, + "bucket": &hcldec.AttrSpec{Name: "bucket", Type: cty.String, Required: false}, + "gcs_object_name": &hcldec.AttrSpec{Name: "gcs_object_name", Type: cty.String, Required: false}, + "image_description": &hcldec.AttrSpec{Name: "image_description", Type: cty.String, Required: false}, + "image_family": &hcldec.AttrSpec{Name: "image_family", Type: cty.String, Required: false}, + "image_guest_os_features": &hcldec.AttrSpec{Name: "image_guest_os_features", Type: cty.List(cty.String), Required: false}, + "image_labels": &hcldec.AttrSpec{Name: "image_labels", Type: cty.Map(cty.String), Required: false}, + "image_name": &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false}, + "skip_clean": &hcldec.AttrSpec{Name: "skip_clean", Type: cty.Bool, Required: false}, + "vault_gcp_oauth_engine": &hcldec.AttrSpec{Name: "vault_gcp_oauth_engine", Type: cty.String, Required: false}, + "image_platform_key": &hcldec.AttrSpec{Name: "image_platform_key", Type: cty.String, Required: false}, + "image_key_exchange_key": &hcldec.AttrSpec{Name: "image_key_exchange_key", Type: cty.List(cty.String), Required: false}, + "image_signatures_db": &hcldec.AttrSpec{Name: "image_signatures_db", Type: cty.List(cty.String), Required: false}, + "image_forbidden_signatures_db": &hcldec.AttrSpec{Name: "image_forbidden_signatures_db", Type: cty.List(cty.String), Required: false}, } return s } diff --git a/website/pages/partials/post-processor/googlecompute-import/Config-not-required.mdx b/website/pages/partials/post-processor/googlecompute-import/Config-not-required.mdx index aa3a5243e..bacbd84e5 100644 --- a/website/pages/partials/post-processor/googlecompute-import/Config-not-required.mdx +++ b/website/pages/partials/post-processor/googlecompute-import/Config-not-required.mdx @@ -13,7 +13,7 @@ - `image_family` (string) - The name of the image family to which the resulting image belongs. - `image_guest_os_features` ([]string) - A list of features to enable on the guest operating system. Applicable only for bootable images. Valid - values are `MULTI_IP_SUBNET`, `SECURE_BOOT`, `UEFI_COMPATIBLE`, + values are `MULTI_IP_SUBNET`, `UEFI_COMPATIBLE`, `VIRTIO_SCSI_MULTIQUEUE` and `WINDOWS` currently. - `image_labels` (map[string]string) - Key/value pair labels to apply to the created image. @@ -24,3 +24,11 @@ `false`. - `vault_gcp_oauth_engine` (string) - Vault GCP Oauth Engine + +- `image_platform_key` (string) - A key used to establish the trust relationship between the platform owner and the firmware. You may only specify one platform key, and it must be a valid X.509 certificate. + +- `image_key_exchange_key` ([]string) - A key used to establish a trust relationship between the firmware and the OS. You may specify multiple comma-separated keys for this value. + +- `image_signatures_db` ([]string) - A database of certificates that have been revoked and will cause the system to stop booting if a boot file is signed with one of them. You may specify single or multiple comma-separated values for this value. + +- `image_forbidden_signatures_db` ([]string) - A database of certificates that are trusted and can be used to sign boot files. You may specify single or multiple comma-separated values for this value. From 007337989e4894ffa9dd94c1241f3219ffaccb97 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 18 Nov 2020 10:23:22 -0800 Subject: [PATCH 85/93] move communicator helpers into communicator dir --- builder/proxmox/clone/step_ssh_key_pair.go | 2 +- builder/virtualbox/common/step_ssh_key_pair.go | 2 +- builder/vmware/common/driver_esx5.go | 2 +- builder/vsphere/common/step_ssh_key_pair.go | 2 +- helper/communicator/config.go | 2 +- helper/{ => communicator}/ssh/key_pair.go | 0 helper/{ => communicator}/ssh/key_pair_test.go | 0 helper/{ => communicator}/ssh/ssh.go | 0 helper/{ => communicator}/ssh/tunnel.go | 0 helper/{ => communicator}/ssh/tunnel_test.go | 0 helper/communicator/step_connect_ssh.go | 2 +- .../sdk-internals/communicator/ssh/connect_test.go | 2 +- 12 files changed, 7 insertions(+), 7 deletions(-) rename helper/{ => communicator}/ssh/key_pair.go (100%) rename helper/{ => communicator}/ssh/key_pair_test.go (100%) rename helper/{ => communicator}/ssh/ssh.go (100%) rename helper/{ => communicator}/ssh/tunnel.go (100%) rename helper/{ => communicator}/ssh/tunnel_test.go (100%) diff --git a/builder/proxmox/clone/step_ssh_key_pair.go b/builder/proxmox/clone/step_ssh_key_pair.go index c963986a4..3626f80c8 100644 --- a/builder/proxmox/clone/step_ssh_key_pair.go +++ b/builder/proxmox/clone/step_ssh_key_pair.go @@ -6,7 +6,7 @@ import ( "os" common "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/helper/ssh" + "github.com/hashicorp/packer/helper/communicator/ssh" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" diff --git a/builder/virtualbox/common/step_ssh_key_pair.go b/builder/virtualbox/common/step_ssh_key_pair.go index e0e851756..7383ed93c 100644 --- a/builder/virtualbox/common/step_ssh_key_pair.go +++ b/builder/virtualbox/common/step_ssh_key_pair.go @@ -6,7 +6,7 @@ import ( "os" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/ssh" + "github.com/hashicorp/packer/helper/communicator/ssh" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" diff --git a/builder/vmware/common/driver_esx5.go b/builder/vmware/common/driver_esx5.go index 710752258..73ca6b7e3 100644 --- a/builder/vmware/common/driver_esx5.go +++ b/builder/vmware/common/driver_esx5.go @@ -29,7 +29,7 @@ import ( "github.com/hashicorp/go-getter/v2" "github.com/hashicorp/packer/helper/communicator" - helperssh "github.com/hashicorp/packer/helper/ssh" + helperssh "github.com/hashicorp/packer/helper/communicator/ssh" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" diff --git a/builder/vsphere/common/step_ssh_key_pair.go b/builder/vsphere/common/step_ssh_key_pair.go index 3b2769461..80fecaabc 100644 --- a/builder/vsphere/common/step_ssh_key_pair.go +++ b/builder/vsphere/common/step_ssh_key_pair.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/ssh" + "github.com/hashicorp/packer/helper/communicator/ssh" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" diff --git a/helper/communicator/config.go b/helper/communicator/config.go index 25b1e074f..dc1e9b23a 100644 --- a/helper/communicator/config.go +++ b/helper/communicator/config.go @@ -12,8 +12,8 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" + helperssh "github.com/hashicorp/packer/helper/communicator/ssh" "github.com/hashicorp/packer/helper/config" - helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" packerssh "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" diff --git a/helper/ssh/key_pair.go b/helper/communicator/ssh/key_pair.go similarity index 100% rename from helper/ssh/key_pair.go rename to helper/communicator/ssh/key_pair.go diff --git a/helper/ssh/key_pair_test.go b/helper/communicator/ssh/key_pair_test.go similarity index 100% rename from helper/ssh/key_pair_test.go rename to helper/communicator/ssh/key_pair_test.go diff --git a/helper/ssh/ssh.go b/helper/communicator/ssh/ssh.go similarity index 100% rename from helper/ssh/ssh.go rename to helper/communicator/ssh/ssh.go diff --git a/helper/ssh/tunnel.go b/helper/communicator/ssh/tunnel.go similarity index 100% rename from helper/ssh/tunnel.go rename to helper/communicator/ssh/tunnel.go diff --git a/helper/ssh/tunnel_test.go b/helper/communicator/ssh/tunnel_test.go similarity index 100% rename from helper/ssh/tunnel_test.go rename to helper/communicator/ssh/tunnel_test.go diff --git a/helper/communicator/step_connect_ssh.go b/helper/communicator/step_connect_ssh.go index 7e6edb05c..93ba8a3a6 100644 --- a/helper/communicator/step_connect_ssh.go +++ b/helper/communicator/step_connect_ssh.go @@ -13,7 +13,7 @@ import ( "golang.org/x/crypto/ssh/terminal" - helperssh "github.com/hashicorp/packer/helper/ssh" + helperssh "github.com/hashicorp/packer/helper/communicator/ssh" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" diff --git a/packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go index 3e8ba0e6e..9e4c0cc8b 100644 --- a/packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go +++ b/packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - helperssh "github.com/hashicorp/packer/helper/ssh" + helperssh "github.com/hashicorp/packer/helper/communicator/ssh" "golang.org/x/crypto/ssh" ) From 9e47696dffc36af5501615505c9bef7902963315 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 18 Nov 2020 10:34:59 -0800 Subject: [PATCH 86/93] move helper/config to bundle with the other template definitions --- builder/alicloud/ecs/builder.go | 2 +- builder/alicloud/ecs/builder_test.go | 2 +- builder/alicloud/ecs/image_config.go | 2 +- builder/alicloud/ecs/run_config.go | 2 +- builder/alicloud/ecs/step_create_instance.go | 2 +- builder/alicloud/ecs/step_region_copy_image.go | 2 +- builder/amazon/chroot/builder.go | 2 +- builder/amazon/chroot/step_register_ami.go | 2 +- builder/amazon/common/ami_config.go | 2 +- builder/amazon/common/ami_config_test.go | 2 +- builder/amazon/common/block_device.go | 2 +- builder/amazon/common/block_device_test.go | 2 +- builder/amazon/common/step_ami_region_copy.go | 2 +- builder/amazon/common/step_ami_region_copy_test.go | 2 +- builder/amazon/common/step_modify_ebs_instance.go | 2 +- builder/amazon/common/step_source_ami_info.go | 2 +- builder/amazon/ebs/builder.go | 2 +- builder/amazon/ebssurrogate/builder.go | 2 +- builder/amazon/ebssurrogate/step_register_ami.go | 2 +- builder/amazon/ebsvolume/builder.go | 2 +- builder/amazon/instance/builder.go | 2 +- builder/amazon/instance/step_register_ami.go | 2 +- builder/azure/arm/config.go | 2 +- builder/azure/chroot/builder.go | 2 +- builder/azure/dtl/config.go | 2 +- builder/cloudstack/config.go | 2 +- builder/digitalocean/config.go | 2 +- builder/docker/config.go | 2 +- builder/file/config.go | 2 +- builder/googlecompute/config.go | 2 +- builder/googlecompute/step_create_instance_test.go | 2 +- builder/googlecompute/step_wait_startup_script_test.go | 2 +- builder/hcloud/config.go | 2 +- builder/hyperone/config.go | 2 +- builder/hyperv/iso/builder.go | 2 +- builder/hyperv/vmcx/builder.go | 2 +- builder/jdcloud/builder.go | 2 +- builder/linode/config.go | 2 +- builder/lxc/config.go | 2 +- builder/lxd/config.go | 2 +- builder/ncloud/config.go | 2 +- builder/null/config.go | 2 +- builder/oneandone/config.go | 2 +- builder/openstack/builder.go | 2 +- builder/oracle/classic/config.go | 2 +- builder/oracle/oci/config.go | 2 +- builder/osc/bsu/builder.go | 2 +- builder/osc/bsusurrogate/builder.go | 2 +- builder/osc/bsuvolume/builder.go | 2 +- builder/osc/chroot/builder.go | 2 +- builder/parallels/iso/builder.go | 2 +- builder/parallels/pvm/config.go | 2 +- builder/profitbricks/config.go | 2 +- builder/proxmox/clone/config.go | 2 +- builder/proxmox/common/config.go | 2 +- builder/qemu/config.go | 2 +- builder/scaleway/config.go | 2 +- builder/tencentcloud/cvm/builder.go | 2 +- builder/triton/builder.go | 2 +- builder/ucloud/uhost/builder.go | 2 +- builder/vagrant/builder.go | 2 +- builder/virtualbox/iso/builder.go | 2 +- builder/virtualbox/ovf/config.go | 2 +- builder/virtualbox/vm/config.go | 2 +- builder/vmware/common/driver_esx5_test.go | 2 +- builder/vmware/iso/config.go | 2 +- builder/vmware/vmx/config.go | 2 +- builder/vsphere/clone/config.go | 2 +- builder/vsphere/clone/step_customize.go | 2 +- builder/vsphere/iso/config.go | 2 +- builder/yandex/config.go | 2 +- hcl2template/common_test.go | 2 +- hcl2template/internal/mock.go | 2 +- helper/communicator/config.go | 2 +- packer-plugin-sdk/shell-local/config.go | 2 +- {helper => packer-plugin-sdk/template}/config/custom_types.go | 0 .../template}/config/custom_types_test.go | 0 {helper => packer-plugin-sdk/template}/config/decode.go | 0 {helper => packer-plugin-sdk/template}/config/decode_test.go | 0 .../template}/config/deprecated_options.go | 0 packer/core_test.go | 2 +- post-processor/alicloud-import/post-processor.go | 2 +- post-processor/amazon-import/post-processor.go | 2 +- post-processor/artifice/post-processor.go | 2 +- post-processor/checksum/post-processor.go | 2 +- post-processor/compress/post-processor.go | 2 +- post-processor/digitalocean-import/post-processor.go | 2 +- post-processor/docker-import/post-processor.go | 2 +- post-processor/docker-push/post-processor.go | 2 +- post-processor/docker-save/post-processor.go | 2 +- post-processor/docker-tag/post-processor.go | 2 +- post-processor/exoscale-import/post-processor.go | 2 +- post-processor/googlecompute-export/post-processor.go | 2 +- post-processor/googlecompute-import/post-processor.go | 2 +- post-processor/manifest/post-processor.go | 2 +- post-processor/ucloud-import/post-processor.go | 2 +- post-processor/vagrant-cloud/post-processor.go | 2 +- post-processor/vagrant/post-processor.go | 2 +- post-processor/vsphere-template/post-processor.go | 2 +- post-processor/vsphere-template/step_mark_as_template.go | 2 +- post-processor/vsphere/post-processor.go | 2 +- post-processor/yandex-export/post-processor.go | 2 +- post-processor/yandex-import/post-processor.go | 2 +- provisioner/ansible-local/provisioner.go | 2 +- provisioner/ansible/provisioner.go | 2 +- provisioner/ansible/provisioner_test.go | 2 +- provisioner/azure-dtlartifact/provisioner.go | 2 +- provisioner/breakpoint/provisioner.go | 2 +- provisioner/chef-client/provisioner.go | 2 +- provisioner/chef-solo/provisioner.go | 2 +- provisioner/converge/provisioner.go | 2 +- provisioner/file/provisioner.go | 2 +- provisioner/inspec/provisioner.go | 2 +- provisioner/powershell/provisioner.go | 2 +- provisioner/puppet-masterless/provisioner.go | 2 +- provisioner/puppet-server/provisioner.go | 2 +- provisioner/salt-masterless/provisioner.go | 2 +- provisioner/shell/provisioner.go | 2 +- provisioner/sleep/provisioner.go | 2 +- provisioner/windows-restart/provisioner.go | 2 +- provisioner/windows-shell/provisioner.go | 2 +- 121 files changed, 116 insertions(+), 116 deletions(-) rename {helper => packer-plugin-sdk/template}/config/custom_types.go (100%) rename {helper => packer-plugin-sdk/template}/config/custom_types_test.go (100%) rename {helper => packer-plugin-sdk/template}/config/decode.go (100%) rename {helper => packer-plugin-sdk/template}/config/decode_test.go (100%) rename {helper => packer-plugin-sdk/template}/config/deprecated_options.go (100%) diff --git a/builder/alicloud/ecs/builder.go b/builder/alicloud/ecs/builder.go index f509767ca..9fc5f679f 100644 --- a/builder/alicloud/ecs/builder.go +++ b/builder/alicloud/ecs/builder.go @@ -10,11 +10,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/alicloud/ecs/builder_test.go b/builder/alicloud/ecs/builder_test.go index 9a691de77..9b92a5c5d 100644 --- a/builder/alicloud/ecs/builder_test.go +++ b/builder/alicloud/ecs/builder_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - helperconfig "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + helperconfig "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) func testBuilderConfig() map[string]interface{} { diff --git a/builder/alicloud/ecs/image_config.go b/builder/alicloud/ecs/image_config.go index 575a1c1c5..37eb06ce5 100644 --- a/builder/alicloud/ecs/image_config.go +++ b/builder/alicloud/ecs/image_config.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/hashicorp/packer/hcl2template" - "github.com/hashicorp/packer/helper/config" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/alicloud/ecs/run_config.go b/builder/alicloud/ecs/run_config.go index a8988bb0a..f9450ed15 100644 --- a/builder/alicloud/ecs/run_config.go +++ b/builder/alicloud/ecs/run_config.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/alicloud/ecs/step_create_instance.go b/builder/alicloud/ecs/step_create_instance.go index da6696e25..0d9958d40 100644 --- a/builder/alicloud/ecs/step_create_instance.go +++ b/builder/alicloud/ecs/step_create_instance.go @@ -12,9 +12,9 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type stepCreateAlicloudInstance struct { diff --git a/builder/alicloud/ecs/step_region_copy_image.go b/builder/alicloud/ecs/step_region_copy_image.go index c0ec5e3f3..6905b179d 100644 --- a/builder/alicloud/ecs/step_region_copy_image.go +++ b/builder/alicloud/ecs/step_region_copy_image.go @@ -7,9 +7,9 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type stepRegionCopyAlicloudImage struct { diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index 8964ec157..43cbd64ce 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -16,13 +16,13 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/hcl2template" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/chroot" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/chroot/step_register_ami.go b/builder/amazon/chroot/step_register_ami.go index 628a62f7b..74f10e271 100644 --- a/builder/amazon/chroot/step_register_ami.go +++ b/builder/amazon/chroot/step_register_ami.go @@ -7,10 +7,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) // StepRegisterAMI creates the AMI. diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go index 2675a2d4f..338f69f2c 100644 --- a/builder/amazon/common/ami_config.go +++ b/builder/amazon/common/ami_config.go @@ -8,7 +8,7 @@ import ( "regexp" "github.com/hashicorp/packer/hcl2template" - "github.com/hashicorp/packer/helper/config" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/common/ami_config_test.go b/builder/amazon/common/ami_config_test.go index 2448965db..5764a6045 100644 --- a/builder/amazon/common/ami_config_test.go +++ b/builder/amazon/common/ami_config_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/helper/config" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) func testAMIConfig() *AMIConfig { diff --git a/builder/amazon/common/block_device.go b/builder/amazon/common/block_device.go index 5c2ae01d3..55654de14 100644 --- a/builder/amazon/common/block_device.go +++ b/builder/amazon/common/block_device.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/config" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/common/block_device_test.go b/builder/amazon/common/block_device_test.go index b434ca02b..3d7e55fd7 100644 --- a/builder/amazon/common/block_device_test.go +++ b/builder/amazon/common/block_device_test.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/packer/helper/config" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) func TestBlockDevice(t *testing.T) { diff --git a/builder/amazon/common/step_ami_region_copy.go b/builder/amazon/common/step_ami_region_copy.go index 01a9bea21..1395b3f80 100644 --- a/builder/amazon/common/step_ami_region_copy.go +++ b/builder/amazon/common/step_ami_region_copy.go @@ -8,9 +8,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type StepAMIRegionCopy struct { diff --git a/builder/amazon/common/step_ami_region_copy_test.go b/builder/amazon/common/step_ami_region_copy_test.go index 93e370307..a9f511a61 100644 --- a/builder/amazon/common/step_ami_region_copy_test.go +++ b/builder/amazon/common/step_ami_region_copy_test.go @@ -11,9 +11,9 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) // Define a mock struct to be used in unit tests for common aws steps. diff --git a/builder/amazon/common/step_modify_ebs_instance.go b/builder/amazon/common/step_modify_ebs_instance.go index e3a08e5d0..a578bcb24 100644 --- a/builder/amazon/common/step_modify_ebs_instance.go +++ b/builder/amazon/common/step_modify_ebs_instance.go @@ -7,9 +7,9 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type StepModifyEBSBackedInstance struct { diff --git a/builder/amazon/common/step_source_ami_info.go b/builder/amazon/common/step_source_ami_info.go index 53b609dc7..3c387a1c0 100644 --- a/builder/amazon/common/step_source_ami_info.go +++ b/builder/amazon/common/step_source_ami_info.go @@ -8,9 +8,9 @@ import ( "time" "github.com/aws/aws-sdk-go/service/ec2" - confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) // StepSourceAMIInfo extracts critical information from the source AMI diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 5c37146f0..2179d3d14 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -18,12 +18,12 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index 53073100c..305c87c91 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -16,12 +16,12 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/ebssurrogate/step_register_ami.go b/builder/amazon/ebssurrogate/step_register_ami.go index 69a696a7f..66865250f 100644 --- a/builder/amazon/ebssurrogate/step_register_ami.go +++ b/builder/amazon/ebssurrogate/step_register_ami.go @@ -7,10 +7,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) // StepRegisterAMI creates the AMI. diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index 7bd18bd3e..1f52bc872 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/builder/amazon/ebsvolume/builder.go @@ -15,12 +15,12 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index ebd9ad339..6a706b0ae 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -17,12 +17,12 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/instance/step_register_ami.go b/builder/amazon/instance/step_register_ami.go index 513baa4bd..10992c1cc 100644 --- a/builder/amazon/instance/step_register_ami.go +++ b/builder/amazon/instance/step_register_ami.go @@ -7,10 +7,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type StepRegisterAMI struct { diff --git a/builder/azure/arm/config.go b/builder/azure/arm/config.go index ef70b38c9..6ba3a662a 100644 --- a/builder/azure/arm/config.go +++ b/builder/azure/arm/config.go @@ -30,9 +30,9 @@ import ( "github.com/hashicorp/packer/builder/azure/pkcs12" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "golang.org/x/crypto/ssh" diff --git a/builder/azure/chroot/builder.go b/builder/azure/chroot/builder.go index 6387e5603..58e146d3e 100644 --- a/builder/azure/chroot/builder.go +++ b/builder/azure/chroot/builder.go @@ -18,12 +18,12 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" azcommon "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/chroot" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" diff --git a/builder/azure/dtl/config.go b/builder/azure/dtl/config.go index 7268fc612..fdb960905 100644 --- a/builder/azure/dtl/config.go +++ b/builder/azure/dtl/config.go @@ -25,9 +25,9 @@ import ( "github.com/hashicorp/packer/builder/azure/pkcs12" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "golang.org/x/crypto/ssh" diff --git a/builder/cloudstack/config.go b/builder/cloudstack/config.go index 99adfa718..0d05c3325 100644 --- a/builder/cloudstack/config.go +++ b/builder/cloudstack/config.go @@ -10,10 +10,10 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/digitalocean/config.go b/builder/digitalocean/config.go index ee67b8bdc..9f68ca001 100644 --- a/builder/digitalocean/config.go +++ b/builder/digitalocean/config.go @@ -11,9 +11,9 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/mitchellh/mapstructure" diff --git a/builder/docker/config.go b/builder/docker/config.go index 463f13dfd..5fe0e8b54 100644 --- a/builder/docker/config.go +++ b/builder/docker/config.go @@ -8,9 +8,9 @@ import ( "os" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/file/config.go b/builder/file/config.go index d5ddedd8a..5560f73e5 100644 --- a/builder/file/config.go +++ b/builder/file/config.go @@ -5,9 +5,9 @@ package file import ( "fmt" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/googlecompute/config.go b/builder/googlecompute/config.go index 9cc372f07..cdf4581e5 100644 --- a/builder/googlecompute/config.go +++ b/builder/googlecompute/config.go @@ -12,9 +12,9 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" compute "google.golang.org/api/compute/v1" diff --git a/builder/googlecompute/step_create_instance_test.go b/builder/googlecompute/step_create_instance_test.go index 791c6ffbe..42fa74d8c 100644 --- a/builder/googlecompute/step_create_instance_test.go +++ b/builder/googlecompute/step_create_instance_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/stretchr/testify/assert" ) diff --git a/builder/googlecompute/step_wait_startup_script_test.go b/builder/googlecompute/step_wait_startup_script_test.go index d22fbbd61..0e783f8dd 100644 --- a/builder/googlecompute/step_wait_startup_script_test.go +++ b/builder/googlecompute/step_wait_startup_script_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/stretchr/testify/assert" ) diff --git a/builder/hcloud/config.go b/builder/hcloud/config.go index 5bdee0ee7..55d31e799 100644 --- a/builder/hcloud/config.go +++ b/builder/hcloud/config.go @@ -9,10 +9,10 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/hetznercloud/hcloud-go/hcloud" diff --git a/builder/hyperone/config.go b/builder/hyperone/config.go index 4b5b5ee06..78a5ede64 100644 --- a/builder/hyperone/config.go +++ b/builder/hyperone/config.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/json" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/mitchellh/go-homedir" diff --git a/builder/hyperv/iso/builder.go b/builder/hyperv/iso/builder.go index dcbdae5af..b5df8e57c 100644 --- a/builder/hyperv/iso/builder.go +++ b/builder/hyperv/iso/builder.go @@ -14,13 +14,13 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/hyperv/vmcx/builder.go b/builder/hyperv/vmcx/builder.go index 8c57ad792..ad91ec126 100644 --- a/builder/hyperv/vmcx/builder.go +++ b/builder/hyperv/vmcx/builder.go @@ -14,13 +14,13 @@ import ( hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/jdcloud/builder.go b/builder/jdcloud/builder.go index c226ca01b..8dc291b6f 100644 --- a/builder/jdcloud/builder.go +++ b/builder/jdcloud/builder.go @@ -6,10 +6,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/linode/config.go b/builder/linode/config.go index a66a180d7..f749fa113 100644 --- a/builder/linode/config.go +++ b/builder/linode/config.go @@ -12,9 +12,9 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/lxc/config.go b/builder/lxc/config.go index f7cfa8ee7..c02187794 100644 --- a/builder/lxc/config.go +++ b/builder/lxc/config.go @@ -8,9 +8,9 @@ import ( "os" "time" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/lxd/config.go b/builder/lxd/config.go index 0369158b2..f737d283b 100644 --- a/builder/lxd/config.go +++ b/builder/lxd/config.go @@ -6,9 +6,9 @@ package lxd import ( "fmt" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/ncloud/config.go b/builder/ncloud/config.go index d3fd8ec61..9db019e74 100644 --- a/builder/ncloud/config.go +++ b/builder/ncloud/config.go @@ -11,9 +11,9 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/null/config.go b/builder/null/config.go index 62f82e04f..500cb0674 100644 --- a/builder/null/config.go +++ b/builder/null/config.go @@ -6,9 +6,9 @@ import ( "fmt" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/oneandone/config.go b/builder/oneandone/config.go index 66c49b87f..c11e2e925 100644 --- a/builder/oneandone/config.go +++ b/builder/oneandone/config.go @@ -9,9 +9,9 @@ import ( "github.com/1and1/oneandone-cloudserver-sdk-go" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go index ddc9adad6..a61b1d547 100644 --- a/builder/openstack/builder.go +++ b/builder/openstack/builder.go @@ -11,11 +11,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/oracle/classic/config.go b/builder/oracle/classic/config.go index fcb28a527..a463fe787 100644 --- a/builder/oracle/classic/config.go +++ b/builder/oracle/classic/config.go @@ -10,9 +10,9 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/oracle/oci/config.go b/builder/oracle/oci/config.go index 20096d9d5..4f2ca5e50 100644 --- a/builder/oracle/oci/config.go +++ b/builder/oracle/oci/config.go @@ -14,9 +14,9 @@ import ( "strings" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ocicommon "github.com/oracle/oci-go-sdk/common" ociauth "github.com/oracle/oci-go-sdk/common/auth" diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go index 5d0d1124a..0f05b93ad 100644 --- a/builder/osc/bsu/builder.go +++ b/builder/osc/bsu/builder.go @@ -14,11 +14,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/bsusurrogate/builder.go b/builder/osc/bsusurrogate/builder.go index dde2cf8d7..b4e2f2db2 100644 --- a/builder/osc/bsusurrogate/builder.go +++ b/builder/osc/bsusurrogate/builder.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/bsuvolume/builder.go b/builder/osc/bsuvolume/builder.go index 57a78253c..05a2f9c43 100644 --- a/builder/osc/bsuvolume/builder.go +++ b/builder/osc/bsuvolume/builder.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/chroot/builder.go b/builder/osc/chroot/builder.go index 7d049385f..7740bc357 100644 --- a/builder/osc/chroot/builder.go +++ b/builder/osc/chroot/builder.go @@ -13,11 +13,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/iso/builder.go b/builder/parallels/iso/builder.go index ff67ebddd..0fa823f0a 100644 --- a/builder/parallels/iso/builder.go +++ b/builder/parallels/iso/builder.go @@ -11,13 +11,13 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/pvm/config.go b/builder/parallels/pvm/config.go index 3b5aafdce..27e7b5a43 100644 --- a/builder/parallels/pvm/config.go +++ b/builder/parallels/pvm/config.go @@ -8,12 +8,12 @@ import ( "os" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/profitbricks/config.go b/builder/profitbricks/config.go index ccecb3e68..3c9b994d3 100644 --- a/builder/profitbricks/config.go +++ b/builder/profitbricks/config.go @@ -7,9 +7,9 @@ import ( "os" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/proxmox/clone/config.go b/builder/proxmox/clone/config.go index e9a8721d6..01fa6971d 100644 --- a/builder/proxmox/clone/config.go +++ b/builder/proxmox/clone/config.go @@ -4,8 +4,8 @@ package proxmoxclone import ( proxmox "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type Config struct { diff --git a/builder/proxmox/common/config.go b/builder/proxmox/common/config.go index 66d17a318..916b3fdb7 100644 --- a/builder/proxmox/common/config.go +++ b/builder/proxmox/common/config.go @@ -12,11 +12,11 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/mitchellh/mapstructure" diff --git a/builder/qemu/config.go b/builder/qemu/config.go index 358a26589..cc0814667 100644 --- a/builder/qemu/config.go +++ b/builder/qemu/config.go @@ -13,12 +13,12 @@ import ( "runtime" "strings" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/scaleway/config.go b/builder/scaleway/config.go index 7411d33b7..58a62b949 100644 --- a/builder/scaleway/config.go +++ b/builder/scaleway/config.go @@ -11,10 +11,10 @@ import ( "github.com/hashicorp/packer/builder/scaleway/version" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/useragent" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/mitchellh/mapstructure" diff --git a/builder/tencentcloud/cvm/builder.go b/builder/tencentcloud/cvm/builder.go index 18e86175b..ecdfde864 100644 --- a/builder/tencentcloud/cvm/builder.go +++ b/builder/tencentcloud/cvm/builder.go @@ -8,11 +8,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/triton/builder.go b/builder/triton/builder.go index 26d1274cd..ca41cb270 100644 --- a/builder/triton/builder.go +++ b/builder/triton/builder.go @@ -6,10 +6,10 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) const ( diff --git a/builder/ucloud/uhost/builder.go b/builder/ucloud/uhost/builder.go index 8d7c7de0d..c2cd520f1 100644 --- a/builder/ucloud/uhost/builder.go +++ b/builder/ucloud/uhost/builder.go @@ -10,11 +10,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vagrant/builder.go b/builder/vagrant/builder.go index 3bc7a1200..82862db07 100644 --- a/builder/vagrant/builder.go +++ b/builder/vagrant/builder.go @@ -15,12 +15,12 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go index e6fd54587..eb21cdc59 100644 --- a/builder/virtualbox/iso/builder.go +++ b/builder/virtualbox/iso/builder.go @@ -11,12 +11,12 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/ovf/config.go b/builder/virtualbox/ovf/config.go index 1851ec94c..d30d408a1 100644 --- a/builder/virtualbox/ovf/config.go +++ b/builder/virtualbox/ovf/config.go @@ -7,11 +7,11 @@ import ( "fmt" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/vm/config.go b/builder/virtualbox/vm/config.go index ce3f71e3d..95a60bce8 100644 --- a/builder/virtualbox/vm/config.go +++ b/builder/virtualbox/vm/config.go @@ -9,11 +9,11 @@ import ( "time" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vmware/common/driver_esx5_test.go b/builder/vmware/common/driver_esx5_test.go index fd17fc73a..84dd2b745 100644 --- a/builder/vmware/common/driver_esx5_test.go +++ b/builder/vmware/common/driver_esx5_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) func TestESX5Driver_implDriver(t *testing.T) { diff --git a/builder/vmware/iso/config.go b/builder/vmware/iso/config.go index 9443394cd..fc6903576 100644 --- a/builder/vmware/iso/config.go +++ b/builder/vmware/iso/config.go @@ -10,12 +10,12 @@ import ( "strings" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vmware/vmx/config.go b/builder/vmware/vmx/config.go index 2d613d138..0be17d7fb 100644 --- a/builder/vmware/vmx/config.go +++ b/builder/vmware/vmx/config.go @@ -8,12 +8,12 @@ import ( "os" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vsphere/clone/config.go b/builder/vsphere/clone/config.go index 3de3be585..ced3d6d44 100644 --- a/builder/vsphere/clone/config.go +++ b/builder/vsphere/clone/config.go @@ -6,10 +6,10 @@ package clone import ( "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" packerCommon "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vsphere/clone/step_customize.go b/builder/vsphere/clone/step_customize.go index e05cb38b4..c5ebecf96 100644 --- a/builder/vsphere/clone/step_customize.go +++ b/builder/vsphere/clone/step_customize.go @@ -9,9 +9,9 @@ import ( "net" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/vmware/govmomi/vim25/types" ) diff --git a/builder/vsphere/iso/config.go b/builder/vsphere/iso/config.go index e3bb7849b..44d2acee1 100644 --- a/builder/vsphere/iso/config.go +++ b/builder/vsphere/iso/config.go @@ -6,10 +6,10 @@ package iso import ( "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" packerCommon "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/yandex/config.go b/builder/yandex/config.go index 25fc61cd6..37e75b60c 100644 --- a/builder/yandex/config.go +++ b/builder/yandex/config.go @@ -11,9 +11,9 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/hcl2template/common_test.go b/hcl2template/common_test.go index 08f4ea10b..ac65ac3e7 100644 --- a/hcl2template/common_test.go +++ b/hcl2template/common_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/hcl/v2/hclparse" "github.com/hashicorp/packer/builder/null" . "github.com/hashicorp/packer/hcl2template/internal" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl2template/internal/mock.go b/hcl2template/internal/mock.go index bf746ed5c..8b1dff62c 100644 --- a/hcl2template/internal/mock.go +++ b/hcl2template/internal/mock.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/json" ) diff --git a/helper/communicator/config.go b/helper/communicator/config.go index dc1e9b23a..0dcc21bbc 100644 --- a/helper/communicator/config.go +++ b/helper/communicator/config.go @@ -13,10 +13,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" helperssh "github.com/hashicorp/packer/helper/communicator/ssh" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" packerssh "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/masterzen/winrm" "golang.org/x/crypto/ssh" diff --git a/packer-plugin-sdk/shell-local/config.go b/packer-plugin-sdk/shell-local/config.go index f8cd434ad..9ee2d614d 100644 --- a/packer-plugin-sdk/shell-local/config.go +++ b/packer-plugin-sdk/shell-local/config.go @@ -10,9 +10,9 @@ import ( "runtime" "strings" - configHelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/shell" + configHelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/helper/config/custom_types.go b/packer-plugin-sdk/template/config/custom_types.go similarity index 100% rename from helper/config/custom_types.go rename to packer-plugin-sdk/template/config/custom_types.go diff --git a/helper/config/custom_types_test.go b/packer-plugin-sdk/template/config/custom_types_test.go similarity index 100% rename from helper/config/custom_types_test.go rename to packer-plugin-sdk/template/config/custom_types_test.go diff --git a/helper/config/decode.go b/packer-plugin-sdk/template/config/decode.go similarity index 100% rename from helper/config/decode.go rename to packer-plugin-sdk/template/config/decode.go diff --git a/helper/config/decode_test.go b/packer-plugin-sdk/template/config/decode_test.go similarity index 100% rename from helper/config/decode_test.go rename to packer-plugin-sdk/template/config/decode_test.go diff --git a/helper/config/deprecated_options.go b/packer-plugin-sdk/template/config/deprecated_options.go similarity index 100% rename from helper/config/deprecated_options.go rename to packer-plugin-sdk/template/config/deprecated_options.go diff --git a/packer/core_test.go b/packer/core_test.go index d60af3472..2c5c70aa7 100644 --- a/packer/core_test.go +++ b/packer/core_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - configHelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer-plugin-sdk/template" + configHelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) func TestCoreBuildNames(t *testing.T) { diff --git a/post-processor/alicloud-import/post-processor.go b/post-processor/alicloud-import/post-processor.go index cc87a221d..f965ad77b 100644 --- a/post-processor/alicloud-import/post-processor.go +++ b/post-processor/alicloud-import/post-processor.go @@ -19,8 +19,8 @@ import ( "github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/hashicorp/hcl/v2/hcldec" packerecs "github.com/hashicorp/packer/builder/alicloud/ecs" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/amazon-import/post-processor.go b/post-processor/amazon-import/post-processor.go index a97d8501c..df4062c6a 100644 --- a/post-processor/amazon-import/post-processor.go +++ b/post-processor/amazon-import/post-processor.go @@ -16,10 +16,10 @@ import ( "github.com/aws/aws-sdk-go/service/s3/s3manager" "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/retry" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/artifice/post-processor.go b/post-processor/artifice/post-processor.go index 2131d2c01..104d144fe 100644 --- a/post-processor/artifice/post-processor.go +++ b/post-processor/artifice/post-processor.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/checksum/post-processor.go b/post-processor/checksum/post-processor.go index c2cc5b080..5d0a9c2b5 100644 --- a/post-processor/checksum/post-processor.go +++ b/post-processor/checksum/post-processor.go @@ -15,9 +15,9 @@ import ( "path/filepath" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/compress/post-processor.go b/post-processor/compress/post-processor.go index fb37aeceb..0864a5dff 100644 --- a/post-processor/compress/post-processor.go +++ b/post-processor/compress/post-processor.go @@ -15,9 +15,9 @@ import ( "github.com/biogo/hts/bgzf" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/klauspost/pgzip" "github.com/pierrec/lz4" diff --git a/post-processor/digitalocean-import/post-processor.go b/post-processor/digitalocean-import/post-processor.go index 5914de3f0..fe652ecf1 100644 --- a/post-processor/digitalocean-import/post-processor.go +++ b/post-processor/digitalocean-import/post-processor.go @@ -21,9 +21,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/digitalocean" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/docker-import/post-processor.go b/post-processor/docker-import/post-processor.go index a0562395a..7cde7c926 100644 --- a/post-processor/docker-import/post-processor.go +++ b/post-processor/docker-import/post-processor.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/docker" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" ) diff --git a/post-processor/docker-push/post-processor.go b/post-processor/docker-push/post-processor.go index 6683aa299..facce79b5 100644 --- a/post-processor/docker-push/post-processor.go +++ b/post-processor/docker-push/post-processor.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/docker" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" dockertag "github.com/hashicorp/packer/post-processor/docker-tag" diff --git a/post-processor/docker-save/post-processor.go b/post-processor/docker-save/post-processor.go index 1cbe7e5f0..bfa44d065 100644 --- a/post-processor/docker-save/post-processor.go +++ b/post-processor/docker-save/post-processor.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/docker" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" dockertag "github.com/hashicorp/packer/post-processor/docker-tag" diff --git a/post-processor/docker-tag/post-processor.go b/post-processor/docker-tag/post-processor.go index c8cd44608..254e63859 100644 --- a/post-processor/docker-tag/post-processor.go +++ b/post-processor/docker-tag/post-processor.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/docker" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" ) diff --git a/post-processor/exoscale-import/post-processor.go b/post-processor/exoscale-import/post-processor.go index 14f5aa23b..685ef903f 100644 --- a/post-processor/exoscale-import/post-processor.go +++ b/post-processor/exoscale-import/post-processor.go @@ -20,9 +20,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/builder/qemu" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/post-processor/artifice" "github.com/hashicorp/packer/post-processor/exoscale-import/version" ) diff --git a/post-processor/googlecompute-export/post-processor.go b/post-processor/googlecompute-export/post-processor.go index 3f8b6071a..f3bcc684a 100644 --- a/post-processor/googlecompute-export/post-processor.go +++ b/post-processor/googlecompute-export/post-processor.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/googlecompute" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" ) diff --git a/post-processor/googlecompute-import/post-processor.go b/post-processor/googlecompute-import/post-processor.go index c86ddbac3..ee10949ba 100644 --- a/post-processor/googlecompute-import/post-processor.go +++ b/post-processor/googlecompute-import/post-processor.go @@ -16,9 +16,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/googlecompute" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" "github.com/hashicorp/packer/post-processor/compress" diff --git a/post-processor/manifest/post-processor.go b/post-processor/manifest/post-processor.go index 0ee7cdb68..26e9ac191 100644 --- a/post-processor/manifest/post-processor.go +++ b/post-processor/manifest/post-processor.go @@ -14,9 +14,9 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/ucloud-import/post-processor.go b/post-processor/ucloud-import/post-processor.go index 22fabbbf5..1296f326d 100644 --- a/post-processor/ucloud-import/post-processor.go +++ b/post-processor/ucloud-import/post-processor.go @@ -13,10 +13,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/retry" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/ucloud/ucloud-sdk-go/services/ufile" "github.com/ucloud/ucloud-sdk-go/services/uhost" diff --git a/post-processor/vagrant-cloud/post-processor.go b/post-processor/vagrant-cloud/post-processor.go index dfc74e8ad..602393620 100644 --- a/post-processor/vagrant-cloud/post-processor.go +++ b/post-processor/vagrant-cloud/post-processor.go @@ -19,11 +19,11 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go index 79fd37473..06f546523 100644 --- a/post-processor/vagrant/post-processor.go +++ b/post-processor/vagrant/post-processor.go @@ -16,9 +16,9 @@ import ( "text/template" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/hashicorp/packer/post-processor/artifice" diff --git a/post-processor/vsphere-template/post-processor.go b/post-processor/vsphere-template/post-processor.go index 437a90dfb..2d3fc18b4 100644 --- a/post-processor/vsphere-template/post-processor.go +++ b/post-processor/vsphere-template/post-processor.go @@ -13,11 +13,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" vsphere "github.com/hashicorp/packer/builder/vsphere/common" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" vspherepost "github.com/hashicorp/packer/post-processor/vsphere" diff --git a/post-processor/vsphere-template/step_mark_as_template.go b/post-processor/vsphere-template/step_mark_as_template.go index 664b60e9b..e4af31f83 100644 --- a/post-processor/vsphere-template/step_mark_as_template.go +++ b/post-processor/vsphere-template/step_mark_as_template.go @@ -7,9 +7,9 @@ import ( "regexp" "strings" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/post-processor/vsphere" "github.com/vmware/govmomi" "github.com/vmware/govmomi/object" diff --git a/post-processor/vsphere/post-processor.go b/post-processor/vsphere/post-processor.go index f9661076c..ba3645db5 100644 --- a/post-processor/vsphere/post-processor.go +++ b/post-processor/vsphere/post-processor.go @@ -15,10 +15,10 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" shelllocal "github.com/hashicorp/packer/packer-plugin-sdk/shell-local" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/yandex-export/post-processor.go b/post-processor/yandex-export/post-processor.go index 0586f6009..8c48da450 100644 --- a/post-processor/yandex-export/post-processor.go +++ b/post-processor/yandex-export/post-processor.go @@ -13,12 +13,12 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/yandex" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" ) diff --git a/post-processor/yandex-import/post-processor.go b/post-processor/yandex-import/post-processor.go index fa6f8ab2f..8800e2381 100644 --- a/post-processor/yandex-import/post-processor.go +++ b/post-processor/yandex-import/post-processor.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/builder/yandex" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" "github.com/hashicorp/packer/post-processor/compress" diff --git a/provisioner/ansible-local/provisioner.go b/provisioner/ansible-local/provisioner.go index 96dfc3593..96f9cf0be 100644 --- a/provisioner/ansible-local/provisioner.go +++ b/provisioner/ansible-local/provisioner.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go index 3cf28ce8a..63de5f4df 100644 --- a/provisioner/ansible/provisioner.go +++ b/provisioner/ansible/provisioner.go @@ -30,11 +30,11 @@ import ( "golang.org/x/crypto/ssh" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/adapter" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/provisioner/ansible/provisioner_test.go b/provisioner/ansible/provisioner_test.go index 076ebd2c9..b73e5c543 100644 --- a/provisioner/ansible/provisioner_test.go +++ b/provisioner/ansible/provisioner_test.go @@ -14,9 +14,9 @@ import ( "strings" "testing" - confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/azure-dtlartifact/provisioner.go b/provisioner/azure-dtlartifact/provisioner.go index 034d29ee6..68e83ed79 100644 --- a/provisioner/azure-dtlartifact/provisioner.go +++ b/provisioner/azure-dtlartifact/provisioner.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/breakpoint/provisioner.go b/provisioner/breakpoint/provisioner.go index 8fa9b1e11..b1fb64611 100644 --- a/provisioner/breakpoint/provisioner.go +++ b/provisioner/breakpoint/provisioner.go @@ -9,9 +9,9 @@ import ( "golang.org/x/sync/errgroup" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/chef-client/provisioner.go b/provisioner/chef-client/provisioner.go index 22b9bd363..feef39f9e 100644 --- a/provisioner/chef-client/provisioner.go +++ b/provisioner/chef-client/provisioner.go @@ -16,10 +16,10 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/provisioner/chef-solo/provisioner.go b/provisioner/chef-solo/provisioner.go index d9faa035c..07bf75432 100644 --- a/provisioner/chef-solo/provisioner.go +++ b/provisioner/chef-solo/provisioner.go @@ -16,10 +16,10 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/converge/provisioner.go b/provisioner/converge/provisioner.go index 1a60d2715..a34323cdf 100644 --- a/provisioner/converge/provisioner.go +++ b/provisioner/converge/provisioner.go @@ -16,9 +16,9 @@ import ( "encoding/json" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/file/provisioner.go b/provisioner/file/provisioner.go index 0715797e4..abf6e0ad4 100644 --- a/provisioner/file/provisioner.go +++ b/provisioner/file/provisioner.go @@ -13,9 +13,9 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/inspec/provisioner.go b/provisioner/inspec/provisioner.go index 1d8ab0606..fdf13cc5a 100644 --- a/provisioner/inspec/provisioner.go +++ b/provisioner/inspec/provisioner.go @@ -28,10 +28,10 @@ import ( "golang.org/x/crypto/ssh" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/adapter" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go index cb7d03da5..2f44644e1 100644 --- a/provisioner/powershell/provisioner.go +++ b/provisioner/powershell/provisioner.go @@ -17,12 +17,12 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/shell" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" diff --git a/provisioner/puppet-masterless/provisioner.go b/provisioner/puppet-masterless/provisioner.go index 6fc71e93f..a851aa7e2 100644 --- a/provisioner/puppet-masterless/provisioner.go +++ b/provisioner/puppet-masterless/provisioner.go @@ -13,10 +13,10 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/puppet-server/provisioner.go b/provisioner/puppet-server/provisioner.go index 070990926..e652e3c5b 100644 --- a/provisioner/puppet-server/provisioner.go +++ b/provisioner/puppet-server/provisioner.go @@ -12,10 +12,10 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go index 64a850d6a..743f1fe8f 100644 --- a/provisioner/salt-masterless/provisioner.go +++ b/provisioner/salt-masterless/provisioner.go @@ -16,10 +16,10 @@ import ( "github.com/hashicorp/go-getter/v2" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go index 826d0f99f..4d6cd376f 100644 --- a/provisioner/shell/provisioner.go +++ b/provisioner/shell/provisioner.go @@ -18,11 +18,11 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/shell" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/provisioner/sleep/provisioner.go b/provisioner/sleep/provisioner.go index f3414c961..e530e4761 100644 --- a/provisioner/sleep/provisioner.go +++ b/provisioner/sleep/provisioner.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type Provisioner struct { diff --git a/provisioner/windows-restart/provisioner.go b/provisioner/windows-restart/provisioner.go index b33ba29c4..a14603b63 100644 --- a/provisioner/windows-restart/provisioner.go +++ b/provisioner/windows-restart/provisioner.go @@ -14,10 +14,10 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/retry" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/masterzen/winrm" ) diff --git a/provisioner/windows-shell/provisioner.go b/provisioner/windows-shell/provisioner.go index 28b633e69..25db70ef2 100644 --- a/provisioner/windows-shell/provisioner.go +++ b/provisioner/windows-shell/provisioner.go @@ -16,11 +16,11 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/shell" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) From f8f1ebf0c7c0e092fd417a5431d68897516504ca Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 18 Nov 2020 11:40:06 -0800 Subject: [PATCH 87/93] move version and useragent definitions into sdk --- Makefile | 2 +- builder/alicloud/version/version.go | 2 +- builder/amazon/version/version.go | 2 +- builder/azure/arm/azure_client.go | 2 +- builder/azure/common/client/azure_client_set.go | 2 +- builder/azure/common/client/devicelogin.go | 2 +- builder/azure/dtl/azure_client.go | 2 +- builder/azure/version/version.go | 2 +- builder/cloudstack/version/version.go | 2 +- builder/digitalocean/version/version.go | 2 +- builder/docker/version/version.go | 2 +- builder/file/version/version.go | 2 +- builder/googlecompute/driver_gce.go | 2 +- builder/googlecompute/version/version.go | 2 +- builder/hcloud/version/version.go | 2 +- builder/hyperone/version/version.go | 2 +- builder/hyperv/version/version.go | 2 +- builder/jdcloud/version/version.go | 2 +- builder/linode/version/version.go | 2 +- builder/lxc/version/version.go | 2 +- builder/lxd/version/version.go | 2 +- builder/ncloud/version/version.go | 2 +- builder/null/version/version.go | 2 +- builder/oneandone/version/version.go | 2 +- builder/openstack/version/version.go | 2 +- builder/oracle/version/version.go | 2 +- builder/osc/version/version.go | 2 +- builder/parallels/version/version.go | 2 +- builder/profitbricks/version/version.go | 2 +- builder/proxmox/version/version.go | 2 +- builder/qemu/version/version.go | 2 +- builder/scaleway/config.go | 2 +- builder/scaleway/version/version.go | 2 +- builder/tencentcloud/version/version.go | 2 +- builder/triton/version/version.go | 2 +- builder/ucloud/version/version.go | 2 +- builder/vagrant/version/version.go | 2 +- builder/virtualbox/version/version.go | 2 +- builder/vmware/version/version.go | 2 +- builder/vsphere/version/version.go | 2 +- builder/yandex/driver_yc.go | 2 +- builder/yandex/version/version.go | 2 +- cmd/generate-fixer-deprecations/main.go | 4 ++-- cmd/mapstructure-to-hcl2/mapstructure-to-hcl2.go | 2 +- {helper => packer-plugin-sdk}/useragent/useragent.go | 0 {helper => packer-plugin-sdk}/useragent/useragent_test.go | 0 {helper => packer-plugin-sdk}/version/version.go | 0 post-processor/alicloud-import/version/version.go | 2 +- post-processor/amazon-import/version/version.go | 2 +- post-processor/artifice/version/version.go | 2 +- post-processor/checksum/version/version.go | 2 +- post-processor/compress/version/version.go | 2 +- post-processor/digitalocean-import/version/version.go | 2 +- post-processor/docker-import/version/version.go | 2 +- post-processor/docker-push/version/version.go | 2 +- post-processor/docker-save/version/version.go | 2 +- post-processor/docker-tag/version/version.go | 2 +- post-processor/exoscale-import/version/version.go | 2 +- post-processor/googlecompute-export/version/version.go | 2 +- post-processor/googlecompute-import/version/version.go | 2 +- post-processor/manifest/version/version.go | 2 +- post-processor/shell-local/version/version.go | 2 +- post-processor/ucloud-import/version/version.go | 2 +- post-processor/vagrant-cloud/version/version.go | 2 +- post-processor/vagrant/version/version.go | 2 +- post-processor/vsphere-template/version/version.go | 2 +- post-processor/vsphere/version/version.go | 2 +- post-processor/yandex-export/version/version.go | 2 +- post-processor/yandex-import/version/version.go | 2 +- provisioner/ansible-local/version/version.go | 2 +- provisioner/ansible/version/version.go | 2 +- provisioner/azure-dtlartifact/version/version.go | 2 +- provisioner/breakpoint/version/version.go | 2 +- provisioner/chef-client/version/version.go | 2 +- provisioner/chef-solo/version/version.go | 2 +- provisioner/converge/version/version.go | 2 +- provisioner/file/version/version.go | 2 +- provisioner/inspec/version/version.go | 2 +- provisioner/powershell/version/version.go | 2 +- provisioner/puppet-masterless/version/version.go | 2 +- provisioner/puppet-server/version/version.go | 2 +- provisioner/salt-masterless/version/version.go | 2 +- provisioner/shell-local/version/version.go | 2 +- provisioner/shell/version/version.go | 2 +- provisioner/sleep/version/version.go | 2 +- provisioner/windows-restart/version/version.go | 2 +- provisioner/windows-shell/version/version.go | 2 +- version/version.go | 2 +- 88 files changed, 86 insertions(+), 86 deletions(-) rename {helper => packer-plugin-sdk}/useragent/useragent.go (100%) rename {helper => packer-plugin-sdk}/useragent/useragent_test.go (100%) rename {helper => packer-plugin-sdk}/version/version.go (100%) diff --git a/Makefile b/Makefile index f4d375843..3a50eaf44 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,7 @@ generate: install-gen-deps ## Generate dynamically generated code @echo "==> removing autogenerated markdown..." @find website/pages/ -type f | xargs grep -l '^ -- `communicator` (string) - Communicator - - `guest_additions_mode` (string) - The method by which guest additions are made available to the guest for installation. Valid options are `upload`, `attach`, or `disable`. If the mode is `attach` the guest additions ISO will diff --git a/website/pages/partials/builder/virtualbox/common/VBoxVersionConfig-not-required.mdx b/website/pages/partials/builder/virtualbox/common/VBoxVersionConfig-not-required.mdx index 69c87362c..0744b932f 100644 --- a/website/pages/partials/builder/virtualbox/common/VBoxVersionConfig-not-required.mdx +++ b/website/pages/partials/builder/virtualbox/common/VBoxVersionConfig-not-required.mdx @@ -1,7 +1,5 @@ -- `communicator` (string) - Communicator - - `virtualbox_version_file` (\*string) - The path within the virtual machine to upload a file that contains the VirtualBox version that was used to create the machine. This information can be useful for provisioning. By default From ea1ac530b03f26ca99d3c82de7860f6961f35815 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 18 Nov 2020 15:46:42 -0800 Subject: [PATCH 89/93] move hcl2template kv types into the config/custom_types with trilean definitions --- builder/alicloud/ecs/builder.hcl2spec.go | 210 +++++++++--------- builder/alicloud/ecs/image_config.go | 3 +- builder/amazon/chroot/builder.go | 3 +- builder/amazon/chroot/builder.hcl2spec.go | 14 +- builder/amazon/common/ami_config.go | 5 +- builder/amazon/common/run_config.go | 22 +- builder/amazon/common/run_config.hcl2spec.go | 34 +-- builder/amazon/common/run_config_test.go | 4 +- builder/amazon/ebs/builder.go | 3 +- builder/amazon/ebs/builder.hcl2spec.go | 22 +- builder/amazon/ebssurrogate/builder.go | 3 +- .../amazon/ebssurrogate/builder.hcl2spec.go | 22 +- builder/amazon/ebsvolume/block_device.go | 4 +- builder/amazon/ebsvolume/builder.go | 3 +- builder/amazon/ebsvolume/builder.hcl2spec.go | 40 ++-- builder/amazon/instance/builder.hcl2spec.go | 18 +- builder/azure/arm/config.go | 3 +- builder/azure/arm/config.hcl2spec.go | 6 +- builder/azure/arm/config_test.go | 6 +- builder/hyperone/config.go | 5 +- builder/hyperone/config.hcl2spec.go | 192 ++++++++-------- builder/osc/common/run_config.go | 18 +- builder/osc/common/run_config.hcl2spec.go | 34 +-- builder/osc/common/run_config_test.go | 6 +- builder/tencentcloud/cvm/builder.hcl2spec.go | 194 ++++++++-------- builder/tencentcloud/cvm/run_config.go | 4 +- builder/triton/config.hcl2spec.go | 166 +++++++------- builder/triton/source_machine_config.go | 4 +- builder/triton/target_image_config.go | 4 +- cmd/struct-markdown/main.go | 4 +- hcl2template/types.kv.go | 71 ------ .../template/config/custom_types.go | 70 ++++++ .../template/config/custom_types.hcl2spec.go | 2 +- .../post-processor.hcl2spec.go | 6 +- 34 files changed, 598 insertions(+), 607 deletions(-) delete mode 100644 hcl2template/types.kv.go rename hcl2template/types.kv.hcl2spec.go => packer-plugin-sdk/template/config/custom_types.hcl2spec.go (99%) diff --git a/builder/alicloud/ecs/builder.hcl2spec.go b/builder/alicloud/ecs/builder.hcl2spec.go index 862ed5ddf..86546392c 100644 --- a/builder/alicloud/ecs/builder.hcl2spec.go +++ b/builder/alicloud/ecs/builder.hcl2spec.go @@ -3,7 +3,7 @@ package ecs import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) @@ -47,109 +47,109 @@ func (*FlatAlicloudDiskDevice) HCL2Spec() map[string]hcldec.Spec { // FlatConfig is an auto-generated flat version of Config. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatConfig struct { - PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` - PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` - PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` - PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` - PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` - PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` - PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"` - PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"` - AlicloudAccessKey *string `mapstructure:"access_key" required:"true" cty:"access_key" hcl:"access_key"` - AlicloudSecretKey *string `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"` - AlicloudRegion *string `mapstructure:"region" required:"true" cty:"region" hcl:"region"` - AlicloudSkipValidation *bool `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"` - AlicloudSkipImageValidation *bool `mapstructure:"skip_image_validation" required:"false" cty:"skip_image_validation" hcl:"skip_image_validation"` - AlicloudProfile *string `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"` - AlicloudSharedCredentialsFile *string `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file" hcl:"shared_credentials_file"` - SecurityToken *string `mapstructure:"security_token" required:"false" cty:"security_token" hcl:"security_token"` - AlicloudImageName *string `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"` - AlicloudImageVersion *string `mapstructure:"image_version" required:"false" cty:"image_version" hcl:"image_version"` - AlicloudImageDescription *string `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"` - AlicloudImageShareAccounts []string `mapstructure:"image_share_account" required:"false" cty:"image_share_account" hcl:"image_share_account"` - AlicloudImageUNShareAccounts []string `mapstructure:"image_unshare_account" cty:"image_unshare_account" hcl:"image_unshare_account"` - AlicloudImageDestinationRegions []string `mapstructure:"image_copy_regions" required:"false" cty:"image_copy_regions" hcl:"image_copy_regions"` - AlicloudImageDestinationNames []string `mapstructure:"image_copy_names" required:"false" cty:"image_copy_names" hcl:"image_copy_names"` - ImageEncrypted *bool `mapstructure:"image_encrypted" required:"false" cty:"image_encrypted" hcl:"image_encrypted"` - AlicloudImageForceDelete *bool `mapstructure:"image_force_delete" required:"false" cty:"image_force_delete" hcl:"image_force_delete"` - AlicloudImageForceDeleteSnapshots *bool `mapstructure:"image_force_delete_snapshots" required:"false" cty:"image_force_delete_snapshots" hcl:"image_force_delete_snapshots"` - AlicloudImageForceDeleteInstances *bool `mapstructure:"image_force_delete_instances" cty:"image_force_delete_instances" hcl:"image_force_delete_instances"` - AlicloudImageIgnoreDataDisks *bool `mapstructure:"image_ignore_data_disks" required:"false" cty:"image_ignore_data_disks" hcl:"image_ignore_data_disks"` - AlicloudImageTags map[string]string `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"` - AlicloudImageTag []hcl2template.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` - ECSSystemDiskMapping *FlatAlicloudDiskDevice `mapstructure:"system_disk_mapping" required:"false" cty:"system_disk_mapping" hcl:"system_disk_mapping"` - ECSImagesDiskMappings []FlatAlicloudDiskDevice `mapstructure:"image_disk_mappings" required:"false" cty:"image_disk_mappings" hcl:"image_disk_mappings"` - AssociatePublicIpAddress *bool `mapstructure:"associate_public_ip_address" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"` - ZoneId *string `mapstructure:"zone_id" required:"false" cty:"zone_id" hcl:"zone_id"` - IOOptimized *bool `mapstructure:"io_optimized" required:"false" cty:"io_optimized" hcl:"io_optimized"` - InstanceType *string `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"` - Description *string `mapstructure:"description" cty:"description" hcl:"description"` - AlicloudSourceImage *string `mapstructure:"source_image" required:"true" cty:"source_image" hcl:"source_image"` - ForceStopInstance *bool `mapstructure:"force_stop_instance" required:"false" cty:"force_stop_instance" hcl:"force_stop_instance"` - DisableStopInstance *bool `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance" hcl:"disable_stop_instance"` - SecurityGroupId *string `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"` - SecurityGroupName *string `mapstructure:"security_group_name" required:"false" cty:"security_group_name" hcl:"security_group_name"` - UserData *string `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"` - UserDataFile *string `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"` - VpcId *string `mapstructure:"vpc_id" required:"false" cty:"vpc_id" hcl:"vpc_id"` - VpcName *string `mapstructure:"vpc_name" required:"false" cty:"vpc_name" hcl:"vpc_name"` - CidrBlock *string `mapstructure:"vpc_cidr_block" required:"false" cty:"vpc_cidr_block" hcl:"vpc_cidr_block"` - VSwitchId *string `mapstructure:"vswitch_id" required:"false" cty:"vswitch_id" hcl:"vswitch_id"` - VSwitchName *string `mapstructure:"vswitch_name" required:"false" cty:"vswitch_name" hcl:"vswitch_name"` - InstanceName *string `mapstructure:"instance_name" required:"false" cty:"instance_name" hcl:"instance_name"` - InternetChargeType *string `mapstructure:"internet_charge_type" required:"false" cty:"internet_charge_type" hcl:"internet_charge_type"` - InternetMaxBandwidthOut *int `mapstructure:"internet_max_bandwidth_out" required:"false" cty:"internet_max_bandwidth_out" hcl:"internet_max_bandwidth_out"` - WaitSnapshotReadyTimeout *int `mapstructure:"wait_snapshot_ready_timeout" required:"false" cty:"wait_snapshot_ready_timeout" hcl:"wait_snapshot_ready_timeout"` - Type *string `mapstructure:"communicator" cty:"communicator" hcl:"communicator"` - PauseBeforeConnect *string `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"` - SSHHost *string `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"` - SSHPort *int `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"` - SSHUsername *string `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"` - SSHPassword *string `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"` - SSHKeyPairName *string `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"` - SSHTemporaryKeyPairName *string `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"` - SSHTemporaryKeyPairType *string `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"` - SSHTemporaryKeyPairBits *int `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"` - SSHCiphers []string `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"` - SSHClearAuthorizedKeys *bool `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"` - SSHKEXAlgos []string `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"` - SSHPrivateKeyFile *string `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"` - SSHCertificateFile *string `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"` - SSHPty *bool `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"` - SSHTimeout *string `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"` - SSHWaitTimeout *string `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"` - SSHAgentAuth *bool `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"` - SSHDisableAgentForwarding *bool `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"` - SSHHandshakeAttempts *int `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"` - SSHBastionHost *string `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"` - SSHBastionPort *int `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"` - SSHBastionAgentAuth *bool `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"` - SSHBastionUsername *string `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"` - SSHBastionPassword *string `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"` - SSHBastionInteractive *bool `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"` - SSHBastionPrivateKeyFile *string `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"` - SSHBastionCertificateFile *string `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"` - SSHFileTransferMethod *string `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"` - SSHProxyHost *string `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"` - SSHProxyPort *int `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"` - SSHProxyUsername *string `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"` - SSHProxyPassword *string `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"` - SSHKeepAliveInterval *string `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"` - SSHReadWriteTimeout *string `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"` - SSHRemoteTunnels []string `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"` - SSHLocalTunnels []string `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"` - SSHPublicKey []byte `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"` - SSHPrivateKey []byte `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"` - WinRMUser *string `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"` - WinRMPassword *string `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"` - WinRMHost *string `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"` - WinRMNoProxy *bool `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"` - WinRMPort *int `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"` - WinRMTimeout *string `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"` - WinRMUseSSL *bool `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"` - WinRMInsecure *bool `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"` - WinRMUseNTLM *bool `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"` - SSHPrivateIp *bool `mapstructure:"ssh_private_ip" required:"false" cty:"ssh_private_ip" hcl:"ssh_private_ip"` + PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` + PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` + PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` + PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` + PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` + PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"` + PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"` + AlicloudAccessKey *string `mapstructure:"access_key" required:"true" cty:"access_key" hcl:"access_key"` + AlicloudSecretKey *string `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"` + AlicloudRegion *string `mapstructure:"region" required:"true" cty:"region" hcl:"region"` + AlicloudSkipValidation *bool `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"` + AlicloudSkipImageValidation *bool `mapstructure:"skip_image_validation" required:"false" cty:"skip_image_validation" hcl:"skip_image_validation"` + AlicloudProfile *string `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"` + AlicloudSharedCredentialsFile *string `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file" hcl:"shared_credentials_file"` + SecurityToken *string `mapstructure:"security_token" required:"false" cty:"security_token" hcl:"security_token"` + AlicloudImageName *string `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"` + AlicloudImageVersion *string `mapstructure:"image_version" required:"false" cty:"image_version" hcl:"image_version"` + AlicloudImageDescription *string `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"` + AlicloudImageShareAccounts []string `mapstructure:"image_share_account" required:"false" cty:"image_share_account" hcl:"image_share_account"` + AlicloudImageUNShareAccounts []string `mapstructure:"image_unshare_account" cty:"image_unshare_account" hcl:"image_unshare_account"` + AlicloudImageDestinationRegions []string `mapstructure:"image_copy_regions" required:"false" cty:"image_copy_regions" hcl:"image_copy_regions"` + AlicloudImageDestinationNames []string `mapstructure:"image_copy_names" required:"false" cty:"image_copy_names" hcl:"image_copy_names"` + ImageEncrypted *bool `mapstructure:"image_encrypted" required:"false" cty:"image_encrypted" hcl:"image_encrypted"` + AlicloudImageForceDelete *bool `mapstructure:"image_force_delete" required:"false" cty:"image_force_delete" hcl:"image_force_delete"` + AlicloudImageForceDeleteSnapshots *bool `mapstructure:"image_force_delete_snapshots" required:"false" cty:"image_force_delete_snapshots" hcl:"image_force_delete_snapshots"` + AlicloudImageForceDeleteInstances *bool `mapstructure:"image_force_delete_instances" cty:"image_force_delete_instances" hcl:"image_force_delete_instances"` + AlicloudImageIgnoreDataDisks *bool `mapstructure:"image_ignore_data_disks" required:"false" cty:"image_ignore_data_disks" hcl:"image_ignore_data_disks"` + AlicloudImageTags map[string]string `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"` + AlicloudImageTag []config.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` + ECSSystemDiskMapping *FlatAlicloudDiskDevice `mapstructure:"system_disk_mapping" required:"false" cty:"system_disk_mapping" hcl:"system_disk_mapping"` + ECSImagesDiskMappings []FlatAlicloudDiskDevice `mapstructure:"image_disk_mappings" required:"false" cty:"image_disk_mappings" hcl:"image_disk_mappings"` + AssociatePublicIpAddress *bool `mapstructure:"associate_public_ip_address" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"` + ZoneId *string `mapstructure:"zone_id" required:"false" cty:"zone_id" hcl:"zone_id"` + IOOptimized *bool `mapstructure:"io_optimized" required:"false" cty:"io_optimized" hcl:"io_optimized"` + InstanceType *string `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"` + Description *string `mapstructure:"description" cty:"description" hcl:"description"` + AlicloudSourceImage *string `mapstructure:"source_image" required:"true" cty:"source_image" hcl:"source_image"` + ForceStopInstance *bool `mapstructure:"force_stop_instance" required:"false" cty:"force_stop_instance" hcl:"force_stop_instance"` + DisableStopInstance *bool `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance" hcl:"disable_stop_instance"` + SecurityGroupId *string `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"` + SecurityGroupName *string `mapstructure:"security_group_name" required:"false" cty:"security_group_name" hcl:"security_group_name"` + UserData *string `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"` + UserDataFile *string `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"` + VpcId *string `mapstructure:"vpc_id" required:"false" cty:"vpc_id" hcl:"vpc_id"` + VpcName *string `mapstructure:"vpc_name" required:"false" cty:"vpc_name" hcl:"vpc_name"` + CidrBlock *string `mapstructure:"vpc_cidr_block" required:"false" cty:"vpc_cidr_block" hcl:"vpc_cidr_block"` + VSwitchId *string `mapstructure:"vswitch_id" required:"false" cty:"vswitch_id" hcl:"vswitch_id"` + VSwitchName *string `mapstructure:"vswitch_name" required:"false" cty:"vswitch_name" hcl:"vswitch_name"` + InstanceName *string `mapstructure:"instance_name" required:"false" cty:"instance_name" hcl:"instance_name"` + InternetChargeType *string `mapstructure:"internet_charge_type" required:"false" cty:"internet_charge_type" hcl:"internet_charge_type"` + InternetMaxBandwidthOut *int `mapstructure:"internet_max_bandwidth_out" required:"false" cty:"internet_max_bandwidth_out" hcl:"internet_max_bandwidth_out"` + WaitSnapshotReadyTimeout *int `mapstructure:"wait_snapshot_ready_timeout" required:"false" cty:"wait_snapshot_ready_timeout" hcl:"wait_snapshot_ready_timeout"` + Type *string `mapstructure:"communicator" cty:"communicator" hcl:"communicator"` + PauseBeforeConnect *string `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"` + SSHHost *string `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"` + SSHPort *int `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"` + SSHUsername *string `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"` + SSHPassword *string `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"` + SSHKeyPairName *string `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"` + SSHTemporaryKeyPairName *string `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"` + SSHTemporaryKeyPairType *string `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"` + SSHTemporaryKeyPairBits *int `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"` + SSHCiphers []string `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"` + SSHClearAuthorizedKeys *bool `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"` + SSHKEXAlgos []string `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"` + SSHPrivateKeyFile *string `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"` + SSHCertificateFile *string `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"` + SSHPty *bool `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"` + SSHTimeout *string `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"` + SSHWaitTimeout *string `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"` + SSHAgentAuth *bool `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"` + SSHDisableAgentForwarding *bool `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"` + SSHHandshakeAttempts *int `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"` + SSHBastionHost *string `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"` + SSHBastionPort *int `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"` + SSHBastionAgentAuth *bool `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"` + SSHBastionUsername *string `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"` + SSHBastionPassword *string `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"` + SSHBastionInteractive *bool `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"` + SSHBastionPrivateKeyFile *string `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"` + SSHBastionCertificateFile *string `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"` + SSHFileTransferMethod *string `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"` + SSHProxyHost *string `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"` + SSHProxyPort *int `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"` + SSHProxyUsername *string `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"` + SSHProxyPassword *string `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"` + SSHKeepAliveInterval *string `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"` + SSHReadWriteTimeout *string `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"` + SSHRemoteTunnels []string `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"` + SSHLocalTunnels []string `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"` + SSHPublicKey []byte `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"` + SSHPrivateKey []byte `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"` + WinRMUser *string `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"` + WinRMPassword *string `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"` + WinRMHost *string `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"` + WinRMNoProxy *bool `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"` + WinRMPort *int `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"` + WinRMTimeout *string `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"` + WinRMUseSSL *bool `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"` + WinRMInsecure *bool `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"` + WinRMUseNTLM *bool `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"` + SSHPrivateIp *bool `mapstructure:"ssh_private_ip" required:"false" cty:"ssh_private_ip" hcl:"ssh_private_ip"` } // FlatMapstructure returns a new FlatConfig. @@ -193,7 +193,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "image_force_delete_instances": &hcldec.AttrSpec{Name: "image_force_delete_instances", Type: cty.Bool, Required: false}, "image_ignore_data_disks": &hcldec.AttrSpec{Name: "image_ignore_data_disks", Type: cty.Bool, Required: false}, "tags": &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false}, - "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "system_disk_mapping": &hcldec.BlockSpec{TypeName: "system_disk_mapping", Nested: hcldec.ObjectSpec((*FlatAlicloudDiskDevice)(nil).HCL2Spec())}, "image_disk_mappings": &hcldec.BlockListSpec{TypeName: "image_disk_mappings", Nested: hcldec.ObjectSpec((*FlatAlicloudDiskDevice)(nil).HCL2Spec())}, "associate_public_ip_address": &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false}, diff --git a/builder/alicloud/ecs/image_config.go b/builder/alicloud/ecs/image_config.go index 37eb06ce5..77d7547f9 100644 --- a/builder/alicloud/ecs/image_config.go +++ b/builder/alicloud/ecs/image_config.go @@ -7,7 +7,6 @@ import ( "regexp" "strings" - "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) @@ -156,7 +155,7 @@ type AlicloudImageConfig struct { // containing a `key` and a `value` field. In HCL2 mode the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - AlicloudImageTag hcl2template.KeyValues `mapstructure:"tag" required:"false"` + AlicloudImageTag config.KeyValues `mapstructure:"tag" required:"false"` AlicloudDiskDevices `mapstructure:",squash"` } diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index 43cbd64ce..a6c750aca 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -15,7 +15,6 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/chroot" "github.com/hashicorp/packer/packer-plugin-sdk/common" @@ -169,7 +168,7 @@ type Config struct { // singular block containing a `key` and a `value` field. In HCL2 mode the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - RootVolumeTag hcl2template.KeyValues `mapstructure:"root_volume_tag" required:"false"` + RootVolumeTag config.KeyValues `mapstructure:"root_volume_tag" required:"false"` // what architecture to use when registering the final AMI; valid options // are "x86_64" or "arm64". Defaults to "x86_64". Architecture string `mapstructure:"ami_architecture" required:"false"` diff --git a/builder/amazon/chroot/builder.hcl2spec.go b/builder/amazon/chroot/builder.hcl2spec.go index 48b480da0..572ec8a2d 100644 --- a/builder/amazon/chroot/builder.hcl2spec.go +++ b/builder/amazon/chroot/builder.hcl2spec.go @@ -4,7 +4,7 @@ package chroot import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) @@ -28,7 +28,7 @@ type FlatConfig struct { AMIRegions []string `mapstructure:"ami_regions" required:"false" cty:"ami_regions" hcl:"ami_regions"` AMISkipRegionValidation *bool `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"` AMITags map[string]string `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"` - AMITag []hcl2template.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` + AMITag []config.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` AMIENASupport *bool `mapstructure:"ena_support" required:"false" cty:"ena_support" hcl:"ena_support"` AMISriovNetSupport *bool `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"` AMIForceDeregister *bool `mapstructure:"force_deregister" required:"false" cty:"force_deregister" hcl:"force_deregister"` @@ -38,7 +38,7 @@ type FlatConfig struct { AMIRegionKMSKeyIDs map[string]string `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids" hcl:"region_kms_key_ids"` AMISkipBuildRegion *bool `mapstructure:"skip_save_build_region" cty:"skip_save_build_region" hcl:"skip_save_build_region"` SnapshotTags map[string]string `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags" hcl:"snapshot_tags"` - SnapshotTag []hcl2template.FlatKeyValue `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"` + SnapshotTag []config.FlatKeyValue `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"` SnapshotUsers []string `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users" hcl:"snapshot_users"` SnapshotGroups []string `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups" hcl:"snapshot_groups"` AccessKey *string `mapstructure:"access_key" required:"true" cty:"access_key" hcl:"access_key"` @@ -75,7 +75,7 @@ type FlatConfig struct { SourceAmi *string `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"` SourceAmiFilter *common.FlatAmiFilterOptions `mapstructure:"source_ami_filter" required:"false" cty:"source_ami_filter" hcl:"source_ami_filter"` RootVolumeTags map[string]string `mapstructure:"root_volume_tags" required:"false" cty:"root_volume_tags" hcl:"root_volume_tags"` - RootVolumeTag []hcl2template.FlatKeyValue `mapstructure:"root_volume_tag" required:"false" cty:"root_volume_tag" hcl:"root_volume_tag"` + RootVolumeTag []config.FlatKeyValue `mapstructure:"root_volume_tag" required:"false" cty:"root_volume_tag" hcl:"root_volume_tag"` Architecture *string `mapstructure:"ami_architecture" required:"false" cty:"ami_architecture" hcl:"ami_architecture"` } @@ -108,7 +108,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "ami_regions": &hcldec.AttrSpec{Name: "ami_regions", Type: cty.List(cty.String), Required: false}, "skip_region_validation": &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false}, "tags": &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false}, - "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "ena_support": &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false}, "sriov_support": &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false}, "force_deregister": &hcldec.AttrSpec{Name: "force_deregister", Type: cty.Bool, Required: false}, @@ -118,7 +118,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "region_kms_key_ids": &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(cty.String), Required: false}, "skip_save_build_region": &hcldec.AttrSpec{Name: "skip_save_build_region", Type: cty.Bool, Required: false}, "snapshot_tags": &hcldec.AttrSpec{Name: "snapshot_tags", Type: cty.Map(cty.String), Required: false}, - "snapshot_tag": &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "snapshot_tag": &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "snapshot_users": &hcldec.AttrSpec{Name: "snapshot_users", Type: cty.List(cty.String), Required: false}, "snapshot_groups": &hcldec.AttrSpec{Name: "snapshot_groups", Type: cty.List(cty.String), Required: false}, "access_key": &hcldec.AttrSpec{Name: "access_key", Type: cty.String, Required: false}, @@ -155,7 +155,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "source_ami": &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false}, "source_ami_filter": &hcldec.BlockSpec{TypeName: "source_ami_filter", Nested: hcldec.ObjectSpec((*common.FlatAmiFilterOptions)(nil).HCL2Spec())}, "root_volume_tags": &hcldec.AttrSpec{Name: "root_volume_tags", Type: cty.Map(cty.String), Required: false}, - "root_volume_tag": &hcldec.BlockListSpec{TypeName: "root_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "root_volume_tag": &hcldec.BlockListSpec{TypeName: "root_volume_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "ami_architecture": &hcldec.AttrSpec{Name: "ami_architecture", Type: cty.String, Required: false}, } return s diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go index 338f69f2c..d224b91df 100644 --- a/builder/amazon/common/ami_config.go +++ b/builder/amazon/common/ami_config.go @@ -7,7 +7,6 @@ import ( "log" "regexp" - "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) @@ -55,7 +54,7 @@ type AMIConfig struct { // containing a `key` and a `value` field. In HCL2 mode the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - AMITag hcl2template.KeyValues `mapstructure:"tag" required:"false"` + AMITag config.KeyValues `mapstructure:"tag" required:"false"` // Enable enhanced networking (ENA but not SriovNetSupport) on // HVM-compatible AMIs. If set, add `ec2:ModifyInstanceAttribute` to your // AWS IAM policy. @@ -140,7 +139,7 @@ type AMIConfig struct { // repeatable block containing a `key` and a `value` field. In HCL2 mode the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - SnapshotTag hcl2template.KeyValues `mapstructure:"snapshot_tag" required:"false"` + SnapshotTag config.KeyValues `mapstructure:"snapshot_tag" required:"false"` // A list of account IDs that have // access to create volumes from the snapshot(s). By default no additional // users other than the user creating the AMI has permissions to create diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go index 05e6a444b..49f9357f2 100644 --- a/builder/amazon/common/run_config.go +++ b/builder/amazon/common/run_config.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) @@ -20,9 +20,9 @@ import ( var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$") type AmiFilterOptions struct { - hcl2template.KeyValueFilter `mapstructure:",squash"` - Owners []string - MostRecent bool `mapstructure:"most_recent"` + config.KeyValueFilter `mapstructure:",squash"` + Owners []string + MostRecent bool `mapstructure:"most_recent"` } func (d *AmiFilterOptions) GetOwners() []*string { @@ -43,13 +43,13 @@ func (d *AmiFilterOptions) NoOwner() bool { } type SubnetFilterOptions struct { - hcl2template.NameValueFilter `mapstructure:",squash"` - MostFree bool `mapstructure:"most_free"` - Random bool `mapstructure:"random"` + config.NameValueFilter `mapstructure:",squash"` + MostFree bool `mapstructure:"most_free"` + Random bool `mapstructure:"random"` } type VpcFilterOptions struct { - hcl2template.NameValueFilter `mapstructure:",squash"` + config.NameValueFilter `mapstructure:",squash"` } type Statement struct { @@ -64,7 +64,7 @@ type PolicyDocument struct { } type SecurityGroupFilterOptions struct { - hcl2template.NameValueFilter `mapstructure:",squash"` + config.NameValueFilter `mapstructure:",squash"` } // RunConfig contains configuration for running an instance from a source @@ -206,7 +206,7 @@ type RunConfig struct { // block containing a `key` and a `value` field. In HCL2 mode the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - RunTag hcl2template.KeyValues `mapstructure:"run_tag" required:"false"` + RunTag config.KeyValues `mapstructure:"run_tag" required:"false"` // The ID (not the name) of the security // group to assign to the instance. By default this is not set and Packer will // automatically create a new temporary security group to allow SSH access. @@ -321,7 +321,7 @@ type RunConfig struct { // containing a `key` and a `value` field. In HCL2 mode the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - SpotTag hcl2template.KeyValues `mapstructure:"spot_tag" required:"false"` + SpotTag config.KeyValues `mapstructure:"spot_tag" required:"false"` // Filters used to populate the `subnet_id` field. // JSON Example: // diff --git a/builder/amazon/common/run_config.hcl2spec.go b/builder/amazon/common/run_config.hcl2spec.go index 12b9a4482..49ad3950b 100644 --- a/builder/amazon/common/run_config.hcl2spec.go +++ b/builder/amazon/common/run_config.hcl2spec.go @@ -3,17 +3,17 @@ package common import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) // FlatAmiFilterOptions is an auto-generated flat version of AmiFilterOptions. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatAmiFilterOptions struct { - Filters map[string]string `cty:"filters" hcl:"filters"` - Filter []hcl2template.FlatKeyValue `cty:"filter" hcl:"filter"` - Owners []string `cty:"owners" hcl:"owners"` - MostRecent *bool `mapstructure:"most_recent" cty:"most_recent" hcl:"most_recent"` + Filters map[string]string `cty:"filters" hcl:"filters"` + Filter []config.FlatKeyValue `cty:"filter" hcl:"filter"` + Owners []string `cty:"owners" hcl:"owners"` + MostRecent *bool `mapstructure:"most_recent" cty:"most_recent" hcl:"most_recent"` } // FlatMapstructure returns a new FlatAmiFilterOptions. @@ -29,7 +29,7 @@ func (*AmiFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]hcl func (*FlatAmiFilterOptions) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false}, - "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "owners": &hcldec.AttrSpec{Name: "owners", Type: cty.List(cty.String), Required: false}, "most_recent": &hcldec.AttrSpec{Name: "most_recent", Type: cty.Bool, Required: false}, } @@ -64,8 +64,8 @@ func (*FlatPolicyDocument) HCL2Spec() map[string]hcldec.Spec { // FlatSecurityGroupFilterOptions is an auto-generated flat version of SecurityGroupFilterOptions. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatSecurityGroupFilterOptions struct { - Filters map[string]string `cty:"filters" hcl:"filters"` - Filter []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"` + Filters map[string]string `cty:"filters" hcl:"filters"` + Filter []config.FlatNameValue `cty:"filter" hcl:"filter"` } // FlatMapstructure returns a new FlatSecurityGroupFilterOptions. @@ -81,7 +81,7 @@ func (*SecurityGroupFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[ func (*FlatSecurityGroupFilterOptions) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false}, - "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())}, + "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())}, } return s } @@ -116,10 +116,10 @@ func (*FlatStatement) HCL2Spec() map[string]hcldec.Spec { // FlatSubnetFilterOptions is an auto-generated flat version of SubnetFilterOptions. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatSubnetFilterOptions struct { - Filters map[string]string `cty:"filters" hcl:"filters"` - Filter []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"` - MostFree *bool `mapstructure:"most_free" cty:"most_free" hcl:"most_free"` - Random *bool `mapstructure:"random" cty:"random" hcl:"random"` + Filters map[string]string `cty:"filters" hcl:"filters"` + Filter []config.FlatNameValue `cty:"filter" hcl:"filter"` + MostFree *bool `mapstructure:"most_free" cty:"most_free" hcl:"most_free"` + Random *bool `mapstructure:"random" cty:"random" hcl:"random"` } // FlatMapstructure returns a new FlatSubnetFilterOptions. @@ -135,7 +135,7 @@ func (*SubnetFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string] func (*FlatSubnetFilterOptions) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false}, - "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())}, + "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())}, "most_free": &hcldec.AttrSpec{Name: "most_free", Type: cty.Bool, Required: false}, "random": &hcldec.AttrSpec{Name: "random", Type: cty.Bool, Required: false}, } @@ -145,8 +145,8 @@ func (*FlatSubnetFilterOptions) HCL2Spec() map[string]hcldec.Spec { // FlatVpcFilterOptions is an auto-generated flat version of VpcFilterOptions. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatVpcFilterOptions struct { - Filters map[string]string `cty:"filters" hcl:"filters"` - Filter []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"` + Filters map[string]string `cty:"filters" hcl:"filters"` + Filter []config.FlatNameValue `cty:"filter" hcl:"filter"` } // FlatMapstructure returns a new FlatVpcFilterOptions. @@ -162,7 +162,7 @@ func (*VpcFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]hcl func (*FlatVpcFilterOptions) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false}, - "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())}, + "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())}, } return s } diff --git a/builder/amazon/common/run_config_test.go b/builder/amazon/common/run_config_test.go index 452cdab22..7be00a47a 100644 --- a/builder/amazon/common/run_config_test.go +++ b/builder/amazon/common/run_config_test.go @@ -6,8 +6,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) func init() { @@ -87,7 +87,7 @@ func TestRunConfigPrepare_SourceAmiFilterGood(t *testing.T) { filter_value := "foo" goodFilter := AmiFilterOptions{ Owners: []string{owner}, - KeyValueFilter: hcl2template.KeyValueFilter{ + KeyValueFilter: config.KeyValueFilter{ Filters: map[string]string{filter_key: filter_value}, }, } diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 2179d3d14..a7be359c2 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -16,7 +16,6 @@ import ( "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" @@ -61,7 +60,7 @@ type Config struct { // block containing a `name` and a `value` field. In HCL2 mode the // [`dynamic_block`](https://packer.io/docs/configuration/from-1.5/expressions.html#dynamic-blocks) // will allow you to create those programatically. - VolumeRunTag hcl2template.NameValues `mapstructure:"run_volume_tag" required:"false"` + VolumeRunTag config.NameValues `mapstructure:"run_volume_tag" required:"false"` // Relevant only to Windows guests: If you set this flag, we'll add clauses // to the launch_block_device_mappings that make sure ephemeral drives // don't show up in the EC2 console. If you launched from the EC2 console, diff --git a/builder/amazon/ebs/builder.hcl2spec.go b/builder/amazon/ebs/builder.hcl2spec.go index 279bd073b..77ae64535 100644 --- a/builder/amazon/ebs/builder.hcl2spec.go +++ b/builder/amazon/ebs/builder.hcl2spec.go @@ -4,7 +4,7 @@ package ebs import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) @@ -44,7 +44,7 @@ type FlatConfig struct { AMIProductCodes []string `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes" hcl:"ami_product_codes"` AMIRegions []string `mapstructure:"ami_regions" required:"false" cty:"ami_regions" hcl:"ami_regions"` AMITags map[string]string `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"` - AMITag []hcl2template.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` + AMITag []config.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` AMIENASupport *bool `mapstructure:"ena_support" required:"false" cty:"ena_support" hcl:"ena_support"` AMISriovNetSupport *bool `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"` AMIForceDeregister *bool `mapstructure:"force_deregister" required:"false" cty:"force_deregister" hcl:"force_deregister"` @@ -54,7 +54,7 @@ type FlatConfig struct { AMIRegionKMSKeyIDs map[string]string `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids" hcl:"region_kms_key_ids"` AMISkipBuildRegion *bool `mapstructure:"skip_save_build_region" cty:"skip_save_build_region" hcl:"skip_save_build_region"` SnapshotTags map[string]string `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags" hcl:"snapshot_tags"` - SnapshotTag []hcl2template.FlatKeyValue `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"` + SnapshotTag []config.FlatKeyValue `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"` SnapshotUsers []string `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users" hcl:"snapshot_users"` SnapshotGroups []string `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups" hcl:"snapshot_groups"` AssociatePublicIpAddress *bool `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"` @@ -70,7 +70,7 @@ type FlatConfig struct { InstanceType *string `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"` SecurityGroupFilter *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter" hcl:"security_group_filter"` RunTags map[string]string `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"` - RunTag []hcl2template.FlatKeyValue `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"` + RunTag []config.FlatKeyValue `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"` SecurityGroupId *string `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"` SecurityGroupIds []string `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids" hcl:"security_group_ids"` SourceAmi *string `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"` @@ -79,7 +79,7 @@ type FlatConfig struct { SpotPrice *string `mapstructure:"spot_price" required:"false" cty:"spot_price" hcl:"spot_price"` SpotPriceAutoProduct *string `mapstructure:"spot_price_auto_product" required:"false" undocumented:"true" cty:"spot_price_auto_product" hcl:"spot_price_auto_product"` SpotTags map[string]string `mapstructure:"spot_tags" required:"false" cty:"spot_tags" hcl:"spot_tags"` - SpotTag []hcl2template.FlatKeyValue `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"` + SpotTag []config.FlatKeyValue `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"` SubnetFilter *common.FlatSubnetFilterOptions `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter" hcl:"subnet_filter"` SubnetId *string `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"` Tenancy *string `mapstructure:"tenancy" required:"false" cty:"tenancy" hcl:"tenancy"` @@ -144,7 +144,7 @@ type FlatConfig struct { AMIMappings []common.FlatBlockDevice `mapstructure:"ami_block_device_mappings" required:"false" cty:"ami_block_device_mappings" hcl:"ami_block_device_mappings"` LaunchMappings []common.FlatBlockDevice `mapstructure:"launch_block_device_mappings" required:"false" cty:"launch_block_device_mappings" hcl:"launch_block_device_mappings"` VolumeRunTags map[string]string `mapstructure:"run_volume_tags" cty:"run_volume_tags" hcl:"run_volume_tags"` - VolumeRunTag []hcl2template.FlatNameValue `mapstructure:"run_volume_tag" required:"false" cty:"run_volume_tag" hcl:"run_volume_tag"` + VolumeRunTag []config.FlatNameValue `mapstructure:"run_volume_tag" required:"false" cty:"run_volume_tag" hcl:"run_volume_tag"` NoEphemeral *bool `mapstructure:"no_ephemeral" required:"false" cty:"no_ephemeral" hcl:"no_ephemeral"` } @@ -193,7 +193,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "ami_product_codes": &hcldec.AttrSpec{Name: "ami_product_codes", Type: cty.List(cty.String), Required: false}, "ami_regions": &hcldec.AttrSpec{Name: "ami_regions", Type: cty.List(cty.String), Required: false}, "tags": &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false}, - "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "ena_support": &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false}, "sriov_support": &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false}, "force_deregister": &hcldec.AttrSpec{Name: "force_deregister", Type: cty.Bool, Required: false}, @@ -203,7 +203,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "region_kms_key_ids": &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(cty.String), Required: false}, "skip_save_build_region": &hcldec.AttrSpec{Name: "skip_save_build_region", Type: cty.Bool, Required: false}, "snapshot_tags": &hcldec.AttrSpec{Name: "snapshot_tags", Type: cty.Map(cty.String), Required: false}, - "snapshot_tag": &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "snapshot_tag": &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "snapshot_users": &hcldec.AttrSpec{Name: "snapshot_users", Type: cty.List(cty.String), Required: false}, "snapshot_groups": &hcldec.AttrSpec{Name: "snapshot_groups", Type: cty.List(cty.String), Required: false}, "associate_public_ip_address": &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false}, @@ -219,7 +219,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "instance_type": &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false}, "security_group_filter": &hcldec.BlockSpec{TypeName: "security_group_filter", Nested: hcldec.ObjectSpec((*common.FlatSecurityGroupFilterOptions)(nil).HCL2Spec())}, "run_tags": &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false}, - "run_tag": &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "run_tag": &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "security_group_id": &hcldec.AttrSpec{Name: "security_group_id", Type: cty.String, Required: false}, "security_group_ids": &hcldec.AttrSpec{Name: "security_group_ids", Type: cty.List(cty.String), Required: false}, "source_ami": &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false}, @@ -228,7 +228,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "spot_price": &hcldec.AttrSpec{Name: "spot_price", Type: cty.String, Required: false}, "spot_price_auto_product": &hcldec.AttrSpec{Name: "spot_price_auto_product", Type: cty.String, Required: false}, "spot_tags": &hcldec.AttrSpec{Name: "spot_tags", Type: cty.Map(cty.String), Required: false}, - "spot_tag": &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "spot_tag": &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "subnet_filter": &hcldec.BlockSpec{TypeName: "subnet_filter", Nested: hcldec.ObjectSpec((*common.FlatSubnetFilterOptions)(nil).HCL2Spec())}, "subnet_id": &hcldec.AttrSpec{Name: "subnet_id", Type: cty.String, Required: false}, "tenancy": &hcldec.AttrSpec{Name: "tenancy", Type: cty.String, Required: false}, @@ -293,7 +293,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "ami_block_device_mappings": &hcldec.BlockListSpec{TypeName: "ami_block_device_mappings", Nested: hcldec.ObjectSpec((*common.FlatBlockDevice)(nil).HCL2Spec())}, "launch_block_device_mappings": &hcldec.BlockListSpec{TypeName: "launch_block_device_mappings", Nested: hcldec.ObjectSpec((*common.FlatBlockDevice)(nil).HCL2Spec())}, "run_volume_tags": &hcldec.AttrSpec{Name: "run_volume_tags", Type: cty.Map(cty.String), Required: false}, - "run_volume_tag": &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())}, + "run_volume_tag": &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())}, "no_ephemeral": &hcldec.AttrSpec{Name: "no_ephemeral", Type: cty.Bool, Required: false}, } return s diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index 305c87c91..a6036bd76 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -14,7 +14,6 @@ import ( "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" @@ -67,7 +66,7 @@ type Config struct { // block containing a `name` and a `value` field. In HCL2 mode the // [`dynamic_block`](https://packer.io/docs/configuration/from-1.5/expressions.html#dynamic-blocks) // will allow you to create those programatically. - VolumeRunTag hcl2template.NameValues `mapstructure:"run_volume_tag" required:"false"` + VolumeRunTag config.NameValues `mapstructure:"run_volume_tag" required:"false"` // what architecture to use when registering the // final AMI; valid options are "x86_64" or "arm64". Defaults to "x86_64". Architecture string `mapstructure:"ami_architecture" required:"false"` diff --git a/builder/amazon/ebssurrogate/builder.hcl2spec.go b/builder/amazon/ebssurrogate/builder.hcl2spec.go index b56f37b69..41a88a00a 100644 --- a/builder/amazon/ebssurrogate/builder.hcl2spec.go +++ b/builder/amazon/ebssurrogate/builder.hcl2spec.go @@ -4,7 +4,7 @@ package ebssurrogate import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) @@ -92,7 +92,7 @@ type FlatConfig struct { InstanceType *string `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"` SecurityGroupFilter *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter" hcl:"security_group_filter"` RunTags map[string]string `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"` - RunTag []hcl2template.FlatKeyValue `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"` + RunTag []config.FlatKeyValue `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"` SecurityGroupId *string `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"` SecurityGroupIds []string `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids" hcl:"security_group_ids"` SourceAmi *string `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"` @@ -101,7 +101,7 @@ type FlatConfig struct { SpotPrice *string `mapstructure:"spot_price" required:"false" cty:"spot_price" hcl:"spot_price"` SpotPriceAutoProduct *string `mapstructure:"spot_price_auto_product" required:"false" undocumented:"true" cty:"spot_price_auto_product" hcl:"spot_price_auto_product"` SpotTags map[string]string `mapstructure:"spot_tags" required:"false" cty:"spot_tags" hcl:"spot_tags"` - SpotTag []hcl2template.FlatKeyValue `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"` + SpotTag []config.FlatKeyValue `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"` SubnetFilter *common.FlatSubnetFilterOptions `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter" hcl:"subnet_filter"` SubnetId *string `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"` Tenancy *string `mapstructure:"tenancy" required:"false" cty:"tenancy" hcl:"tenancy"` @@ -171,7 +171,7 @@ type FlatConfig struct { AMIProductCodes []string `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes" hcl:"ami_product_codes"` AMIRegions []string `mapstructure:"ami_regions" required:"false" cty:"ami_regions" hcl:"ami_regions"` AMITags map[string]string `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"` - AMITag []hcl2template.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` + AMITag []config.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` AMIENASupport *bool `mapstructure:"ena_support" required:"false" cty:"ena_support" hcl:"ena_support"` AMISriovNetSupport *bool `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"` AMIForceDeregister *bool `mapstructure:"force_deregister" required:"false" cty:"force_deregister" hcl:"force_deregister"` @@ -181,14 +181,14 @@ type FlatConfig struct { AMIRegionKMSKeyIDs map[string]string `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids" hcl:"region_kms_key_ids"` AMISkipBuildRegion *bool `mapstructure:"skip_save_build_region" cty:"skip_save_build_region" hcl:"skip_save_build_region"` SnapshotTags map[string]string `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags" hcl:"snapshot_tags"` - SnapshotTag []hcl2template.FlatKeyValue `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"` + SnapshotTag []config.FlatKeyValue `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"` SnapshotUsers []string `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users" hcl:"snapshot_users"` SnapshotGroups []string `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups" hcl:"snapshot_groups"` AMIMappings []common.FlatBlockDevice `mapstructure:"ami_block_device_mappings" required:"false" cty:"ami_block_device_mappings" hcl:"ami_block_device_mappings"` LaunchMappings []FlatBlockDevice `mapstructure:"launch_block_device_mappings" required:"false" cty:"launch_block_device_mappings" hcl:"launch_block_device_mappings"` RootDevice *FlatRootBlockDevice `mapstructure:"ami_root_device" required:"true" cty:"ami_root_device" hcl:"ami_root_device"` VolumeRunTags map[string]string `mapstructure:"run_volume_tags" cty:"run_volume_tags" hcl:"run_volume_tags"` - VolumeRunTag []hcl2template.FlatNameValue `mapstructure:"run_volume_tag" required:"false" cty:"run_volume_tag" hcl:"run_volume_tag"` + VolumeRunTag []config.FlatNameValue `mapstructure:"run_volume_tag" required:"false" cty:"run_volume_tag" hcl:"run_volume_tag"` Architecture *string `mapstructure:"ami_architecture" required:"false" cty:"ami_architecture" hcl:"ami_architecture"` } @@ -242,7 +242,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "instance_type": &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false}, "security_group_filter": &hcldec.BlockSpec{TypeName: "security_group_filter", Nested: hcldec.ObjectSpec((*common.FlatSecurityGroupFilterOptions)(nil).HCL2Spec())}, "run_tags": &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false}, - "run_tag": &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "run_tag": &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "security_group_id": &hcldec.AttrSpec{Name: "security_group_id", Type: cty.String, Required: false}, "security_group_ids": &hcldec.AttrSpec{Name: "security_group_ids", Type: cty.List(cty.String), Required: false}, "source_ami": &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false}, @@ -251,7 +251,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "spot_price": &hcldec.AttrSpec{Name: "spot_price", Type: cty.String, Required: false}, "spot_price_auto_product": &hcldec.AttrSpec{Name: "spot_price_auto_product", Type: cty.String, Required: false}, "spot_tags": &hcldec.AttrSpec{Name: "spot_tags", Type: cty.Map(cty.String), Required: false}, - "spot_tag": &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "spot_tag": &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "subnet_filter": &hcldec.BlockSpec{TypeName: "subnet_filter", Nested: hcldec.ObjectSpec((*common.FlatSubnetFilterOptions)(nil).HCL2Spec())}, "subnet_id": &hcldec.AttrSpec{Name: "subnet_id", Type: cty.String, Required: false}, "tenancy": &hcldec.AttrSpec{Name: "tenancy", Type: cty.String, Required: false}, @@ -321,7 +321,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "ami_product_codes": &hcldec.AttrSpec{Name: "ami_product_codes", Type: cty.List(cty.String), Required: false}, "ami_regions": &hcldec.AttrSpec{Name: "ami_regions", Type: cty.List(cty.String), Required: false}, "tags": &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false}, - "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "ena_support": &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false}, "sriov_support": &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false}, "force_deregister": &hcldec.AttrSpec{Name: "force_deregister", Type: cty.Bool, Required: false}, @@ -331,14 +331,14 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "region_kms_key_ids": &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(cty.String), Required: false}, "skip_save_build_region": &hcldec.AttrSpec{Name: "skip_save_build_region", Type: cty.Bool, Required: false}, "snapshot_tags": &hcldec.AttrSpec{Name: "snapshot_tags", Type: cty.Map(cty.String), Required: false}, - "snapshot_tag": &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "snapshot_tag": &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "snapshot_users": &hcldec.AttrSpec{Name: "snapshot_users", Type: cty.List(cty.String), Required: false}, "snapshot_groups": &hcldec.AttrSpec{Name: "snapshot_groups", Type: cty.List(cty.String), Required: false}, "ami_block_device_mappings": &hcldec.BlockListSpec{TypeName: "ami_block_device_mappings", Nested: hcldec.ObjectSpec((*common.FlatBlockDevice)(nil).HCL2Spec())}, "launch_block_device_mappings": &hcldec.BlockListSpec{TypeName: "launch_block_device_mappings", Nested: hcldec.ObjectSpec((*FlatBlockDevice)(nil).HCL2Spec())}, "ami_root_device": &hcldec.BlockSpec{TypeName: "ami_root_device", Nested: hcldec.ObjectSpec((*FlatRootBlockDevice)(nil).HCL2Spec())}, "run_volume_tags": &hcldec.AttrSpec{Name: "run_volume_tags", Type: cty.Map(cty.String), Required: false}, - "run_volume_tag": &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())}, + "run_volume_tag": &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())}, "ami_architecture": &hcldec.AttrSpec{Name: "ami_architecture", Type: cty.String, Required: false}, } return s diff --git a/builder/amazon/ebsvolume/block_device.go b/builder/amazon/ebsvolume/block_device.go index 47f22c9b2..111be84bb 100644 --- a/builder/amazon/ebsvolume/block_device.go +++ b/builder/amazon/ebsvolume/block_device.go @@ -5,7 +5,7 @@ package ebsvolume import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) @@ -19,7 +19,7 @@ type BlockDevice struct { // containing a `key` and a `value` field. In HCL2 mode the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - Tag hcl2template.KeyValues `mapstructure:"tag" required:"false"` + Tag config.KeyValues `mapstructure:"tag" required:"false"` } type BlockDevices []BlockDevice diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index 1f52bc872..d5d5bddb1 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/builder/amazon/ebsvolume/builder.go @@ -13,7 +13,6 @@ import ( "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" @@ -73,7 +72,7 @@ type Config struct { // the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - VolumeRunTag hcl2template.KeyValues `mapstructure:"run_volume_tag"` + VolumeRunTag config.KeyValues `mapstructure:"run_volume_tag"` launchBlockDevices BlockDevices diff --git a/builder/amazon/ebsvolume/builder.hcl2spec.go b/builder/amazon/ebsvolume/builder.hcl2spec.go index e76c946cc..0fbf0e8eb 100644 --- a/builder/amazon/ebsvolume/builder.hcl2spec.go +++ b/builder/amazon/ebsvolume/builder.hcl2spec.go @@ -4,25 +4,25 @@ package ebsvolume import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) // FlatBlockDevice is an auto-generated flat version of BlockDevice. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatBlockDevice struct { - DeleteOnTermination *bool `mapstructure:"delete_on_termination" required:"false" cty:"delete_on_termination" hcl:"delete_on_termination"` - DeviceName *string `mapstructure:"device_name" required:"false" cty:"device_name" hcl:"device_name"` - Encrypted *bool `mapstructure:"encrypted" required:"false" cty:"encrypted" hcl:"encrypted"` - IOPS *int64 `mapstructure:"iops" required:"false" cty:"iops" hcl:"iops"` - NoDevice *bool `mapstructure:"no_device" required:"false" cty:"no_device" hcl:"no_device"` - SnapshotId *string `mapstructure:"snapshot_id" required:"false" cty:"snapshot_id" hcl:"snapshot_id"` - VirtualName *string `mapstructure:"virtual_name" required:"false" cty:"virtual_name" hcl:"virtual_name"` - VolumeType *string `mapstructure:"volume_type" required:"false" cty:"volume_type" hcl:"volume_type"` - VolumeSize *int64 `mapstructure:"volume_size" required:"false" cty:"volume_size" hcl:"volume_size"` - KmsKeyId *string `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id" hcl:"kms_key_id"` - Tags map[string]string `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"` - Tag []hcl2template.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` + DeleteOnTermination *bool `mapstructure:"delete_on_termination" required:"false" cty:"delete_on_termination" hcl:"delete_on_termination"` + DeviceName *string `mapstructure:"device_name" required:"false" cty:"device_name" hcl:"device_name"` + Encrypted *bool `mapstructure:"encrypted" required:"false" cty:"encrypted" hcl:"encrypted"` + IOPS *int64 `mapstructure:"iops" required:"false" cty:"iops" hcl:"iops"` + NoDevice *bool `mapstructure:"no_device" required:"false" cty:"no_device" hcl:"no_device"` + SnapshotId *string `mapstructure:"snapshot_id" required:"false" cty:"snapshot_id" hcl:"snapshot_id"` + VirtualName *string `mapstructure:"virtual_name" required:"false" cty:"virtual_name" hcl:"virtual_name"` + VolumeType *string `mapstructure:"volume_type" required:"false" cty:"volume_type" hcl:"volume_type"` + VolumeSize *int64 `mapstructure:"volume_size" required:"false" cty:"volume_size" hcl:"volume_size"` + KmsKeyId *string `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id" hcl:"kms_key_id"` + Tags map[string]string `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"` + Tag []config.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` } // FlatMapstructure returns a new FlatBlockDevice. @@ -48,7 +48,7 @@ func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec { "volume_size": &hcldec.AttrSpec{Name: "volume_size", Type: cty.Number, Required: false}, "kms_key_id": &hcldec.AttrSpec{Name: "kms_key_id", Type: cty.String, Required: false}, "tags": &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false}, - "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, } return s } @@ -94,7 +94,7 @@ type FlatConfig struct { InstanceType *string `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"` SecurityGroupFilter *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter" hcl:"security_group_filter"` RunTags map[string]string `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"` - RunTag []hcl2template.FlatKeyValue `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"` + RunTag []config.FlatKeyValue `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"` SecurityGroupId *string `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"` SecurityGroupIds []string `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids" hcl:"security_group_ids"` SourceAmi *string `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"` @@ -103,7 +103,7 @@ type FlatConfig struct { SpotPrice *string `mapstructure:"spot_price" required:"false" cty:"spot_price" hcl:"spot_price"` SpotPriceAutoProduct *string `mapstructure:"spot_price_auto_product" required:"false" undocumented:"true" cty:"spot_price_auto_product" hcl:"spot_price_auto_product"` SpotTags map[string]string `mapstructure:"spot_tags" required:"false" cty:"spot_tags" hcl:"spot_tags"` - SpotTag []hcl2template.FlatKeyValue `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"` + SpotTag []config.FlatKeyValue `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"` SubnetFilter *common.FlatSubnetFilterOptions `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter" hcl:"subnet_filter"` SubnetId *string `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"` Tenancy *string `mapstructure:"tenancy" required:"false" cty:"tenancy" hcl:"tenancy"` @@ -169,7 +169,7 @@ type FlatConfig struct { AMISriovNetSupport *bool `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"` VolumeMappings []FlatBlockDevice `mapstructure:"ebs_volumes" required:"false" cty:"ebs_volumes" hcl:"ebs_volumes"` VolumeRunTags map[string]string `mapstructure:"run_volume_tags" cty:"run_volume_tags" hcl:"run_volume_tags"` - VolumeRunTag []hcl2template.FlatKeyValue `mapstructure:"run_volume_tag" cty:"run_volume_tag" hcl:"run_volume_tag"` + VolumeRunTag []config.FlatKeyValue `mapstructure:"run_volume_tag" cty:"run_volume_tag" hcl:"run_volume_tag"` } // FlatMapstructure returns a new FlatConfig. @@ -222,7 +222,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "instance_type": &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false}, "security_group_filter": &hcldec.BlockSpec{TypeName: "security_group_filter", Nested: hcldec.ObjectSpec((*common.FlatSecurityGroupFilterOptions)(nil).HCL2Spec())}, "run_tags": &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false}, - "run_tag": &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "run_tag": &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "security_group_id": &hcldec.AttrSpec{Name: "security_group_id", Type: cty.String, Required: false}, "security_group_ids": &hcldec.AttrSpec{Name: "security_group_ids", Type: cty.List(cty.String), Required: false}, "source_ami": &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false}, @@ -231,7 +231,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "spot_price": &hcldec.AttrSpec{Name: "spot_price", Type: cty.String, Required: false}, "spot_price_auto_product": &hcldec.AttrSpec{Name: "spot_price_auto_product", Type: cty.String, Required: false}, "spot_tags": &hcldec.AttrSpec{Name: "spot_tags", Type: cty.Map(cty.String), Required: false}, - "spot_tag": &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "spot_tag": &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "subnet_filter": &hcldec.BlockSpec{TypeName: "subnet_filter", Nested: hcldec.ObjectSpec((*common.FlatSubnetFilterOptions)(nil).HCL2Spec())}, "subnet_id": &hcldec.AttrSpec{Name: "subnet_id", Type: cty.String, Required: false}, "tenancy": &hcldec.AttrSpec{Name: "tenancy", Type: cty.String, Required: false}, @@ -297,7 +297,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "sriov_support": &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false}, "ebs_volumes": &hcldec.BlockListSpec{TypeName: "ebs_volumes", Nested: hcldec.ObjectSpec((*FlatBlockDevice)(nil).HCL2Spec())}, "run_volume_tags": &hcldec.AttrSpec{Name: "run_volume_tags", Type: cty.Map(cty.String), Required: false}, - "run_volume_tag": &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "run_volume_tag": &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, } return s } diff --git a/builder/amazon/instance/builder.hcl2spec.go b/builder/amazon/instance/builder.hcl2spec.go index 81378789b..40cfe304e 100644 --- a/builder/amazon/instance/builder.hcl2spec.go +++ b/builder/amazon/instance/builder.hcl2spec.go @@ -4,7 +4,7 @@ package instance import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) @@ -44,7 +44,7 @@ type FlatConfig struct { AMIProductCodes []string `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes" hcl:"ami_product_codes"` AMIRegions []string `mapstructure:"ami_regions" required:"false" cty:"ami_regions" hcl:"ami_regions"` AMITags map[string]string `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"` - AMITag []hcl2template.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` + AMITag []config.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` AMIENASupport *bool `mapstructure:"ena_support" required:"false" cty:"ena_support" hcl:"ena_support"` AMISriovNetSupport *bool `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"` AMIForceDeregister *bool `mapstructure:"force_deregister" required:"false" cty:"force_deregister" hcl:"force_deregister"` @@ -54,7 +54,7 @@ type FlatConfig struct { AMIRegionKMSKeyIDs map[string]string `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids" hcl:"region_kms_key_ids"` AMISkipBuildRegion *bool `mapstructure:"skip_save_build_region" cty:"skip_save_build_region" hcl:"skip_save_build_region"` SnapshotTags map[string]string `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags" hcl:"snapshot_tags"` - SnapshotTag []hcl2template.FlatKeyValue `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"` + SnapshotTag []config.FlatKeyValue `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"` SnapshotUsers []string `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users" hcl:"snapshot_users"` SnapshotGroups []string `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups" hcl:"snapshot_groups"` AssociatePublicIpAddress *bool `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"` @@ -70,7 +70,7 @@ type FlatConfig struct { InstanceType *string `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"` SecurityGroupFilter *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter" hcl:"security_group_filter"` RunTags map[string]string `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"` - RunTag []hcl2template.FlatKeyValue `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"` + RunTag []config.FlatKeyValue `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"` SecurityGroupId *string `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"` SecurityGroupIds []string `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids" hcl:"security_group_ids"` SourceAmi *string `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"` @@ -79,7 +79,7 @@ type FlatConfig struct { SpotPrice *string `mapstructure:"spot_price" required:"false" cty:"spot_price" hcl:"spot_price"` SpotPriceAutoProduct *string `mapstructure:"spot_price_auto_product" required:"false" undocumented:"true" cty:"spot_price_auto_product" hcl:"spot_price_auto_product"` SpotTags map[string]string `mapstructure:"spot_tags" required:"false" cty:"spot_tags" hcl:"spot_tags"` - SpotTag []hcl2template.FlatKeyValue `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"` + SpotTag []config.FlatKeyValue `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"` SubnetFilter *common.FlatSubnetFilterOptions `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter" hcl:"subnet_filter"` SubnetId *string `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"` Tenancy *string `mapstructure:"tenancy" required:"false" cty:"tenancy" hcl:"tenancy"` @@ -199,7 +199,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "ami_product_codes": &hcldec.AttrSpec{Name: "ami_product_codes", Type: cty.List(cty.String), Required: false}, "ami_regions": &hcldec.AttrSpec{Name: "ami_regions", Type: cty.List(cty.String), Required: false}, "tags": &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false}, - "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "ena_support": &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false}, "sriov_support": &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false}, "force_deregister": &hcldec.AttrSpec{Name: "force_deregister", Type: cty.Bool, Required: false}, @@ -209,7 +209,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "region_kms_key_ids": &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(cty.String), Required: false}, "skip_save_build_region": &hcldec.AttrSpec{Name: "skip_save_build_region", Type: cty.Bool, Required: false}, "snapshot_tags": &hcldec.AttrSpec{Name: "snapshot_tags", Type: cty.Map(cty.String), Required: false}, - "snapshot_tag": &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "snapshot_tag": &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "snapshot_users": &hcldec.AttrSpec{Name: "snapshot_users", Type: cty.List(cty.String), Required: false}, "snapshot_groups": &hcldec.AttrSpec{Name: "snapshot_groups", Type: cty.List(cty.String), Required: false}, "associate_public_ip_address": &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false}, @@ -225,7 +225,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "instance_type": &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false}, "security_group_filter": &hcldec.BlockSpec{TypeName: "security_group_filter", Nested: hcldec.ObjectSpec((*common.FlatSecurityGroupFilterOptions)(nil).HCL2Spec())}, "run_tags": &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false}, - "run_tag": &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "run_tag": &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "security_group_id": &hcldec.AttrSpec{Name: "security_group_id", Type: cty.String, Required: false}, "security_group_ids": &hcldec.AttrSpec{Name: "security_group_ids", Type: cty.List(cty.String), Required: false}, "source_ami": &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false}, @@ -234,7 +234,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "spot_price": &hcldec.AttrSpec{Name: "spot_price", Type: cty.String, Required: false}, "spot_price_auto_product": &hcldec.AttrSpec{Name: "spot_price_auto_product", Type: cty.String, Required: false}, "spot_tags": &hcldec.AttrSpec{Name: "spot_tags", Type: cty.Map(cty.String), Required: false}, - "spot_tag": &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "spot_tag": &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "subnet_filter": &hcldec.BlockSpec{TypeName: "subnet_filter", Nested: hcldec.ObjectSpec((*common.FlatSubnetFilterOptions)(nil).HCL2Spec())}, "subnet_id": &hcldec.AttrSpec{Name: "subnet_id", Type: cty.String, Required: false}, "tenancy": &hcldec.AttrSpec{Name: "tenancy", Type: cty.String, Required: false}, diff --git a/builder/azure/arm/config.go b/builder/azure/arm/config.go index 6ba3a662a..9ec804fd8 100644 --- a/builder/azure/arm/config.go +++ b/builder/azure/arm/config.go @@ -28,7 +28,6 @@ import ( "github.com/hashicorp/packer/builder/azure/common/client" "github.com/hashicorp/packer/builder/azure/common/constants" "github.com/hashicorp/packer/builder/azure/pkcs12" - "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" @@ -293,7 +292,7 @@ type Config struct { // containing a `name` and a `value` field. In HCL2 mode the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - AzureTag hcl2template.NameValues `mapstructure:"azure_tag" required:"false"` + AzureTag config.NameValues `mapstructure:"azure_tag" required:"false"` // Resource group under which the final artifact will be stored. ResourceGroupName string `mapstructure:"resource_group_name"` // Storage account under which the final artifact will be stored. diff --git a/builder/azure/arm/config.hcl2spec.go b/builder/azure/arm/config.hcl2spec.go index 7ce2b4464..29d725f7d 100644 --- a/builder/azure/arm/config.hcl2spec.go +++ b/builder/azure/arm/config.hcl2spec.go @@ -3,7 +3,7 @@ package arm import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) @@ -52,7 +52,7 @@ type FlatConfig struct { ManagedImageDataDiskSnapshotPrefix *string `mapstructure:"managed_image_data_disk_snapshot_prefix" required:"false" cty:"managed_image_data_disk_snapshot_prefix" hcl:"managed_image_data_disk_snapshot_prefix"` ManagedImageZoneResilient *bool `mapstructure:"managed_image_zone_resilient" required:"false" cty:"managed_image_zone_resilient" hcl:"managed_image_zone_resilient"` AzureTags map[string]string `mapstructure:"azure_tags" required:"false" cty:"azure_tags" hcl:"azure_tags"` - AzureTag []hcl2template.FlatNameValue `mapstructure:"azure_tag" required:"false" cty:"azure_tag" hcl:"azure_tag"` + AzureTag []config.FlatNameValue `mapstructure:"azure_tag" required:"false" cty:"azure_tag" hcl:"azure_tag"` ResourceGroupName *string `mapstructure:"resource_group_name" cty:"resource_group_name" hcl:"resource_group_name"` StorageAccount *string `mapstructure:"storage_account" cty:"storage_account" hcl:"storage_account"` TempComputeName *string `mapstructure:"temp_compute_name" required:"false" cty:"temp_compute_name" hcl:"temp_compute_name"` @@ -180,7 +180,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "managed_image_data_disk_snapshot_prefix": &hcldec.AttrSpec{Name: "managed_image_data_disk_snapshot_prefix", Type: cty.String, Required: false}, "managed_image_zone_resilient": &hcldec.AttrSpec{Name: "managed_image_zone_resilient", Type: cty.Bool, Required: false}, "azure_tags": &hcldec.AttrSpec{Name: "azure_tags", Type: cty.Map(cty.String), Required: false}, - "azure_tag": &hcldec.BlockListSpec{TypeName: "azure_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())}, + "azure_tag": &hcldec.BlockListSpec{TypeName: "azure_tag", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())}, "resource_group_name": &hcldec.AttrSpec{Name: "resource_group_name", Type: cty.String, Required: false}, "storage_account": &hcldec.AttrSpec{Name: "storage_account", Type: cty.String, Required: false}, "temp_compute_name": &hcldec.AttrSpec{Name: "temp_compute_name", Type: cty.String, Required: false}, diff --git a/builder/azure/arm/config_test.go b/builder/azure/arm/config_test.go index dda6e9234..cb85d6a31 100644 --- a/builder/azure/arm/config_test.go +++ b/builder/azure/arm/config_test.go @@ -8,7 +8,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "github.com/google/go-cmp/cmp" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/hcl2template" + sdkconfig "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) // List of configuration parameters that are required by the ARM builder. @@ -913,7 +913,7 @@ func TestConfigShouldAcceptTags(t *testing.T) { } c := Config{ - AzureTag: hcl2template.NameValues{ + AzureTag: sdkconfig.NameValues{ {Name: "tag03", Value: "value03"}, }, } @@ -948,7 +948,7 @@ func TestConfigShouldAcceptTag(t *testing.T) { } c := Config{ - AzureTag: hcl2template.NameValues{ + AzureTag: sdkconfig.NameValues{ {Name: "tag03", Value: "value03"}, }, } diff --git a/builder/hyperone/config.go b/builder/hyperone/config.go index 78a5ede64..7f5cd520e 100644 --- a/builder/hyperone/config.go +++ b/builder/hyperone/config.go @@ -10,7 +10,6 @@ import ( "os" "time" - "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" @@ -67,7 +66,7 @@ type Config struct { // block containing a `key` and a `value` field. In HCL2 mode the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - ImageTag hcl2template.KeyValues `mapstructure:"image_tag" required:"false"` + ImageTag config.KeyValues `mapstructure:"image_tag" required:"false"` // The service of the resulting image. ImageService string `mapstructure:"image_service" required:"false"` // ID or name of the type this server should be created with. @@ -80,7 +79,7 @@ type Config struct { // containing a `key` and a `value` field. In HCL2 mode the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - VmTag hcl2template.NameValues `mapstructure:"vm_tag" required:"false"` + VmTag config.NameValues `mapstructure:"vm_tag" required:"false"` // The name of the created disk. DiskName string `mapstructure:"disk_name" required:"false"` // The type of the created disk. Defaults to ssd. diff --git a/builder/hyperone/config.hcl2spec.go b/builder/hyperone/config.hcl2spec.go index 4e4e01821..24cfca117 100644 --- a/builder/hyperone/config.hcl2spec.go +++ b/builder/hyperone/config.hcl2spec.go @@ -3,106 +3,106 @@ package hyperone import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) // FlatConfig is an auto-generated flat version of Config. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatConfig struct { - PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` - PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` - PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` - PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` - PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` - PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` - PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"` - PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"` - Type *string `mapstructure:"communicator" cty:"communicator" hcl:"communicator"` - PauseBeforeConnect *string `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"` - SSHHost *string `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"` - SSHPort *int `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"` - SSHUsername *string `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"` - SSHPassword *string `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"` - SSHKeyPairName *string `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"` - SSHTemporaryKeyPairName *string `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"` - SSHTemporaryKeyPairType *string `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"` - SSHTemporaryKeyPairBits *int `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"` - SSHCiphers []string `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"` - SSHClearAuthorizedKeys *bool `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"` - SSHKEXAlgos []string `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"` - SSHPrivateKeyFile *string `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"` - SSHCertificateFile *string `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"` - SSHPty *bool `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"` - SSHTimeout *string `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"` - SSHWaitTimeout *string `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"` - SSHAgentAuth *bool `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"` - SSHDisableAgentForwarding *bool `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"` - SSHHandshakeAttempts *int `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"` - SSHBastionHost *string `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"` - SSHBastionPort *int `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"` - SSHBastionAgentAuth *bool `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"` - SSHBastionUsername *string `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"` - SSHBastionPassword *string `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"` - SSHBastionInteractive *bool `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"` - SSHBastionPrivateKeyFile *string `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"` - SSHBastionCertificateFile *string `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"` - SSHFileTransferMethod *string `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"` - SSHProxyHost *string `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"` - SSHProxyPort *int `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"` - SSHProxyUsername *string `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"` - SSHProxyPassword *string `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"` - SSHKeepAliveInterval *string `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"` - SSHReadWriteTimeout *string `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"` - SSHRemoteTunnels []string `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"` - SSHLocalTunnels []string `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"` - SSHPublicKey []byte `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"` - SSHPrivateKey []byte `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"` - WinRMUser *string `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"` - WinRMPassword *string `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"` - WinRMHost *string `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"` - WinRMNoProxy *bool `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"` - WinRMPort *int `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"` - WinRMTimeout *string `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"` - WinRMUseSSL *bool `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"` - WinRMInsecure *bool `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"` - WinRMUseNTLM *bool `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"` - APIURL *string `mapstructure:"api_url" required:"false" cty:"api_url" hcl:"api_url"` - Token *string `mapstructure:"token" required:"true" cty:"token" hcl:"token"` - Project *string `mapstructure:"project" required:"true" cty:"project" hcl:"project"` - TokenLogin *string `mapstructure:"token_login" required:"false" cty:"token_login" hcl:"token_login"` - StateTimeout *string `mapstructure:"state_timeout" required:"false" cty:"state_timeout" hcl:"state_timeout"` - SourceImage *string `mapstructure:"source_image" required:"true" cty:"source_image" hcl:"source_image"` - ImageName *string `mapstructure:"image_name" required:"false" cty:"image_name" hcl:"image_name"` - ImageDescription *string `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"` - ImageTags map[string]string `mapstructure:"image_tags" required:"false" cty:"image_tags" hcl:"image_tags"` - ImageTag []hcl2template.FlatKeyValue `mapstructure:"image_tag" required:"false" cty:"image_tag" hcl:"image_tag"` - ImageService *string `mapstructure:"image_service" required:"false" cty:"image_service" hcl:"image_service"` - VmType *string `mapstructure:"vm_type" required:"true" cty:"vm_type" hcl:"vm_type"` - VmName *string `mapstructure:"vm_name" required:"false" cty:"vm_name" hcl:"vm_name"` - VmTags map[string]string `mapstructure:"vm_tags" required:"false" cty:"vm_tags" hcl:"vm_tags"` - VmTag []hcl2template.FlatNameValue `mapstructure:"vm_tag" required:"false" cty:"vm_tag" hcl:"vm_tag"` - DiskName *string `mapstructure:"disk_name" required:"false" cty:"disk_name" hcl:"disk_name"` - DiskType *string `mapstructure:"disk_type" required:"false" cty:"disk_type" hcl:"disk_type"` - DiskSize *float32 `mapstructure:"disk_size" required:"true" cty:"disk_size" hcl:"disk_size"` - Network *string `mapstructure:"network" required:"false" cty:"network" hcl:"network"` - PrivateIP *string `mapstructure:"private_ip" required:"false" cty:"private_ip" hcl:"private_ip"` - PublicIP *string `mapstructure:"public_ip" required:"false" cty:"public_ip" hcl:"public_ip"` - PublicNetAdpService *string `mapstructure:"public_netadp_service" required:"false" cty:"public_netadp_service" hcl:"public_netadp_service"` - ChrootDevice *string `mapstructure:"chroot_device" cty:"chroot_device" hcl:"chroot_device"` - ChrootDisk *bool `mapstructure:"chroot_disk" cty:"chroot_disk" hcl:"chroot_disk"` - ChrootDiskSize *float32 `mapstructure:"chroot_disk_size" cty:"chroot_disk_size" hcl:"chroot_disk_size"` - ChrootDiskType *string `mapstructure:"chroot_disk_type" cty:"chroot_disk_type" hcl:"chroot_disk_type"` - ChrootMountPath *string `mapstructure:"chroot_mount_path" cty:"chroot_mount_path" hcl:"chroot_mount_path"` - ChrootMounts [][]string `mapstructure:"chroot_mounts" cty:"chroot_mounts" hcl:"chroot_mounts"` - ChrootCopyFiles []string `mapstructure:"chroot_copy_files" cty:"chroot_copy_files" hcl:"chroot_copy_files"` - ChrootCommandWrapper *string `mapstructure:"chroot_command_wrapper" cty:"chroot_command_wrapper" hcl:"chroot_command_wrapper"` - MountOptions []string `mapstructure:"mount_options" cty:"mount_options" hcl:"mount_options"` - MountPartition *string `mapstructure:"mount_partition" cty:"mount_partition" hcl:"mount_partition"` - PreMountCommands []string `mapstructure:"pre_mount_commands" cty:"pre_mount_commands" hcl:"pre_mount_commands"` - PostMountCommands []string `mapstructure:"post_mount_commands" cty:"post_mount_commands" hcl:"post_mount_commands"` - SSHKeys []string `mapstructure:"ssh_keys" required:"false" cty:"ssh_keys" hcl:"ssh_keys"` - UserData *string `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"` + PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` + PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` + PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` + PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` + PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` + PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"` + PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"` + Type *string `mapstructure:"communicator" cty:"communicator" hcl:"communicator"` + PauseBeforeConnect *string `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"` + SSHHost *string `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"` + SSHPort *int `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"` + SSHUsername *string `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"` + SSHPassword *string `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"` + SSHKeyPairName *string `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"` + SSHTemporaryKeyPairName *string `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"` + SSHTemporaryKeyPairType *string `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"` + SSHTemporaryKeyPairBits *int `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"` + SSHCiphers []string `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"` + SSHClearAuthorizedKeys *bool `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"` + SSHKEXAlgos []string `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"` + SSHPrivateKeyFile *string `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"` + SSHCertificateFile *string `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"` + SSHPty *bool `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"` + SSHTimeout *string `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"` + SSHWaitTimeout *string `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"` + SSHAgentAuth *bool `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"` + SSHDisableAgentForwarding *bool `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"` + SSHHandshakeAttempts *int `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"` + SSHBastionHost *string `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"` + SSHBastionPort *int `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"` + SSHBastionAgentAuth *bool `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"` + SSHBastionUsername *string `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"` + SSHBastionPassword *string `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"` + SSHBastionInteractive *bool `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"` + SSHBastionPrivateKeyFile *string `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"` + SSHBastionCertificateFile *string `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"` + SSHFileTransferMethod *string `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"` + SSHProxyHost *string `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"` + SSHProxyPort *int `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"` + SSHProxyUsername *string `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"` + SSHProxyPassword *string `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"` + SSHKeepAliveInterval *string `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"` + SSHReadWriteTimeout *string `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"` + SSHRemoteTunnels []string `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"` + SSHLocalTunnels []string `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"` + SSHPublicKey []byte `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"` + SSHPrivateKey []byte `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"` + WinRMUser *string `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"` + WinRMPassword *string `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"` + WinRMHost *string `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"` + WinRMNoProxy *bool `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"` + WinRMPort *int `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"` + WinRMTimeout *string `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"` + WinRMUseSSL *bool `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"` + WinRMInsecure *bool `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"` + WinRMUseNTLM *bool `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"` + APIURL *string `mapstructure:"api_url" required:"false" cty:"api_url" hcl:"api_url"` + Token *string `mapstructure:"token" required:"true" cty:"token" hcl:"token"` + Project *string `mapstructure:"project" required:"true" cty:"project" hcl:"project"` + TokenLogin *string `mapstructure:"token_login" required:"false" cty:"token_login" hcl:"token_login"` + StateTimeout *string `mapstructure:"state_timeout" required:"false" cty:"state_timeout" hcl:"state_timeout"` + SourceImage *string `mapstructure:"source_image" required:"true" cty:"source_image" hcl:"source_image"` + ImageName *string `mapstructure:"image_name" required:"false" cty:"image_name" hcl:"image_name"` + ImageDescription *string `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"` + ImageTags map[string]string `mapstructure:"image_tags" required:"false" cty:"image_tags" hcl:"image_tags"` + ImageTag []config.FlatKeyValue `mapstructure:"image_tag" required:"false" cty:"image_tag" hcl:"image_tag"` + ImageService *string `mapstructure:"image_service" required:"false" cty:"image_service" hcl:"image_service"` + VmType *string `mapstructure:"vm_type" required:"true" cty:"vm_type" hcl:"vm_type"` + VmName *string `mapstructure:"vm_name" required:"false" cty:"vm_name" hcl:"vm_name"` + VmTags map[string]string `mapstructure:"vm_tags" required:"false" cty:"vm_tags" hcl:"vm_tags"` + VmTag []config.FlatNameValue `mapstructure:"vm_tag" required:"false" cty:"vm_tag" hcl:"vm_tag"` + DiskName *string `mapstructure:"disk_name" required:"false" cty:"disk_name" hcl:"disk_name"` + DiskType *string `mapstructure:"disk_type" required:"false" cty:"disk_type" hcl:"disk_type"` + DiskSize *float32 `mapstructure:"disk_size" required:"true" cty:"disk_size" hcl:"disk_size"` + Network *string `mapstructure:"network" required:"false" cty:"network" hcl:"network"` + PrivateIP *string `mapstructure:"private_ip" required:"false" cty:"private_ip" hcl:"private_ip"` + PublicIP *string `mapstructure:"public_ip" required:"false" cty:"public_ip" hcl:"public_ip"` + PublicNetAdpService *string `mapstructure:"public_netadp_service" required:"false" cty:"public_netadp_service" hcl:"public_netadp_service"` + ChrootDevice *string `mapstructure:"chroot_device" cty:"chroot_device" hcl:"chroot_device"` + ChrootDisk *bool `mapstructure:"chroot_disk" cty:"chroot_disk" hcl:"chroot_disk"` + ChrootDiskSize *float32 `mapstructure:"chroot_disk_size" cty:"chroot_disk_size" hcl:"chroot_disk_size"` + ChrootDiskType *string `mapstructure:"chroot_disk_type" cty:"chroot_disk_type" hcl:"chroot_disk_type"` + ChrootMountPath *string `mapstructure:"chroot_mount_path" cty:"chroot_mount_path" hcl:"chroot_mount_path"` + ChrootMounts [][]string `mapstructure:"chroot_mounts" cty:"chroot_mounts" hcl:"chroot_mounts"` + ChrootCopyFiles []string `mapstructure:"chroot_copy_files" cty:"chroot_copy_files" hcl:"chroot_copy_files"` + ChrootCommandWrapper *string `mapstructure:"chroot_command_wrapper" cty:"chroot_command_wrapper" hcl:"chroot_command_wrapper"` + MountOptions []string `mapstructure:"mount_options" cty:"mount_options" hcl:"mount_options"` + MountPartition *string `mapstructure:"mount_partition" cty:"mount_partition" hcl:"mount_partition"` + PreMountCommands []string `mapstructure:"pre_mount_commands" cty:"pre_mount_commands" hcl:"pre_mount_commands"` + PostMountCommands []string `mapstructure:"post_mount_commands" cty:"post_mount_commands" hcl:"post_mount_commands"` + SSHKeys []string `mapstructure:"ssh_keys" required:"false" cty:"ssh_keys" hcl:"ssh_keys"` + UserData *string `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"` } // FlatMapstructure returns a new FlatConfig. @@ -183,12 +183,12 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "image_name": &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false}, "image_description": &hcldec.AttrSpec{Name: "image_description", Type: cty.String, Required: false}, "image_tags": &hcldec.AttrSpec{Name: "image_tags", Type: cty.Map(cty.String), Required: false}, - "image_tag": &hcldec.BlockListSpec{TypeName: "image_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "image_tag": &hcldec.BlockListSpec{TypeName: "image_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "image_service": &hcldec.AttrSpec{Name: "image_service", Type: cty.String, Required: false}, "vm_type": &hcldec.AttrSpec{Name: "vm_type", Type: cty.String, Required: false}, "vm_name": &hcldec.AttrSpec{Name: "vm_name", Type: cty.String, Required: false}, "vm_tags": &hcldec.AttrSpec{Name: "vm_tags", Type: cty.Map(cty.String), Required: false}, - "vm_tag": &hcldec.BlockListSpec{TypeName: "vm_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())}, + "vm_tag": &hcldec.BlockListSpec{TypeName: "vm_tag", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())}, "disk_name": &hcldec.AttrSpec{Name: "disk_name", Type: cty.String, Required: false}, "disk_type": &hcldec.AttrSpec{Name: "disk_type", Type: cty.String, Required: false}, "disk_size": &hcldec.AttrSpec{Name: "disk_size", Type: cty.Number, Required: false}, diff --git a/builder/osc/common/run_config.go b/builder/osc/common/run_config.go index 589ed3f28..088f1ca8c 100644 --- a/builder/osc/common/run_config.go +++ b/builder/osc/common/run_config.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) @@ -21,9 +21,9 @@ var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$") // docs at // https://wiki.outscale.net/display/EN/Getting+Information+About+Your+OMIs type OmiFilterOptions struct { - hcl2template.NameValueFilter `mapstructure:",squash"` - Owners []string - MostRecent bool `mapstructure:"most_recent"` + config.NameValueFilter `mapstructure:",squash"` + Owners []string + MostRecent bool `mapstructure:"most_recent"` } func (d *OmiFilterOptions) Empty() bool { @@ -37,20 +37,20 @@ func (d *OmiFilterOptions) NoOwner() bool { // docs at // https://wiki.outscale.net/display/EN/Getting+Information+About+Your+Subnets type SubnetFilterOptions struct { - hcl2template.NameValueFilter `mapstructure:",squash"` - MostFree bool `mapstructure:"most_free"` - Random bool `mapstructure:"random"` + config.NameValueFilter `mapstructure:",squash"` + MostFree bool `mapstructure:"most_free"` + Random bool `mapstructure:"random"` } // docs at https://docs.outscale.com/api#tocsfiltersnet type NetFilterOptions struct { - hcl2template.NameValueFilter `mapstructure:",squash"` + config.NameValueFilter `mapstructure:",squash"` } // docs at // https://wiki.outscale.net/display/EN/Getting+Information+About+Your+Security+Groups type SecurityGroupFilterOptions struct { - hcl2template.NameValueFilter `mapstructure:",squash"` + config.NameValueFilter `mapstructure:",squash"` } // RunConfig contains configuration for running an vm from a source diff --git a/builder/osc/common/run_config.hcl2spec.go b/builder/osc/common/run_config.hcl2spec.go index c3906cbdc..47ee128f7 100644 --- a/builder/osc/common/run_config.hcl2spec.go +++ b/builder/osc/common/run_config.hcl2spec.go @@ -3,7 +3,7 @@ package common import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) @@ -47,8 +47,8 @@ func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec { // FlatNetFilterOptions is an auto-generated flat version of NetFilterOptions. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatNetFilterOptions struct { - Filters map[string]string `cty:"filters" hcl:"filters"` - Filter []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"` + Filters map[string]string `cty:"filters" hcl:"filters"` + Filter []config.FlatNameValue `cty:"filter" hcl:"filter"` } // FlatMapstructure returns a new FlatNetFilterOptions. @@ -64,7 +64,7 @@ func (*NetFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]hcl func (*FlatNetFilterOptions) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false}, - "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())}, + "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())}, } return s } @@ -72,10 +72,10 @@ func (*FlatNetFilterOptions) HCL2Spec() map[string]hcldec.Spec { // FlatOmiFilterOptions is an auto-generated flat version of OmiFilterOptions. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatOmiFilterOptions struct { - Filters map[string]string `cty:"filters" hcl:"filters"` - Filter []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"` - Owners []string `cty:"owners" hcl:"owners"` - MostRecent *bool `mapstructure:"most_recent" cty:"most_recent" hcl:"most_recent"` + Filters map[string]string `cty:"filters" hcl:"filters"` + Filter []config.FlatNameValue `cty:"filter" hcl:"filter"` + Owners []string `cty:"owners" hcl:"owners"` + MostRecent *bool `mapstructure:"most_recent" cty:"most_recent" hcl:"most_recent"` } // FlatMapstructure returns a new FlatOmiFilterOptions. @@ -91,7 +91,7 @@ func (*OmiFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]hcl func (*FlatOmiFilterOptions) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false}, - "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())}, + "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())}, "owners": &hcldec.AttrSpec{Name: "owners", Type: cty.List(cty.String), Required: false}, "most_recent": &hcldec.AttrSpec{Name: "most_recent", Type: cty.Bool, Required: false}, } @@ -101,8 +101,8 @@ func (*FlatOmiFilterOptions) HCL2Spec() map[string]hcldec.Spec { // FlatSecurityGroupFilterOptions is an auto-generated flat version of SecurityGroupFilterOptions. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatSecurityGroupFilterOptions struct { - Filters map[string]string `cty:"filters" hcl:"filters"` - Filter []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"` + Filters map[string]string `cty:"filters" hcl:"filters"` + Filter []config.FlatNameValue `cty:"filter" hcl:"filter"` } // FlatMapstructure returns a new FlatSecurityGroupFilterOptions. @@ -118,7 +118,7 @@ func (*SecurityGroupFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[ func (*FlatSecurityGroupFilterOptions) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false}, - "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())}, + "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())}, } return s } @@ -126,10 +126,10 @@ func (*FlatSecurityGroupFilterOptions) HCL2Spec() map[string]hcldec.Spec { // FlatSubnetFilterOptions is an auto-generated flat version of SubnetFilterOptions. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatSubnetFilterOptions struct { - Filters map[string]string `cty:"filters" hcl:"filters"` - Filter []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"` - MostFree *bool `mapstructure:"most_free" cty:"most_free" hcl:"most_free"` - Random *bool `mapstructure:"random" cty:"random" hcl:"random"` + Filters map[string]string `cty:"filters" hcl:"filters"` + Filter []config.FlatNameValue `cty:"filter" hcl:"filter"` + MostFree *bool `mapstructure:"most_free" cty:"most_free" hcl:"most_free"` + Random *bool `mapstructure:"random" cty:"random" hcl:"random"` } // FlatMapstructure returns a new FlatSubnetFilterOptions. @@ -145,7 +145,7 @@ func (*SubnetFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string] func (*FlatSubnetFilterOptions) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false}, - "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())}, + "filter": &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())}, "most_free": &hcldec.AttrSpec{Name: "most_free", Type: cty.Bool, Required: false}, "random": &hcldec.AttrSpec{Name: "random", Type: cty.Bool, Required: false}, } diff --git a/builder/osc/common/run_config_test.go b/builder/osc/common/run_config_test.go index 93df79849..345b693cc 100644 --- a/builder/osc/common/run_config_test.go +++ b/builder/osc/common/run_config_test.go @@ -6,8 +6,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) func init() { @@ -74,7 +74,7 @@ func TestRunConfigPrepare_SourceOmiFilterOwnersBlank(t *testing.T) { filter_key := "name" filter_value := "foo" c.SourceOmiFilter = OmiFilterOptions{ - NameValueFilter: hcl2template.NameValueFilter{ + NameValueFilter: config.NameValueFilter{ Filters: map[string]string{filter_key: filter_value}, }, } @@ -90,7 +90,7 @@ func TestRunConfigPrepare_SourceOmiFilterGood(t *testing.T) { filter_value := "foo" goodFilter := OmiFilterOptions{ Owners: []string{owner}, - NameValueFilter: hcl2template.NameValueFilter{ + NameValueFilter: config.NameValueFilter{ Filters: map[string]string{filter_key: filter_value}, }, } diff --git a/builder/tencentcloud/cvm/builder.hcl2spec.go b/builder/tencentcloud/cvm/builder.hcl2spec.go index f45a443cc..e5612fc12 100644 --- a/builder/tencentcloud/cvm/builder.hcl2spec.go +++ b/builder/tencentcloud/cvm/builder.hcl2spec.go @@ -3,108 +3,108 @@ package cvm import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) // FlatConfig is an auto-generated flat version of Config. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatConfig struct { - PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` - PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` - PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` - PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` - PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` - PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` - PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"` - PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"` - SecretId *string `mapstructure:"secret_id" required:"true" cty:"secret_id" hcl:"secret_id"` - SecretKey *string `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"` - Region *string `mapstructure:"region" required:"true" cty:"region" hcl:"region"` - Zone *string `mapstructure:"zone" required:"true" cty:"zone" hcl:"zone"` - SkipValidation *bool `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"` - ImageName *string `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"` - ImageDescription *string `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"` - Reboot *bool `mapstructure:"reboot" required:"false" cty:"reboot" hcl:"reboot"` - ForcePoweroff *bool `mapstructure:"force_poweroff" required:"false" cty:"force_poweroff" hcl:"force_poweroff"` - Sysprep *bool `mapstructure:"sysprep" required:"false" cty:"sysprep" hcl:"sysprep"` - ImageForceDelete *bool `mapstructure:"image_force_delete" cty:"image_force_delete" hcl:"image_force_delete"` - ImageCopyRegions []string `mapstructure:"image_copy_regions" required:"false" cty:"image_copy_regions" hcl:"image_copy_regions"` - ImageShareAccounts []string `mapstructure:"image_share_accounts" required:"false" cty:"image_share_accounts" hcl:"image_share_accounts"` - AssociatePublicIpAddress *bool `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"` - SourceImageId *string `mapstructure:"source_image_id" required:"false" cty:"source_image_id" hcl:"source_image_id"` - SourceImageName *string `mapstructure:"source_image_name" required:"false" cty:"source_image_name" hcl:"source_image_name"` - InstanceType *string `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"` - InstanceName *string `mapstructure:"instance_name" required:"false" cty:"instance_name" hcl:"instance_name"` - DiskType *string `mapstructure:"disk_type" required:"false" cty:"disk_type" hcl:"disk_type"` - DiskSize *int64 `mapstructure:"disk_size" required:"false" cty:"disk_size" hcl:"disk_size"` - DataDisks []FlattencentCloudDataDisk `mapstructure:"data_disks" cty:"data_disks" hcl:"data_disks"` - VpcId *string `mapstructure:"vpc_id" required:"false" cty:"vpc_id" hcl:"vpc_id"` - VpcName *string `mapstructure:"vpc_name" required:"false" cty:"vpc_name" hcl:"vpc_name"` - VpcIp *string `mapstructure:"vpc_ip" cty:"vpc_ip" hcl:"vpc_ip"` - SubnetId *string `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"` - SubnetName *string `mapstructure:"subnet_name" required:"false" cty:"subnet_name" hcl:"subnet_name"` - CidrBlock *string `mapstructure:"cidr_block" required:"false" cty:"cidr_block" hcl:"cidr_block"` - SubnectCidrBlock *string `mapstructure:"subnect_cidr_block" required:"false" cty:"subnect_cidr_block" hcl:"subnect_cidr_block"` - InternetChargeType *string `mapstructure:"internet_charge_type" cty:"internet_charge_type" hcl:"internet_charge_type"` - InternetMaxBandwidthOut *int64 `mapstructure:"internet_max_bandwidth_out" required:"false" cty:"internet_max_bandwidth_out" hcl:"internet_max_bandwidth_out"` - SecurityGroupId *string `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"` - SecurityGroupName *string `mapstructure:"security_group_name" required:"false" cty:"security_group_name" hcl:"security_group_name"` - UserData *string `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"` - UserDataFile *string `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"` - HostName *string `mapstructure:"host_name" required:"false" cty:"host_name" hcl:"host_name"` - RunTags map[string]string `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"` - RunTag []hcl2template.FlatKeyValue `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"` - Type *string `mapstructure:"communicator" cty:"communicator" hcl:"communicator"` - PauseBeforeConnect *string `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"` - SSHHost *string `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"` - SSHPort *int `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"` - SSHUsername *string `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"` - SSHPassword *string `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"` - SSHKeyPairName *string `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"` - SSHTemporaryKeyPairName *string `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"` - SSHTemporaryKeyPairType *string `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"` - SSHTemporaryKeyPairBits *int `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"` - SSHCiphers []string `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"` - SSHClearAuthorizedKeys *bool `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"` - SSHKEXAlgos []string `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"` - SSHPrivateKeyFile *string `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"` - SSHCertificateFile *string `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"` - SSHPty *bool `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"` - SSHTimeout *string `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"` - SSHWaitTimeout *string `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"` - SSHAgentAuth *bool `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"` - SSHDisableAgentForwarding *bool `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"` - SSHHandshakeAttempts *int `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"` - SSHBastionHost *string `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"` - SSHBastionPort *int `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"` - SSHBastionAgentAuth *bool `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"` - SSHBastionUsername *string `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"` - SSHBastionPassword *string `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"` - SSHBastionInteractive *bool `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"` - SSHBastionPrivateKeyFile *string `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"` - SSHBastionCertificateFile *string `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"` - SSHFileTransferMethod *string `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"` - SSHProxyHost *string `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"` - SSHProxyPort *int `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"` - SSHProxyUsername *string `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"` - SSHProxyPassword *string `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"` - SSHKeepAliveInterval *string `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"` - SSHReadWriteTimeout *string `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"` - SSHRemoteTunnels []string `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"` - SSHLocalTunnels []string `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"` - SSHPublicKey []byte `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"` - SSHPrivateKey []byte `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"` - WinRMUser *string `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"` - WinRMPassword *string `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"` - WinRMHost *string `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"` - WinRMNoProxy *bool `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"` - WinRMPort *int `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"` - WinRMTimeout *string `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"` - WinRMUseSSL *bool `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"` - WinRMInsecure *bool `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"` - WinRMUseNTLM *bool `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"` - SSHPrivateIp *bool `mapstructure:"ssh_private_ip" cty:"ssh_private_ip" hcl:"ssh_private_ip"` + PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` + PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` + PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` + PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` + PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` + PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"` + PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"` + SecretId *string `mapstructure:"secret_id" required:"true" cty:"secret_id" hcl:"secret_id"` + SecretKey *string `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"` + Region *string `mapstructure:"region" required:"true" cty:"region" hcl:"region"` + Zone *string `mapstructure:"zone" required:"true" cty:"zone" hcl:"zone"` + SkipValidation *bool `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"` + ImageName *string `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"` + ImageDescription *string `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"` + Reboot *bool `mapstructure:"reboot" required:"false" cty:"reboot" hcl:"reboot"` + ForcePoweroff *bool `mapstructure:"force_poweroff" required:"false" cty:"force_poweroff" hcl:"force_poweroff"` + Sysprep *bool `mapstructure:"sysprep" required:"false" cty:"sysprep" hcl:"sysprep"` + ImageForceDelete *bool `mapstructure:"image_force_delete" cty:"image_force_delete" hcl:"image_force_delete"` + ImageCopyRegions []string `mapstructure:"image_copy_regions" required:"false" cty:"image_copy_regions" hcl:"image_copy_regions"` + ImageShareAccounts []string `mapstructure:"image_share_accounts" required:"false" cty:"image_share_accounts" hcl:"image_share_accounts"` + AssociatePublicIpAddress *bool `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"` + SourceImageId *string `mapstructure:"source_image_id" required:"false" cty:"source_image_id" hcl:"source_image_id"` + SourceImageName *string `mapstructure:"source_image_name" required:"false" cty:"source_image_name" hcl:"source_image_name"` + InstanceType *string `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"` + InstanceName *string `mapstructure:"instance_name" required:"false" cty:"instance_name" hcl:"instance_name"` + DiskType *string `mapstructure:"disk_type" required:"false" cty:"disk_type" hcl:"disk_type"` + DiskSize *int64 `mapstructure:"disk_size" required:"false" cty:"disk_size" hcl:"disk_size"` + DataDisks []FlattencentCloudDataDisk `mapstructure:"data_disks" cty:"data_disks" hcl:"data_disks"` + VpcId *string `mapstructure:"vpc_id" required:"false" cty:"vpc_id" hcl:"vpc_id"` + VpcName *string `mapstructure:"vpc_name" required:"false" cty:"vpc_name" hcl:"vpc_name"` + VpcIp *string `mapstructure:"vpc_ip" cty:"vpc_ip" hcl:"vpc_ip"` + SubnetId *string `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"` + SubnetName *string `mapstructure:"subnet_name" required:"false" cty:"subnet_name" hcl:"subnet_name"` + CidrBlock *string `mapstructure:"cidr_block" required:"false" cty:"cidr_block" hcl:"cidr_block"` + SubnectCidrBlock *string `mapstructure:"subnect_cidr_block" required:"false" cty:"subnect_cidr_block" hcl:"subnect_cidr_block"` + InternetChargeType *string `mapstructure:"internet_charge_type" cty:"internet_charge_type" hcl:"internet_charge_type"` + InternetMaxBandwidthOut *int64 `mapstructure:"internet_max_bandwidth_out" required:"false" cty:"internet_max_bandwidth_out" hcl:"internet_max_bandwidth_out"` + SecurityGroupId *string `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"` + SecurityGroupName *string `mapstructure:"security_group_name" required:"false" cty:"security_group_name" hcl:"security_group_name"` + UserData *string `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"` + UserDataFile *string `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"` + HostName *string `mapstructure:"host_name" required:"false" cty:"host_name" hcl:"host_name"` + RunTags map[string]string `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"` + RunTag []config.FlatKeyValue `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"` + Type *string `mapstructure:"communicator" cty:"communicator" hcl:"communicator"` + PauseBeforeConnect *string `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"` + SSHHost *string `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"` + SSHPort *int `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"` + SSHUsername *string `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"` + SSHPassword *string `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"` + SSHKeyPairName *string `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"` + SSHTemporaryKeyPairName *string `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"` + SSHTemporaryKeyPairType *string `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"` + SSHTemporaryKeyPairBits *int `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"` + SSHCiphers []string `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"` + SSHClearAuthorizedKeys *bool `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"` + SSHKEXAlgos []string `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"` + SSHPrivateKeyFile *string `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"` + SSHCertificateFile *string `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"` + SSHPty *bool `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"` + SSHTimeout *string `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"` + SSHWaitTimeout *string `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"` + SSHAgentAuth *bool `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"` + SSHDisableAgentForwarding *bool `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"` + SSHHandshakeAttempts *int `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"` + SSHBastionHost *string `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"` + SSHBastionPort *int `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"` + SSHBastionAgentAuth *bool `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"` + SSHBastionUsername *string `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"` + SSHBastionPassword *string `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"` + SSHBastionInteractive *bool `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"` + SSHBastionPrivateKeyFile *string `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"` + SSHBastionCertificateFile *string `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"` + SSHFileTransferMethod *string `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"` + SSHProxyHost *string `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"` + SSHProxyPort *int `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"` + SSHProxyUsername *string `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"` + SSHProxyPassword *string `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"` + SSHKeepAliveInterval *string `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"` + SSHReadWriteTimeout *string `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"` + SSHRemoteTunnels []string `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"` + SSHLocalTunnels []string `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"` + SSHPublicKey []byte `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"` + SSHPrivateKey []byte `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"` + WinRMUser *string `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"` + WinRMPassword *string `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"` + WinRMHost *string `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"` + WinRMNoProxy *bool `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"` + WinRMPort *int `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"` + WinRMTimeout *string `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"` + WinRMUseSSL *bool `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"` + WinRMInsecure *bool `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"` + WinRMUseNTLM *bool `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"` + SSHPrivateIp *bool `mapstructure:"ssh_private_ip" cty:"ssh_private_ip" hcl:"ssh_private_ip"` } // FlatMapstructure returns a new FlatConfig. @@ -163,7 +163,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "user_data_file": &hcldec.AttrSpec{Name: "user_data_file", Type: cty.String, Required: false}, "host_name": &hcldec.AttrSpec{Name: "host_name", Type: cty.String, Required: false}, "run_tags": &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false}, - "run_tag": &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "run_tag": &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "communicator": &hcldec.AttrSpec{Name: "communicator", Type: cty.String, Required: false}, "pause_before_connecting": &hcldec.AttrSpec{Name: "pause_before_connecting", Type: cty.String, Required: false}, "ssh_host": &hcldec.AttrSpec{Name: "ssh_host", Type: cty.String, Required: false}, diff --git a/builder/tencentcloud/cvm/run_config.go b/builder/tencentcloud/cvm/run_config.go index d3083661b..f13d4595d 100644 --- a/builder/tencentcloud/cvm/run_config.go +++ b/builder/tencentcloud/cvm/run_config.go @@ -8,8 +8,8 @@ import ( "os" "strings" - "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/pkg/errors" @@ -91,7 +91,7 @@ type TencentCloudRunConfig struct { // block containing a `key` and a `value` field. In HCL2 mode the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - RunTag hcl2template.KeyValues `mapstructure:"run_tag" required:"false"` + RunTag config.KeyValues `mapstructure:"run_tag" required:"false"` // Communicator settings Comm communicator.Config `mapstructure:",squash"` diff --git a/builder/triton/config.hcl2spec.go b/builder/triton/config.hcl2spec.go index 89bef9eab..fa8427aad 100644 --- a/builder/triton/config.hcl2spec.go +++ b/builder/triton/config.hcl2spec.go @@ -3,93 +3,93 @@ package triton import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) // FlatConfig is an auto-generated flat version of Config. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatConfig struct { - PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` - PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` - PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` - PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` - PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` - PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` - PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"` - PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"` - Endpoint *string `mapstructure:"triton_url" required:"false" cty:"triton_url" hcl:"triton_url"` - Account *string `mapstructure:"triton_account" required:"true" cty:"triton_account" hcl:"triton_account"` - Username *string `mapstructure:"triton_user" required:"false" cty:"triton_user" hcl:"triton_user"` - KeyID *string `mapstructure:"triton_key_id" required:"true" cty:"triton_key_id" hcl:"triton_key_id"` - KeyMaterial *string `mapstructure:"triton_key_material" required:"false" cty:"triton_key_material" hcl:"triton_key_material"` - InsecureSkipTLSVerify *bool `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify" hcl:"insecure_skip_tls_verify"` - MachineName *string `mapstructure:"source_machine_name" required:"false" cty:"source_machine_name" hcl:"source_machine_name"` - MachinePackage *string `mapstructure:"source_machine_package" required:"true" cty:"source_machine_package" hcl:"source_machine_package"` - MachineImage *string `mapstructure:"source_machine_image" required:"true" cty:"source_machine_image" hcl:"source_machine_image"` - MachineNetworks []string `mapstructure:"source_machine_networks" required:"false" cty:"source_machine_networks" hcl:"source_machine_networks"` - MachineMetadata map[string]string `mapstructure:"source_machine_metadata" required:"false" cty:"source_machine_metadata" hcl:"source_machine_metadata"` - MachineTags map[string]string `mapstructure:"source_machine_tags" required:"false" cty:"source_machine_tags" hcl:"source_machine_tags"` - MachineTag []hcl2template.FlatKeyValue `mapstructure:"source_machine_tag" required:"false" cty:"source_machine_tag" hcl:"source_machine_tag"` - MachineFirewallEnabled *bool `mapstructure:"source_machine_firewall_enabled" required:"false" cty:"source_machine_firewall_enabled" hcl:"source_machine_firewall_enabled"` - MachineImageFilters *FlatMachineImageFilter `mapstructure:"source_machine_image_filter" required:"false" cty:"source_machine_image_filter" hcl:"source_machine_image_filter"` - ImageName *string `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"` - ImageVersion *string `mapstructure:"image_version" required:"true" cty:"image_version" hcl:"image_version"` - ImageDescription *string `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"` - ImageHomepage *string `mapstructure:"image_homepage" required:"false" cty:"image_homepage" hcl:"image_homepage"` - ImageEULA *string `mapstructure:"image_eula_url" required:"false" cty:"image_eula_url" hcl:"image_eula_url"` - ImageACL []string `mapstructure:"image_acls" required:"false" cty:"image_acls" hcl:"image_acls"` - ImageTags map[string]string `mapstructure:"image_tags" required:"false" cty:"image_tags" hcl:"image_tags"` - ImageTag []hcl2template.FlatNameValue `mapstructure:"image_tag" required:"false" cty:"image_tag" hcl:"image_tag"` - Type *string `mapstructure:"communicator" cty:"communicator" hcl:"communicator"` - PauseBeforeConnect *string `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"` - SSHHost *string `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"` - SSHPort *int `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"` - SSHUsername *string `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"` - SSHPassword *string `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"` - SSHKeyPairName *string `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"` - SSHTemporaryKeyPairName *string `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"` - SSHTemporaryKeyPairType *string `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"` - SSHTemporaryKeyPairBits *int `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"` - SSHCiphers []string `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"` - SSHClearAuthorizedKeys *bool `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"` - SSHKEXAlgos []string `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"` - SSHPrivateKeyFile *string `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"` - SSHCertificateFile *string `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"` - SSHPty *bool `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"` - SSHTimeout *string `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"` - SSHWaitTimeout *string `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"` - SSHAgentAuth *bool `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"` - SSHDisableAgentForwarding *bool `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"` - SSHHandshakeAttempts *int `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"` - SSHBastionHost *string `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"` - SSHBastionPort *int `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"` - SSHBastionAgentAuth *bool `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"` - SSHBastionUsername *string `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"` - SSHBastionPassword *string `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"` - SSHBastionInteractive *bool `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"` - SSHBastionPrivateKeyFile *string `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"` - SSHBastionCertificateFile *string `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"` - SSHFileTransferMethod *string `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"` - SSHProxyHost *string `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"` - SSHProxyPort *int `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"` - SSHProxyUsername *string `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"` - SSHProxyPassword *string `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"` - SSHKeepAliveInterval *string `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"` - SSHReadWriteTimeout *string `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"` - SSHRemoteTunnels []string `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"` - SSHLocalTunnels []string `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"` - SSHPublicKey []byte `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"` - SSHPrivateKey []byte `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"` - WinRMUser *string `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"` - WinRMPassword *string `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"` - WinRMHost *string `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"` - WinRMNoProxy *bool `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"` - WinRMPort *int `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"` - WinRMTimeout *string `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"` - WinRMUseSSL *bool `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"` - WinRMInsecure *bool `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"` - WinRMUseNTLM *bool `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"` + PackerBuildName *string `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"` + PackerBuilderType *string `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"` + PackerCoreVersion *string `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"` + PackerDebug *bool `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"` + PackerForce *bool `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"` + PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"` + PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"` + PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"` + Endpoint *string `mapstructure:"triton_url" required:"false" cty:"triton_url" hcl:"triton_url"` + Account *string `mapstructure:"triton_account" required:"true" cty:"triton_account" hcl:"triton_account"` + Username *string `mapstructure:"triton_user" required:"false" cty:"triton_user" hcl:"triton_user"` + KeyID *string `mapstructure:"triton_key_id" required:"true" cty:"triton_key_id" hcl:"triton_key_id"` + KeyMaterial *string `mapstructure:"triton_key_material" required:"false" cty:"triton_key_material" hcl:"triton_key_material"` + InsecureSkipTLSVerify *bool `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify" hcl:"insecure_skip_tls_verify"` + MachineName *string `mapstructure:"source_machine_name" required:"false" cty:"source_machine_name" hcl:"source_machine_name"` + MachinePackage *string `mapstructure:"source_machine_package" required:"true" cty:"source_machine_package" hcl:"source_machine_package"` + MachineImage *string `mapstructure:"source_machine_image" required:"true" cty:"source_machine_image" hcl:"source_machine_image"` + MachineNetworks []string `mapstructure:"source_machine_networks" required:"false" cty:"source_machine_networks" hcl:"source_machine_networks"` + MachineMetadata map[string]string `mapstructure:"source_machine_metadata" required:"false" cty:"source_machine_metadata" hcl:"source_machine_metadata"` + MachineTags map[string]string `mapstructure:"source_machine_tags" required:"false" cty:"source_machine_tags" hcl:"source_machine_tags"` + MachineTag []config.FlatKeyValue `mapstructure:"source_machine_tag" required:"false" cty:"source_machine_tag" hcl:"source_machine_tag"` + MachineFirewallEnabled *bool `mapstructure:"source_machine_firewall_enabled" required:"false" cty:"source_machine_firewall_enabled" hcl:"source_machine_firewall_enabled"` + MachineImageFilters *FlatMachineImageFilter `mapstructure:"source_machine_image_filter" required:"false" cty:"source_machine_image_filter" hcl:"source_machine_image_filter"` + ImageName *string `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"` + ImageVersion *string `mapstructure:"image_version" required:"true" cty:"image_version" hcl:"image_version"` + ImageDescription *string `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"` + ImageHomepage *string `mapstructure:"image_homepage" required:"false" cty:"image_homepage" hcl:"image_homepage"` + ImageEULA *string `mapstructure:"image_eula_url" required:"false" cty:"image_eula_url" hcl:"image_eula_url"` + ImageACL []string `mapstructure:"image_acls" required:"false" cty:"image_acls" hcl:"image_acls"` + ImageTags map[string]string `mapstructure:"image_tags" required:"false" cty:"image_tags" hcl:"image_tags"` + ImageTag []config.FlatNameValue `mapstructure:"image_tag" required:"false" cty:"image_tag" hcl:"image_tag"` + Type *string `mapstructure:"communicator" cty:"communicator" hcl:"communicator"` + PauseBeforeConnect *string `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"` + SSHHost *string `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"` + SSHPort *int `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"` + SSHUsername *string `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"` + SSHPassword *string `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"` + SSHKeyPairName *string `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"` + SSHTemporaryKeyPairName *string `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"` + SSHTemporaryKeyPairType *string `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"` + SSHTemporaryKeyPairBits *int `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"` + SSHCiphers []string `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"` + SSHClearAuthorizedKeys *bool `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"` + SSHKEXAlgos []string `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"` + SSHPrivateKeyFile *string `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"` + SSHCertificateFile *string `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"` + SSHPty *bool `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"` + SSHTimeout *string `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"` + SSHWaitTimeout *string `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"` + SSHAgentAuth *bool `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"` + SSHDisableAgentForwarding *bool `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"` + SSHHandshakeAttempts *int `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"` + SSHBastionHost *string `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"` + SSHBastionPort *int `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"` + SSHBastionAgentAuth *bool `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"` + SSHBastionUsername *string `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"` + SSHBastionPassword *string `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"` + SSHBastionInteractive *bool `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"` + SSHBastionPrivateKeyFile *string `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"` + SSHBastionCertificateFile *string `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"` + SSHFileTransferMethod *string `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"` + SSHProxyHost *string `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"` + SSHProxyPort *int `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"` + SSHProxyUsername *string `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"` + SSHProxyPassword *string `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"` + SSHKeepAliveInterval *string `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"` + SSHReadWriteTimeout *string `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"` + SSHRemoteTunnels []string `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"` + SSHLocalTunnels []string `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"` + SSHPublicKey []byte `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"` + SSHPrivateKey []byte `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"` + WinRMUser *string `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"` + WinRMPassword *string `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"` + WinRMHost *string `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"` + WinRMNoProxy *bool `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"` + WinRMPort *int `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"` + WinRMTimeout *string `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"` + WinRMUseSSL *bool `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"` + WinRMInsecure *bool `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"` + WinRMUseNTLM *bool `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"` } // FlatMapstructure returns a new FlatConfig. @@ -124,7 +124,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "source_machine_networks": &hcldec.AttrSpec{Name: "source_machine_networks", Type: cty.List(cty.String), Required: false}, "source_machine_metadata": &hcldec.AttrSpec{Name: "source_machine_metadata", Type: cty.Map(cty.String), Required: false}, "source_machine_tags": &hcldec.AttrSpec{Name: "source_machine_tags", Type: cty.Map(cty.String), Required: false}, - "source_machine_tag": &hcldec.BlockListSpec{TypeName: "source_machine_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "source_machine_tag": &hcldec.BlockListSpec{TypeName: "source_machine_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "source_machine_firewall_enabled": &hcldec.AttrSpec{Name: "source_machine_firewall_enabled", Type: cty.Bool, Required: false}, "source_machine_image_filter": &hcldec.BlockSpec{TypeName: "source_machine_image_filter", Nested: hcldec.ObjectSpec((*FlatMachineImageFilter)(nil).HCL2Spec())}, "image_name": &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false}, @@ -134,7 +134,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "image_eula_url": &hcldec.AttrSpec{Name: "image_eula_url", Type: cty.String, Required: false}, "image_acls": &hcldec.AttrSpec{Name: "image_acls", Type: cty.List(cty.String), Required: false}, "image_tags": &hcldec.AttrSpec{Name: "image_tags", Type: cty.Map(cty.String), Required: false}, - "image_tag": &hcldec.BlockListSpec{TypeName: "image_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())}, + "image_tag": &hcldec.BlockListSpec{TypeName: "image_tag", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())}, "communicator": &hcldec.AttrSpec{Name: "communicator", Type: cty.String, Required: false}, "pause_before_connecting": &hcldec.AttrSpec{Name: "pause_before_connecting", Type: cty.String, Required: false}, "ssh_host": &hcldec.AttrSpec{Name: "ssh_host", Type: cty.String, Required: false}, diff --git a/builder/triton/source_machine_config.go b/builder/triton/source_machine_config.go index cb0292fdb..18db29d59 100644 --- a/builder/triton/source_machine_config.go +++ b/builder/triton/source_machine_config.go @@ -6,7 +6,7 @@ package triton import ( "fmt" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) @@ -59,7 +59,7 @@ type SourceMachineConfig struct { // singular block containing a `key` and a `value` field. In HCL2 mode the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - MachineTag hcl2template.KeyValues `mapstructure:"source_machine_tag" required:"false"` + MachineTag config.KeyValues `mapstructure:"source_machine_tag" required:"false"` // Whether or not the firewall // of the VM used to create an image of is enabled. The Triton firewall only // filters inbound traffic to the VM. All outbound traffic is always allowed. diff --git a/builder/triton/target_image_config.go b/builder/triton/target_image_config.go index f3c62fce4..545240565 100644 --- a/builder/triton/target_image_config.go +++ b/builder/triton/target_image_config.go @@ -5,7 +5,7 @@ package triton import ( "fmt" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) @@ -41,7 +41,7 @@ type TargetImageConfig struct { // block containing a `name` and a `value` field. In HCL2 mode the // [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks) // will allow you to create those programatically. - ImageTag hcl2template.NameValues `mapstructure:"image_tag" required:"false"` + ImageTag config.NameValues `mapstructure:"image_tag" required:"false"` } // Prepare performs basic validation on a TargetImageConfig struct. diff --git a/cmd/struct-markdown/main.go b/cmd/struct-markdown/main.go index 77410baa4..a1731ae00 100644 --- a/cmd/struct-markdown/main.go +++ b/cmd/struct-markdown/main.go @@ -126,9 +126,9 @@ func main() { fieldType = `duration string | ex: "1h5m2s"` case "config.Trilean": fieldType = `boolean` - case "hcl2template.NameValues": + case "config.NameValues": fieldType = `[]{name string, value string}` - case "hcl2template.KeyValues": + case "config.KeyValues": fieldType = `[]{key string, value string}` } diff --git a/hcl2template/types.kv.go b/hcl2template/types.kv.go deleted file mode 100644 index a743b5778..000000000 --- a/hcl2template/types.kv.go +++ /dev/null @@ -1,71 +0,0 @@ -//go:generate mapstructure-to-hcl2 -type KeyValue,KeyValues,KeyValueFilter,NameValue,NameValues,NameValueFilter - -package hcl2template - -type KeyValue struct { - Key string - Value string -} - -type KeyValues []KeyValue - -func (kvs KeyValues) CopyOn(to *map[string]string) []error { - if len(kvs) == 0 { - return nil - } - if *to == nil { - *to = map[string]string{} - } - for _, kv := range kvs { - (*to)[kv.Key] = kv.Value - } - return nil -} - -type KeyValueFilter struct { - Filters map[string]string - Filter KeyValues -} - -func (kvf *KeyValueFilter) Prepare() []error { - kvf.Filter.CopyOn(&kvf.Filters) - return nil -} - -func (kvf *KeyValueFilter) Empty() bool { - return len(kvf.Filters) == 0 -} - -type NameValue struct { - Name string - Value string -} - -type NameValues []NameValue - -func (nvs NameValues) CopyOn(to *map[string]string) []error { - if len(nvs) == 0 { - return nil - } - if *to == nil { - *to = map[string]string{} - } - for _, kv := range nvs { - (*to)[kv.Name] = kv.Value - } - return nil -} - -type NameValueFilter struct { - Filters map[string]string - Filter NameValues -} - -func (nvf *NameValueFilter) Prepare() []error { - nvf.Filter.CopyOn(&nvf.Filters) - return nil -} - -func (nvf *NameValueFilter) Empty() bool { - return len(nvf.Filters) == 0 -} diff --git a/packer-plugin-sdk/template/config/custom_types.go b/packer-plugin-sdk/template/config/custom_types.go index df7038459..398f24dd4 100644 --- a/packer-plugin-sdk/template/config/custom_types.go +++ b/packer-plugin-sdk/template/config/custom_types.go @@ -1,3 +1,4 @@ +//go:generate mapstructure-to-hcl2 -type KeyValue,KeyValues,KeyValueFilter,NameValue,NameValues,NameValueFilter package config import ( @@ -70,3 +71,72 @@ func TrileanFromBool(b bool) Trilean { func boolPointer(b bool) *bool { return &b } + +// These are used to convert HCL blocks to key-value pairs +type KeyValue struct { + Key string + Value string +} + +type KeyValues []KeyValue + +func (kvs KeyValues) CopyOn(to *map[string]string) []error { + if len(kvs) == 0 { + return nil + } + if *to == nil { + *to = map[string]string{} + } + for _, kv := range kvs { + (*to)[kv.Key] = kv.Value + } + return nil +} + +type KeyValueFilter struct { + Filters map[string]string + Filter KeyValues +} + +func (kvf *KeyValueFilter) Prepare() []error { + kvf.Filter.CopyOn(&kvf.Filters) + return nil +} + +func (kvf *KeyValueFilter) Empty() bool { + return len(kvf.Filters) == 0 +} + +type NameValue struct { + Name string + Value string +} + +type NameValues []NameValue + +func (nvs NameValues) CopyOn(to *map[string]string) []error { + if len(nvs) == 0 { + return nil + } + if *to == nil { + *to = map[string]string{} + } + for _, kv := range nvs { + (*to)[kv.Name] = kv.Value + } + return nil +} + +type NameValueFilter struct { + Filters map[string]string + Filter NameValues +} + +func (nvf *NameValueFilter) Prepare() []error { + nvf.Filter.CopyOn(&nvf.Filters) + return nil +} + +func (nvf *NameValueFilter) Empty() bool { + return len(nvf.Filters) == 0 +} diff --git a/hcl2template/types.kv.hcl2spec.go b/packer-plugin-sdk/template/config/custom_types.hcl2spec.go similarity index 99% rename from hcl2template/types.kv.hcl2spec.go rename to packer-plugin-sdk/template/config/custom_types.hcl2spec.go index 9880d5207..6d78cda43 100644 --- a/hcl2template/types.kv.hcl2spec.go +++ b/packer-plugin-sdk/template/config/custom_types.hcl2spec.go @@ -1,5 +1,5 @@ // Code generated by "mapstructure-to-hcl2 -type KeyValue,KeyValues,KeyValueFilter,NameValue,NameValues,NameValueFilter"; DO NOT EDIT. -package hcl2template +package config import ( "github.com/hashicorp/hcl/v2/hcldec" diff --git a/post-processor/alicloud-import/post-processor.hcl2spec.go b/post-processor/alicloud-import/post-processor.hcl2spec.go index 8a3a742fe..2a3292281 100644 --- a/post-processor/alicloud-import/post-processor.hcl2spec.go +++ b/post-processor/alicloud-import/post-processor.hcl2spec.go @@ -4,7 +4,7 @@ package alicloudimport import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/alicloud/ecs" - "github.com/hashicorp/packer/hcl2template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) @@ -40,7 +40,7 @@ type FlatConfig struct { AlicloudImageForceDeleteInstances *bool `mapstructure:"image_force_delete_instances" cty:"image_force_delete_instances" hcl:"image_force_delete_instances"` AlicloudImageIgnoreDataDisks *bool `mapstructure:"image_ignore_data_disks" required:"false" cty:"image_ignore_data_disks" hcl:"image_ignore_data_disks"` AlicloudImageTags map[string]string `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"` - AlicloudImageTag []hcl2template.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` + AlicloudImageTag []config.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"` ECSSystemDiskMapping *ecs.FlatAlicloudDiskDevice `mapstructure:"system_disk_mapping" required:"false" cty:"system_disk_mapping" hcl:"system_disk_mapping"` ECSImagesDiskMappings []ecs.FlatAlicloudDiskDevice `mapstructure:"image_disk_mappings" required:"false" cty:"image_disk_mappings" hcl:"image_disk_mappings"` AssociatePublicIpAddress *bool `mapstructure:"associate_public_ip_address" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"` @@ -165,7 +165,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "image_force_delete_instances": &hcldec.AttrSpec{Name: "image_force_delete_instances", Type: cty.Bool, Required: false}, "image_ignore_data_disks": &hcldec.AttrSpec{Name: "image_ignore_data_disks", Type: cty.Bool, Required: false}, "tags": &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false}, - "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())}, + "tag": &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())}, "system_disk_mapping": &hcldec.BlockSpec{TypeName: "system_disk_mapping", Nested: hcldec.ObjectSpec((*ecs.FlatAlicloudDiskDevice)(nil).HCL2Spec())}, "image_disk_mappings": &hcldec.BlockListSpec{TypeName: "image_disk_mappings", Nested: hcldec.ObjectSpec((*ecs.FlatAlicloudDiskDevice)(nil).HCL2Spec())}, "associate_public_ip_address": &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false}, From f42094688fa38edf29ed1e13931385e514797040 Mon Sep 17 00:00:00 2001 From: Wilken Rivera Date: Thu, 19 Nov 2020 10:36:31 -0500 Subject: [PATCH 90/93] Add note to unmaintained provisioners (#10283) --- website/pages/docs/provisioners/chef-client.mdx | 2 ++ website/pages/docs/provisioners/chef-solo.mdx | 2 ++ website/pages/docs/provisioners/converge.mdx | 2 ++ website/pages/docs/provisioners/puppet-masterless.mdx | 2 ++ website/pages/docs/provisioners/puppet-server.mdx | 2 ++ website/pages/partials/provisioners/unmaintained-plugin.mdx | 2 +- 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/website/pages/docs/provisioners/chef-client.mdx b/website/pages/docs/provisioners/chef-client.mdx index 67de81919..df117c42b 100644 --- a/website/pages/docs/provisioners/chef-client.mdx +++ b/website/pages/docs/provisioners/chef-client.mdx @@ -14,6 +14,8 @@ sidebar_title: Chef Client # Chef Client Provisioner +@include 'provisioners/unmaintained-plugin.mdx' + Type: `chef-client` The Chef Client Packer provisioner installs and configures software on machines diff --git a/website/pages/docs/provisioners/chef-solo.mdx b/website/pages/docs/provisioners/chef-solo.mdx index 4944376d2..5e524c0d6 100644 --- a/website/pages/docs/provisioners/chef-solo.mdx +++ b/website/pages/docs/provisioners/chef-solo.mdx @@ -10,6 +10,8 @@ sidebar_title: Chef Solo # Chef Solo Provisioner +@include 'provisioners/unmaintained-plugin.mdx' + Type: `chef-solo` The Chef solo Packer provisioner installs and configures software on machines diff --git a/website/pages/docs/provisioners/converge.mdx b/website/pages/docs/provisioners/converge.mdx index 96ccc508b..a3aec3597 100644 --- a/website/pages/docs/provisioners/converge.mdx +++ b/website/pages/docs/provisioners/converge.mdx @@ -9,6 +9,8 @@ sidebar_title: Converge # Converge Provisioner +@include 'provisioners/unmaintained-plugin.mdx' + Type: `converge` The [Converge](http://converge.aster.is) Packer provisioner uses Converge diff --git a/website/pages/docs/provisioners/puppet-masterless.mdx b/website/pages/docs/provisioners/puppet-masterless.mdx index 8e9cadfad..4ad97f59f 100644 --- a/website/pages/docs/provisioners/puppet-masterless.mdx +++ b/website/pages/docs/provisioners/puppet-masterless.mdx @@ -18,6 +18,8 @@ sidebar_title: Puppet Masterless # Puppet (Masterless) Provisioner +@include 'provisioners/unmaintained-plugin.mdx' + Type: `puppet-masterless` The masterless Puppet Packer provisioner configures Puppet to run on the diff --git a/website/pages/docs/provisioners/puppet-server.mdx b/website/pages/docs/provisioners/puppet-server.mdx index 3e339728d..ce30bc3a3 100644 --- a/website/pages/docs/provisioners/puppet-server.mdx +++ b/website/pages/docs/provisioners/puppet-server.mdx @@ -9,6 +9,8 @@ sidebar_title: Puppet Server # Puppet Server Provisioner +@include 'provisioners/unmaintained-plugin.mdx' + Type: `puppet-server` The `puppet-server` Packer provisioner provisions Packer machines with Puppet diff --git a/website/pages/partials/provisioners/unmaintained-plugin.mdx b/website/pages/partials/provisioners/unmaintained-plugin.mdx index 6f92a3339..8d9dd44b9 100644 --- a/website/pages/partials/provisioners/unmaintained-plugin.mdx +++ b/website/pages/partials/provisioners/unmaintained-plugin.mdx @@ -1 +1 @@ -~> **This community-supported provisioner is unmaintained**, read more details in the [README](https://github.com/hashicorp/packer/blob/master/README.md#unmaintained-plugins) +~> **This is community maintained provisioner is currently unmaintained**; if you are interested in contributing or taking ownership of it, please reach out to us at [packer@hashicorp.com](mailto://packer@hashicorp.com). More details can be found in the [README](https://github.com/hashicorp/packer/blob/master/README.md#unmaintained-plugins). From 3b523e147e813838327ac04a9f5459f5e4e6999c Mon Sep 17 00:00:00 2001 From: sylviamoss Date: Fri, 20 Nov 2020 11:51:53 +0100 Subject: [PATCH 91/93] add config opt to additional storage to cloned vm --- builder/vsphere/clone/config.hcl2spec.go | 4 + builder/vsphere/clone/step_clone.go | 18 +- builder/vsphere/clone/step_clone.hcl2spec.go | 33 ++-- .../vsphere/clone/step_customize.hcl2spec.go | 11 +- builder/vsphere/common/storage_config.go | 118 ++++++++++++ .../vsphere/common/storage_config.hcl2spec.go | 61 ++++++ builder/vsphere/driver/disk.go | 84 +++++++++ builder/vsphere/driver/vm.go | 176 ++++++++++-------- builder/vsphere/iso/config.hcl2spec.go | 4 +- builder/vsphere/iso/step_create.go | 143 +++----------- builder/vsphere/iso/step_create.hcl2spec.go | 48 +---- builder/vsphere/iso/step_create_test.go | 68 ++++--- .../docs/builders/vmware/vsphere-clone.mdx | 15 ++ .../docs/builders/vmware/vsphere-iso.mdx | 8 +- .../common/DiskConfig-not-required.mdx | 7 + .../vsphere/common/DiskConfig-required.mdx | 3 + .../builder/vsphere/common/DiskConfig.mdx | 74 ++++++++ .../common/StorageConfig-not-required.mdx | 8 + .../vsphere/iso/CreateConfig-not-required.mdx | 7 - 19 files changed, 592 insertions(+), 298 deletions(-) create mode 100644 builder/vsphere/common/storage_config.go create mode 100644 builder/vsphere/common/storage_config.hcl2spec.go create mode 100644 builder/vsphere/driver/disk.go create mode 100644 website/pages/partials/builder/vsphere/common/DiskConfig-not-required.mdx create mode 100644 website/pages/partials/builder/vsphere/common/DiskConfig-required.mdx create mode 100644 website/pages/partials/builder/vsphere/common/DiskConfig.mdx create mode 100644 website/pages/partials/builder/vsphere/common/StorageConfig-not-required.mdx diff --git a/builder/vsphere/clone/config.hcl2spec.go b/builder/vsphere/clone/config.hcl2spec.go index ec26d8d42..ca49332d2 100644 --- a/builder/vsphere/clone/config.hcl2spec.go +++ b/builder/vsphere/clone/config.hcl2spec.go @@ -37,6 +37,8 @@ type FlatConfig struct { MacAddress *string `mapstructure:"mac_address" cty:"mac_address" hcl:"mac_address"` Notes *string `mapstructure:"notes" cty:"notes" hcl:"notes"` VAppConfig *FlatvAppConfig `mapstructure:"vapp" cty:"vapp" hcl:"vapp"` + DiskControllerType []string `mapstructure:"disk_controller_type" cty:"disk_controller_type" hcl:"disk_controller_type"` + Storage []common.FlatDiskConfig `mapstructure:"storage" cty:"storage" hcl:"storage"` VMName *string `mapstructure:"vm_name" cty:"vm_name" hcl:"vm_name"` Folder *string `mapstructure:"folder" cty:"folder" hcl:"folder"` Cluster *string `mapstructure:"cluster" cty:"cluster" hcl:"cluster"` @@ -174,6 +176,8 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "mac_address": &hcldec.AttrSpec{Name: "mac_address", Type: cty.String, Required: false}, "notes": &hcldec.AttrSpec{Name: "notes", Type: cty.String, Required: false}, "vapp": &hcldec.BlockSpec{TypeName: "vapp", Nested: hcldec.ObjectSpec((*FlatvAppConfig)(nil).HCL2Spec())}, + "disk_controller_type": &hcldec.AttrSpec{Name: "disk_controller_type", Type: cty.List(cty.String), Required: false}, + "storage": &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*common.FlatDiskConfig)(nil).HCL2Spec())}, "vm_name": &hcldec.AttrSpec{Name: "vm_name", Type: cty.String, Required: false}, "folder": &hcldec.AttrSpec{Name: "folder", Type: cty.String, Required: false}, "cluster": &hcldec.AttrSpec{Name: "cluster", Type: cty.String, Required: false}, diff --git a/builder/vsphere/clone/step_clone.go b/builder/vsphere/clone/step_clone.go index 8a8ca1ccf..850d2b3d5 100644 --- a/builder/vsphere/clone/step_clone.go +++ b/builder/vsphere/clone/step_clone.go @@ -44,11 +44,13 @@ type CloneConfig struct { // Set the vApp Options to a virtual machine. // See the [vApp Options Configuration](/docs/builders/vmware/vsphere-clone#vapp-options-configuration) // to know the available options and how to use it. - VAppConfig vAppConfig `mapstructure:"vapp"` + VAppConfig vAppConfig `mapstructure:"vapp"` + StorageConfig common.StorageConfig `mapstructure:",squash"` } func (c *CloneConfig) Prepare() []error { var errs []error + errs = append(errs, c.StorageConfig.Prepare()...) if c.Template == "" { errs = append(errs, fmt.Errorf("'template' is required")) @@ -89,6 +91,16 @@ func (s *StepCloneVM) Run(ctx context.Context, state multistep.StateBag) multist return multistep.ActionHalt } + var disks []driver.Disk + for _, disk := range s.Config.StorageConfig.Storage { + disks = append(disks, driver.Disk{ + DiskSize: disk.DiskSize, + DiskEagerlyScrub: disk.DiskEagerlyScrub, + DiskThinProvisioned: disk.DiskThinProvisioned, + ControllerIndex: disk.DiskControllerIndex, + }) + } + vm, err := template.Clone(ctx, &driver.CloneConfig{ Name: s.Location.VMName, Folder: s.Location.Folder, @@ -101,6 +113,10 @@ func (s *StepCloneVM) Run(ctx context.Context, state multistep.StateBag) multist MacAddress: s.Config.MacAddress, Annotation: s.Config.Notes, VAppProperties: s.Config.VAppConfig.Properties, + StorageConfig: driver.StorageConfig{ + DiskControllerType: s.Config.StorageConfig.DiskControllerType, + Storage: disks, + }, }) if err != nil { state.Put("error", err) diff --git a/builder/vsphere/clone/step_clone.hcl2spec.go b/builder/vsphere/clone/step_clone.hcl2spec.go index ad55ebfa8..a0422e28e 100644 --- a/builder/vsphere/clone/step_clone.hcl2spec.go +++ b/builder/vsphere/clone/step_clone.hcl2spec.go @@ -3,19 +3,22 @@ package clone import ( "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer/builder/vsphere/common" "github.com/zclconf/go-cty/cty" ) // FlatCloneConfig is an auto-generated flat version of CloneConfig. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatCloneConfig struct { - Template *string `mapstructure:"template" cty:"template" hcl:"template"` - DiskSize *int64 `mapstructure:"disk_size" cty:"disk_size" hcl:"disk_size"` - LinkedClone *bool `mapstructure:"linked_clone" cty:"linked_clone" hcl:"linked_clone"` - Network *string `mapstructure:"network" cty:"network" hcl:"network"` - MacAddress *string `mapstructure:"mac_address" cty:"mac_address" hcl:"mac_address"` - Notes *string `mapstructure:"notes" cty:"notes" hcl:"notes"` - VAppConfig *FlatvAppConfig `mapstructure:"vapp" cty:"vapp" hcl:"vapp"` + Template *string `mapstructure:"template" cty:"template" hcl:"template"` + DiskSize *int64 `mapstructure:"disk_size" cty:"disk_size" hcl:"disk_size"` + LinkedClone *bool `mapstructure:"linked_clone" cty:"linked_clone" hcl:"linked_clone"` + Network *string `mapstructure:"network" cty:"network" hcl:"network"` + MacAddress *string `mapstructure:"mac_address" cty:"mac_address" hcl:"mac_address"` + Notes *string `mapstructure:"notes" cty:"notes" hcl:"notes"` + VAppConfig *FlatvAppConfig `mapstructure:"vapp" cty:"vapp" hcl:"vapp"` + DiskControllerType []string `mapstructure:"disk_controller_type" cty:"disk_controller_type" hcl:"disk_controller_type"` + Storage []common.FlatDiskConfig `mapstructure:"storage" cty:"storage" hcl:"storage"` } // FlatMapstructure returns a new FlatCloneConfig. @@ -30,13 +33,15 @@ func (*CloneConfig) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.S // The decoded values from this spec will then be applied to a FlatCloneConfig. func (*FlatCloneConfig) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ - "template": &hcldec.AttrSpec{Name: "template", Type: cty.String, Required: false}, - "disk_size": &hcldec.AttrSpec{Name: "disk_size", Type: cty.Number, Required: false}, - "linked_clone": &hcldec.AttrSpec{Name: "linked_clone", Type: cty.Bool, Required: false}, - "network": &hcldec.AttrSpec{Name: "network", Type: cty.String, Required: false}, - "mac_address": &hcldec.AttrSpec{Name: "mac_address", Type: cty.String, Required: false}, - "notes": &hcldec.AttrSpec{Name: "notes", Type: cty.String, Required: false}, - "vapp": &hcldec.BlockSpec{TypeName: "vapp", Nested: hcldec.ObjectSpec((*FlatvAppConfig)(nil).HCL2Spec())}, + "template": &hcldec.AttrSpec{Name: "template", Type: cty.String, Required: false}, + "disk_size": &hcldec.AttrSpec{Name: "disk_size", Type: cty.Number, Required: false}, + "linked_clone": &hcldec.AttrSpec{Name: "linked_clone", Type: cty.Bool, Required: false}, + "network": &hcldec.AttrSpec{Name: "network", Type: cty.String, Required: false}, + "mac_address": &hcldec.AttrSpec{Name: "mac_address", Type: cty.String, Required: false}, + "notes": &hcldec.AttrSpec{Name: "notes", Type: cty.String, Required: false}, + "vapp": &hcldec.BlockSpec{TypeName: "vapp", Nested: hcldec.ObjectSpec((*FlatvAppConfig)(nil).HCL2Spec())}, + "disk_controller_type": &hcldec.AttrSpec{Name: "disk_controller_type", Type: cty.List(cty.String), Required: false}, + "storage": &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*common.FlatDiskConfig)(nil).HCL2Spec())}, } return s } diff --git a/builder/vsphere/clone/step_customize.hcl2spec.go b/builder/vsphere/clone/step_customize.hcl2spec.go index 2620122b2..ff2f1dded 100644 --- a/builder/vsphere/clone/step_customize.hcl2spec.go +++ b/builder/vsphere/clone/step_customize.hcl2spec.go @@ -3,6 +3,7 @@ package clone import ( "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) @@ -94,10 +95,10 @@ func (*FlatGlobalRoutingSettings) HCL2Spec() map[string]hcldec.Spec { // FlatLinuxOptions is an auto-generated flat version of LinuxOptions. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatLinuxOptions struct { - Domain *string `mapstructure:"domain" cty:"domain" hcl:"domain"` - Hostname *string `mapstructure:"host_name" cty:"host_name" hcl:"host_name"` - HWClockUTC *bool `mapstructure:"hw_clock_utc" cty:"hw_clock_utc" hcl:"hw_clock_utc"` - Timezone *string `mapstructure:"time_zone" cty:"time_zone" hcl:"time_zone"` + Domain *string `mapstructure:"domain" cty:"domain" hcl:"domain"` + Hostname *string `mapstructure:"host_name" cty:"host_name" hcl:"host_name"` + HWClockUTC *config.Trilean `mapstructure:"hw_clock_utc" cty:"hw_clock_utc" hcl:"hw_clock_utc"` + Timezone *string `mapstructure:"time_zone" cty:"time_zone" hcl:"time_zone"` } // FlatMapstructure returns a new FlatLinuxOptions. @@ -114,7 +115,7 @@ func (*FlatLinuxOptions) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "domain": &hcldec.AttrSpec{Name: "domain", Type: cty.String, Required: false}, "host_name": &hcldec.AttrSpec{Name: "host_name", Type: cty.String, Required: false}, - "hw_clock_utc": &hcldec.AttrSpec{Name: "hw_clock_utc", Type: cty.Bool, Required: false}, + "hw_clock_utc": &hcldec.AttrSpec{Name: "hw_clock_utc", Type: cty.Number, Required: false}, "time_zone": &hcldec.AttrSpec{Name: "time_zone", Type: cty.String, Required: false}, } return s diff --git a/builder/vsphere/common/storage_config.go b/builder/vsphere/common/storage_config.go new file mode 100644 index 000000000..6650616d5 --- /dev/null +++ b/builder/vsphere/common/storage_config.go @@ -0,0 +1,118 @@ +//go:generate struct-markdown +//go:generate mapstructure-to-hcl2 -type StorageConfig,DiskConfig + +package common + +import ( + "fmt" +) + +// Defines the disk storage for a VM. +// +// Example that will create a 15GB and a 20GB disk on the VM. The second disk will be thin provisioned: +// +// In JSON: +// ```json +// "storage": [ +// { +// "disk_size": 15000 +// }, +// { +// "disk_size": 20000, +// "disk_thin_provisioned": true +// } +// ], +// ``` +// In HCL2: +// ```hcl +// storage { +// disk_size = 15000 +// } +// storage { +// disk_size = 20000 +// disk_thin_provisioned = true +// } +// ``` +// +// Example that creates 2 pvscsi controllers and adds 2 disks to each one: +// +// In JSON: +// ```json +// "disk_controller_type": ["pvscsi", "pvscsi"], +// "storage": [ +// { +// "disk_size": 15000, +// "disk_controller_index": 0 +// }, +// { +// "disk_size": 15000, +// "disk_controller_index": 0 +// }, +// { +// "disk_size": 15000, +// "disk_controller_index": 1 +// }, +// { +// "disk_size": 15000, +// "disk_controller_index": 1 +// } +// ], +// ``` +// +// In HCL2: +// ```hcl +// disk_controller_type = ["pvscsi", "pvscsi"] +// storage { +// disk_size = 15000, +// disk_controller_index = 0 +// } +// storage { +// disk_size = 15000 +// disk_controller_index = 0 +// } +// storage { +// disk_size = 15000 +// disk_controller_index = 1 +// } +// storage { +// disk_size = 15000 +// disk_controller_index = 1 +// } +// ``` +type DiskConfig struct { + // The size of the disk in MB. + DiskSize int64 `mapstructure:"disk_size" required:"true"` + // Enable VMDK thin provisioning for VM. Defaults to `false`. + DiskThinProvisioned bool `mapstructure:"disk_thin_provisioned"` + // Enable VMDK eager scrubbing for VM. Defaults to `false`. + DiskEagerlyScrub bool `mapstructure:"disk_eagerly_scrub"` + // The assigned disk controller. Defaults to the first one (0) + DiskControllerIndex int `mapstructure:"disk_controller_index"` +} + +type StorageConfig struct { + // Set VM disk controller type. Example `lsilogic`, `pvscsi`, `nvme`, or `scsi`. Use a list to define additional controllers. + // Defaults to `lsilogic`. See + // [SCSI, SATA, and NVMe Storage Controller Conditions, Limitations, and Compatibility](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362.html#GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362) + // for additional details. + DiskControllerType []string `mapstructure:"disk_controller_type"` + // Configures a collection of one or more disks to be provisioned along with the VM. See the [Storage Configuration](#storage-configuration). + Storage []DiskConfig `mapstructure:"storage"` +} + +func (c *StorageConfig) Prepare() []error { + var errs []error + + if len(c.Storage) > 0 { + for i, storage := range c.Storage { + if storage.DiskSize == 0 { + errs = append(errs, fmt.Errorf("storage[%d].'disk_size' is required", i)) + } + if storage.DiskControllerIndex >= len(c.DiskControllerType) { + errs = append(errs, fmt.Errorf("storage[%d].'disk_controller_index' references an unknown disk controller", i)) + } + } + } + + return errs +} diff --git a/builder/vsphere/common/storage_config.hcl2spec.go b/builder/vsphere/common/storage_config.hcl2spec.go new file mode 100644 index 000000000..37d8722a2 --- /dev/null +++ b/builder/vsphere/common/storage_config.hcl2spec.go @@ -0,0 +1,61 @@ +// Code generated by "mapstructure-to-hcl2 -type StorageConfig,DiskConfig"; DO NOT EDIT. +package common + +import ( + "github.com/hashicorp/hcl/v2/hcldec" + "github.com/zclconf/go-cty/cty" +) + +// FlatDiskConfig is an auto-generated flat version of DiskConfig. +// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. +type FlatDiskConfig struct { + DiskSize *int64 `mapstructure:"disk_size" required:"true" cty:"disk_size" hcl:"disk_size"` + DiskThinProvisioned *bool `mapstructure:"disk_thin_provisioned" cty:"disk_thin_provisioned" hcl:"disk_thin_provisioned"` + DiskEagerlyScrub *bool `mapstructure:"disk_eagerly_scrub" cty:"disk_eagerly_scrub" hcl:"disk_eagerly_scrub"` + DiskControllerIndex *int `mapstructure:"disk_controller_index" cty:"disk_controller_index" hcl:"disk_controller_index"` +} + +// FlatMapstructure returns a new FlatDiskConfig. +// FlatDiskConfig is an auto-generated flat version of DiskConfig. +// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up. +func (*DiskConfig) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } { + return new(FlatDiskConfig) +} + +// HCL2Spec returns the hcl spec of a DiskConfig. +// This spec is used by HCL to read the fields of DiskConfig. +// The decoded values from this spec will then be applied to a FlatDiskConfig. +func (*FlatDiskConfig) HCL2Spec() map[string]hcldec.Spec { + s := map[string]hcldec.Spec{ + "disk_size": &hcldec.AttrSpec{Name: "disk_size", Type: cty.Number, Required: false}, + "disk_thin_provisioned": &hcldec.AttrSpec{Name: "disk_thin_provisioned", Type: cty.Bool, Required: false}, + "disk_eagerly_scrub": &hcldec.AttrSpec{Name: "disk_eagerly_scrub", Type: cty.Bool, Required: false}, + "disk_controller_index": &hcldec.AttrSpec{Name: "disk_controller_index", Type: cty.Number, Required: false}, + } + return s +} + +// FlatStorageConfig is an auto-generated flat version of StorageConfig. +// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. +type FlatStorageConfig struct { + DiskControllerType []string `mapstructure:"disk_controller_type" cty:"disk_controller_type" hcl:"disk_controller_type"` + Storage []FlatDiskConfig `mapstructure:"storage" cty:"storage" hcl:"storage"` +} + +// FlatMapstructure returns a new FlatStorageConfig. +// FlatStorageConfig is an auto-generated flat version of StorageConfig. +// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up. +func (*StorageConfig) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } { + return new(FlatStorageConfig) +} + +// HCL2Spec returns the hcl spec of a StorageConfig. +// This spec is used by HCL to read the fields of StorageConfig. +// The decoded values from this spec will then be applied to a FlatStorageConfig. +func (*FlatStorageConfig) HCL2Spec() map[string]hcldec.Spec { + s := map[string]hcldec.Spec{ + "disk_controller_type": &hcldec.AttrSpec{Name: "disk_controller_type", Type: cty.List(cty.String), Required: false}, + "storage": &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*FlatDiskConfig)(nil).HCL2Spec())}, + } + return s +} diff --git a/builder/vsphere/driver/disk.go b/builder/vsphere/driver/disk.go new file mode 100644 index 000000000..07553e212 --- /dev/null +++ b/builder/vsphere/driver/disk.go @@ -0,0 +1,84 @@ +package driver + +import ( + "errors" + + "github.com/vmware/govmomi/object" + "github.com/vmware/govmomi/vim25/types" +) + +type Disk struct { + DiskSize int64 + DiskEagerlyScrub bool + DiskThinProvisioned bool + ControllerIndex int +} + +type StorageConfig struct { + DiskControllerType []string // example: "scsi", "pvscsi", "nvme", "lsilogic" + Storage []Disk +} + +func (c *StorageConfig) AddStorageDevices(existingDevices object.VirtualDeviceList) ([]types.BaseVirtualDeviceConfigSpec, error) { + newDevices := object.VirtualDeviceList{} + + // Create new controller based on existing devices list and add it to the new devices list + // to confirm creation + var controllers []types.BaseVirtualController + for _, controllerType := range c.DiskControllerType { + var device types.BaseVirtualDevice + var err error + if controllerType == "nvme" { + device, err = existingDevices.CreateNVMEController() + } else { + device, err = existingDevices.CreateSCSIController(controllerType) + } + if err != nil { + return nil, err + } + existingDevices = append(existingDevices, device) + newDevices = append(newDevices, device) + controller, err := existingDevices.FindDiskController(existingDevices.Name(device)) + if err != nil { + return nil, err + } + controllers = append(controllers, controller) + } + + for _, dc := range c.Storage { + disk := &types.VirtualDisk{ + VirtualDevice: types.VirtualDevice{ + Key: existingDevices.NewKey(), + Backing: &types.VirtualDiskFlatVer2BackingInfo{ + DiskMode: string(types.VirtualDiskModePersistent), + ThinProvisioned: types.NewBool(dc.DiskThinProvisioned), + EagerlyScrub: types.NewBool(dc.DiskEagerlyScrub), + }, + }, + CapacityInKB: dc.DiskSize * 1024, + } + + existingDevices.AssignController(disk, controllers[dc.ControllerIndex]) + newDevices = append(newDevices, disk) + } + + return newDevices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd) +} + +func findDisk(devices object.VirtualDeviceList) (*types.VirtualDisk, error) { + var disks []*types.VirtualDisk + for _, device := range devices { + switch d := device.(type) { + case *types.VirtualDisk: + disks = append(disks, d) + } + } + + switch len(disks) { + case 0: + return nil, errors.New("VM has no disks") + case 1: + return disks[0], nil + } + return nil, errors.New("VM has multiple disks") +} diff --git a/builder/vsphere/driver/vm.go b/builder/vsphere/driver/vm.go index 8481f3716..020af6809 100644 --- a/builder/vsphere/driver/vm.go +++ b/builder/vsphere/driver/vm.go @@ -79,6 +79,7 @@ type CloneConfig struct { MacAddress string Annotation string VAppProperties map[string]string + StorageConfig StorageConfig } type HardwareConfig struct { @@ -96,6 +97,7 @@ type HardwareConfig struct { VGPUProfile string Firmware string ForceBIOSSetup bool + StorageConfig StorageConfig } type NIC struct { @@ -106,8 +108,6 @@ type NIC struct { } type CreateConfig struct { - DiskControllerType []string // example: "scsi", "pvscsi", "nvme", "lsilogic" - Annotation string Name string Folder string @@ -119,14 +119,7 @@ type CreateConfig struct { NICs []NIC USBController []string Version uint // example: 10 - Storage []Disk -} - -type Disk struct { - DiskSize int64 - DiskEagerlyScrub bool - DiskThinProvisioned bool - ControllerIndex int + StorageConfig StorageConfig } func (d *VCenterDriver) NewVM(ref *types.ManagedObjectReference) VirtualMachine { @@ -207,11 +200,12 @@ func (d *VCenterDriver) CreateVM(config *CreateConfig) (VirtualMachine, error) { } devices := object.VirtualDeviceList{} - - devices, err = addDisk(d, devices, config) + storageConfigSpec, err := config.StorageConfig.AddStorageDevices(devices) if err != nil { return nil, err } + createSpec.DeviceChange = append(createSpec.DeviceChange, storageConfigSpec...) + devices, err = addNetwork(d, devices, config) if err != nil { return nil, err @@ -235,10 +229,11 @@ func (d *VCenterDriver) CreateVM(config *CreateConfig) (VirtualMachine, error) { devices = append(devices, usb) } - createSpec.DeviceChange, err = devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd) + devicesConfigSpec, err := devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd) if err != nil { return nil, err } + createSpec.DeviceChange = append(createSpec.DeviceChange, devicesConfigSpec...) createSpec.Files = &types.VirtualMachineFileInfo{ VmPathName: fmt.Sprintf("[%s]", datastore.Name()), @@ -341,6 +336,24 @@ func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig) configSpec.Annotation = config.Annotation } + devices, err := vm.vm.Device(vm.driver.ctx) + if err != nil { + return nil, err + } + virtualDisks := devices.SelectByType((*types.VirtualDisk)(nil)) + virtualControllers := devices.SelectByType((*types.VirtualController)(nil)) + + // Use existing devices to avoid overlapping configuration + existingDevices := object.VirtualDeviceList{} + existingDevices = append(existingDevices, virtualDisks...) + existingDevices = append(existingDevices, virtualControllers...) + + storageConfigSpec, err := config.StorageConfig.AddStorageDevices(existingDevices) + if err != nil { + return nil, err + } + configSpec.DeviceChange = append(configSpec.DeviceChange, storageConfigSpec...) + if config.Network != "" { net, err := vm.driver.FindNetwork(config.Network) if err != nil { @@ -508,6 +521,76 @@ func (vm *VirtualMachineDriver) Configure(config *HardwareConfig) error { confSpec.CpuHotAddEnabled = &config.CpuHotAddEnabled confSpec.MemoryHotAddEnabled = &config.MemoryHotAddEnabled + // + //if len(config.StorageConfig.Storage) > 0 { + // ds, err := vm.vm.Device(vm.driver.ctx) + // if err != nil { + // return err + // } + // vd := ds.SelectByType((*types.VirtualDisk)(nil)) + // vc := ds.SelectByType((*types.VirtualController)(nil)) + // + // // Use existing devices to avoid wrong configuration + // devices := object.VirtualDeviceList{} + // devices = append(devices, vd...) + // devices = append(devices, vc...) + // + // newDevices := object.VirtualDeviceList{} + // + // // Adds new controllers + // var controllers []types.BaseVirtualController + // for _, controllerType := range config.StorageConfig.DiskControllerType { + // var device types.BaseVirtualDevice + // var err error + // if controllerType == "nvme" { + // device, err = devices.CreateNVMEController() + // } else { + // device, err = devices.CreateSCSIController(controllerType) + // } + // if err != nil { + // return err + // } + // devices = append(devices, device) + // newDevices = append(newDevices, device) + // name := devices.Name(device) + // log.Printf("MOSS controller name %s", name) + // controller, err := devices.FindDiskController(name) + // if err != nil { + // return err + // } + // controllers = append(controllers, controller) + // } + // + // for _, dc := range config.StorageConfig.Storage { + // key := devices.NewKey() + // disk := &types.VirtualDisk{ + // VirtualDevice: types.VirtualDevice{ + // Key: key, + // Backing: &types.VirtualDiskFlatVer2BackingInfo{ + // DiskMode: string(types.VirtualDiskModePersistent), + // ThinProvisioned: types.NewBool(dc.DiskThinProvisioned), + // EagerlyScrub: types.NewBool(dc.DiskEagerlyScrub), + // }, + // }, + // CapacityInKB: dc.DiskSize * 1024, + // } + // + // log.Printf("MOSS device key %d", key) + // + // devices.AssignController(disk, controllers[dc.ControllerIndex]) + // newDevices = append(newDevices, disk) + // } + // //devices, err = config.StorageConfig.AddStorageDevices(devices) + // //if err != nil { + // // return err + // //} + // + // devicesConfigSpec, err := newDevices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd) + // if err != nil { + // return err + // } + // confSpec.DeviceChange = append(confSpec.DeviceChange, devicesConfigSpec...) + //} if config.VideoRAM != 0 { devices, err := vm.vm.Device(vm.driver.ctx) @@ -616,24 +699,6 @@ func (vm *VirtualMachineDriver) ResizeDisk(diskSize int64) error { return err } -func findDisk(devices object.VirtualDeviceList) (*types.VirtualDisk, error) { - var disks []*types.VirtualDisk - for _, device := range devices { - switch d := device.(type) { - case *types.VirtualDisk: - disks = append(disks, d) - } - } - - switch len(disks) { - case 0: - return nil, errors.New("VM has no disks") - case 1: - return disks[0], nil - } - return nil, errors.New("VM has multiple disks") -} - func (vm *VirtualMachineDriver) PowerOn() error { task, err := vm.vm.PowerOn(vm.driver.ctx) if err != nil { @@ -849,55 +914,6 @@ func (vm *VirtualMachineDriver) GetDir() (string, error) { return "", fmt.Errorf("cannot find '%s'", vmxName) } -func addDisk(_ *VCenterDriver, devices object.VirtualDeviceList, config *CreateConfig) (object.VirtualDeviceList, error) { - if len(config.Storage) == 0 { - return nil, errors.New("no storage devices have been defined") - } - - if len(config.DiskControllerType) == 0 { - return nil, errors.New("no controllers have been defined") - } - - var controllers []types.BaseVirtualController - for _, controllerType := range config.DiskControllerType { - var device types.BaseVirtualDevice - var err error - if controllerType == "nvme" { - device, err = devices.CreateNVMEController() - } else { - device, err = devices.CreateSCSIController(controllerType) - } - if err != nil { - return nil, err - } - devices = append(devices, device) - controller, err := devices.FindDiskController(devices.Name(device)) - if err != nil { - return nil, err - } - controllers = append(controllers, controller) - } - - for _, dc := range config.Storage { - disk := &types.VirtualDisk{ - VirtualDevice: types.VirtualDevice{ - Key: devices.NewKey(), - Backing: &types.VirtualDiskFlatVer2BackingInfo{ - DiskMode: string(types.VirtualDiskModePersistent), - ThinProvisioned: types.NewBool(dc.DiskThinProvisioned), - EagerlyScrub: types.NewBool(dc.DiskEagerlyScrub), - }, - }, - CapacityInKB: dc.DiskSize * 1024, - } - - devices.AssignController(disk, controllers[dc.ControllerIndex]) - devices = append(devices, disk) - } - - return devices, nil -} - func addNetwork(d *VCenterDriver, devices object.VirtualDeviceList, config *CreateConfig) (object.VirtualDeviceList, error) { if len(config.NICs) == 0 { return nil, errors.New("no network adapters have been defined") diff --git a/builder/vsphere/iso/config.hcl2spec.go b/builder/vsphere/iso/config.hcl2spec.go index 41061b95a..f8f31ec3b 100644 --- a/builder/vsphere/iso/config.hcl2spec.go +++ b/builder/vsphere/iso/config.hcl2spec.go @@ -33,7 +33,7 @@ type FlatConfig struct { Version *uint `mapstructure:"vm_version" cty:"vm_version" hcl:"vm_version"` GuestOSType *string `mapstructure:"guest_os_type" cty:"guest_os_type" hcl:"guest_os_type"` DiskControllerType []string `mapstructure:"disk_controller_type" cty:"disk_controller_type" hcl:"disk_controller_type"` - Storage []FlatDiskConfig `mapstructure:"storage" cty:"storage" hcl:"storage"` + Storage []common.FlatDiskConfig `mapstructure:"storage" cty:"storage" hcl:"storage"` NICs []FlatNIC `mapstructure:"network_adapters" cty:"network_adapters" hcl:"network_adapters"` USBController []string `mapstructure:"usb_controller" cty:"usb_controller" hcl:"usb_controller"` Notes *string `mapstructure:"notes" cty:"notes" hcl:"notes"` @@ -174,7 +174,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "vm_version": &hcldec.AttrSpec{Name: "vm_version", Type: cty.Number, Required: false}, "guest_os_type": &hcldec.AttrSpec{Name: "guest_os_type", Type: cty.String, Required: false}, "disk_controller_type": &hcldec.AttrSpec{Name: "disk_controller_type", Type: cty.List(cty.String), Required: false}, - "storage": &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*FlatDiskConfig)(nil).HCL2Spec())}, + "storage": &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*common.FlatDiskConfig)(nil).HCL2Spec())}, "network_adapters": &hcldec.BlockListSpec{TypeName: "network_adapters", Nested: hcldec.ObjectSpec((*FlatNIC)(nil).HCL2Spec())}, "usb_controller": &hcldec.AttrSpec{Name: "usb_controller", Type: cty.List(cty.String), Required: false}, "notes": &hcldec.AttrSpec{Name: "notes", Type: cty.String, Required: false}, diff --git a/builder/vsphere/iso/step_create.go b/builder/vsphere/iso/step_create.go index 562d2cf24..7b13f151a 100644 --- a/builder/vsphere/iso/step_create.go +++ b/builder/vsphere/iso/step_create.go @@ -1,5 +1,5 @@ //go:generate struct-markdown -//go:generate mapstructure-to-hcl2 -type NIC,CreateConfig,DiskConfig +//go:generate mapstructure-to-hcl2 -type NIC,CreateConfig package iso @@ -56,89 +56,6 @@ type NIC struct { Passthrough *bool `mapstructure:"passthrough"` } -// Defines the disk storage for a VM. -// -// Example that will create a 15GB and a 20GB disk on the VM. The second disk will be thin provisioned: -// -// In JSON: -// ```json -// "storage": [ -// { -// "disk_size": 15000 -// }, -// { -// "disk_size": 20000, -// "disk_thin_provisioned": true -// } -// ], -// ``` -// In HCL2: -// ```hcl -// storage { -// disk_size = 15000 -// } -// storage { -// disk_size = 20000 -// disk_thin_provisioned = true -// } -// ``` -// -// Example that creates 2 pvscsi controllers and adds 2 disks to each one: -// -// In JSON: -// ```json -// "disk_controller_type": ["pvscsi", "pvscsi"], -// "storage": [ -// { -// "disk_size": 15000, -// "disk_controller_index": 0 -// }, -// { -// "disk_size": 15000, -// "disk_controller_index": 0 -// }, -// { -// "disk_size": 15000, -// "disk_controller_index": 1 -// }, -// { -// "disk_size": 15000, -// "disk_controller_index": 1 -// } -// ], -// ``` -// -// In HCL2: -// ```hcl -// disk_controller_type = ["pvscsi", "pvscsi"] -// storage { -// disk_size = 15000, -// disk_controller_index = 0 -// } -// storage { -// disk_size = 15000 -// disk_controller_index = 0 -// } -// storage { -// disk_size = 15000 -// disk_controller_index = 1 -// } -// storage { -// disk_size = 15000 -// disk_controller_index = 1 -// } -// ``` -type DiskConfig struct { - // The size of the disk in MB. - DiskSize int64 `mapstructure:"disk_size" required:"true"` - // Enable VMDK thin provisioning for VM. Defaults to `false`. - DiskThinProvisioned bool `mapstructure:"disk_thin_provisioned"` - // Enable VMDK eager scrubbing for VM. Defaults to `false`. - DiskEagerlyScrub bool `mapstructure:"disk_eagerly_scrub"` - // The assigned disk controller. Defaults to the first one (0) - DiskControllerIndex int `mapstructure:"disk_controller_index"` -} - type CreateConfig struct { // Set VM hardware version. Defaults to the most current VM hardware // version supported by vCenter. See @@ -148,14 +65,8 @@ type CreateConfig struct { // Set VM OS type. Defaults to `otherGuest`. See [ // here](https://code.vmware.com/apis/358/vsphere/doc/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html) // for a full list of possible values. - GuestOSType string `mapstructure:"guest_os_type"` - // Set VM disk controller type. Example `lsilogic`, `pvscsi`, `nvme`, or `scsi`. Use a list to define additional controllers. - // Defaults to `lsilogic`. See - // [SCSI, SATA, and NVMe Storage Controller Conditions, Limitations, and Compatibility](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362.html#GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362) - // for additional details. - DiskControllerType []string `mapstructure:"disk_controller_type"` - // A collection of one or more disks to be provisioned along with the VM. - Storage []DiskConfig `mapstructure:"storage"` + GuestOSType string `mapstructure:"guest_os_type"` + StorageConfig common.StorageConfig `mapstructure:",squash"` // Network adapters NICs []NIC `mapstructure:"network_adapters"` // Create USB controllers for the virtual machine. "usb" for a usb 2.0 controller. "xhci" for a usb 3.0 controller. There can only be at most one of each. @@ -167,21 +78,15 @@ type CreateConfig struct { func (c *CreateConfig) Prepare() []error { var errs []error - // there should be at least one - if len(c.DiskControllerType) == 0 { - c.DiskControllerType = append(c.DiskControllerType, "") + if len(c.StorageConfig.DiskControllerType) == 0 { + c.StorageConfig.DiskControllerType = append(c.StorageConfig.DiskControllerType, "") } - if len(c.Storage) > 0 { - for i, storage := range c.Storage { - if storage.DiskSize == 0 { - errs = append(errs, fmt.Errorf("storage[%d].'disk_size' is required", i)) - } - if storage.DiskControllerIndex >= len(c.DiskControllerType) { - errs = append(errs, fmt.Errorf("storage[%d].'disk_controller_index' references an unknown disk controller", i)) - } - } + // there should be at least one + if len(c.StorageConfig.Storage) == 0 { + errs = append(errs, fmt.Errorf("no storage devices have been defined")) } + errs = append(errs, c.StorageConfig.Prepare()...) if c.GuestOSType == "" { c.GuestOSType = "otherGuest" @@ -243,7 +148,7 @@ func (s *StepCreateVM) Run(_ context.Context, state multistep.StateBag) multiste // add disk as the first drive for backwards compatibility if the type is defined var disks []driver.Disk - for _, disk := range s.Config.Storage { + for _, disk := range s.Config.StorageConfig.Storage { disks = append(disks, driver.Disk{ DiskSize: disk.DiskSize, DiskEagerlyScrub: disk.DiskEagerlyScrub, @@ -253,19 +158,21 @@ func (s *StepCreateVM) Run(_ context.Context, state multistep.StateBag) multiste } vm, err := d.CreateVM(&driver.CreateConfig{ - DiskControllerType: s.Config.DiskControllerType, - Storage: disks, - Annotation: s.Config.Notes, - Name: s.Location.VMName, - Folder: s.Location.Folder, - Cluster: s.Location.Cluster, - Host: s.Location.Host, - ResourcePool: s.Location.ResourcePool, - Datastore: s.Location.Datastore, - GuestOS: s.Config.GuestOSType, - NICs: networkCards, - USBController: s.Config.USBController, - Version: s.Config.Version, + StorageConfig: driver.StorageConfig{ + DiskControllerType: s.Config.StorageConfig.DiskControllerType, + Storage: disks, + }, + Annotation: s.Config.Notes, + Name: s.Location.VMName, + Folder: s.Location.Folder, + Cluster: s.Location.Cluster, + Host: s.Location.Host, + ResourcePool: s.Location.ResourcePool, + Datastore: s.Location.Datastore, + GuestOS: s.Config.GuestOSType, + NICs: networkCards, + USBController: s.Config.USBController, + Version: s.Config.Version, }) if err != nil { state.Put("error", fmt.Errorf("error creating vm: %v", err)) diff --git a/builder/vsphere/iso/step_create.hcl2spec.go b/builder/vsphere/iso/step_create.hcl2spec.go index dadf605d5..06360e6ac 100644 --- a/builder/vsphere/iso/step_create.hcl2spec.go +++ b/builder/vsphere/iso/step_create.hcl2spec.go @@ -1,21 +1,22 @@ -// Code generated by "mapstructure-to-hcl2 -type NIC,CreateConfig,DiskConfig"; DO NOT EDIT. +// Code generated by "mapstructure-to-hcl2 -type NIC,CreateConfig"; DO NOT EDIT. package iso import ( "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer/builder/vsphere/common" "github.com/zclconf/go-cty/cty" ) // FlatCreateConfig is an auto-generated flat version of CreateConfig. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatCreateConfig struct { - Version *uint `mapstructure:"vm_version" cty:"vm_version" hcl:"vm_version"` - GuestOSType *string `mapstructure:"guest_os_type" cty:"guest_os_type" hcl:"guest_os_type"` - DiskControllerType []string `mapstructure:"disk_controller_type" cty:"disk_controller_type" hcl:"disk_controller_type"` - Storage []FlatDiskConfig `mapstructure:"storage" cty:"storage" hcl:"storage"` - NICs []FlatNIC `mapstructure:"network_adapters" cty:"network_adapters" hcl:"network_adapters"` - USBController []string `mapstructure:"usb_controller" cty:"usb_controller" hcl:"usb_controller"` - Notes *string `mapstructure:"notes" cty:"notes" hcl:"notes"` + Version *uint `mapstructure:"vm_version" cty:"vm_version" hcl:"vm_version"` + GuestOSType *string `mapstructure:"guest_os_type" cty:"guest_os_type" hcl:"guest_os_type"` + DiskControllerType []string `mapstructure:"disk_controller_type" cty:"disk_controller_type" hcl:"disk_controller_type"` + Storage []common.FlatDiskConfig `mapstructure:"storage" cty:"storage" hcl:"storage"` + NICs []FlatNIC `mapstructure:"network_adapters" cty:"network_adapters" hcl:"network_adapters"` + USBController []string `mapstructure:"usb_controller" cty:"usb_controller" hcl:"usb_controller"` + Notes *string `mapstructure:"notes" cty:"notes" hcl:"notes"` } // FlatMapstructure returns a new FlatCreateConfig. @@ -33,7 +34,7 @@ func (*FlatCreateConfig) HCL2Spec() map[string]hcldec.Spec { "vm_version": &hcldec.AttrSpec{Name: "vm_version", Type: cty.Number, Required: false}, "guest_os_type": &hcldec.AttrSpec{Name: "guest_os_type", Type: cty.String, Required: false}, "disk_controller_type": &hcldec.AttrSpec{Name: "disk_controller_type", Type: cty.List(cty.String), Required: false}, - "storage": &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*FlatDiskConfig)(nil).HCL2Spec())}, + "storage": &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*common.FlatDiskConfig)(nil).HCL2Spec())}, "network_adapters": &hcldec.BlockListSpec{TypeName: "network_adapters", Nested: hcldec.ObjectSpec((*FlatNIC)(nil).HCL2Spec())}, "usb_controller": &hcldec.AttrSpec{Name: "usb_controller", Type: cty.List(cty.String), Required: false}, "notes": &hcldec.AttrSpec{Name: "notes", Type: cty.String, Required: false}, @@ -41,35 +42,6 @@ func (*FlatCreateConfig) HCL2Spec() map[string]hcldec.Spec { return s } -// FlatDiskConfig is an auto-generated flat version of DiskConfig. -// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. -type FlatDiskConfig struct { - DiskSize *int64 `mapstructure:"disk_size" required:"true" cty:"disk_size" hcl:"disk_size"` - DiskThinProvisioned *bool `mapstructure:"disk_thin_provisioned" cty:"disk_thin_provisioned" hcl:"disk_thin_provisioned"` - DiskEagerlyScrub *bool `mapstructure:"disk_eagerly_scrub" cty:"disk_eagerly_scrub" hcl:"disk_eagerly_scrub"` - DiskControllerIndex *int `mapstructure:"disk_controller_index" cty:"disk_controller_index" hcl:"disk_controller_index"` -} - -// FlatMapstructure returns a new FlatDiskConfig. -// FlatDiskConfig is an auto-generated flat version of DiskConfig. -// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up. -func (*DiskConfig) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } { - return new(FlatDiskConfig) -} - -// HCL2Spec returns the hcl spec of a DiskConfig. -// This spec is used by HCL to read the fields of DiskConfig. -// The decoded values from this spec will then be applied to a FlatDiskConfig. -func (*FlatDiskConfig) HCL2Spec() map[string]hcldec.Spec { - s := map[string]hcldec.Spec{ - "disk_size": &hcldec.AttrSpec{Name: "disk_size", Type: cty.Number, Required: false}, - "disk_thin_provisioned": &hcldec.AttrSpec{Name: "disk_thin_provisioned", Type: cty.Bool, Required: false}, - "disk_eagerly_scrub": &hcldec.AttrSpec{Name: "disk_eagerly_scrub", Type: cty.Bool, Required: false}, - "disk_controller_index": &hcldec.AttrSpec{Name: "disk_controller_index", Type: cty.Number, Required: false}, - } - return s -} - // FlatNIC is an auto-generated flat version of NIC. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatNIC struct { diff --git a/builder/vsphere/iso/step_create_test.go b/builder/vsphere/iso/step_create_test.go index aca46d155..a4efc95fa 100644 --- a/builder/vsphere/iso/step_create_test.go +++ b/builder/vsphere/iso/step_create_test.go @@ -24,7 +24,7 @@ func TestCreateConfig_Prepare(t *testing.T) { if config.GuestOSType != "otherGuest" { t.Fatalf("GuestOSType should default to 'otherGuest'") } - if len(config.DiskControllerType) != 1 { + if len(config.StorageConfig.DiskControllerType) != 1 { t.Fatalf("DiskControllerType should have at least one element as default") } @@ -38,10 +38,12 @@ func TestCreateConfig_Prepare(t *testing.T) { { name: "Storage validate disk_size", config: &CreateConfig{ - Storage: []DiskConfig{ - { - DiskSize: 0, - DiskThinProvisioned: true, + StorageConfig: common.StorageConfig{ + Storage: []common.DiskConfig{ + { + DiskSize: 0, + DiskThinProvisioned: true, + }, }, }, }, @@ -51,10 +53,12 @@ func TestCreateConfig_Prepare(t *testing.T) { { name: "Storage validate disk_controller_index", config: &CreateConfig{ - Storage: []DiskConfig{ - { - DiskSize: 32768, - DiskControllerIndex: 3, + StorageConfig: common.StorageConfig{ + Storage: []common.DiskConfig{ + { + DiskSize: 32768, + DiskControllerIndex: 3, + }, }, }, }, @@ -294,13 +298,15 @@ func basicLocationConfig() *common.LocationConfig { func createConfig() *CreateConfig { return &CreateConfig{ - Version: 1, - GuestOSType: "ubuntu64Guest", - DiskControllerType: []string{"pvscsi"}, - Storage: []DiskConfig{ - { - DiskSize: 32768, - DiskThinProvisioned: true, + Version: 1, + GuestOSType: "ubuntu64Guest", + StorageConfig: common.StorageConfig{ + DiskControllerType: []string{"pvscsi"}, + Storage: []common.DiskConfig{ + { + DiskSize: 32768, + DiskThinProvisioned: true, + }, }, }, NICs: []NIC{ @@ -324,7 +330,7 @@ func driverCreateConfig(config *CreateConfig, location *common.LocationConfig) * } var disks []driver.Disk - for _, disk := range config.Storage { + for _, disk := range config.StorageConfig.Storage { disks = append(disks, driver.Disk{ DiskSize: disk.DiskSize, DiskEagerlyScrub: disk.DiskEagerlyScrub, @@ -334,18 +340,20 @@ func driverCreateConfig(config *CreateConfig, location *common.LocationConfig) * } return &driver.CreateConfig{ - DiskControllerType: config.DiskControllerType, - Storage: disks, - Annotation: config.Notes, - Name: location.VMName, - Folder: location.Folder, - Cluster: location.Cluster, - Host: location.Host, - ResourcePool: location.ResourcePool, - Datastore: location.Datastore, - GuestOS: config.GuestOSType, - NICs: networkCards, - USBController: config.USBController, - Version: config.Version, + StorageConfig: driver.StorageConfig{ + DiskControllerType: config.StorageConfig.DiskControllerType, + Storage: disks, + }, + Annotation: config.Notes, + Name: location.VMName, + Folder: location.Folder, + Cluster: location.Cluster, + Host: location.Host, + ResourcePool: location.ResourcePool, + Datastore: location.Datastore, + GuestOS: config.GuestOSType, + NICs: networkCards, + USBController: config.USBController, + Version: config.Version, } } diff --git a/website/pages/docs/builders/vmware/vsphere-clone.mdx b/website/pages/docs/builders/vmware/vsphere-clone.mdx index e91bf3734..a9b68e4be 100644 --- a/website/pages/docs/builders/vmware/vsphere-clone.mdx +++ b/website/pages/docs/builders/vmware/vsphere-clone.mdx @@ -45,6 +45,21 @@ necessary for this build to succeed and can be found further down the page. @include 'builder/vsphere/clone/CloneConfig-not-required.mdx' +@include 'builder/vsphere/common/StorageConfig-not-required.mdx' + +### Storage Configuration + +When cloning a VM, the storage configuration can be used to add additional storage and disk controllers. The resulting VM +will contain the origin VM storage and disk controller plus the new configured ones. + +@include 'builder/vsphere/common/DiskConfig.mdx' + +@include 'builder/vsphere/common/DiskConfig-required.mdx' + +#### Optional + +@include 'builder/vsphere/common/DiskConfig-not-required.mdx' + ### vApp Options Configuration @include 'builder/vsphere/clone/vAppConfig-not-required.mdx' diff --git a/website/pages/docs/builders/vmware/vsphere-iso.mdx b/website/pages/docs/builders/vmware/vsphere-iso.mdx index 34c5db6f2..a6b06b6ec 100644 --- a/website/pages/docs/builders/vmware/vsphere-iso.mdx +++ b/website/pages/docs/builders/vmware/vsphere-iso.mdx @@ -186,6 +186,8 @@ iso_paths = [ @include 'builder/vsphere/iso/CreateConfig-not-required.mdx' +@include 'builder/vsphere/common/StorageConfig-not-required.mdx' + ### Network Adapter Configuration @include 'builder/vsphere/iso/NIC.mdx' @@ -198,13 +200,13 @@ iso_paths = [ ### Storage Configuration -@include 'builder/vsphere/iso/DiskConfig.mdx' +@include 'builder/vsphere/common/DiskConfig.mdx' -@include 'builder/vsphere/iso/DiskConfig-required.mdx' +@include 'builder/vsphere/common/DiskConfig-required.mdx' #### Optional -@include 'builder/vsphere/iso/DiskConfig-not-required.mdx' +@include 'builder/vsphere/common/DiskConfig-not-required.mdx' ### Export Configuration diff --git a/website/pages/partials/builder/vsphere/common/DiskConfig-not-required.mdx b/website/pages/partials/builder/vsphere/common/DiskConfig-not-required.mdx new file mode 100644 index 000000000..f7267b405 --- /dev/null +++ b/website/pages/partials/builder/vsphere/common/DiskConfig-not-required.mdx @@ -0,0 +1,7 @@ + + +- `disk_thin_provisioned` (bool) - Enable VMDK thin provisioning for VM. Defaults to `false`. + +- `disk_eagerly_scrub` (bool) - Enable VMDK eager scrubbing for VM. Defaults to `false`. + +- `disk_controller_index` (int) - The assigned disk controller. Defaults to the first one (0) diff --git a/website/pages/partials/builder/vsphere/common/DiskConfig-required.mdx b/website/pages/partials/builder/vsphere/common/DiskConfig-required.mdx new file mode 100644 index 000000000..29a583222 --- /dev/null +++ b/website/pages/partials/builder/vsphere/common/DiskConfig-required.mdx @@ -0,0 +1,3 @@ + + +- `disk_size` (int64) - The size of the disk in MB. diff --git a/website/pages/partials/builder/vsphere/common/DiskConfig.mdx b/website/pages/partials/builder/vsphere/common/DiskConfig.mdx new file mode 100644 index 000000000..44040b0f7 --- /dev/null +++ b/website/pages/partials/builder/vsphere/common/DiskConfig.mdx @@ -0,0 +1,74 @@ + + +Defines the disk storage for a VM. + +Example that will create a 15GB and a 20GB disk on the VM. The second disk will be thin provisioned: + +In JSON: +```json + "storage": [ + { + "disk_size": 15000 + }, + { + "disk_size": 20000, + "disk_thin_provisioned": true + } + ], +``` +In HCL2: +```hcl + storage { + disk_size = 15000 + } + storage { + disk_size = 20000 + disk_thin_provisioned = true + } +``` + +Example that creates 2 pvscsi controllers and adds 2 disks to each one: + +In JSON: +```json + "disk_controller_type": ["pvscsi", "pvscsi"], + "storage": [ + { + "disk_size": 15000, + "disk_controller_index": 0 + }, + { + "disk_size": 15000, + "disk_controller_index": 0 + }, + { + "disk_size": 15000, + "disk_controller_index": 1 + }, + { + "disk_size": 15000, + "disk_controller_index": 1 + } + ], +``` + +In HCL2: +```hcl + disk_controller_type = ["pvscsi", "pvscsi"] + storage { + disk_size = 15000, + disk_controller_index = 0 + } + storage { + disk_size = 15000 + disk_controller_index = 0 + } + storage { + disk_size = 15000 + disk_controller_index = 1 + } + storage { + disk_size = 15000 + disk_controller_index = 1 + } +``` diff --git a/website/pages/partials/builder/vsphere/common/StorageConfig-not-required.mdx b/website/pages/partials/builder/vsphere/common/StorageConfig-not-required.mdx new file mode 100644 index 000000000..2146f4442 --- /dev/null +++ b/website/pages/partials/builder/vsphere/common/StorageConfig-not-required.mdx @@ -0,0 +1,8 @@ + + +- `disk_controller_type` ([]string) - Set VM disk controller type. Example `lsilogic`, `pvscsi`, `nvme`, or `scsi`. Use a list to define additional controllers. + Defaults to `lsilogic`. See + [SCSI, SATA, and NVMe Storage Controller Conditions, Limitations, and Compatibility](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362.html#GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362) + for additional details. + +- `storage` ([]DiskConfig) - Configures a collection of one or more disks to be provisioned along with the VM. See the [Storage Configuration](#storage-configuration). diff --git a/website/pages/partials/builder/vsphere/iso/CreateConfig-not-required.mdx b/website/pages/partials/builder/vsphere/iso/CreateConfig-not-required.mdx index a69992f04..cd2ddc28d 100644 --- a/website/pages/partials/builder/vsphere/iso/CreateConfig-not-required.mdx +++ b/website/pages/partials/builder/vsphere/iso/CreateConfig-not-required.mdx @@ -9,13 +9,6 @@ here](https://code.vmware.com/apis/358/vsphere/doc/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html) for a full list of possible values. -- `disk_controller_type` ([]string) - Set VM disk controller type. Example `lsilogic`, `pvscsi`, `nvme`, or `scsi`. Use a list to define additional controllers. - Defaults to `lsilogic`. See - [SCSI, SATA, and NVMe Storage Controller Conditions, Limitations, and Compatibility](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362.html#GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362) - for additional details. - -- `storage` ([]DiskConfig) - A collection of one or more disks to be provisioned along with the VM. - - `network_adapters` ([]NIC) - Network adapters - `usb_controller` ([]string) - Create USB controllers for the virtual machine. "usb" for a usb 2.0 controller. "xhci" for a usb 3.0 controller. There can only be at most one of each. From 99e7ac5f42e163769de808ebed0908f0c9e9b40e Mon Sep 17 00:00:00 2001 From: sylviamoss Date: Fri, 20 Nov 2020 16:42:49 +0100 Subject: [PATCH 92/93] fix test and generated code --- .../vsphere/clone/step_customize.hcl2spec.go | 11 ++- builder/vsphere/driver/vm.go | 71 ------------------ builder/vsphere/iso/step_create_test.go | 64 +++++++++++++++- .../vsphere/iso/DiskConfig-not-required.mdx | 7 -- .../vsphere/iso/DiskConfig-required.mdx | 3 - .../builder/vsphere/iso/DiskConfig.mdx | 74 ------------------- 6 files changed, 66 insertions(+), 164 deletions(-) delete mode 100644 website/pages/partials/builder/vsphere/iso/DiskConfig-not-required.mdx delete mode 100644 website/pages/partials/builder/vsphere/iso/DiskConfig-required.mdx delete mode 100644 website/pages/partials/builder/vsphere/iso/DiskConfig.mdx diff --git a/builder/vsphere/clone/step_customize.hcl2spec.go b/builder/vsphere/clone/step_customize.hcl2spec.go index ff2f1dded..2620122b2 100644 --- a/builder/vsphere/clone/step_customize.hcl2spec.go +++ b/builder/vsphere/clone/step_customize.hcl2spec.go @@ -3,7 +3,6 @@ package clone import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) @@ -95,10 +94,10 @@ func (*FlatGlobalRoutingSettings) HCL2Spec() map[string]hcldec.Spec { // FlatLinuxOptions is an auto-generated flat version of LinuxOptions. // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. type FlatLinuxOptions struct { - Domain *string `mapstructure:"domain" cty:"domain" hcl:"domain"` - Hostname *string `mapstructure:"host_name" cty:"host_name" hcl:"host_name"` - HWClockUTC *config.Trilean `mapstructure:"hw_clock_utc" cty:"hw_clock_utc" hcl:"hw_clock_utc"` - Timezone *string `mapstructure:"time_zone" cty:"time_zone" hcl:"time_zone"` + Domain *string `mapstructure:"domain" cty:"domain" hcl:"domain"` + Hostname *string `mapstructure:"host_name" cty:"host_name" hcl:"host_name"` + HWClockUTC *bool `mapstructure:"hw_clock_utc" cty:"hw_clock_utc" hcl:"hw_clock_utc"` + Timezone *string `mapstructure:"time_zone" cty:"time_zone" hcl:"time_zone"` } // FlatMapstructure returns a new FlatLinuxOptions. @@ -115,7 +114,7 @@ func (*FlatLinuxOptions) HCL2Spec() map[string]hcldec.Spec { s := map[string]hcldec.Spec{ "domain": &hcldec.AttrSpec{Name: "domain", Type: cty.String, Required: false}, "host_name": &hcldec.AttrSpec{Name: "host_name", Type: cty.String, Required: false}, - "hw_clock_utc": &hcldec.AttrSpec{Name: "hw_clock_utc", Type: cty.Number, Required: false}, + "hw_clock_utc": &hcldec.AttrSpec{Name: "hw_clock_utc", Type: cty.Bool, Required: false}, "time_zone": &hcldec.AttrSpec{Name: "time_zone", Type: cty.String, Required: false}, } return s diff --git a/builder/vsphere/driver/vm.go b/builder/vsphere/driver/vm.go index 020af6809..acc80ec4e 100644 --- a/builder/vsphere/driver/vm.go +++ b/builder/vsphere/driver/vm.go @@ -97,7 +97,6 @@ type HardwareConfig struct { VGPUProfile string Firmware string ForceBIOSSetup bool - StorageConfig StorageConfig } type NIC struct { @@ -521,76 +520,6 @@ func (vm *VirtualMachineDriver) Configure(config *HardwareConfig) error { confSpec.CpuHotAddEnabled = &config.CpuHotAddEnabled confSpec.MemoryHotAddEnabled = &config.MemoryHotAddEnabled - // - //if len(config.StorageConfig.Storage) > 0 { - // ds, err := vm.vm.Device(vm.driver.ctx) - // if err != nil { - // return err - // } - // vd := ds.SelectByType((*types.VirtualDisk)(nil)) - // vc := ds.SelectByType((*types.VirtualController)(nil)) - // - // // Use existing devices to avoid wrong configuration - // devices := object.VirtualDeviceList{} - // devices = append(devices, vd...) - // devices = append(devices, vc...) - // - // newDevices := object.VirtualDeviceList{} - // - // // Adds new controllers - // var controllers []types.BaseVirtualController - // for _, controllerType := range config.StorageConfig.DiskControllerType { - // var device types.BaseVirtualDevice - // var err error - // if controllerType == "nvme" { - // device, err = devices.CreateNVMEController() - // } else { - // device, err = devices.CreateSCSIController(controllerType) - // } - // if err != nil { - // return err - // } - // devices = append(devices, device) - // newDevices = append(newDevices, device) - // name := devices.Name(device) - // log.Printf("MOSS controller name %s", name) - // controller, err := devices.FindDiskController(name) - // if err != nil { - // return err - // } - // controllers = append(controllers, controller) - // } - // - // for _, dc := range config.StorageConfig.Storage { - // key := devices.NewKey() - // disk := &types.VirtualDisk{ - // VirtualDevice: types.VirtualDevice{ - // Key: key, - // Backing: &types.VirtualDiskFlatVer2BackingInfo{ - // DiskMode: string(types.VirtualDiskModePersistent), - // ThinProvisioned: types.NewBool(dc.DiskThinProvisioned), - // EagerlyScrub: types.NewBool(dc.DiskEagerlyScrub), - // }, - // }, - // CapacityInKB: dc.DiskSize * 1024, - // } - // - // log.Printf("MOSS device key %d", key) - // - // devices.AssignController(disk, controllers[dc.ControllerIndex]) - // newDevices = append(newDevices, disk) - // } - // //devices, err = config.StorageConfig.AddStorageDevices(devices) - // //if err != nil { - // // return err - // //} - // - // devicesConfigSpec, err := newDevices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd) - // if err != nil { - // return err - // } - // confSpec.DeviceChange = append(confSpec.DeviceChange, devicesConfigSpec...) - //} if config.VideoRAM != 0 { devices, err := vm.vm.Device(vm.driver.ctx) diff --git a/builder/vsphere/iso/step_create_test.go b/builder/vsphere/iso/step_create_test.go index a4efc95fa..cd0b4fa57 100644 --- a/builder/vsphere/iso/step_create_test.go +++ b/builder/vsphere/iso/step_create_test.go @@ -17,9 +17,18 @@ import ( func TestCreateConfig_Prepare(t *testing.T) { // Empty config - check defaults - config := &CreateConfig{} + config := &CreateConfig{ + // Storage is required + StorageConfig: common.StorageConfig{ + Storage: []common.DiskConfig{ + { + DiskSize: 32768, + }, + }, + }, + } if errs := config.Prepare(); len(errs) != 0 { - t.Fatalf("Config preprare should not fail") + t.Fatalf("Config preprare should not fail: %s", errs[0]) } if config.GuestOSType != "otherGuest" { t.Fatalf("GuestOSType should default to 'otherGuest'") @@ -69,6 +78,13 @@ func TestCreateConfig_Prepare(t *testing.T) { name: "USBController validate 'usb' and 'xhci' can be set together", config: &CreateConfig{ USBController: []string{"usb", "xhci"}, + StorageConfig: common.StorageConfig{ + Storage: []common.DiskConfig{ + { + DiskSize: 32768, + }, + }, + }, }, fail: false, }, @@ -76,6 +92,13 @@ func TestCreateConfig_Prepare(t *testing.T) { name: "USBController validate '1' and '0' can be set together", config: &CreateConfig{ USBController: []string{"1", "0"}, + StorageConfig: common.StorageConfig{ + Storage: []common.DiskConfig{ + { + DiskSize: 32768, + }, + }, + }, }, fail: false, }, @@ -83,6 +106,13 @@ func TestCreateConfig_Prepare(t *testing.T) { name: "USBController validate 'true' and 'false' can be set together", config: &CreateConfig{ USBController: []string{"true", "false"}, + StorageConfig: common.StorageConfig{ + Storage: []common.DiskConfig{ + { + DiskSize: 32768, + }, + }, + }, }, fail: false, }, @@ -90,6 +120,13 @@ func TestCreateConfig_Prepare(t *testing.T) { name: "USBController validate 'true' and 'usb' cannot be set together", config: &CreateConfig{ USBController: []string{"true", "usb"}, + StorageConfig: common.StorageConfig{ + Storage: []common.DiskConfig{ + { + DiskSize: 32768, + }, + }, + }, }, fail: true, expectedErrMsg: "there can only be one usb controller and one xhci controller", @@ -98,6 +135,13 @@ func TestCreateConfig_Prepare(t *testing.T) { name: "USBController validate '1' and 'usb' cannot be set together", config: &CreateConfig{ USBController: []string{"1", "usb"}, + StorageConfig: common.StorageConfig{ + Storage: []common.DiskConfig{ + { + DiskSize: 32768, + }, + }, + }, }, fail: true, expectedErrMsg: "there can only be one usb controller and one xhci controller", @@ -106,6 +150,13 @@ func TestCreateConfig_Prepare(t *testing.T) { name: "USBController validate 'xhci' cannot be set more that once", config: &CreateConfig{ USBController: []string{"xhci", "xhci"}, + StorageConfig: common.StorageConfig{ + Storage: []common.DiskConfig{ + { + DiskSize: 32768, + }, + }, + }, }, fail: true, expectedErrMsg: "there can only be one usb controller and one xhci controller", @@ -114,6 +165,13 @@ func TestCreateConfig_Prepare(t *testing.T) { name: "USBController validate unknown value cannot be set", config: &CreateConfig{ USBController: []string{"unknown"}, + StorageConfig: common.StorageConfig{ + Storage: []common.DiskConfig{ + { + DiskSize: 32768, + }, + }, + }, }, fail: true, expectedErrMsg: "usb_controller[0] references an unknown usb controller", @@ -131,7 +189,7 @@ func TestCreateConfig_Prepare(t *testing.T) { } } else { if len(errs) != 0 { - t.Fatalf("Config preprare should not fail") + t.Fatalf("Config preprare should not fail: %s", errs[0]) } } } diff --git a/website/pages/partials/builder/vsphere/iso/DiskConfig-not-required.mdx b/website/pages/partials/builder/vsphere/iso/DiskConfig-not-required.mdx deleted file mode 100644 index 8e31b90d4..000000000 --- a/website/pages/partials/builder/vsphere/iso/DiskConfig-not-required.mdx +++ /dev/null @@ -1,7 +0,0 @@ - - -- `disk_thin_provisioned` (bool) - Enable VMDK thin provisioning for VM. Defaults to `false`. - -- `disk_eagerly_scrub` (bool) - Enable VMDK eager scrubbing for VM. Defaults to `false`. - -- `disk_controller_index` (int) - The assigned disk controller. Defaults to the first one (0) diff --git a/website/pages/partials/builder/vsphere/iso/DiskConfig-required.mdx b/website/pages/partials/builder/vsphere/iso/DiskConfig-required.mdx deleted file mode 100644 index 83683c366..000000000 --- a/website/pages/partials/builder/vsphere/iso/DiskConfig-required.mdx +++ /dev/null @@ -1,3 +0,0 @@ - - -- `disk_size` (int64) - The size of the disk in MB. diff --git a/website/pages/partials/builder/vsphere/iso/DiskConfig.mdx b/website/pages/partials/builder/vsphere/iso/DiskConfig.mdx deleted file mode 100644 index 988ce2819..000000000 --- a/website/pages/partials/builder/vsphere/iso/DiskConfig.mdx +++ /dev/null @@ -1,74 +0,0 @@ - - -Defines the disk storage for a VM. - -Example that will create a 15GB and a 20GB disk on the VM. The second disk will be thin provisioned: - -In JSON: -```json - "storage": [ - { - "disk_size": 15000 - }, - { - "disk_size": 20000, - "disk_thin_provisioned": true - } - ], -``` -In HCL2: -```hcl - storage { - disk_size = 15000 - } - storage { - disk_size = 20000 - disk_thin_provisioned = true - } -``` - -Example that creates 2 pvscsi controllers and adds 2 disks to each one: - -In JSON: -```json - "disk_controller_type": ["pvscsi", "pvscsi"], - "storage": [ - { - "disk_size": 15000, - "disk_controller_index": 0 - }, - { - "disk_size": 15000, - "disk_controller_index": 0 - }, - { - "disk_size": 15000, - "disk_controller_index": 1 - }, - { - "disk_size": 15000, - "disk_controller_index": 1 - } - ], -``` - -In HCL2: -```hcl - disk_controller_type = ["pvscsi", "pvscsi"] - storage { - disk_size = 15000, - disk_controller_index = 0 - } - storage { - disk_size = 15000 - disk_controller_index = 0 - } - storage { - disk_size = 15000 - disk_controller_index = 1 - } - storage { - disk_size = 15000 - disk_controller_index = 1 - } -``` From 01f6763db09dfea6c7682696eee5be17a342a664 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Fri, 20 Nov 2020 14:53:08 -0800 Subject: [PATCH 93/93] fix generation --- website/pages/partials/builder/scaleway/Config-not-required.mdx | 1 + 1 file changed, 1 insertion(+) diff --git a/website/pages/partials/builder/scaleway/Config-not-required.mdx b/website/pages/partials/builder/scaleway/Config-not-required.mdx index 47c8b3e7b..ef73b13c1 100644 --- a/website/pages/partials/builder/scaleway/Config-not-required.mdx +++ b/website/pages/partials/builder/scaleway/Config-not-required.mdx @@ -1,6 +1,7 @@ - `api_url` (string) - The Scaleway API URL to use + Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md). It can also be specified via the environment variable SCW_API_URL - `snapshot_name` (string) - The name of the resulting snapshot that will