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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.24.7
1.25.8
45 changes: 23 additions & 22 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
module github.com/infobloxopen/terraform-provider-infoblox

go 1.24.7
go 1.25.8

require (
github.com/google/uuid v1.6.0
github.com/hashicorp/terraform-plugin-log v0.9.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.1
github.com/infobloxopen/infoblox-go-client/v2 v2.11.0
github.com/sirupsen/logrus v1.9.3
github.com/hashicorp/terraform-plugin-log v0.10.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.40.0
github.com/infobloxopen/infoblox-go-client/v2 v2.12.0
github.com/sirupsen/logrus v1.9.4
)

require (
github.com/ProtonMail/go-crypto v1.3.0 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/cloudflare/circl v1.6.1 // indirect
github.com/fatih/color v1.18.0 // indirect
github.com/fatih/color v1.19.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -27,16 +27,17 @@ require (
github.com/hashicorp/go-plugin v1.7.0 // indirect
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/hashicorp/hc-install v0.9.2 // indirect
github.com/hashicorp/go-version v1.9.0 // indirect
github.com/hashicorp/hc-install v0.9.3 // indirect
github.com/hashicorp/hcl/v2 v2.24.0 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-exec v0.24.0 // indirect
github.com/hashicorp/terraform-exec v0.25.0 // indirect
github.com/hashicorp/terraform-json v0.27.2 // indirect
github.com/hashicorp/terraform-plugin-go v0.29.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.31.0 // indirect
github.com/hashicorp/terraform-registry-address v0.4.0 // indirect
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
github.com/hashicorp/terraform-svchost v0.2.1 // indirect
github.com/hashicorp/yamux v0.1.2 // indirect
github.com/kisielk/errcheck v1.10.0 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand All @@ -48,16 +49,16 @@ require (
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/zclconf/go-cty v1.17.0 // indirect
golang.org/x/crypto v0.43.0 // indirect
golang.org/x/mod v0.29.0 // indirect
golang.org/x/net v0.46.0 // indirect
golang.org/x/sync v0.17.0 // indirect
golang.org/x/sys v0.37.0 // indirect
golang.org/x/text v0.30.0 // indirect
golang.org/x/tools v0.38.0 // indirect
github.com/zclconf/go-cty v1.18.0 // indirect
golang.org/x/crypto v0.49.0 // indirect
golang.org/x/mod v0.34.0 // indirect
golang.org/x/net v0.52.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/text v0.35.0 // indirect
golang.org/x/tools v0.43.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f // indirect
google.golang.org/grpc v1.76.0 // indirect
google.golang.org/protobuf v1.36.10 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
google.golang.org/grpc v1.80.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
)
123 changes: 62 additions & 61 deletions go.sum

Large diffs are not rendered by default.

16 changes: 11 additions & 5 deletions infoblox/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,10 @@ func mergeEAs(niosEAs, newTerraformEAs, oldTerraformEAs map[string]interface{},
// change a value of this EA by the terraform user, use EA value from NIOS

// If EA is required returns true, else returns false
req := checkEARequirement(key, conn)
req, err := checkEARequirement(key, conn)
if err != nil {
return nil, err
}

if newTfVal, newTfValFound := newTerraformEAs[key]; !newTfValFound {
if _, oldTfValFound := oldTerraformEAs[key]; !oldTfValFound {
Expand Down Expand Up @@ -393,7 +396,7 @@ func mergeEAs(niosEAs, newTerraformEAs, oldTerraformEAs map[string]interface{},
return res, nil
}

func checkEARequirement(name string, conn ibclient.IBConnector) bool {
func checkEARequirement(name string, conn ibclient.IBConnector) (bool, error) {
eadef := &ibclient.EADefinition{}
eadef.SetReturnFields(append(eadef.ReturnFields(), "flags"))

Expand All @@ -405,15 +408,18 @@ func checkEARequirement(name string, conn ibclient.IBConnector) bool {

err := conn.GetObject(eadef, "", qp, &res)
if err != nil {
fmt.Errorf("failed to get EA definition")
return false, fmt.Errorf("failed to get EA definition for '%s': %w", name, err)
}
if len(res) == 0 {
return false, fmt.Errorf("EA definition '%s' was not found", name)
}
result := &res[0]
if result.Flags != nil {
if strings.Contains(*result.Flags, "M") {
return true
return true, nil
}
}
return false
return false, nil
}

// Check Pre-requisites for the provider and create if not present
Expand Down
112 changes: 80 additions & 32 deletions vendor/github.com/fatih/color/color.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/fatih/color/color_windows.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 38 additions & 0 deletions vendor/github.com/hashicorp/go-version/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/hashicorp/go-version/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading