Skip to content

feat: implement comprehensive OpenAPI discriminator pattern support #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat: implement comprehensive OpenAPI discriminator pattern support #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dffe9d
feat: implement comprehensive OpenAPI discriminator pattern support
bradyburke Sep 16, 2025
a3f0d68
Update refs to fork
bradyburke Sep 16, 2025
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
2 changes: 1 addition & 1 deletion cmd/tfplugingen-openapi/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/hashicorp/cli"
"github.com/mattn/go-colorable"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/cmd"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/cmd"
)

// version will be set by goreleaser via ldflags
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/hashicorp/terraform-plugin-codegen-openapi
module github.com/starburstdata/terraform-plugin-codegen-openapi

go 1.23.0

Expand Down
17 changes: 9 additions & 8 deletions internal/cmd/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ import (
"os"
"strings"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/config"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/config"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper"
"github.com/hashicorp/terraform-plugin-codegen-spec/spec"

"github.com/hashicorp/cli"
"github.com/pb33f/libopenapi"
high "github.com/pb33f/libopenapi/datamodel/high/v3"
"github.com/pb33f/libopenapi/index"
)

Expand Down Expand Up @@ -148,7 +149,7 @@ func (cmd *GenerateCommand) runInternal(logger *slog.Logger) error {

// 5. Generate provider code spec w/ config
oasExplorer := explorer.NewConfigExplorer(model.Model, *config)
providerCodeSpec, err := generateProviderCodeSpec(logger, oasExplorer, *config)
providerCodeSpec, err := generateProviderCodeSpec(logger, oasExplorer, &model.Model, *config)
if err != nil {
return err
}
Expand Down Expand Up @@ -181,7 +182,7 @@ func (cmd *GenerateCommand) runInternal(logger *slog.Logger) error {
return nil
}

func generateProviderCodeSpec(logger *slog.Logger, dora explorer.Explorer, cfg config.Config) (*spec.Specification, error) {
func generateProviderCodeSpec(logger *slog.Logger, dora explorer.Explorer, document *high.Document, cfg config.Config) (*spec.Specification, error) {
// 1. Find TF resources in OAS
explorerResources, err := dora.FindResources()
if err != nil {
Expand All @@ -201,21 +202,21 @@ func generateProviderCodeSpec(logger *slog.Logger, dora explorer.Explorer, cfg c
}

// 4. Use TF info to generate provider code spec for resources
resourceMapper := mapper.NewResourceMapper(explorerResources, cfg)
resourceMapper := mapper.NewResourceMapper(explorerResources, document, cfg)
resourcesIR, err := resourceMapper.MapToIR(logger)
if err != nil {
return nil, fmt.Errorf("error generating provider code spec for resources: %w", err)
}

// 5. Use TF info to generate provider code spec for data sources
dataSourceMapper := mapper.NewDataSourceMapper(explorerDataSources, cfg)
dataSourceMapper := mapper.NewDataSourceMapper(explorerDataSources, document, cfg)
dataSourcesIR, err := dataSourceMapper.MapToIR(logger)
if err != nil {
return nil, fmt.Errorf("error generating provider code spec for data sources: %w", err)
}

// 6. Use TF info to generate provider code spec for provider
providerMapper := mapper.NewProviderMapper(explorerProvider, cfg)
providerMapper := mapper.NewProviderMapper(explorerProvider, document, cfg)
providerIR, err := providerMapper.MapToIR(logger)
if err != nil {
return nil, fmt.Errorf("error generating provider code spec for provider: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/generate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/hashicorp/cli"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/cmd"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/cmd"
)

func TestGenerate_WithConfig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/config/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"regexp"
"testing"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/config"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/config"
)

func TestParseConfig_Valid(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/explorer/config_explorer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"fmt"
"strings"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/config"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/config"

highbase "github.com/pb33f/libopenapi/datamodel/high/base"
high "github.com/pb33f/libopenapi/datamodel/high/v3"
Expand Down
4 changes: 2 additions & 2 deletions internal/explorer/config_explorer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"gopkg.in/yaml.v3"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/config"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/config"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
2 changes: 1 addition & 1 deletion internal/explorer/explorer_utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/pb33f/libopenapi/datamodel/high/base"
high "github.com/pb33f/libopenapi/datamodel/high/v3"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/util"
)

func TestReadOpParameters_Resource(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/explorer/guesstimator_explorer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package explorer_test
import (
"testing"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"

high "github.com/pb33f/libopenapi/datamodel/high/v3"
"github.com/pb33f/libopenapi/orderedmap"
Expand Down
2 changes: 1 addition & 1 deletion internal/log/warn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"errors"
"log/slog"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/oas"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/oas"
)

// WarnLogOnError inspects the error type and extracts additional information for structured logging if possible
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/bool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package attrmapper

import (
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/hashicorp/terraform-plugin-codegen-spec/datasource"
"github.com/hashicorp/terraform-plugin-codegen-spec/provider"
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/bool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
"github.com/hashicorp/terraform-plugin-codegen-spec/schema"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
)

func TestResourceBoolAttribute_Merge(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/mapper/attrmapper/data_source_attributes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"errors"
"strings"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-spec/datasource"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/data_source_attributes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/hashicorp/terraform-plugin-codegen-spec/datasource"
"github.com/hashicorp/terraform-plugin-codegen-spec/schema"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
)

func TestDataSourceAttributes_Merge(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/float64.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package attrmapper

import (
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/hashicorp/terraform-plugin-codegen-spec/datasource"
"github.com/hashicorp/terraform-plugin-codegen-spec/provider"
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/float64_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
"github.com/hashicorp/terraform-plugin-codegen-spec/schema"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
)

func TestResourceFloat64Attribute_Merge(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/int64.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package attrmapper

import (
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/hashicorp/terraform-plugin-codegen-spec/datasource"
"github.com/hashicorp/terraform-plugin-codegen-spec/provider"
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/int64_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
"github.com/hashicorp/terraform-plugin-codegen-spec/schema"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
)

func TestResourceInt64Attribute_Merge(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package attrmapper

import (
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/hashicorp/terraform-plugin-codegen-spec/datasource"
"github.com/hashicorp/terraform-plugin-codegen-spec/provider"
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/list_nested.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package attrmapper

import (
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/hashicorp/terraform-plugin-codegen-spec/datasource"
"github.com/hashicorp/terraform-plugin-codegen-spec/provider"
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/list_nested_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
"github.com/hashicorp/terraform-plugin-codegen-spec/schema"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
)

func TestResourceListNestedAttribute_Merge(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
"github.com/hashicorp/terraform-plugin-codegen-spec/schema"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
)

func TestResourceListAttribute_Merge(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/map.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package attrmapper

import (
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/hashicorp/terraform-plugin-codegen-spec/datasource"
"github.com/hashicorp/terraform-plugin-codegen-spec/provider"
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/map_nested.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package attrmapper

import (
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/hashicorp/terraform-plugin-codegen-spec/datasource"
"github.com/hashicorp/terraform-plugin-codegen-spec/provider"
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/map_nested_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
"github.com/hashicorp/terraform-plugin-codegen-spec/schema"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
)

func TestResourceMapNestedAttribute_Merge(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/map_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
"github.com/hashicorp/terraform-plugin-codegen-spec/schema"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
)

func TestResourceMapAttribute_Merge(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/number.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package attrmapper

import (
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/hashicorp/terraform-plugin-codegen-spec/datasource"
"github.com/hashicorp/terraform-plugin-codegen-spec/provider"
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/number_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
"github.com/hashicorp/terraform-plugin-codegen-spec/schema"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
)

func TestResourceNumberAttribute_Merge(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/mapper/attrmapper/resource_attributes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"errors"
"strings"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/resource_attributes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
"github.com/hashicorp/terraform-plugin-codegen-spec/schema"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
)

func TestResourceAttributes_Merge(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package attrmapper

import (
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/hashicorp/terraform-plugin-codegen-spec/datasource"
"github.com/hashicorp/terraform-plugin-codegen-spec/provider"
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/set_nested.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package attrmapper

import (
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/util"
"github.com/hashicorp/terraform-plugin-codegen-spec/datasource"
"github.com/hashicorp/terraform-plugin-codegen-spec/provider"
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/mapper/attrmapper/set_nested_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/hashicorp/terraform-plugin-codegen-spec/resource"
"github.com/hashicorp/terraform-plugin-codegen-spec/schema"

"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/hashicorp/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/explorer"
"github.com/starburstdata/terraform-plugin-codegen-openapi/internal/mapper/attrmapper"
)

func TestResourceSetNestedAttribute_Merge(t *testing.T) {
Expand Down
Loading