exclude idp options for now

Author: wasaga

internal/provider/convert.go

@@ -2,15 +2,13 @@ package provider
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/pomerium/enterprise-client-go/pb"
 	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/structpb"
 )
 
 // StringP returns a pointer to the string value if not null, otherwise nil
@@ -133,33 +131,3 @@ func FromDurationP(d *durationpb.Duration) types.String {
 	}
 	return types.StringValue(d.AsDuration().String())
 }
-
-// ToStruct converts a types.Map to a structpb.Struct and handles diagnostics internally
-func ToStruct(ctx context.Context, dst **structpb.Struct, m types.Map, field string, diagnostics *diag.Diagnostics) {
-	if m.IsNull() {
-		*dst = nil
-		return
-	}
-
-	var options map[string]interface{}
-	diagnostics.Append(m.ElementsAs(ctx, &options, false)...)
-	if !diagnostics.HasError() {
-		if s, err := structpb.NewStruct(options); err == nil {
-			*dst = s
-		} else {
-			diagnostics.AddError("invalid "+field, err.Error())
-		}
-	}
-}
-
-// FromStruct converts a structpb.Struct to a types.Map
-func FromStruct(s *structpb.Struct) types.Map {
-	if s == nil {
-		return types.MapNull(types.StringType)
-	}
-	elements := make(map[string]attr.Value)
-	for k, v := range s.AsMap() {
-		elements[k] = types.StringValue(fmt.Sprint(v))
-	}
-	return types.MapValueMust(types.StringType, elements)
-}

internal/provider/convert_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/structpb"
 )
 
 func TestStringP(t *testing.T) {
@@ -152,63 +151,6 @@ func TestFromDurationP(t *testing.T) {
 	}
 }
 
-func TestToStruct(t *testing.T) {
-	ctx := context.Background()
-	tests := []struct {
-		name        string
-		input       types.Map
-		expectError bool
-		validate    func(*testing.T, *structpb.Struct)
-	}{
-		{
-			name:  "null map",
-			input: types.MapNull(types.StringType),
-			validate: func(t *testing.T, s *structpb.Struct) {
-				assert.Nil(t, s)
-			},
-		},
-		{
-			name: "valid map",
-			input: types.MapValueMust(types.StringType, map[string]attr.Value{
-				"key1": types.StringValue("value1"),
-				"key2": types.StringValue("value2"),
-			}),
-			validate: func(t *testing.T, s *structpb.Struct) {
-				require.NotNil(t, s)
-				require.NotNil(t, s.Fields)
-				assert.Equal(t, "value1", s.Fields["key1"].GetStringValue())
-				assert.Equal(t, "value2", s.Fields["key2"].GetStringValue())
-			},
-		},
-		{
-			name:  "empty map",
-			input: types.MapValueMust(types.StringType, map[string]attr.Value{}),
-			validate: func(t *testing.T, s *structpb.Struct) {
-				require.NotNil(t, s)
-				assert.Empty(t, s.Fields)
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var result *structpb.Struct
-			diagnostics := diag.Diagnostics{}
-			provider.ToStruct(ctx, &result, tt.input, "test", &diagnostics)
-
-			if tt.expectError {
-				assert.True(t, diagnostics.HasError())
-				return
-			}
-
-			assert.False(t, diagnostics.HasError())
-			if tt.validate != nil {
-				tt.validate(t, result)
-			}
-		})
-	}
-}
-
 func TestToStringList(t *testing.T) {
 	ctx := context.Background()
 	tests := []struct {

internal/provider/settings_model.go

@@ -125,7 +125,6 @@ func ConvertSettingsToPB(
 	pbSettings.GrpcInsecure = BoolP(src.GRPCInsecure)
 	pbSettings.HttpRedirectAddr = StringP(src.HTTPRedirectAddr)
 	pbSettings.IdentityProvider = StringP(src.IdentityProvider)
-	ToStruct(ctx, &pbSettings.IdentityProviderOptions, src.IdentityProviderOptions, "identity_provider_options", &diagnostics)
 	ToDurationP(&pbSettings.IdentityProviderRefreshInterval, src.IdentityProviderRefreshInterval, "identity_provider_refresh_interval", &diagnostics)
 	ToDurationP(&pbSettings.IdentityProviderRefreshTimeout, src.IdentityProviderRefreshTimeout, "identity_provider_refresh_timeout", &diagnostics)
 	pbSettings.IdpClientId = StringP(src.IdpClientID)
@@ -206,7 +205,6 @@ func ConvertSettingsFromPB(
 	dst.GRPCInsecure = types.BoolPointerValue(src.GrpcInsecure)
 	dst.HTTPRedirectAddr = types.StringPointerValue(src.HttpRedirectAddr)
 	dst.IdentityProvider = types.StringPointerValue(src.IdentityProvider)
-	dst.IdentityProviderOptions = FromStruct(src.IdentityProviderOptions)
 	dst.IdentityProviderRefreshInterval = FromDurationP(src.IdentityProviderRefreshInterval)
 	dst.IdentityProviderRefreshTimeout = FromDurationP(src.IdentityProviderRefreshTimeout)
 	dst.IdpClientID = types.StringPointerValue(src.IdpClientId)