parent
460c18c202
commit
53a3697850
124 changed files with 8342 additions and 6042 deletions
|
|
@ -2,9 +2,15 @@ package networkarea
|
|||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
|
||||
|
||||
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
|
||||
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils"
|
||||
|
||||
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
|
||||
iaasUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iaas/utils"
|
||||
|
||||
|
|
@ -17,8 +23,6 @@ import (
|
|||
"github.com/hashicorp/terraform-plugin-framework/types"
|
||||
"github.com/hashicorp/terraform-plugin-log/tflog"
|
||||
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
|
||||
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
|
||||
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils"
|
||||
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
|
||||
)
|
||||
|
||||
|
|
@ -58,6 +62,7 @@ func (d *networkAreaDataSource) Configure(ctx context.Context, req datasource.Co
|
|||
|
||||
// Schema defines the schema for the data source.
|
||||
func (d *networkAreaDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, resp *datasource.SchemaResponse) {
|
||||
deprecationMsg := "Deprecated because of the IaaS API v1 -> v2 migration. Will be removed in May 2026."
|
||||
description := "Network area datasource schema. Must have a `region` specified in the provider configuration."
|
||||
resp.Schema = schema.Schema{
|
||||
Description: description,
|
||||
|
|
@ -99,13 +104,15 @@ func (d *networkAreaDataSource) Schema(_ context.Context, _ datasource.SchemaReq
|
|||
},
|
||||
},
|
||||
"default_nameservers": schema.ListAttribute{
|
||||
Description: "List of DNS Servers/Nameservers.",
|
||||
Computed: true,
|
||||
ElementType: types.StringType,
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Description: "List of DNS Servers/Nameservers.",
|
||||
Computed: true,
|
||||
ElementType: types.StringType,
|
||||
},
|
||||
"network_ranges": schema.ListNestedAttribute{
|
||||
Description: "List of Network ranges.",
|
||||
Computed: true,
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Description: "List of Network ranges.",
|
||||
Computed: true,
|
||||
Validators: []validator.List{
|
||||
listvalidator.SizeAtLeast(1),
|
||||
listvalidator.SizeAtMost(64),
|
||||
|
|
@ -126,28 +133,32 @@ func (d *networkAreaDataSource) Schema(_ context.Context, _ datasource.SchemaReq
|
|||
},
|
||||
},
|
||||
"transfer_network": schema.StringAttribute{
|
||||
Description: "Classless Inter-Domain Routing (CIDR).",
|
||||
Computed: true,
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Description: "Classless Inter-Domain Routing (CIDR).",
|
||||
Computed: true,
|
||||
},
|
||||
"default_prefix_length": schema.Int64Attribute{
|
||||
Description: "The default prefix length for networks in the network area.",
|
||||
Computed: true,
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Description: "The default prefix length for networks in the network area.",
|
||||
Computed: true,
|
||||
Validators: []validator.Int64{
|
||||
int64validator.AtLeast(24),
|
||||
int64validator.AtMost(29),
|
||||
},
|
||||
},
|
||||
"max_prefix_length": schema.Int64Attribute{
|
||||
Description: "The maximal prefix length for networks in the network area.",
|
||||
Computed: true,
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Description: "The maximal prefix length for networks in the network area.",
|
||||
Computed: true,
|
||||
Validators: []validator.Int64{
|
||||
int64validator.AtLeast(24),
|
||||
int64validator.AtMost(29),
|
||||
},
|
||||
},
|
||||
"min_prefix_length": schema.Int64Attribute{
|
||||
Description: "The minimal prefix length for networks in the network area.",
|
||||
Computed: true,
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Description: "The minimal prefix length for networks in the network area.",
|
||||
Computed: true,
|
||||
Validators: []validator.Int64{
|
||||
int64validator.AtLeast(22),
|
||||
int64validator.AtMost(29),
|
||||
|
|
@ -196,13 +207,32 @@ func (d *networkAreaDataSource) Read(ctx context.Context, req datasource.ReadReq
|
|||
|
||||
ctx = core.LogResponse(ctx)
|
||||
|
||||
networkAreaRanges := networkAreaResp.Ipv4.NetworkRanges
|
||||
|
||||
err = mapFields(ctx, networkAreaResp, networkAreaRanges, &model)
|
||||
err = mapFields(ctx, networkAreaResp, &model)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading network area", fmt.Sprintf("Processing API payload: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
networkAreaRegionResp, err := d.client.GetNetworkAreaRegion(ctx, organizationId, networkAreaId, "eu01").Execute()
|
||||
if err != nil {
|
||||
var oapiErr *oapierror.GenericOpenAPIError
|
||||
ok := errors.As(err, &oapiErr)
|
||||
if !(ok && (oapiErr.StatusCode == http.StatusNotFound || oapiErr.StatusCode == http.StatusBadRequest)) { // TODO: iaas api returns http 400 in case network area region is not found
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading network area region", fmt.Sprintf("Calling API: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
networkAreaRegionResp = &iaas.RegionalArea{}
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
err = mapNetworkAreaRegionFields(ctx, networkAreaRegionResp, &model)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading network area region", fmt.Sprintf("Processing API payload: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
diags = resp.State.Set(ctx, model)
|
||||
resp.Diagnostics.Append(diags...)
|
||||
if resp.Diagnostics.HasError() {
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package networkarea
|
|||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
|
@ -34,26 +35,55 @@ import (
|
|||
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
|
||||
)
|
||||
|
||||
const (
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
defaultValueDefaultPrefixLength = 25
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
defaultValueMinPrefixLength = 24
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
defaultValueMaxPrefixLength = 29
|
||||
|
||||
// Deprecated: Will be removed in May 2026.
|
||||
deprecationWarningSummary = "Migration to new `stackit_network_area_region` resource needed"
|
||||
// Deprecated: Will be removed in May 2026.
|
||||
deprecationWarningDetails = "You're using deprecated features of the `stackit_network_area` resource. These will be removed in May 2026. Migrate to the new `stackit_network_area_region` resource instead."
|
||||
)
|
||||
|
||||
// Ensure the implementation satisfies the expected interfaces.
|
||||
var (
|
||||
_ resource.Resource = &networkAreaResource{}
|
||||
_ resource.ResourceWithConfigure = &networkAreaResource{}
|
||||
_ resource.ResourceWithImportState = &networkAreaResource{}
|
||||
_ resource.Resource = &networkAreaResource{}
|
||||
_ resource.ResourceWithConfigure = &networkAreaResource{}
|
||||
_ resource.ResourceWithImportState = &networkAreaResource{}
|
||||
_ resource.ResourceWithValidateConfig = &networkAreaResource{}
|
||||
)
|
||||
|
||||
type Model struct {
|
||||
Id types.String `tfsdk:"id"` // needed by TF
|
||||
OrganizationId types.String `tfsdk:"organization_id"`
|
||||
NetworkAreaId types.String `tfsdk:"network_area_id"`
|
||||
Name types.String `tfsdk:"name"`
|
||||
ProjectCount types.Int64 `tfsdk:"project_count"`
|
||||
DefaultNameservers types.List `tfsdk:"default_nameservers"`
|
||||
NetworkRanges types.List `tfsdk:"network_ranges"`
|
||||
TransferNetwork types.String `tfsdk:"transfer_network"`
|
||||
DefaultPrefixLength types.Int64 `tfsdk:"default_prefix_length"`
|
||||
MaxPrefixLength types.Int64 `tfsdk:"max_prefix_length"`
|
||||
MinPrefixLength types.Int64 `tfsdk:"min_prefix_length"`
|
||||
Labels types.Map `tfsdk:"labels"`
|
||||
Id types.String `tfsdk:"id"` // needed by TF
|
||||
OrganizationId types.String `tfsdk:"organization_id"`
|
||||
NetworkAreaId types.String `tfsdk:"network_area_id"`
|
||||
Name types.String `tfsdk:"name"`
|
||||
ProjectCount types.Int64 `tfsdk:"project_count"`
|
||||
Labels types.Map `tfsdk:"labels"`
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
DefaultNameservers types.List `tfsdk:"default_nameservers"`
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
MaxPrefixLength types.Int64 `tfsdk:"max_prefix_length"`
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
NetworkRanges types.List `tfsdk:"network_ranges"`
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
TransferNetwork types.String `tfsdk:"transfer_network"`
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
DefaultPrefixLength types.Int64 `tfsdk:"default_prefix_length"`
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
MinPrefixLength types.Int64 `tfsdk:"min_prefix_length"`
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider. LegacyMode checks if any of the deprecated fields are set which now relate to the network area region API resource.
|
||||
func (model *Model) LegacyMode() bool {
|
||||
return !model.NetworkRanges.IsNull() || model.NetworkRanges.IsUnknown() || !model.TransferNetwork.IsNull() || model.TransferNetwork.IsUnknown() || !model.DefaultNameservers.IsNull() || model.DefaultNameservers.IsUnknown() || model.DefaultPrefixLength != types.Int64Value(int64(defaultValueDefaultPrefixLength)) || model.MinPrefixLength != types.Int64Value(int64(defaultValueMinPrefixLength)) || model.MaxPrefixLength != types.Int64Value(int64(defaultValueMaxPrefixLength))
|
||||
}
|
||||
|
||||
// Struct corresponding to Model.NetworkRanges[i]
|
||||
|
|
@ -104,9 +134,27 @@ func (r *networkAreaResource) Configure(ctx context.Context, req resource.Config
|
|||
tflog.Info(ctx, "IaaS client configured")
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
func (r *networkAreaResource) ValidateConfig(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
|
||||
var resourceModel Model
|
||||
resp.Diagnostics.Append(req.Config.Get(ctx, &resourceModel)...)
|
||||
if resp.Diagnostics.HasError() {
|
||||
return
|
||||
}
|
||||
|
||||
if resourceModel.NetworkRanges.IsNull() != resourceModel.TransferNetwork.IsNull() {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error configuring network network area", "You have to either provide both the `network_ranges` and `transfer_network` fields simultaneously or none of them.")
|
||||
}
|
||||
|
||||
if (resourceModel.NetworkRanges.IsNull() || resourceModel.TransferNetwork.IsNull()) && (!resourceModel.DefaultNameservers.IsNull() || !resourceModel.DefaultPrefixLength.IsNull() || !resourceModel.MinPrefixLength.IsNull() || !resourceModel.MaxPrefixLength.IsNull()) {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error configuring network network area", "You have to provide both the `network_ranges` and `transfer_network` fields when providing one of these fields: `default_nameservers`, `default_prefix_length`, `max_prefix_length`, `min_prefix_length`")
|
||||
}
|
||||
}
|
||||
|
||||
// Schema defines the schema for the resource.
|
||||
func (r *networkAreaResource) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) {
|
||||
description := "Network area resource schema. Must have a `region` specified in the provider configuration."
|
||||
deprecationMsg := "Deprecated because of the IaaS API v1 -> v2 migration. Will be removed in May 2026. Use the new `stackit_network_area_region` resource instead."
|
||||
description := "Network area resource schema."
|
||||
resp.Schema = schema.Schema{
|
||||
Description: description,
|
||||
MarkdownDescription: description,
|
||||
|
|
@ -155,14 +203,18 @@ func (r *networkAreaResource) Schema(_ context.Context, _ resource.SchemaRequest
|
|||
int64validator.AtLeast(0),
|
||||
},
|
||||
},
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
"default_nameservers": schema.ListAttribute{
|
||||
Description: "List of DNS Servers/Nameservers.",
|
||||
Optional: true,
|
||||
ElementType: types.StringType,
|
||||
Description: "List of DNS Servers/Nameservers for configuration of network area for region `eu01`.",
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Optional: true,
|
||||
ElementType: types.StringType,
|
||||
},
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
"network_ranges": schema.ListNestedAttribute{
|
||||
Description: "List of Network ranges.",
|
||||
Required: true,
|
||||
Description: "List of Network ranges for configuration of network area for region `eu01`.",
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Optional: true,
|
||||
Validators: []validator.List{
|
||||
listvalidator.SizeAtLeast(1),
|
||||
listvalidator.SizeAtMost(64),
|
||||
|
|
@ -170,55 +222,65 @@ func (r *networkAreaResource) Schema(_ context.Context, _ resource.SchemaRequest
|
|||
NestedObject: schema.NestedAttributeObject{
|
||||
Attributes: map[string]schema.Attribute{
|
||||
"network_range_id": schema.StringAttribute{
|
||||
Computed: true,
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Computed: true,
|
||||
Validators: []validator.String{
|
||||
validate.UUID(),
|
||||
validate.NoSeparator(),
|
||||
},
|
||||
},
|
||||
"prefix": schema.StringAttribute{
|
||||
Description: "Classless Inter-Domain Routing (CIDR).",
|
||||
Required: true,
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Description: "Classless Inter-Domain Routing (CIDR).",
|
||||
Required: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
"transfer_network": schema.StringAttribute{
|
||||
Description: "Classless Inter-Domain Routing (CIDR).",
|
||||
Required: true,
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Description: "Classless Inter-Domain Routing (CIDR) for configuration of network area for region `eu01`.",
|
||||
Optional: true,
|
||||
PlanModifiers: []planmodifier.String{
|
||||
stringplanmodifier.RequiresReplace(),
|
||||
},
|
||||
},
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
"default_prefix_length": schema.Int64Attribute{
|
||||
Description: "The default prefix length for networks in the network area.",
|
||||
Optional: true,
|
||||
Computed: true,
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Description: "The default prefix length for networks in the network area for region `eu01`.",
|
||||
Optional: true,
|
||||
Computed: true,
|
||||
Validators: []validator.Int64{
|
||||
int64validator.AtLeast(24),
|
||||
int64validator.AtMost(29),
|
||||
},
|
||||
Default: int64default.StaticInt64(25),
|
||||
Default: int64default.StaticInt64(defaultValueDefaultPrefixLength),
|
||||
},
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
"max_prefix_length": schema.Int64Attribute{
|
||||
Description: "The maximal prefix length for networks in the network area.",
|
||||
Optional: true,
|
||||
Computed: true,
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Description: "The maximal prefix length for networks in the network area for region `eu01`.",
|
||||
Optional: true,
|
||||
Computed: true,
|
||||
Validators: []validator.Int64{
|
||||
int64validator.AtLeast(24),
|
||||
int64validator.AtMost(29),
|
||||
},
|
||||
Default: int64default.StaticInt64(29),
|
||||
Default: int64default.StaticInt64(defaultValueMaxPrefixLength),
|
||||
},
|
||||
// Deprecated: Will be removed in May 2026. Only kept to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
"min_prefix_length": schema.Int64Attribute{
|
||||
Description: "The minimal prefix length for networks in the network area.",
|
||||
Optional: true,
|
||||
Computed: true,
|
||||
DeprecationMessage: deprecationMsg,
|
||||
Description: "The minimal prefix length for networks in the network area for region `eu01`.",
|
||||
Optional: true,
|
||||
Computed: true,
|
||||
Validators: []validator.Int64{
|
||||
int64validator.AtLeast(8),
|
||||
int64validator.AtMost(29),
|
||||
},
|
||||
Default: int64default.StaticInt64(24),
|
||||
Default: int64default.StaticInt64(defaultValueMinPrefixLength),
|
||||
},
|
||||
"labels": schema.MapAttribute{
|
||||
Description: "Labels are key-value string pairs which can be attached to a resource container",
|
||||
|
|
@ -233,8 +295,7 @@ func (r *networkAreaResource) Schema(_ context.Context, _ resource.SchemaRequest
|
|||
func (r *networkAreaResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { // nolint:gocritic // function signature required by Terraform
|
||||
// Retrieve values from plan
|
||||
var model Model
|
||||
diags := req.Plan.Get(ctx, &model)
|
||||
resp.Diagnostics.Append(diags...)
|
||||
resp.Diagnostics.Append(req.Plan.Get(ctx, &model)...)
|
||||
if resp.Diagnostics.HasError() {
|
||||
return
|
||||
}
|
||||
|
|
@ -253,7 +314,7 @@ func (r *networkAreaResource) Create(ctx context.Context, req resource.CreateReq
|
|||
}
|
||||
|
||||
// Create new network area
|
||||
area, err := r.client.CreateNetworkArea(ctx, organizationId).CreateNetworkAreaPayload(*payload).Execute()
|
||||
networkArea, err := r.client.CreateNetworkArea(ctx, organizationId).CreateNetworkAreaPayload(*payload).Execute()
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating network area", fmt.Sprintf("Calling API: %v", err))
|
||||
return
|
||||
|
|
@ -261,25 +322,66 @@ func (r *networkAreaResource) Create(ctx context.Context, req resource.CreateReq
|
|||
|
||||
ctx = core.LogResponse(ctx)
|
||||
|
||||
networkArea, err := wait.CreateNetworkAreaWaitHandler(ctx, r.client, organizationId, *area.AreaId).WaitWithContext(context.Background())
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating network area", fmt.Sprintf("Network area creation waiting: %v", err))
|
||||
return
|
||||
}
|
||||
networkAreaId := *networkArea.AreaId
|
||||
networkAreaId := *networkArea.Id
|
||||
ctx = tflog.SetField(ctx, "network_area_id", networkAreaId)
|
||||
|
||||
networkAreaRanges := networkArea.Ipv4.NetworkRanges
|
||||
|
||||
// Map response body to schema
|
||||
err = mapFields(ctx, networkArea, networkAreaRanges, &model)
|
||||
err = mapFields(ctx, networkArea, &model)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating network area", fmt.Sprintf("Processing API payload: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
if model.LegacyMode() {
|
||||
core.LogAndAddWarning(ctx, &resp.Diagnostics, deprecationWarningSummary, deprecationWarningDetails)
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
regionCreatePayload, err := toRegionCreatePayload(ctx, &model)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating network area region", fmt.Sprintf("Creating API payload: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
networkAreaRegionCreateResp, err := r.client.CreateNetworkAreaRegion(ctx, organizationId, networkAreaId, "eu01").CreateNetworkAreaRegionPayload(*regionCreatePayload).Execute()
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating network area region", fmt.Sprintf("Calling API: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
err = mapNetworkAreaRegionFields(ctx, networkAreaRegionCreateResp, &model) // map partial state - just in case anything goes wrong during the wait handler
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating network area region", fmt.Sprintf("Processing API payload: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
networkAreaRegionResp, err := wait.CreateNetworkAreaRegionWaitHandler(ctx, r.client, organizationId, networkAreaId, "eu01").WaitWithContext(ctx)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error waiting for network area region creation", fmt.Sprintf("Calling API: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
err = mapNetworkAreaRegionFields(ctx, networkAreaRegionResp, &model)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating network area region", fmt.Sprintf("Processing API payload: %v", err))
|
||||
return
|
||||
}
|
||||
} else {
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
model.NetworkRanges = types.ListNull(types.ObjectType{AttrTypes: networkRangeTypes})
|
||||
model.DefaultNameservers = types.ListNull(types.StringType)
|
||||
model.TransferNetwork = types.StringNull()
|
||||
model.DefaultPrefixLength = types.Int64Value(defaultValueDefaultPrefixLength)
|
||||
model.MinPrefixLength = types.Int64Value(defaultValueMinPrefixLength)
|
||||
model.MaxPrefixLength = types.Int64Value(defaultValueMaxPrefixLength)
|
||||
}
|
||||
|
||||
// Set state to fully populated data
|
||||
diags = resp.State.Set(ctx, model)
|
||||
resp.Diagnostics.Append(diags...)
|
||||
resp.Diagnostics.Append(resp.State.Set(ctx, model)...)
|
||||
if resp.Diagnostics.HasError() {
|
||||
return
|
||||
}
|
||||
|
|
@ -289,11 +391,11 @@ func (r *networkAreaResource) Create(ctx context.Context, req resource.CreateReq
|
|||
// Read refreshes the Terraform state with the latest data.
|
||||
func (r *networkAreaResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { // nolint:gocritic // function signature required by Terraform
|
||||
var model Model
|
||||
diags := req.State.Get(ctx, &model)
|
||||
resp.Diagnostics.Append(diags...)
|
||||
resp.Diagnostics.Append(req.State.Get(ctx, &model)...)
|
||||
if resp.Diagnostics.HasError() {
|
||||
return
|
||||
}
|
||||
|
||||
organizationId := model.OrganizationId.ValueString()
|
||||
networkAreaId := model.NetworkAreaId.ValueString()
|
||||
|
||||
|
|
@ -304,7 +406,8 @@ func (r *networkAreaResource) Read(ctx context.Context, req resource.ReadRequest
|
|||
|
||||
networkAreaResp, err := r.client.GetNetworkArea(ctx, organizationId, networkAreaId).Execute()
|
||||
if err != nil {
|
||||
oapiErr, ok := err.(*oapierror.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped
|
||||
var oapiErr *oapierror.GenericOpenAPIError
|
||||
ok := errors.As(err, &oapiErr)
|
||||
if ok && oapiErr.StatusCode == http.StatusNotFound {
|
||||
resp.State.RemoveResource(ctx)
|
||||
return
|
||||
|
|
@ -315,17 +418,53 @@ func (r *networkAreaResource) Read(ctx context.Context, req resource.ReadRequest
|
|||
|
||||
ctx = core.LogResponse(ctx)
|
||||
|
||||
networkAreaRanges := networkAreaResp.Ipv4.NetworkRanges
|
||||
|
||||
// Map response body to schema
|
||||
err = mapFields(ctx, networkAreaResp, networkAreaRanges, &model)
|
||||
err = mapFields(ctx, networkAreaResp, &model)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading network area", fmt.Sprintf("Processing API payload: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
if model.LegacyMode() {
|
||||
core.LogAndAddWarning(ctx, &resp.Diagnostics, deprecationWarningSummary, deprecationWarningDetails)
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
networkAreaRegionResp, err := r.client.GetNetworkAreaRegion(ctx, organizationId, networkAreaId, "eu01").Execute()
|
||||
if err != nil {
|
||||
var oapiErr *oapierror.GenericOpenAPIError
|
||||
ok := errors.As(err, &oapiErr)
|
||||
if !(ok && (oapiErr.StatusCode == http.StatusNotFound || oapiErr.StatusCode == http.StatusBadRequest)) { // TODO: iaas api returns http 400 in case network area region is not found
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading network area region", fmt.Sprintf("Calling API: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
model.NetworkRanges = types.ListNull(types.ObjectType{AttrTypes: networkRangeTypes})
|
||||
model.DefaultNameservers = types.ListNull(types.StringType)
|
||||
model.TransferNetwork = types.StringNull()
|
||||
model.DefaultPrefixLength = types.Int64Value(defaultValueDefaultPrefixLength)
|
||||
model.MinPrefixLength = types.Int64Value(defaultValueMinPrefixLength)
|
||||
model.MaxPrefixLength = types.Int64Value(defaultValueMaxPrefixLength)
|
||||
} else {
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
err = mapNetworkAreaRegionFields(ctx, networkAreaRegionResp, &model)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading network area region", fmt.Sprintf("Processing API payload: %v", err))
|
||||
return
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
model.NetworkRanges = types.ListNull(types.ObjectType{AttrTypes: networkRangeTypes})
|
||||
model.DefaultNameservers = types.ListNull(types.StringType)
|
||||
model.TransferNetwork = types.StringNull()
|
||||
model.DefaultPrefixLength = types.Int64Value(defaultValueDefaultPrefixLength)
|
||||
model.MinPrefixLength = types.Int64Value(defaultValueMinPrefixLength)
|
||||
model.MaxPrefixLength = types.Int64Value(defaultValueMaxPrefixLength)
|
||||
}
|
||||
|
||||
// Set refreshed state
|
||||
diags = resp.State.Set(ctx, model)
|
||||
resp.Diagnostics.Append(diags...)
|
||||
resp.Diagnostics.Append(resp.State.Set(ctx, model)...)
|
||||
if resp.Diagnostics.HasError() {
|
||||
return
|
||||
}
|
||||
|
|
@ -336,11 +475,11 @@ func (r *networkAreaResource) Read(ctx context.Context, req resource.ReadRequest
|
|||
func (r *networkAreaResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { // nolint:gocritic // function signature required by Terraform
|
||||
// Retrieve values from plan
|
||||
var model Model
|
||||
diags := req.Plan.Get(ctx, &model)
|
||||
resp.Diagnostics.Append(diags...)
|
||||
resp.Diagnostics.Append(req.Plan.Get(ctx, &model)...)
|
||||
if resp.Diagnostics.HasError() {
|
||||
return
|
||||
}
|
||||
|
||||
organizationId := model.OrganizationId.ValueString()
|
||||
networkAreaId := model.NetworkAreaId.ValueString()
|
||||
|
||||
|
|
@ -351,8 +490,7 @@ func (r *networkAreaResource) Update(ctx context.Context, req resource.UpdateReq
|
|||
|
||||
ranges := []networkRange{}
|
||||
if !(model.NetworkRanges.IsNull() || model.NetworkRanges.IsUnknown()) {
|
||||
diags = model.NetworkRanges.ElementsAs(ctx, &ranges, false)
|
||||
resp.Diagnostics.Append(diags...)
|
||||
resp.Diagnostics.Append(model.NetworkRanges.ElementsAs(ctx, &ranges, false)...)
|
||||
if resp.Diagnostics.HasError() {
|
||||
return
|
||||
}
|
||||
|
|
@ -360,8 +498,7 @@ func (r *networkAreaResource) Update(ctx context.Context, req resource.UpdateReq
|
|||
|
||||
// Retrieve values from state
|
||||
var stateModel Model
|
||||
diags = req.State.Get(ctx, &stateModel)
|
||||
resp.Diagnostics.Append(diags...)
|
||||
resp.Diagnostics.Append(req.State.Get(ctx, &stateModel)...)
|
||||
if resp.Diagnostics.HasError() {
|
||||
return
|
||||
}
|
||||
|
|
@ -373,7 +510,7 @@ func (r *networkAreaResource) Update(ctx context.Context, req resource.UpdateReq
|
|||
return
|
||||
}
|
||||
// Update existing network
|
||||
_, err = r.client.PartialUpdateNetworkArea(ctx, organizationId, networkAreaId).PartialUpdateNetworkAreaPayload(*payload).Execute()
|
||||
networkAreaUpdateResp, err := r.client.PartialUpdateNetworkArea(ctx, organizationId, networkAreaId).PartialUpdateNetworkAreaPayload(*payload).Execute()
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating network area", fmt.Sprintf("Calling API: %v", err))
|
||||
return
|
||||
|
|
@ -381,39 +518,73 @@ func (r *networkAreaResource) Update(ctx context.Context, req resource.UpdateReq
|
|||
|
||||
ctx = core.LogResponse(ctx)
|
||||
|
||||
waitResp, err := wait.UpdateNetworkAreaWaitHandler(ctx, r.client, organizationId, networkAreaId).WaitWithContext(ctx)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating network area", fmt.Sprintf("Network area update waiting: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Update network ranges
|
||||
err = updateNetworkRanges(ctx, organizationId, networkAreaId, ranges, r.client)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating network area", fmt.Sprintf("Updating Network ranges: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
networkAreaResp, err := r.client.GetNetworkArea(ctx, organizationId, networkAreaId).Execute()
|
||||
if err != nil {
|
||||
oapiErr, ok := err.(*oapierror.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped
|
||||
if ok && oapiErr.StatusCode == http.StatusNotFound {
|
||||
resp.State.RemoveResource(ctx)
|
||||
return
|
||||
}
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading network area", fmt.Sprintf("Calling API: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
networkAreaRanges := networkAreaResp.Ipv4.NetworkRanges
|
||||
|
||||
err = mapFields(ctx, waitResp, networkAreaRanges, &model)
|
||||
err = mapFields(ctx, networkAreaUpdateResp, &model)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating network area", fmt.Sprintf("Processing API payload: %v", err))
|
||||
return
|
||||
}
|
||||
diags = resp.State.Set(ctx, model)
|
||||
resp.Diagnostics.Append(diags...)
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
if model.LegacyMode() {
|
||||
core.LogAndAddWarning(ctx, &resp.Diagnostics, deprecationWarningSummary, deprecationWarningDetails)
|
||||
|
||||
// Deprecated: Update network area region payload creation. Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
regionUpdatePayload, err := toRegionUpdatePayload(ctx, &model)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating network area region", fmt.Sprintf("Creating API payload: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Deprecated: Update network area region. Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
networkAreaRegionUpdateResp, err := r.client.UpdateNetworkAreaRegion(ctx, organizationId, networkAreaId, "eu01").UpdateNetworkAreaRegionPayload(*regionUpdatePayload).Execute()
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating network area region", fmt.Sprintf("Calling API: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Deprecated: Update network area region. Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
err = mapNetworkAreaRegionFields(ctx, networkAreaRegionUpdateResp, &model)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating network area region", fmt.Sprintf("Processing API payload: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Deprecated: Update network ranges. Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
err = updateNetworkRanges(ctx, organizationId, networkAreaId, ranges, r.client)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating network area region", fmt.Sprintf("Updating Network ranges: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
networkAreaRegionResp, err := r.client.GetNetworkAreaRegion(ctx, organizationId, networkAreaId, "eu01").Execute()
|
||||
if err != nil {
|
||||
var oapiErr *oapierror.GenericOpenAPIError
|
||||
ok := errors.As(err, &oapiErr)
|
||||
if ok && (oapiErr.StatusCode == http.StatusNotFound || oapiErr.StatusCode == http.StatusBadRequest) { // TODO: iaas api returns http 400 in case network area region is not found
|
||||
return
|
||||
}
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading network area region", fmt.Sprintf("Calling API: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
err = mapNetworkAreaRegionFields(ctx, networkAreaRegionResp, &model)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading network area region", fmt.Sprintf("Processing API payload: %v", err))
|
||||
return
|
||||
}
|
||||
} else {
|
||||
// Deprecated: Will be removed in May 2026. Only introduced to make the IaaS v1 -> v2 API migration non-breaking in the Terraform provider.
|
||||
model.NetworkRanges = types.ListNull(types.ObjectType{AttrTypes: networkRangeTypes})
|
||||
model.DefaultNameservers = types.ListNull(types.StringType)
|
||||
model.TransferNetwork = types.StringNull()
|
||||
model.DefaultPrefixLength = types.Int64Value(defaultValueDefaultPrefixLength)
|
||||
model.MinPrefixLength = types.Int64Value(defaultValueMinPrefixLength)
|
||||
model.MaxPrefixLength = types.Int64Value(defaultValueMaxPrefixLength)
|
||||
}
|
||||
|
||||
resp.Diagnostics.Append(resp.State.Set(ctx, model)...)
|
||||
if resp.Diagnostics.HasError() {
|
||||
return
|
||||
}
|
||||
|
|
@ -444,7 +615,29 @@ func (r *networkAreaResource) Delete(ctx context.Context, req resource.DeleteReq
|
|||
return
|
||||
}
|
||||
|
||||
// Delete existing network
|
||||
// Get all configured regions so we can delete them one by one before deleting the network area
|
||||
regionsListResp, err := r.client.ListNetworkAreaRegions(ctx, organizationId, networkAreaId).Execute()
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting network area region", fmt.Sprintf("Calling API to list configured regions: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
// Delete network region configurations
|
||||
for region := range *regionsListResp.Regions {
|
||||
err = r.client.DeleteNetworkAreaRegion(ctx, organizationId, networkAreaId, region).Execute()
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting network area region", fmt.Sprintf("Calling API: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
_, err = wait.DeleteNetworkAreaRegionWaitHandler(ctx, r.client, organizationId, networkAreaId, region).WaitWithContext(ctx)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting network area region", fmt.Sprintf("Waiting for networea deletion: %v", err))
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// Delete existing network area
|
||||
err = r.client.DeleteNetworkArea(ctx, organizationId, networkAreaId).Execute()
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting network area", fmt.Sprintf("Calling API: %v", err))
|
||||
|
|
@ -453,12 +646,6 @@ func (r *networkAreaResource) Delete(ctx context.Context, req resource.DeleteReq
|
|||
|
||||
ctx = core.LogResponse(ctx)
|
||||
|
||||
_, err = wait.DeleteNetworkAreaWaitHandler(ctx, r.client, organizationId, networkAreaId).WaitWithContext(ctx)
|
||||
if err != nil {
|
||||
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting network area", fmt.Sprintf("Network area deletion waiting: %v", err))
|
||||
return
|
||||
}
|
||||
|
||||
tflog.Info(ctx, "Network area deleted")
|
||||
}
|
||||
|
||||
|
|
@ -485,7 +672,7 @@ func (r *networkAreaResource) ImportState(ctx context.Context, req resource.Impo
|
|||
tflog.Info(ctx, "Network state imported")
|
||||
}
|
||||
|
||||
func mapFields(ctx context.Context, networkAreaResp *iaas.NetworkArea, networkAreaRangesResp *[]iaas.NetworkRange, model *Model) error {
|
||||
func mapFields(ctx context.Context, networkAreaResp *iaas.NetworkArea, model *Model) error {
|
||||
if networkAreaResp == nil {
|
||||
return fmt.Errorf("response input is nil")
|
||||
}
|
||||
|
|
@ -496,18 +683,41 @@ func mapFields(ctx context.Context, networkAreaResp *iaas.NetworkArea, networkAr
|
|||
var networkAreaId string
|
||||
if model.NetworkAreaId.ValueString() != "" {
|
||||
networkAreaId = model.NetworkAreaId.ValueString()
|
||||
} else if networkAreaResp.AreaId != nil {
|
||||
networkAreaId = *networkAreaResp.AreaId
|
||||
} else if networkAreaResp.Id != nil {
|
||||
networkAreaId = *networkAreaResp.Id
|
||||
} else {
|
||||
return fmt.Errorf("network area id not present")
|
||||
}
|
||||
|
||||
model.Id = utils.BuildInternalTerraformId(model.OrganizationId.ValueString(), networkAreaId)
|
||||
|
||||
if networkAreaResp.Ipv4 == nil || networkAreaResp.Ipv4.DefaultNameservers == nil {
|
||||
labels, err := iaasUtils.MapLabels(ctx, networkAreaResp.Labels, model.Labels)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
model.NetworkAreaId = types.StringValue(networkAreaId)
|
||||
model.Name = types.StringPointerValue(networkAreaResp.Name)
|
||||
model.ProjectCount = types.Int64PointerValue(networkAreaResp.ProjectCount)
|
||||
model.Labels = labels
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Deprecated: mapRegionFields maps the region configuration for eu01 to avoid a breaking change in the Terraform provider during the IaaS v1 -> v2 API migration. Will be removed in May 2026.
|
||||
func mapNetworkAreaRegionFields(ctx context.Context, networkAreaRegionResp *iaas.RegionalArea, model *Model) error {
|
||||
if model == nil {
|
||||
return fmt.Errorf("model input is nil")
|
||||
}
|
||||
if networkAreaRegionResp == nil {
|
||||
return fmt.Errorf("response input is nil")
|
||||
}
|
||||
|
||||
// map default nameservers
|
||||
if networkAreaRegionResp.Ipv4 == nil || networkAreaRegionResp.Ipv4.DefaultNameservers == nil {
|
||||
model.DefaultNameservers = types.ListNull(types.StringType)
|
||||
} else {
|
||||
respDefaultNameservers := *networkAreaResp.Ipv4.DefaultNameservers
|
||||
respDefaultNameservers := *networkAreaRegionResp.Ipv4.DefaultNameservers
|
||||
modelDefaultNameservers, err := utils.ListValuetoStringSlice(model.DefaultNameservers)
|
||||
if err != nil {
|
||||
return fmt.Errorf("get current network area default nameservers from model: %w", err)
|
||||
|
|
@ -523,31 +733,28 @@ func mapFields(ctx context.Context, networkAreaResp *iaas.NetworkArea, networkAr
|
|||
model.DefaultNameservers = defaultNameserversTF
|
||||
}
|
||||
|
||||
err := mapNetworkRanges(ctx, networkAreaRangesResp, model)
|
||||
if err != nil {
|
||||
return fmt.Errorf("mapping network ranges: %w", err)
|
||||
// map network ranges
|
||||
if networkAreaRegionResp.Ipv4 == nil || networkAreaRegionResp.Ipv4.NetworkRanges == nil {
|
||||
model.NetworkRanges = types.ListNull(types.ObjectType{AttrTypes: networkRangeTypes})
|
||||
} else {
|
||||
err := mapNetworkRanges(ctx, networkAreaRegionResp.Ipv4.NetworkRanges, model)
|
||||
if err != nil {
|
||||
return fmt.Errorf("mapping network ranges: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
labels, err := iaasUtils.MapLabels(ctx, networkAreaResp.Labels, model.Labels)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
model.NetworkAreaId = types.StringValue(networkAreaId)
|
||||
model.Name = types.StringPointerValue(networkAreaResp.Name)
|
||||
model.ProjectCount = types.Int64PointerValue(networkAreaResp.ProjectCount)
|
||||
model.Labels = labels
|
||||
|
||||
if networkAreaResp.Ipv4 != nil {
|
||||
model.TransferNetwork = types.StringPointerValue(networkAreaResp.Ipv4.TransferNetwork)
|
||||
model.DefaultPrefixLength = types.Int64PointerValue(networkAreaResp.Ipv4.DefaultPrefixLen)
|
||||
model.MaxPrefixLength = types.Int64PointerValue(networkAreaResp.Ipv4.MaxPrefixLen)
|
||||
model.MinPrefixLength = types.Int64PointerValue(networkAreaResp.Ipv4.MinPrefixLen)
|
||||
// map remaining fields
|
||||
if networkAreaRegionResp.Ipv4 != nil {
|
||||
model.TransferNetwork = types.StringPointerValue(networkAreaRegionResp.Ipv4.TransferNetwork)
|
||||
model.DefaultPrefixLength = types.Int64PointerValue(networkAreaRegionResp.Ipv4.DefaultPrefixLen)
|
||||
model.MaxPrefixLength = types.Int64PointerValue(networkAreaRegionResp.Ipv4.MaxPrefixLen)
|
||||
model.MinPrefixLength = types.Int64PointerValue(networkAreaRegionResp.Ipv4.MinPrefixLen)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Deprecated: mapNetworkRanges will be removed in May 2026. Implementation won't be needed anymore because of the IaaS API v1 -> v2 migration. Func was only kept to circumvent breaking changes.
|
||||
func mapNetworkRanges(ctx context.Context, networkAreaRangesList *[]iaas.NetworkRange, model *Model) error {
|
||||
var diags diag.Diagnostics
|
||||
|
||||
|
|
@ -584,7 +791,7 @@ func mapNetworkRanges(ctx context.Context, networkAreaRangesList *[]iaas.Network
|
|||
var networkRangeId string
|
||||
for _, networkRangeElement := range *networkAreaRangesList {
|
||||
if *networkRangeElement.Prefix == prefix {
|
||||
networkRangeId = *networkRangeElement.NetworkRangeId
|
||||
networkRangeId = *networkRangeElement.Id
|
||||
break
|
||||
}
|
||||
}
|
||||
|
|
@ -618,13 +825,26 @@ func toCreatePayload(ctx context.Context, model *Model) (*iaas.CreateNetworkArea
|
|||
return nil, fmt.Errorf("nil model")
|
||||
}
|
||||
|
||||
modelDefaultNameservers := []string{}
|
||||
for _, ns := range model.DefaultNameservers.Elements() {
|
||||
nameserverString, ok := ns.(types.String)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("type assertion failed")
|
||||
}
|
||||
modelDefaultNameservers = append(modelDefaultNameservers, nameserverString.ValueString())
|
||||
labels, err := conversion.ToStringInterfaceMap(ctx, model.Labels)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("converting to Go map: %w", err)
|
||||
}
|
||||
|
||||
return &iaas.CreateNetworkAreaPayload{
|
||||
Name: conversion.StringValueToPointer(model.Name),
|
||||
Labels: &labels,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Deprecated: toRegionCreatePayload will be removed in May 2026. Implementation won't be needed anymore because of the IaaS API v1 -> v2 migration. Func was only introduced to circumvent breaking changes.
|
||||
func toRegionCreatePayload(ctx context.Context, model *Model) (*iaas.CreateNetworkAreaRegionPayload, error) {
|
||||
if model == nil {
|
||||
return nil, fmt.Errorf("nil model")
|
||||
}
|
||||
|
||||
modelDefaultNameservers, err := toDefaultNameserversPayload(ctx, model)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("converting default nameservers: %w", err)
|
||||
}
|
||||
|
||||
networkRangesPayload, err := toNetworkRangesPayload(ctx, model)
|
||||
|
|
@ -632,24 +852,15 @@ func toCreatePayload(ctx context.Context, model *Model) (*iaas.CreateNetworkArea
|
|||
return nil, fmt.Errorf("converting network ranges: %w", err)
|
||||
}
|
||||
|
||||
labels, err := conversion.ToStringInterfaceMap(ctx, model.Labels)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("converting to Go map: %w", err)
|
||||
}
|
||||
|
||||
return &iaas.CreateNetworkAreaPayload{
|
||||
Name: conversion.StringValueToPointer(model.Name),
|
||||
AddressFamily: &iaas.CreateAreaAddressFamily{
|
||||
Ipv4: &iaas.CreateAreaIPv4{
|
||||
DefaultNameservers: &modelDefaultNameservers,
|
||||
NetworkRanges: networkRangesPayload,
|
||||
TransferNetwork: conversion.StringValueToPointer(model.TransferNetwork),
|
||||
DefaultPrefixLen: conversion.Int64ValueToPointer(model.DefaultPrefixLength),
|
||||
MaxPrefixLen: conversion.Int64ValueToPointer(model.MaxPrefixLength),
|
||||
MinPrefixLen: conversion.Int64ValueToPointer(model.MinPrefixLength),
|
||||
},
|
||||
return &iaas.CreateNetworkAreaRegionPayload{
|
||||
Ipv4: &iaas.RegionalAreaIPv4{
|
||||
DefaultNameservers: &modelDefaultNameservers,
|
||||
DefaultPrefixLen: conversion.Int64ValueToPointer(model.DefaultPrefixLength),
|
||||
MaxPrefixLen: conversion.Int64ValueToPointer(model.MaxPrefixLength),
|
||||
MinPrefixLen: conversion.Int64ValueToPointer(model.MinPrefixLength),
|
||||
TransferNetwork: conversion.StringValueToPointer(model.TransferNetwork),
|
||||
NetworkRanges: networkRangesPayload,
|
||||
},
|
||||
Labels: &labels,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
|
@ -658,6 +869,40 @@ func toUpdatePayload(ctx context.Context, model *Model, currentLabels types.Map)
|
|||
return nil, fmt.Errorf("nil model")
|
||||
}
|
||||
|
||||
labels, err := conversion.ToJSONMapPartialUpdatePayload(ctx, currentLabels, model.Labels)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("converting to Go map: %w", err)
|
||||
}
|
||||
|
||||
return &iaas.PartialUpdateNetworkAreaPayload{
|
||||
Name: conversion.StringValueToPointer(model.Name),
|
||||
Labels: &labels,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Deprecated: toRegionUpdatePayload will be removed in May 2026. Implementation won't be needed anymore because of the IaaS API v1 -> v2 migration. Func was only introduced to circumvent breaking changes.
|
||||
func toRegionUpdatePayload(ctx context.Context, model *Model) (*iaas.UpdateNetworkAreaRegionPayload, error) {
|
||||
if model == nil {
|
||||
return nil, fmt.Errorf("nil model")
|
||||
}
|
||||
|
||||
modelDefaultNameservers, err := toDefaultNameserversPayload(ctx, model)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("converting default nameservers: %w", err)
|
||||
}
|
||||
|
||||
return &iaas.UpdateNetworkAreaRegionPayload{
|
||||
Ipv4: &iaas.UpdateRegionalAreaIPv4{
|
||||
DefaultNameservers: &modelDefaultNameservers,
|
||||
DefaultPrefixLen: conversion.Int64ValueToPointer(model.DefaultPrefixLength),
|
||||
MaxPrefixLen: conversion.Int64ValueToPointer(model.MaxPrefixLength),
|
||||
MinPrefixLen: conversion.Int64ValueToPointer(model.MinPrefixLength),
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Deprecated: toDefaultNameserversPayload will be removed in May 2026. Implementation won't be needed anymore because of the IaaS API v1 -> v2 migration. Func was only introduced to circumvent breaking changes.
|
||||
func toDefaultNameserversPayload(_ context.Context, model *Model) ([]string, error) {
|
||||
modelDefaultNameservers := []string{}
|
||||
for _, ns := range model.DefaultNameservers.Elements() {
|
||||
nameserverString, ok := ns.(types.String)
|
||||
|
|
@ -667,25 +912,10 @@ func toUpdatePayload(ctx context.Context, model *Model, currentLabels types.Map)
|
|||
modelDefaultNameservers = append(modelDefaultNameservers, nameserverString.ValueString())
|
||||
}
|
||||
|
||||
labels, err := conversion.ToJSONMapPartialUpdatePayload(ctx, currentLabels, model.Labels)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("converting to Go map: %w", err)
|
||||
}
|
||||
|
||||
return &iaas.PartialUpdateNetworkAreaPayload{
|
||||
Name: conversion.StringValueToPointer(model.Name),
|
||||
AddressFamily: &iaas.UpdateAreaAddressFamily{
|
||||
Ipv4: &iaas.UpdateAreaIPv4{
|
||||
DefaultNameservers: &modelDefaultNameservers,
|
||||
DefaultPrefixLen: conversion.Int64ValueToPointer(model.DefaultPrefixLength),
|
||||
MaxPrefixLen: conversion.Int64ValueToPointer(model.MaxPrefixLength),
|
||||
MinPrefixLen: conversion.Int64ValueToPointer(model.MinPrefixLength),
|
||||
},
|
||||
},
|
||||
Labels: &labels,
|
||||
}, nil
|
||||
return modelDefaultNameservers, nil
|
||||
}
|
||||
|
||||
// Deprecated: toNetworkRangesPayload will be removed in May 2026. Implementation won't be needed anymore because of the IaaS API v1 -> v2 migration. Func was only introduced to circumvent breaking changes.
|
||||
func toNetworkRangesPayload(ctx context.Context, model *Model) (*[]iaas.NetworkRange, error) {
|
||||
if model.NetworkRanges.IsNull() || model.NetworkRanges.IsUnknown() {
|
||||
return nil, nil
|
||||
|
|
@ -712,10 +942,10 @@ func toNetworkRangesPayload(ctx context.Context, model *Model) (*[]iaas.NetworkR
|
|||
return &payload, nil
|
||||
}
|
||||
|
||||
// updateNetworkRanges creates and deletes network ranges so that network area ranges are the ones in the model
|
||||
// Deprecated: updateNetworkRanges creates and deletes network ranges so that network area ranges are the ones in the model. This was only kept to make the v1 -> v2 IaaS API migration non-breaking in the Terraform provider.
|
||||
func updateNetworkRanges(ctx context.Context, organizationId, networkAreaId string, ranges []networkRange, client *iaas.APIClient) error {
|
||||
// Get network ranges current state
|
||||
currentNetworkRangesResp, err := client.ListNetworkAreaRanges(ctx, organizationId, networkAreaId).Execute()
|
||||
currentNetworkRangesResp, err := client.ListNetworkAreaRanges(ctx, organizationId, networkAreaId, "eu01").Execute()
|
||||
if err != nil {
|
||||
return fmt.Errorf("error reading network area ranges: %w", err)
|
||||
}
|
||||
|
|
@ -739,13 +969,13 @@ func updateNetworkRanges(ctx context.Context, organizationId, networkAreaId stri
|
|||
networkRangesState[prefix] = &networkRangeState{}
|
||||
}
|
||||
networkRangesState[prefix].isCreated = true
|
||||
networkRangesState[prefix].id = *networkRange.NetworkRangeId
|
||||
networkRangesState[prefix].id = *networkRange.Id
|
||||
}
|
||||
|
||||
// Delete network ranges
|
||||
for prefix, state := range networkRangesState {
|
||||
if !state.isInModel && state.isCreated {
|
||||
err := client.DeleteNetworkAreaRange(ctx, organizationId, networkAreaId, state.id).Execute()
|
||||
err := client.DeleteNetworkAreaRange(ctx, organizationId, networkAreaId, "eu01", state.id).Execute()
|
||||
if err != nil {
|
||||
return fmt.Errorf("deleting network area range '%v': %w", prefix, err)
|
||||
}
|
||||
|
|
@ -763,7 +993,7 @@ func updateNetworkRanges(ctx context.Context, organizationId, networkAreaId stri
|
|||
},
|
||||
}
|
||||
|
||||
_, err := client.CreateNetworkAreaRange(ctx, organizationId, networkAreaId).CreateNetworkAreaRangePayload(payload).Execute()
|
||||
_, err := client.CreateNetworkAreaRange(ctx, organizationId, networkAreaId, "eu01").CreateNetworkAreaRangePayload(payload).Execute()
|
||||
if err != nil {
|
||||
return fmt.Errorf("creating network range '%v': %w", prefix, err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,16 +28,15 @@ var testRangeId2Repeated = uuid.NewString()
|
|||
|
||||
func TestMapFields(t *testing.T) {
|
||||
tests := []struct {
|
||||
description string
|
||||
state Model
|
||||
input *iaas.NetworkArea
|
||||
ListNetworkRanges *[]iaas.NetworkRange
|
||||
expected Model
|
||||
isValid bool
|
||||
description string
|
||||
state Model
|
||||
input *iaas.NetworkArea
|
||||
expected Model
|
||||
isValid bool
|
||||
}{
|
||||
{
|
||||
"id_ok",
|
||||
Model{
|
||||
description: "id_ok",
|
||||
state: Model{
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
|
|
@ -50,32 +49,16 @@ func TestMapFields(t *testing.T) {
|
|||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
}),
|
||||
DefaultNameservers: types.ListNull(types.StringType),
|
||||
},
|
||||
&iaas.NetworkArea{
|
||||
AreaId: utils.Ptr("naid"),
|
||||
Ipv4: &iaas.NetworkAreaIPv4{},
|
||||
input: &iaas.NetworkArea{
|
||||
Id: utils.Ptr("naid"),
|
||||
},
|
||||
&[]iaas.NetworkRange{
|
||||
{
|
||||
NetworkRangeId: utils.Ptr(testRangeId1),
|
||||
Prefix: utils.Ptr("prefix-1"),
|
||||
},
|
||||
{
|
||||
NetworkRangeId: utils.Ptr(testRangeId2),
|
||||
Prefix: utils.Ptr("prefix-2"),
|
||||
},
|
||||
},
|
||||
|
||||
Model{
|
||||
Id: types.StringValue("oid,naid"),
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
Name: types.StringNull(),
|
||||
DefaultNameservers: types.ListNull(types.StringType),
|
||||
TransferNetwork: types.StringNull(),
|
||||
DefaultPrefixLength: types.Int64Null(),
|
||||
MaxPrefixLength: types.Int64Null(),
|
||||
MinPrefixLength: types.Int64Null(),
|
||||
expected: Model{
|
||||
Id: types.StringValue("oid,naid"),
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
Name: types.StringNull(),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId1),
|
||||
|
|
@ -86,13 +69,14 @@ func TestMapFields(t *testing.T) {
|
|||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
}),
|
||||
Labels: types.MapNull(types.StringType),
|
||||
DefaultNameservers: types.ListNull(types.StringType),
|
||||
Labels: types.MapNull(types.StringType),
|
||||
},
|
||||
true,
|
||||
isValid: true,
|
||||
},
|
||||
{
|
||||
"values_ok",
|
||||
Model{
|
||||
description: "values_ok",
|
||||
state: Model{
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
|
|
@ -105,47 +89,20 @@ func TestMapFields(t *testing.T) {
|
|||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
}),
|
||||
DefaultNameservers: types.ListNull(types.StringType),
|
||||
},
|
||||
&iaas.NetworkArea{
|
||||
AreaId: utils.Ptr("naid"),
|
||||
Ipv4: &iaas.NetworkAreaIPv4{
|
||||
DefaultNameservers: &[]string{
|
||||
"nameserver1",
|
||||
"nameserver2",
|
||||
},
|
||||
TransferNetwork: utils.Ptr("network"),
|
||||
DefaultPrefixLen: utils.Ptr(int64(20)),
|
||||
MaxPrefixLen: utils.Ptr(int64(22)),
|
||||
MinPrefixLen: utils.Ptr(int64(18)),
|
||||
},
|
||||
input: &iaas.NetworkArea{
|
||||
Id: utils.Ptr("naid"),
|
||||
Name: utils.Ptr("name"),
|
||||
Labels: &map[string]interface{}{
|
||||
"key": "value",
|
||||
},
|
||||
},
|
||||
&[]iaas.NetworkRange{
|
||||
{
|
||||
NetworkRangeId: utils.Ptr(testRangeId1),
|
||||
Prefix: utils.Ptr("prefix-1"),
|
||||
},
|
||||
{
|
||||
NetworkRangeId: utils.Ptr(testRangeId2),
|
||||
Prefix: utils.Ptr("prefix-2"),
|
||||
},
|
||||
},
|
||||
Model{
|
||||
expected: Model{
|
||||
Id: types.StringValue("oid,naid"),
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
Name: types.StringValue("name"),
|
||||
DefaultNameservers: types.ListValueMust(types.StringType, []attr.Value{
|
||||
types.StringValue("nameserver1"),
|
||||
types.StringValue("nameserver2"),
|
||||
}),
|
||||
TransferNetwork: types.StringValue("network"),
|
||||
DefaultPrefixLength: types.Int64Value(20),
|
||||
MaxPrefixLength: types.Int64Value(22),
|
||||
MinPrefixLength: types.Int64Value(18),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId1),
|
||||
|
|
@ -159,207 +116,53 @@ func TestMapFields(t *testing.T) {
|
|||
Labels: types.MapValueMust(types.StringType, map[string]attr.Value{
|
||||
"key": types.StringValue("value"),
|
||||
}),
|
||||
},
|
||||
true,
|
||||
},
|
||||
{
|
||||
"model and response have ranges in different order",
|
||||
Model{
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId1),
|
||||
"prefix": types.StringValue("prefix-1"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId2),
|
||||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
}),
|
||||
},
|
||||
&iaas.NetworkArea{
|
||||
AreaId: utils.Ptr("naid"),
|
||||
Ipv4: &iaas.NetworkAreaIPv4{
|
||||
DefaultNameservers: &[]string{
|
||||
"nameserver1",
|
||||
"nameserver2",
|
||||
},
|
||||
TransferNetwork: utils.Ptr("network"),
|
||||
DefaultPrefixLen: utils.Ptr(int64(20)),
|
||||
MaxPrefixLen: utils.Ptr(int64(22)),
|
||||
MinPrefixLen: utils.Ptr(int64(18)),
|
||||
},
|
||||
Name: utils.Ptr("name"),
|
||||
},
|
||||
&[]iaas.NetworkRange{
|
||||
{
|
||||
NetworkRangeId: utils.Ptr(testRangeId2),
|
||||
Prefix: utils.Ptr("prefix-2"),
|
||||
},
|
||||
{
|
||||
NetworkRangeId: utils.Ptr(testRangeId3),
|
||||
Prefix: utils.Ptr("prefix-3"),
|
||||
},
|
||||
{
|
||||
NetworkRangeId: utils.Ptr(testRangeId1),
|
||||
Prefix: utils.Ptr("prefix-1"),
|
||||
},
|
||||
},
|
||||
Model{
|
||||
Id: types.StringValue("oid,naid"),
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
Name: types.StringValue("name"),
|
||||
DefaultNameservers: types.ListValueMust(types.StringType, []attr.Value{
|
||||
types.StringValue("nameserver1"),
|
||||
types.StringValue("nameserver2"),
|
||||
}),
|
||||
TransferNetwork: types.StringValue("network"),
|
||||
DefaultPrefixLength: types.Int64Value(20),
|
||||
MaxPrefixLength: types.Int64Value(22),
|
||||
MinPrefixLength: types.Int64Value(18),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId1),
|
||||
"prefix": types.StringValue("prefix-1"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId2),
|
||||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId3),
|
||||
"prefix": types.StringValue("prefix-3"),
|
||||
}),
|
||||
}),
|
||||
Labels: types.MapNull(types.StringType),
|
||||
},
|
||||
true,
|
||||
},
|
||||
{
|
||||
"default_nameservers_changed_outside_tf",
|
||||
Model{
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
DefaultNameservers: types.ListValueMust(types.StringType, []attr.Value{
|
||||
types.StringValue("ns1"),
|
||||
types.StringValue("ns2"),
|
||||
}),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId1),
|
||||
"prefix": types.StringValue("prefix-1"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId2),
|
||||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
}),
|
||||
},
|
||||
&iaas.NetworkArea{
|
||||
AreaId: utils.Ptr("naid"),
|
||||
Ipv4: &iaas.NetworkAreaIPv4{
|
||||
DefaultNameservers: &[]string{
|
||||
"ns2",
|
||||
"ns3",
|
||||
},
|
||||
},
|
||||
},
|
||||
&[]iaas.NetworkRange{
|
||||
{
|
||||
NetworkRangeId: utils.Ptr(testRangeId1),
|
||||
Prefix: utils.Ptr("prefix-1"),
|
||||
},
|
||||
{
|
||||
NetworkRangeId: utils.Ptr(testRangeId2),
|
||||
Prefix: utils.Ptr("prefix-2"),
|
||||
},
|
||||
},
|
||||
Model{
|
||||
Id: types.StringValue("oid,naid"),
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
DefaultNameservers: types.ListValueMust(types.StringType, []attr.Value{
|
||||
types.StringValue("ns2"),
|
||||
types.StringValue("ns3"),
|
||||
}),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId1),
|
||||
"prefix": types.StringValue("prefix-1"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId2),
|
||||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
}),
|
||||
Labels: types.MapNull(types.StringType),
|
||||
},
|
||||
true,
|
||||
},
|
||||
{
|
||||
"network_ranges_changed_outside_tf",
|
||||
Model{
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId1),
|
||||
"prefix": types.StringValue("prefix-1"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId2),
|
||||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
}),
|
||||
},
|
||||
&iaas.NetworkArea{
|
||||
AreaId: utils.Ptr("naid"),
|
||||
Ipv4: &iaas.NetworkAreaIPv4{},
|
||||
},
|
||||
&[]iaas.NetworkRange{
|
||||
{
|
||||
NetworkRangeId: utils.Ptr(testRangeId2),
|
||||
Prefix: utils.Ptr("prefix-2"),
|
||||
},
|
||||
{
|
||||
NetworkRangeId: utils.Ptr(testRangeId3),
|
||||
Prefix: utils.Ptr("prefix-3"),
|
||||
},
|
||||
},
|
||||
Model{
|
||||
Id: types.StringValue("oid,naid"),
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
DefaultNameservers: types.ListNull(types.StringType),
|
||||
},
|
||||
isValid: true,
|
||||
},
|
||||
{
|
||||
description: "default_nameservers_changed_outside_tf",
|
||||
state: Model{
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId1),
|
||||
"prefix": types.StringValue("prefix-1"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId2),
|
||||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
}),
|
||||
DefaultNameservers: types.ListNull(types.StringType),
|
||||
},
|
||||
input: &iaas.NetworkArea{
|
||||
Id: utils.Ptr("naid"),
|
||||
},
|
||||
expected: Model{
|
||||
Id: types.StringValue("oid,naid"),
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId3),
|
||||
"prefix": types.StringValue("prefix-3"),
|
||||
"network_range_id": types.StringValue(testRangeId1),
|
||||
"prefix": types.StringValue("prefix-1"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId2),
|
||||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
}),
|
||||
Labels: types.MapNull(types.StringType),
|
||||
Labels: types.MapNull(types.StringType),
|
||||
DefaultNameservers: types.ListNull(types.StringType),
|
||||
},
|
||||
true,
|
||||
},
|
||||
{
|
||||
"nil_network_ranges_list",
|
||||
Model{},
|
||||
&iaas.NetworkArea{},
|
||||
nil,
|
||||
Model{},
|
||||
false,
|
||||
isValid: true,
|
||||
},
|
||||
{
|
||||
"response_nil_fail",
|
||||
Model{},
|
||||
nil,
|
||||
nil,
|
||||
Model{},
|
||||
false,
|
||||
},
|
||||
|
|
@ -369,14 +172,13 @@ func TestMapFields(t *testing.T) {
|
|||
OrganizationId: types.StringValue("oid"),
|
||||
},
|
||||
&iaas.NetworkArea{},
|
||||
&[]iaas.NetworkRange{},
|
||||
Model{},
|
||||
false,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.description, func(t *testing.T) {
|
||||
err := mapFields(context.Background(), tt.input, tt.ListNetworkRanges, &tt.state)
|
||||
err := mapFields(context.Background(), tt.input, &tt.state)
|
||||
if !tt.isValid && err == nil {
|
||||
t.Fatalf("Should have failed")
|
||||
}
|
||||
|
|
@ -393,6 +195,243 @@ func TestMapFields(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026.
|
||||
func Test_MapNetworkRanges(t *testing.T) {
|
||||
type args struct {
|
||||
networkAreaRangesList *[]iaas.NetworkRange
|
||||
model *Model
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want *Model
|
||||
wantErr bool
|
||||
}{
|
||||
{
|
||||
name: "model and response have ranges in different order",
|
||||
args: args{
|
||||
model: &Model{
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
DefaultNameservers: types.ListNull(types.StringType),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId1),
|
||||
"prefix": types.StringValue("prefix-1"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId2),
|
||||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
}),
|
||||
Labels: types.MapNull(types.StringType),
|
||||
},
|
||||
networkAreaRangesList: &[]iaas.NetworkRange{
|
||||
{
|
||||
Id: utils.Ptr(testRangeId2),
|
||||
Prefix: utils.Ptr("prefix-2"),
|
||||
},
|
||||
{
|
||||
Id: utils.Ptr(testRangeId3),
|
||||
Prefix: utils.Ptr("prefix-3"),
|
||||
},
|
||||
{
|
||||
Id: utils.Ptr(testRangeId1),
|
||||
Prefix: utils.Ptr("prefix-1"),
|
||||
},
|
||||
},
|
||||
},
|
||||
want: &Model{
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId1),
|
||||
"prefix": types.StringValue("prefix-1"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId2),
|
||||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId3),
|
||||
"prefix": types.StringValue("prefix-3"),
|
||||
}),
|
||||
}),
|
||||
Labels: types.MapNull(types.StringType),
|
||||
DefaultNameservers: types.ListNull(types.StringType),
|
||||
},
|
||||
wantErr: false,
|
||||
},
|
||||
{
|
||||
name: "network_ranges_changed_outside_tf",
|
||||
args: args{
|
||||
model: &Model{
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId1),
|
||||
"prefix": types.StringValue("prefix-1"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId2),
|
||||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
}),
|
||||
Labels: types.MapNull(types.StringType),
|
||||
DefaultNameservers: types.ListNull(types.StringType),
|
||||
},
|
||||
networkAreaRangesList: &[]iaas.NetworkRange{
|
||||
{
|
||||
Id: utils.Ptr(testRangeId2),
|
||||
Prefix: utils.Ptr("prefix-2"),
|
||||
},
|
||||
{
|
||||
Id: utils.Ptr(testRangeId3),
|
||||
Prefix: utils.Ptr("prefix-3"),
|
||||
},
|
||||
},
|
||||
},
|
||||
want: &Model{
|
||||
OrganizationId: types.StringValue("oid"),
|
||||
NetworkAreaId: types.StringValue("naid"),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId2),
|
||||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId3),
|
||||
"prefix": types.StringValue("prefix-3"),
|
||||
}),
|
||||
}),
|
||||
Labels: types.MapNull(types.StringType),
|
||||
DefaultNameservers: types.ListNull(types.StringType),
|
||||
},
|
||||
wantErr: false,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if err := mapNetworkRanges(context.Background(), tt.args.networkAreaRangesList, tt.args.model); (err != nil) != tt.wantErr {
|
||||
t.Errorf("mapNetworkRanges() error = %v, wantErr %v", err, tt.wantErr)
|
||||
}
|
||||
|
||||
diff := cmp.Diff(tt.args.model, tt.want)
|
||||
if diff != "" {
|
||||
t.Fatalf("Data does not match: %s", diff)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026.
|
||||
func TestMapNetworkAreaRegionFields(t *testing.T) {
|
||||
type args struct {
|
||||
networkAreaRegionResp *iaas.RegionalArea
|
||||
model *Model
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want *Model
|
||||
wantErr bool
|
||||
}{
|
||||
{
|
||||
name: "default",
|
||||
args: args{
|
||||
model: &Model{
|
||||
Labels: types.MapNull(types.StringType),
|
||||
},
|
||||
networkAreaRegionResp: &iaas.RegionalArea{
|
||||
Ipv4: &iaas.RegionalAreaIPv4{
|
||||
DefaultNameservers: &[]string{
|
||||
"nameserver1",
|
||||
"nameserver2",
|
||||
},
|
||||
TransferNetwork: utils.Ptr("network"),
|
||||
DefaultPrefixLen: utils.Ptr(int64(20)),
|
||||
MaxPrefixLen: utils.Ptr(int64(22)),
|
||||
MinPrefixLen: utils.Ptr(int64(18)),
|
||||
NetworkRanges: &[]iaas.NetworkRange{
|
||||
{
|
||||
Id: utils.Ptr(testRangeId1),
|
||||
Prefix: utils.Ptr("prefix-1"),
|
||||
},
|
||||
{
|
||||
Id: utils.Ptr(testRangeId2),
|
||||
Prefix: utils.Ptr("prefix-2"),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
want: &Model{
|
||||
DefaultNameservers: types.ListValueMust(types.StringType, []attr.Value{
|
||||
types.StringValue("nameserver1"),
|
||||
types.StringValue("nameserver2"),
|
||||
}),
|
||||
TransferNetwork: types.StringValue("network"),
|
||||
DefaultPrefixLength: types.Int64Value(20),
|
||||
MaxPrefixLength: types.Int64Value(22),
|
||||
MinPrefixLength: types.Int64Value(18),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId1),
|
||||
"prefix": types.StringValue("prefix-1"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringValue(testRangeId2),
|
||||
"prefix": types.StringValue("prefix-2"),
|
||||
}),
|
||||
}),
|
||||
|
||||
Labels: types.MapNull(types.StringType),
|
||||
},
|
||||
wantErr: false,
|
||||
},
|
||||
{
|
||||
name: "model is nil",
|
||||
args: args{
|
||||
model: nil,
|
||||
networkAreaRegionResp: &iaas.RegionalArea{},
|
||||
},
|
||||
want: nil,
|
||||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "network area region response is nil",
|
||||
args: args{
|
||||
model: &Model{
|
||||
DefaultNameservers: types.ListNull(types.StringType),
|
||||
NetworkRanges: types.ListNull(types.ObjectType{AttrTypes: networkRangeTypes}),
|
||||
Labels: types.MapNull(types.StringType),
|
||||
},
|
||||
networkAreaRegionResp: nil,
|
||||
},
|
||||
want: &Model{
|
||||
DefaultNameservers: types.ListNull(types.StringType),
|
||||
NetworkRanges: types.ListNull(types.ObjectType{AttrTypes: networkRangeTypes}),
|
||||
Labels: types.MapNull(types.StringType),
|
||||
},
|
||||
wantErr: true,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if err := mapNetworkAreaRegionFields(context.Background(), tt.args.networkAreaRegionResp, tt.args.model); (err != nil) != tt.wantErr {
|
||||
t.Errorf("mapNetworkAreaRegionFields() error = %v, wantErr %v", err, tt.wantErr)
|
||||
}
|
||||
|
||||
diff := cmp.Diff(tt.args.model, tt.want)
|
||||
if diff != "" {
|
||||
t.Fatalf("Data does not match: %s", diff)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestToCreatePayload(t *testing.T) {
|
||||
tests := []struct {
|
||||
description string
|
||||
|
|
@ -404,50 +443,12 @@ func TestToCreatePayload(t *testing.T) {
|
|||
"default_ok",
|
||||
&Model{
|
||||
Name: types.StringValue("name"),
|
||||
DefaultNameservers: types.ListValueMust(types.StringType, []attr.Value{
|
||||
types.StringValue("ns1"),
|
||||
types.StringValue("ns2"),
|
||||
}),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringUnknown(),
|
||||
"prefix": types.StringValue("pr-1"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringUnknown(),
|
||||
"prefix": types.StringValue("pr-2"),
|
||||
}),
|
||||
}),
|
||||
TransferNetwork: types.StringValue("network"),
|
||||
DefaultPrefixLength: types.Int64Value(20),
|
||||
MaxPrefixLength: types.Int64Value(22),
|
||||
MinPrefixLength: types.Int64Value(18),
|
||||
Labels: types.MapValueMust(types.StringType, map[string]attr.Value{
|
||||
"key": types.StringValue("value"),
|
||||
}),
|
||||
},
|
||||
&iaas.CreateNetworkAreaPayload{
|
||||
Name: utils.Ptr("name"),
|
||||
AddressFamily: &iaas.CreateAreaAddressFamily{
|
||||
Ipv4: &iaas.CreateAreaIPv4{
|
||||
DefaultNameservers: &[]string{
|
||||
"ns1",
|
||||
"ns2",
|
||||
},
|
||||
NetworkRanges: &[]iaas.NetworkRange{
|
||||
{
|
||||
Prefix: utils.Ptr("pr-1"),
|
||||
},
|
||||
{
|
||||
Prefix: utils.Ptr("pr-2"),
|
||||
},
|
||||
},
|
||||
TransferNetwork: utils.Ptr("network"),
|
||||
DefaultPrefixLen: utils.Ptr(int64(20)),
|
||||
MaxPrefixLen: utils.Ptr(int64(22)),
|
||||
MinPrefixLen: utils.Ptr(int64(18)),
|
||||
},
|
||||
},
|
||||
Labels: &map[string]interface{}{
|
||||
"key": "value",
|
||||
},
|
||||
|
|
@ -474,6 +475,86 @@ func TestToCreatePayload(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026.
|
||||
func TestToRegionCreatePayload(t *testing.T) {
|
||||
type args struct {
|
||||
model *Model
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want *iaas.CreateNetworkAreaRegionPayload
|
||||
wantErr bool
|
||||
}{
|
||||
{
|
||||
name: "default_ok",
|
||||
args: args{
|
||||
model: &Model{
|
||||
DefaultNameservers: types.ListValueMust(types.StringType, []attr.Value{
|
||||
types.StringValue("ns1"),
|
||||
types.StringValue("ns2"),
|
||||
}),
|
||||
NetworkRanges: types.ListValueMust(types.ObjectType{AttrTypes: networkRangeTypes}, []attr.Value{
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringUnknown(),
|
||||
"prefix": types.StringValue("pr-1"),
|
||||
}),
|
||||
types.ObjectValueMust(networkRangeTypes, map[string]attr.Value{
|
||||
"network_range_id": types.StringUnknown(),
|
||||
"prefix": types.StringValue("pr-2"),
|
||||
}),
|
||||
}),
|
||||
TransferNetwork: types.StringValue("network"),
|
||||
DefaultPrefixLength: types.Int64Value(20),
|
||||
MaxPrefixLength: types.Int64Value(22),
|
||||
MinPrefixLength: types.Int64Value(18),
|
||||
},
|
||||
},
|
||||
want: &iaas.CreateNetworkAreaRegionPayload{
|
||||
Ipv4: &iaas.RegionalAreaIPv4{
|
||||
DefaultNameservers: &[]string{
|
||||
"ns1",
|
||||
"ns2",
|
||||
},
|
||||
NetworkRanges: &[]iaas.NetworkRange{
|
||||
{
|
||||
Prefix: utils.Ptr("pr-1"),
|
||||
},
|
||||
{
|
||||
Prefix: utils.Ptr("pr-2"),
|
||||
},
|
||||
},
|
||||
TransferNetwork: utils.Ptr("network"),
|
||||
DefaultPrefixLen: utils.Ptr(int64(20)),
|
||||
MaxPrefixLen: utils.Ptr(int64(22)),
|
||||
MinPrefixLen: utils.Ptr(int64(18)),
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "model is nil",
|
||||
args: args{
|
||||
model: nil,
|
||||
},
|
||||
want: nil,
|
||||
wantErr: true,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got, err := toRegionCreatePayload(context.Background(), tt.args.model)
|
||||
if (err != nil) != tt.wantErr {
|
||||
t.Errorf("toRegionCreatePayload() error = %v, wantErr %v", err, tt.wantErr)
|
||||
return
|
||||
}
|
||||
diff := cmp.Diff(got, tt.want)
|
||||
if diff != "" {
|
||||
t.Fatalf("Data does not match: %s", diff)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestToUpdatePayload(t *testing.T) {
|
||||
tests := []struct {
|
||||
description string
|
||||
|
|
@ -485,30 +566,12 @@ func TestToUpdatePayload(t *testing.T) {
|
|||
"default_ok",
|
||||
&Model{
|
||||
Name: types.StringValue("name"),
|
||||
DefaultNameservers: types.ListValueMust(types.StringType, []attr.Value{
|
||||
types.StringValue("ns1"),
|
||||
types.StringValue("ns2"),
|
||||
}),
|
||||
DefaultPrefixLength: types.Int64Value(22),
|
||||
MaxPrefixLength: types.Int64Value(24),
|
||||
MinPrefixLength: types.Int64Value(20),
|
||||
Labels: types.MapValueMust(types.StringType, map[string]attr.Value{
|
||||
"key": types.StringValue("value"),
|
||||
}),
|
||||
},
|
||||
&iaas.PartialUpdateNetworkAreaPayload{
|
||||
Name: utils.Ptr("name"),
|
||||
AddressFamily: &iaas.UpdateAreaAddressFamily{
|
||||
Ipv4: &iaas.UpdateAreaIPv4{
|
||||
DefaultNameservers: &[]string{
|
||||
"ns1",
|
||||
"ns2",
|
||||
},
|
||||
DefaultPrefixLen: utils.Ptr(int64(22)),
|
||||
MaxPrefixLen: utils.Ptr(int64(24)),
|
||||
MinPrefixLen: utils.Ptr(int64(20)),
|
||||
},
|
||||
},
|
||||
Labels: &map[string]interface{}{
|
||||
"key": "value",
|
||||
},
|
||||
|
|
@ -535,24 +598,84 @@ func TestToUpdatePayload(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
// Deprecated: Will be removed in May 2026.
|
||||
func TestToRegionUpdatePayload(t *testing.T) {
|
||||
type args struct {
|
||||
model *Model
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want *iaas.UpdateNetworkAreaRegionPayload
|
||||
wantErr bool
|
||||
}{
|
||||
{
|
||||
name: "default_ok",
|
||||
args: args{
|
||||
model: &Model{
|
||||
DefaultNameservers: types.ListValueMust(types.StringType, []attr.Value{
|
||||
types.StringValue("ns1"),
|
||||
types.StringValue("ns2"),
|
||||
}),
|
||||
DefaultPrefixLength: types.Int64Value(22),
|
||||
MaxPrefixLength: types.Int64Value(24),
|
||||
MinPrefixLength: types.Int64Value(20),
|
||||
},
|
||||
},
|
||||
want: &iaas.UpdateNetworkAreaRegionPayload{
|
||||
Ipv4: &iaas.UpdateRegionalAreaIPv4{
|
||||
DefaultNameservers: &[]string{
|
||||
"ns1",
|
||||
"ns2",
|
||||
},
|
||||
DefaultPrefixLen: utils.Ptr(int64(22)),
|
||||
MaxPrefixLen: utils.Ptr(int64(24)),
|
||||
MinPrefixLen: utils.Ptr(int64(20)),
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "model is nil",
|
||||
args: args{
|
||||
model: nil,
|
||||
},
|
||||
want: nil,
|
||||
wantErr: true,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got, err := toRegionUpdatePayload(context.Background(), tt.args.model)
|
||||
if (err != nil) != tt.wantErr {
|
||||
t.Errorf("toRegionUpdatePayload() error = %v, wantErr %v", err, tt.wantErr)
|
||||
return
|
||||
}
|
||||
diff := cmp.Diff(got, tt.want)
|
||||
if diff != "" {
|
||||
t.Fatalf("Data does not match: %s", diff)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestUpdateNetworkRanges(t *testing.T) {
|
||||
getAllNetworkRangesResp := iaas.NetworkRangeListResponse{
|
||||
Items: &[]iaas.NetworkRange{
|
||||
{
|
||||
Prefix: utils.Ptr("pr-1"),
|
||||
NetworkRangeId: utils.Ptr(testRangeId1),
|
||||
Prefix: utils.Ptr("pr-1"),
|
||||
Id: utils.Ptr(testRangeId1),
|
||||
},
|
||||
{
|
||||
Prefix: utils.Ptr("pr-2"),
|
||||
NetworkRangeId: utils.Ptr(testRangeId2),
|
||||
Prefix: utils.Ptr("pr-2"),
|
||||
Id: utils.Ptr(testRangeId2),
|
||||
},
|
||||
{
|
||||
Prefix: utils.Ptr("pr-3"),
|
||||
NetworkRangeId: utils.Ptr(testRangeId3),
|
||||
Prefix: utils.Ptr("pr-3"),
|
||||
Id: utils.Ptr(testRangeId3),
|
||||
},
|
||||
{
|
||||
Prefix: utils.Ptr("pr-2"),
|
||||
NetworkRangeId: utils.Ptr(testRangeId2Repeated),
|
||||
Prefix: utils.Ptr("pr-2"),
|
||||
Id: utils.Ptr(testRangeId2Repeated),
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -903,8 +1026,8 @@ func TestUpdateNetworkRanges(t *testing.T) {
|
|||
}
|
||||
|
||||
resp := iaas.NetworkRange{
|
||||
Prefix: utils.Ptr("prefix"),
|
||||
NetworkRangeId: utils.Ptr("id-range"),
|
||||
Prefix: utils.Ptr("prefix"),
|
||||
Id: utils.Ptr("id-range"),
|
||||
}
|
||||
respBytes, err := json.Marshal(resp)
|
||||
if err != nil {
|
||||
|
|
@ -930,7 +1053,7 @@ func TestUpdateNetworkRanges(t *testing.T) {
|
|||
|
||||
var prefix string
|
||||
for _, rangeItem := range *getAllNetworkRangesResp.Items {
|
||||
if *rangeItem.NetworkRangeId == networkRangeId {
|
||||
if *rangeItem.Id == networkRangeId {
|
||||
prefix = *rangeItem.Prefix
|
||||
}
|
||||
}
|
||||
|
|
@ -963,14 +1086,14 @@ func TestUpdateNetworkRanges(t *testing.T) {
|
|||
|
||||
// Setup server and client
|
||||
router := mux.NewRouter()
|
||||
router.HandleFunc("/v1/organizations/{organizationId}/network-areas/{areaId}/network-ranges", func(w http.ResponseWriter, r *http.Request) {
|
||||
router.HandleFunc("/v2/organizations/{organizationId}/network-areas/{areaId}/regions/{region}/network-ranges", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method == "GET" {
|
||||
getAllNetworkRangesHandler(w, r)
|
||||
} else if r.Method == "POST" {
|
||||
createNetworkRangeHandler(w, r)
|
||||
}
|
||||
})
|
||||
router.HandleFunc("/v1/organizations/{organizationId}/network-areas/{areaId}/network-ranges/{networkRangeId}", deleteNetworkRangeHandler)
|
||||
router.HandleFunc("/v2/organizations/{organizationId}/network-areas/{areaId}/regions/{region}/network-ranges/{networkRangeId}", deleteNetworkRangeHandler)
|
||||
mockedServer := httptest.NewServer(router)
|
||||
defer mockedServer.Close()
|
||||
client, err := iaas.NewAPIClient(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue