diff --git a/CHANGELOG.md b/CHANGELOG.md index 2be4082..7a0c34c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,21 +1,3 @@ ### Bug fixes -- error when importing kvmvm without image_id -- state reading for kvmvm created from virtual image -- type field usage in image -- wrong API handle for image creation -- updating description in kvmvm -### New features -- ipaType and IS parameters in kvmvm - -### New datasources -- lb -- lb\_list -- lb\_list\_deleted - -### New resources -- lb -- lb\_backend -- lb\_backend\_server -- lb\_frontend -- lb\_frontend\_bind +- error naming lb resources diff --git a/internal/service/cloudapi/lb/resource_lb_backend.go b/internal/service/cloudapi/lb/resource_lb_backend.go index bd47c55..2d9ee54 100644 --- a/internal/service/cloudapi/lb/resource_lb_backend.go +++ b/internal/service/cloudapi/lb/resource_lb_backend.go @@ -86,7 +86,7 @@ func resourceLBBackendCreate(ctx context.Context, d *schema.ResourceData, m inte return diag.FromErr(err) } - d.SetId(strconv.Itoa(d.Get("lb_id").(int)) + "-" + d.Get("name").(string)) + d.SetId(strconv.Itoa(d.Get("lb_id").(int)) + "#" + d.Get("name").(string)) _, err = utilityLBBackendCheckPresence(ctx, d, m) if err != nil { @@ -110,7 +110,7 @@ func resourceLBBackendRead(ctx context.Context, d *schema.ResourceData, m interf return diag.FromErr(err) } - lbId, _ := strconv.ParseInt(strings.Split(d.Id(), "-")[0], 10, 32) + lbId, _ := strconv.ParseInt(strings.Split(d.Id(), "#")[0], 10, 32) d.Set("lb_id", lbId) d.Set("name", b.Name) diff --git a/internal/service/cloudapi/lb/resource_lb_backend_server.go b/internal/service/cloudapi/lb/resource_lb_backend_server.go index 9ec3f52..089e711 100644 --- a/internal/service/cloudapi/lb/resource_lb_backend_server.go +++ b/internal/service/cloudapi/lb/resource_lb_backend_server.go @@ -90,7 +90,7 @@ func resourceLBBackendServerCreate(ctx context.Context, d *schema.ResourceData, return diag.FromErr(err) } - d.SetId(strconv.Itoa(d.Get("lb_id").(int)) + "-" + d.Get("backend_name").(string) + "-" + d.Get("name").(string)) + d.SetId(strconv.Itoa(d.Get("lb_id").(int)) + "#" + d.Get("backend_name").(string) + "#" + d.Get("name").(string)) _, err = utilityLBBackendServerCheckPresence(ctx, d, m) if err != nil { @@ -114,8 +114,8 @@ func resourceLBBackendServerRead(ctx context.Context, d *schema.ResourceData, m return diag.FromErr(err) } - lbId, _ := strconv.ParseInt(strings.Split(d.Id(), "-")[0], 10, 32) - backendName := strings.Split(d.Id(), "-")[1] + lbId, _ := strconv.ParseInt(strings.Split(d.Id(), "#")[0], 10, 32) + backendName := strings.Split(d.Id(), "#")[1] d.Set("lb_id", lbId) d.Set("backend_name", backendName) diff --git a/internal/service/cloudapi/lb/resource_lb_frontend.go b/internal/service/cloudapi/lb/resource_lb_frontend.go index 1b3eaa6..13a1161 100644 --- a/internal/service/cloudapi/lb/resource_lb_frontend.go +++ b/internal/service/cloudapi/lb/resource_lb_frontend.go @@ -58,7 +58,7 @@ func resourceLBFrontendCreate(ctx context.Context, d *schema.ResourceData, m int return diag.FromErr(err) } - d.SetId(strconv.Itoa(d.Get("lb_id").(int)) + "-" + d.Get("name").(string)) + d.SetId(strconv.Itoa(d.Get("lb_id").(int)) + "#" + d.Get("name").(string)) _, err = utilityLBFrontendCheckPresence(ctx, d, m) if err != nil { @@ -82,7 +82,7 @@ func resourceLBFrontendRead(ctx context.Context, d *schema.ResourceData, m inter return diag.FromErr(err) } - lbId, _ := strconv.ParseInt(strings.Split(d.Id(), "-")[0], 10, 32) + lbId, _ := strconv.ParseInt(strings.Split(d.Id(), "#")[0], 10, 32) d.Set("lb_id", lbId) d.Set("backend_name", f.Backend) d.Set("name", f.Name) diff --git a/internal/service/cloudapi/lb/resource_lb_frontend_bind.go b/internal/service/cloudapi/lb/resource_lb_frontend_bind.go index 0860406..d4b3750 100644 --- a/internal/service/cloudapi/lb/resource_lb_frontend_bind.go +++ b/internal/service/cloudapi/lb/resource_lb_frontend_bind.go @@ -60,7 +60,7 @@ func resourceLBFrontendBindCreate(ctx context.Context, d *schema.ResourceData, m return diag.FromErr(err) } - d.SetId(strconv.Itoa(d.Get("lb_id").(int)) + "-" + d.Get("frontend_name").(string) + "-" + d.Get("name").(string)) + d.SetId(strconv.Itoa(d.Get("lb_id").(int)) + "#" + d.Get("frontend_name").(string) + "#" + d.Get("name").(string)) _, err = utilityLBFrontendBindCheckPresence(ctx, d, m) if err != nil { @@ -84,8 +84,8 @@ func resourceLBFrontendBindRead(ctx context.Context, d *schema.ResourceData, m i return diag.FromErr(err) } - lbId, _ := strconv.ParseInt(strings.Split(d.Id(), "-")[0], 10, 32) - frontendName := strings.Split(d.Id(), "-")[1] + lbId, _ := strconv.ParseInt(strings.Split(d.Id(), "#")[0], 10, 32) + frontendName := strings.Split(d.Id(), "#")[1] d.Set("lb_id", lbId) d.Set("frontend_name", frontendName) diff --git a/internal/service/cloudapi/lb/utility_lb_backend.go b/internal/service/cloudapi/lb/utility_lb_backend.go index df81d2e..93958b7 100644 --- a/internal/service/cloudapi/lb/utility_lb_backend.go +++ b/internal/service/cloudapi/lb/utility_lb_backend.go @@ -52,7 +52,7 @@ func utilityLBBackendCheckPresence(ctx context.Context, d *schema.ResourceData, if (d.Get("lb_id").(int)) != 0 { urlValues.Add("lbId", strconv.Itoa(d.Get("lb_id").(int))) } else { - parameters := strings.Split(d.Id(), "-") + parameters := strings.Split(d.Id(), "#") urlValues.Add("lbId", parameters[0]) bName = parameters[1] } diff --git a/internal/service/cloudapi/lb/utility_lb_backend_server.go b/internal/service/cloudapi/lb/utility_lb_backend_server.go index 3da1342..7372874 100644 --- a/internal/service/cloudapi/lb/utility_lb_backend_server.go +++ b/internal/service/cloudapi/lb/utility_lb_backend_server.go @@ -53,7 +53,7 @@ func utilityLBBackendServerCheckPresence(ctx context.Context, d *schema.Resource if (d.Get("lb_id").(int)) != 0 { urlValues.Add("lbId", strconv.Itoa(d.Get("lb_id").(int))) } else { - parameters := strings.Split(d.Id(), "-") + parameters := strings.Split(d.Id(), "#") urlValues.Add("lbId", parameters[0]) bName = parameters[1] sName = parameters[2] diff --git a/internal/service/cloudapi/lb/utility_lb_frontend.go b/internal/service/cloudapi/lb/utility_lb_frontend.go index d7aabf1..b3e0c36 100644 --- a/internal/service/cloudapi/lb/utility_lb_frontend.go +++ b/internal/service/cloudapi/lb/utility_lb_frontend.go @@ -52,7 +52,7 @@ func utilityLBFrontendCheckPresence(ctx context.Context, d *schema.ResourceData, if (d.Get("lb_id").(int)) != 0 { urlValues.Add("lbId", strconv.Itoa(d.Get("lb_id").(int))) } else { - parameters := strings.Split(d.Id(), "-") + parameters := strings.Split(d.Id(), "#") urlValues.Add("lbId", parameters[0]) fName = parameters[1] } diff --git a/internal/service/cloudapi/lb/utility_lb_frontend_bind.go b/internal/service/cloudapi/lb/utility_lb_frontend_bind.go index 1ae9638..90065c0 100644 --- a/internal/service/cloudapi/lb/utility_lb_frontend_bind.go +++ b/internal/service/cloudapi/lb/utility_lb_frontend_bind.go @@ -53,7 +53,7 @@ func utilityLBFrontendBindCheckPresence(ctx context.Context, d *schema.ResourceD if (d.Get("lb_id").(int)) != 0 { urlValues.Add("lbId", strconv.Itoa(d.Get("lb_id").(int))) } else { - parameters := strings.Split(d.Id(), "-") + parameters := strings.Split(d.Id(), "#") urlValues.Add("lbId", parameters[0]) fName = parameters[1] bName = parameters[2]