Update dependencies to latest versions

- Upgrade libopenapi from v0.21.8 to v0.36.1
- Migrate yaml dependency from gopkg.in/yaml.v3 to go.yaml.in/yaml/v4
- Fix shared schema mutation bug in allOf resolution: libopenapi v0.34+
  reuses the same *base.Schema instance for all references to the same
  $ref target. Shallow-copy the schema before overriding the description
  to prevent corruption across properties sharing a reference.
- Adapt to BuildV3Model() returning single error instead of []error
- Regenerate golden test files

Author: hanneshayashi

go.mod

@@ -1,44 +1,45 @@
 module github.com/doitintl/terraform-plugin-codegen-openapi
 
-go 1.23.0
-
-toolchain go1.24.0
+go 1.25.0
 
 require (
 	github.com/google/go-cmp v0.7.0
 	github.com/hashicorp/cli v1.1.7
 	github.com/hashicorp/terraform-plugin-codegen-spec v0.2.0
 	github.com/mattn/go-colorable v0.1.14
-	github.com/pb33f/libopenapi v0.21.8
+	github.com/pb33f/libopenapi v0.36.1
+	go.yaml.in/yaml/v4 v4.0.0-rc.4
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
+	dario.cat/mergo v1.0.2 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.2.0 // indirect
-	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
+	github.com/Masterminds/semver/v3 v3.4.0 // indirect
+	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
-	github.com/bgentry/speakeasy v0.1.0 // indirect
-	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/fatih/color v1.16.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/bgentry/speakeasy v0.2.0 // indirect
+	github.com/buger/jsonparser v1.1.2 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/fatih/color v1.19.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/huandu/xstrings v1.4.0 // indirect
-	github.com/imdario/mergo v0.3.15 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/huandu/xstrings v1.5.0 // indirect
+	github.com/mattn/go-isatty v0.0.21 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/pb33f/jsonpath v0.8.2 // indirect
+	github.com/pb33f/ordered-map/v2 v2.3.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/posener/complete v1.2.3 // indirect
-	github.com/shopspring/decimal v1.3.1 // indirect
-	github.com/speakeasy-api/jsonpath v0.6.1 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/wk8/go-ordered-map/v2 v2.1.9-0.20240815153524-6ea36470d1bd // indirect
-	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
+	github.com/shopspring/decimal v1.4.0 // indirect
+	github.com/spf13/cast v1.10.0 // indirect
+	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/crypto v0.50.0 // indirect
+	golang.org/x/sync v0.20.0 // indirect
+	golang.org/x/sys v0.43.0 // indirect
 )

go.sum

@@ -6,7 +6,6 @@ package cmd
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"flag"
 	"fmt"
 	"log/slog"
@@ -20,7 +19,6 @@ import (
 
 	"github.com/hashicorp/cli"
 	"github.com/pb33f/libopenapi"
-	"github.com/pb33f/libopenapi/index"
 )
 
 type GenerateCommand struct {
@@ -130,20 +128,14 @@ func (cmd *GenerateCommand) runInternal(logger *slog.Logger) error {
 	// 3. Build out the OpenAPI model, this will recursively load all local + remote references into one cohesive model
 	model, errs := doc.BuildV3Model()
 
-	// 4. Log circular references as warnings and fail on any other model building errors
-	var errResult error
-	for _, err := range errs {
-		if rslvErr, ok := err.(*index.ResolvingError); ok {
-			logger.Warn(
-				"circular reference found in OpenAPI spec",
-				"circular_ref", rslvErr.CircularReference.GenerateJourneyPath())
-			continue
-		}
-
-		errResult = errors.Join(errResult, err)
+	// 4. Log circular references as warnings; fail only on fatal errors.
+	// libopenapi guarantees: nil model = fatal error, non-nil model with non-nil err = circular refs only.
+	// Circular references are non-fatal and the generated model is still usable.
+	if model == nil && errs != nil {
+		return fmt.Errorf("error building OpenAPI 3.x model: %w", errs)
 	}
-	if errResult != nil {
-		return fmt.Errorf("error building OpenAPI 3.x model: %w", errResult)
+	if errs != nil {
+		logger.Warn("circular reference(s) found in OpenAPI spec, proceeding", "err", errs)
 	}
 
 	// 5. Generate provider code spec w/ config

internal/cmd/generate.go

@@ -175,7 +175,7 @@ func extractCommonParameters(paths *high.Paths, path string) ([]*high.Parameter,
 
 func extractSchemaProxy(document high.Document, componentRef string) (*highbase.SchemaProxy, error) {
 	// find the reference using the root document.Index
-	indexRef := document.Index.FindComponentInRoot(componentRef)
+	indexRef := document.Index.FindComponentInRoot(context.Background(), componentRef)
 	if indexRef == nil {
 		return nil, fmt.Errorf("unable to find reference: %s", componentRef)
 	}

internal/cmd/testdata/kubernetes/provider_code_spec.json

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	"gopkg.in/yaml.v3"
+	yaml "go.yaml.in/yaml/v4"
 
 	"github.com/doitintl/terraform-plugin-codegen-openapi/internal/config"
 	"github.com/doitintl/terraform-plugin-codegen-openapi/internal/explorer"
@@ -637,13 +637,9 @@ components:
 		return high.Document{}, fmt.Errorf("unexpected error parsing test OAS: %w", err)
 	}
 
-	testOASModel, errs := doc.BuildV3Model()
-	if len(errs) > 0 {
-		var errResult error
-		for _, err := range errs {
-			errResult = errors.Join(errResult, err)
-		}
-		return high.Document{}, fmt.Errorf("unexpected error building test OAS: %w", errResult)
+	testOASModel, err := doc.BuildV3Model()
+	if testOASModel == nil && err != nil {
+		return high.Document{}, fmt.Errorf("unexpected error building test OAS: %w", err)
 	}
 
 	return testOASModel.Model, nil

internal/explorer/config_explorer.go

@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-codegen-spec/provider"
 	"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
 	"github.com/hashicorp/terraform-plugin-codegen-spec/schema"
-	"gopkg.in/yaml.v3"
+	yaml "go.yaml.in/yaml/v4"
 
 	"github.com/doitintl/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
 	"github.com/doitintl/terraform-plugin-codegen-openapi/internal/mapper/oas"

internal/explorer/config_explorer_test.go

@@ -171,9 +171,14 @@ func buildSchemaProxy(proxy *base.SchemaProxy) (*base.Schema, *SchemaError) {
 			return nil, err
 		}
 
-		// Override the description w/ the parent if populated
+		// Override the description w/ the parent if populated.
+		// Shallow-copy the schema first to avoid mutating a shared *base.Schema
+		// instance — libopenapi v0.34+ reuses the same object for all references
+		// to the same $ref target.
 		if s.Description != "" {
-			allOfSchema.Description = s.Description
+			allOfSchemaCopy := *allOfSchema
+			allOfSchemaCopy.Description = s.Description
+			return &allOfSchemaCopy, nil
 		}
 
 		return allOfSchema, nil

internal/mapper/oas/bool_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-codegen-spec/provider"
 	"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
 	"github.com/hashicorp/terraform-plugin-codegen-spec/schema"
-	"gopkg.in/yaml.v3"
+	yaml "go.yaml.in/yaml/v4"
 
 	"github.com/doitintl/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
 	"github.com/doitintl/terraform-plugin-codegen-openapi/internal/mapper/oas"

internal/mapper/oas/build.go

@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-codegen-spec/provider"
 	"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
 	"github.com/hashicorp/terraform-plugin-codegen-spec/schema"
-	"gopkg.in/yaml.v3"
+	yaml "go.yaml.in/yaml/v4"
 
 	"github.com/doitintl/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
 	"github.com/doitintl/terraform-plugin-codegen-openapi/internal/mapper/oas"