Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apstra/analytics/telemetry_service_registry_entry.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/Juniper/apstra-go-sdk/apstra"
"github.com/Juniper/apstra-go-sdk/enum"
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
"github.com/Juniper/terraform-provider-apstra/internal/rosetta"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
dataSourceSchema "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
Expand Down Expand Up @@ -99,7 +99,7 @@ func (o TelemetryServiceRegistryEntry) ResourceAttributes() map[string]resourceS
func (o *TelemetryServiceRegistryEntry) LoadApiData(ctx context.Context, in *apstra.TelemetryServiceRegistryEntry, diag *diag.Diagnostics) {
o.Name = types.StringValue(in.ServiceName)
o.Version = types.StringValue(in.Version)
o.Description = utils.StringValueOrNull(ctx, in.Description, diag)
o.Description = value.StringOrNull(ctx, in.Description, diag)
o.Builtin = types.BoolValue(in.Builtin)
o.ApplicationSchema = jsontypes.NewNormalizedValue(string(in.ApplicationSchema))
o.StorageSchemaPath = types.StringValue(rosetta.StringersToFriendlyString(in.StorageSchemaPath))
Expand Down
5 changes: 3 additions & 2 deletions apstra/blueprint/anomalies_by_node.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package blueprint

import (
"context"

"github.com/Juniper/apstra-go-sdk/apstra"
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework/attr"
dataSourceSchema "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/diag"
Expand Down Expand Up @@ -175,5 +176,5 @@ func newAnomalyNodeSummarySet(ctx context.Context, in []apstra.BlueprintNodeAnom
return types.SetNull(types.ObjectType{AttrTypes: anomalyNodeSummary{}.attrTypes()})
}

return utils.SetValueOrNull(ctx, types.ObjectType{AttrTypes: anomalyNodeSummary{}.attrTypes()}, nodeSummaries, diags)
return value.SetOrNull(ctx, types.ObjectType{AttrTypes: anomalyNodeSummary{}.attrTypes()}, nodeSummaries, diags)
}
5 changes: 3 additions & 2 deletions apstra/blueprint/anomalies_by_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package blueprint

import (
"context"

"github.com/Juniper/apstra-go-sdk/apstra"
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework/attr"
dataSourceSchema "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/diag"
Expand Down Expand Up @@ -56,5 +57,5 @@ func newAnomalyServiceSummarySet(ctx context.Context, in []apstra.BlueprintServi
return types.SetNull(types.ObjectType{AttrTypes: anomalyServiceSummary{}.attrTypes()})
}

return utils.SetValueOrNull(ctx, types.ObjectType{AttrTypes: anomalyServiceSummary{}.attrTypes()}, serviceSummaries, diags)
return value.SetOrNull(ctx, types.ObjectType{AttrTypes: anomalyServiceSummary{}.attrTypes()}, serviceSummaries, diags)
}
15 changes: 8 additions & 7 deletions apstra/blueprint/anomalies_detail.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package blueprint

import (
"context"

"github.com/Juniper/apstra-go-sdk/apstra"
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework/attr"
dataSourceSchema "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/diag"
Expand Down Expand Up @@ -80,11 +81,11 @@ func (o *anomalyDetail) loadApiData(ctx context.Context, in *apstra.BlueprintAno
o.AnomalyId = types.StringValue(in.Id.String())
o.Severity = types.StringValue(in.Severity)
o.AnomalyType = types.StringValue(in.AnomalyType)
o.Expected = utils.StringValueOrNull(ctx, string(in.Expected), diags)
o.Actual = utils.StringValueOrNull(ctx, string(in.Actual), diags)
o.Identity = utils.StringValueOrNull(ctx, string(in.Identity), diags)
o.Role = utils.StringValueOrNull(ctx, role, diags)
o.Anomalous = utils.StringValueOrNull(ctx, string(in.Anomalous), diags)
o.Expected = value.StringOrNull(ctx, string(in.Expected), diags)
o.Actual = value.StringOrNull(ctx, string(in.Actual), diags)
o.Identity = value.StringOrNull(ctx, string(in.Identity), diags)
o.Role = value.StringOrNull(ctx, role, diags)
o.Anomalous = value.StringOrNull(ctx, string(in.Anomalous), diags)
}

func newAnomalyDetailSet(ctx context.Context, in []apstra.BlueprintAnomaly, diags *diag.Diagnostics) types.Set {
Expand All @@ -96,5 +97,5 @@ func newAnomalyDetailSet(ctx context.Context, in []apstra.BlueprintAnomaly, diag
return types.SetNull(types.ObjectType{AttrTypes: anomalyDetail{}.attrTypes()})
}

return utils.SetValueOrNull(ctx, types.ObjectType{AttrTypes: anomalyDetail{}.attrTypes()}, anomalyDetails, diags)
return value.SetOrNull(ctx, types.ObjectType{AttrTypes: anomalyDetail{}.attrTypes()}, anomalyDetails, diags)
}
9 changes: 5 additions & 4 deletions apstra/blueprint/blueprint.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
apstravalidator "github.com/Juniper/terraform-provider-apstra/apstra/validator"
"github.com/Juniper/terraform-provider-apstra/internal/pointer"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework-validators/int64validator"
"github.com/hashicorp/terraform-plugin-framework-validators/objectvalidator"
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
Expand Down Expand Up @@ -682,11 +683,11 @@ func (o *Blueprint) LoadFabricSettings(ctx context.Context, settings *apstra.Fab
}
}

o.DefaultIpLinksToGenericMtu = utils.Int64PointerValue(settings.ExternalRouterMtu)
o.DefaultSviL3Mtu = utils.Int64PointerValue(settings.DefaultSviL3Mtu)
o.EsiMacMsb = utils.Int64PointerValue(settings.EsiMacMsb)
o.DefaultIpLinksToGenericMtu = value.Int64FromPointer(settings.ExternalRouterMtu)
o.DefaultSviL3Mtu = value.Int64FromPointer(settings.DefaultSviL3Mtu)
o.EsiMacMsb = value.Int64FromPointer(settings.EsiMacMsb)
o.EvpnType5Routes = boolAttrValueFromFeatureswitchEnumPtr(settings.EvpnGenerateType5HostRoutes)
o.FabricMtu = utils.Int64PointerValue(settings.FabricL3Mtu)
o.FabricMtu = value.Int64FromPointer(settings.FabricL3Mtu)
o.Ipv6Applications = boolAttrValueFromBoolPtr(settings.Ipv6Enabled)
o.JunosEvpnMaxNexthopAndInterfaceNumber = boolAttrValueFromFeatureswitchEnumPtr(settings.JunosEvpnMaxNexthopAndInterfaceNumber)
o.JunosEvpnRoutingInstanceModeMacVrf = boolAttrValueFromFeatureswitchEnumPtr(settings.JunosEvpnRoutingInstanceVlanAware)
Expand Down
6 changes: 3 additions & 3 deletions apstra/blueprint/configlet.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"

"github.com/Juniper/apstra-go-sdk/apstra"
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
apstravalidator "github.com/Juniper/terraform-provider-apstra/apstra/validator"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
dataSourceSchema "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
Expand Down Expand Up @@ -141,7 +141,7 @@ func (o *DatacenterConfiglet) LoadApiData(ctx context.Context, in *apstra.TwoSta

o.Condition = types.StringValue(in.Condition)
o.Name = types.StringValue(in.Label)
o.Generators = utils.ListValueOrNull(ctx, types.ObjectType{AttrTypes: ConfigletGenerator{}.AttrTypes()}, generators, diags)
o.Generators = value.ListOrNull(ctx, types.ObjectType{AttrTypes: ConfigletGenerator{}.AttrTypes()}, generators, diags)
}

func (o *DatacenterConfiglet) LoadCatalogConfigletData(ctx context.Context, in *apstra.ConfigletData, diags *diag.Diagnostics) {
Expand All @@ -157,7 +157,7 @@ func (o *DatacenterConfiglet) LoadCatalogConfigletData(ctx context.Context, in *
return
}

o.Generators = utils.ListValueOrNull(ctx, types.ObjectType{AttrTypes: ConfigletGenerator{}.AttrTypes()}, generators, diags)
o.Generators = value.ListOrNull(ctx, types.ObjectType{AttrTypes: ConfigletGenerator{}.AttrTypes()}, generators, diags)
if diags.HasError() {
return
}
Expand Down
7 changes: 4 additions & 3 deletions apstra/blueprint/configlet_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
apstravalidator "github.com/Juniper/terraform-provider-apstra/apstra/validator"
"github.com/Juniper/terraform-provider-apstra/internal/rosetta"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
"github.com/hashicorp/terraform-plugin-framework/attr"
dataSourceSchema "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
Expand Down Expand Up @@ -186,10 +187,10 @@ func (o ConfigletGenerator) AttrTypes() map[string]attr.Type {
func (o *ConfigletGenerator) LoadApiData(ctx context.Context, in *apstra.ConfigletGenerator, diags *diag.Diagnostics) {
o.ConfigStyle = types.StringValue(rosetta.StringersToFriendlyString(in.ConfigStyle))
o.Section = types.StringValue(rosetta.StringersToFriendlyString(in.Section, in.ConfigStyle))
o.SectionCondition = utils.StringValueOrNull(ctx, in.SectionCondition, diags)
o.SectionCondition = value.StringOrNull(ctx, in.SectionCondition, diags)
o.TemplateText = types.StringValue(in.TemplateText)
o.NegationTemplateText = utils.StringValueOrNull(ctx, in.NegationTemplateText, diags)
o.FileName = utils.StringValueOrNull(ctx, in.Filename, diags)
o.NegationTemplateText = value.StringOrNull(ctx, in.NegationTemplateText, diags)
o.FileName = value.StringOrNull(ctx, in.Filename, diags)
}

func (o *ConfigletGenerator) Request(_ context.Context, diags *diag.Diagnostics) *apstra.ConfigletGenerator {
Expand Down
7 changes: 4 additions & 3 deletions apstra/blueprint/connectivity_template.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/Juniper/apstra-go-sdk/apstra"
connectivitytemplate "github.com/Juniper/terraform-provider-apstra/apstra/connectivity_template"
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
"github.com/hashicorp/terraform-plugin-framework/diag"
Expand Down Expand Up @@ -143,7 +144,7 @@ func (o *ConnectivityTemplate) LoadApiData(ctx context.Context, in *apstra.Conne

o.Id = types.StringValue(in.Id.String())
o.Name = types.StringValue(in.Label)
o.Description = utils.StringValueOrNull(ctx, in.Description, diags) // safe to ignore diagnostic here
o.Tags = utils.SetValueOrNull(ctx, types.StringType, in.Tags, diags) // safe to ignore diagnostic here
o.Primitives = utils.SetValueOrNull(ctx, types.StringType, oPrimitives, diags) // safe to ignore diagnostic here
o.Description = value.StringOrNull(ctx, in.Description, diags) // safe to ignore diagnostic here
o.Tags = value.SetOrNull(ctx, types.StringType, in.Tags, diags) // safe to ignore diagnostic here
o.Primitives = value.SetOrNull(ctx, types.StringType, oPrimitives, diags) // safe to ignore diagnostic here
}
4 changes: 2 additions & 2 deletions apstra/blueprint/connectivity_template_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/Juniper/apstra-go-sdk/apstra"
"github.com/Juniper/apstra-go-sdk/enum"
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
"github.com/Juniper/terraform-provider-apstra/internal/rosetta"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework/attr"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/diag"
Expand Down Expand Up @@ -74,5 +74,5 @@ func (o *ConnectivityTemplateStatus) LoadApiData(ctx context.Context, in apstra.
o.Description = types.StringValue(in.Description)
o.Status = types.StringValue(in.Status.String())
o.AssignmentCount = types.Int64Value(int64(in.AppPointsCount))
o.Tags = utils.SetValueOrNull(ctx, types.StringType, in.Tags, diags)
o.Tags = value.SetOrNull(ctx, types.StringType, in.Tags, diags)
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/Juniper/apstra-go-sdk/apstra"
"github.com/Juniper/terraform-provider-apstra/apstra/blueprint/connectivity_templates/primitives"
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework-validators/mapvalidator"
"github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
Expand Down Expand Up @@ -138,8 +138,8 @@ func (o ConnectivityTemplateInterface) Request(ctx context.Context, diags *diag.
func (o *ConnectivityTemplateInterface) LoadApiData(ctx context.Context, in *apstra.ConnectivityTemplate, diags *diag.Diagnostics) {
o.Id = types.StringPointerValue((*string)(in.Id))
o.Name = types.StringValue(in.Label)
o.Description = utils.StringValueOrNull(ctx, in.Description, diags)
o.Tags = utils.SetValueOrNull(ctx, types.StringType, in.Tags, diags)
o.Description = value.StringOrNull(ctx, in.Description, diags)
o.Tags = value.SetOrNull(ctx, types.StringType, in.Tags, diags)
o.IpLinks = primitives.IpLinkPrimitivesFromSubpolicies(ctx, in.Subpolicies, diags)
o.RoutingZoneConstraints = primitives.RoutingZoneConstraintPrimitivesFromSubpolicies(ctx, in.Subpolicies, diags)
o.VirtualNetworkMultiples = primitives.VirtualNetworkMultiplePrimitivesFromSubpolicies(ctx, in.Subpolicies, diags)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/Juniper/apstra-go-sdk/apstra"
"github.com/Juniper/terraform-provider-apstra/apstra/blueprint/connectivity_templates/primitives"
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework-validators/mapvalidator"
"github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
Expand Down Expand Up @@ -108,8 +108,8 @@ func (o ConnectivityTemplateLoopback) Request(ctx context.Context, diags *diag.D
func (o *ConnectivityTemplateLoopback) LoadApiData(ctx context.Context, in *apstra.ConnectivityTemplate, diags *diag.Diagnostics) {
o.Id = types.StringPointerValue((*string)(in.Id))
o.Name = types.StringValue(in.Label)
o.Description = utils.StringValueOrNull(ctx, in.Description, diags)
o.Tags = utils.SetValueOrNull(ctx, types.StringType, in.Tags, diags)
o.Description = value.StringOrNull(ctx, in.Description, diags)
o.Tags = value.SetOrNull(ctx, types.StringType, in.Tags, diags)
o.BgpPeeringIpEndpoints = primitives.BgpPeeringIpEndpointPrimitivesFromSubpolicies(ctx, in.Subpolicies, diags)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/Juniper/apstra-go-sdk/apstra"
"github.com/Juniper/terraform-provider-apstra/apstra/blueprint/connectivity_templates/primitives"
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework-validators/mapvalidator"
"github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
Expand Down Expand Up @@ -108,8 +108,8 @@ func (o ConnectivityTemplateProtocolEndpoint) Request(ctx context.Context, diags
func (o *ConnectivityTemplateProtocolEndpoint) LoadApiData(ctx context.Context, in *apstra.ConnectivityTemplate, diags *diag.Diagnostics) {
o.Id = types.StringPointerValue((*string)(in.Id))
o.Name = types.StringValue(in.Label)
o.Description = utils.StringValueOrNull(ctx, in.Description, diags)
o.Tags = utils.SetValueOrNull(ctx, types.StringType, in.Tags, diags)
o.Description = value.StringOrNull(ctx, in.Description, diags)
o.Tags = value.SetOrNull(ctx, types.StringType, in.Tags, diags)
o.RoutingPolicies = primitives.RoutingPolicyPrimitivesFromSubpolicies(ctx, in.Subpolicies, diags)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/Juniper/apstra-go-sdk/apstra"
"github.com/Juniper/terraform-provider-apstra/apstra/blueprint/connectivity_templates/primitives"
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework-validators/mapvalidator"
"github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
Expand Down Expand Up @@ -114,8 +114,8 @@ func (o *ConnectivityTemplateSvi) Request(ctx context.Context, diags *diag.Diagn
func (o *ConnectivityTemplateSvi) LoadApiData(ctx context.Context, in *apstra.ConnectivityTemplate, diags *diag.Diagnostics) {
o.Id = types.StringPointerValue((*string)(in.Id))
o.Name = types.StringValue(in.Label)
o.Description = utils.StringValueOrNull(ctx, in.Description, diags)
o.Tags = utils.SetValueOrNull(ctx, types.StringType, in.Tags, diags)
o.Description = value.StringOrNull(ctx, in.Description, diags)
o.Tags = value.SetOrNull(ctx, types.StringType, in.Tags, diags)
o.BgpPeeringIpEndpoints = primitives.BgpPeeringIpEndpointPrimitivesFromSubpolicies(ctx, in.Subpolicies, diags)
o.DynamicBgpPeerings = primitives.DynamicBgpPeeringPrimitivesFromSubpolicies(ctx, in.Subpolicies, diags)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/Juniper/apstra-go-sdk/apstra"
"github.com/Juniper/terraform-provider-apstra/apstra/blueprint/connectivity_templates/primitives"
"github.com/Juniper/terraform-provider-apstra/apstra/utils"
"github.com/Juniper/terraform-provider-apstra/internal/value"
"github.com/hashicorp/terraform-plugin-framework-validators/mapvalidator"
"github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
Expand Down Expand Up @@ -130,8 +130,8 @@ func (o ConnectivityTemplateSystem) Request(ctx context.Context, diags *diag.Dia
func (o *ConnectivityTemplateSystem) LoadApiData(ctx context.Context, in *apstra.ConnectivityTemplate, diags *diag.Diagnostics) {
o.Id = types.StringPointerValue((*string)(in.Id))
o.Name = types.StringValue(in.Label)
o.Description = utils.StringValueOrNull(ctx, in.Description, diags)
o.Tags = utils.SetValueOrNull(ctx, types.StringType, in.Tags, diags)
o.Description = value.StringOrNull(ctx, in.Description, diags)
o.Tags = value.SetOrNull(ctx, types.StringType, in.Tags, diags)
o.CustomStaticRoutes = primitives.CustomStaticRoutePrimitivesFromSubpolicies(ctx, in.Subpolicies, diags)
}

Expand Down
Loading
Loading