Merge branch 'fix-custom-provider-plan-state' into 'master'

custom provider state inconsistency fix

See merge request cidaas-management/terraform!132

Author: Tujit Bora

helpers/cidaas/custom_provider.go

@@ -9,7 +9,7 @@ import (
 )
 
 type Scopes struct {
-	DisplayLabel string       `json:"display_label,omitempty"`
+	DisplayLabel string       `json:"display_label"`
 	Scopes       []ScopeChild `json:"scopes,omitempty"`
 }
 
@@ -28,7 +28,7 @@ type CustomProviderModel struct {
 	AuthorizationEndpoint string                 `json:"authorization_endpoint,omitempty"`
 	TokenEndpoint         string                 `json:"token_endpoint,omitempty"`
 	ProviderName          string                 `json:"provider_name,omitempty"`
-	LogoURL               string                 `json:"logo_url,omitempty"`
+	LogoURL               string                 `json:"logo_url"`
 	UserinfoEndpoint      string                 `json:"userinfo_endpoint,omitempty"`
 	UserinfoFields        map[string]interface{} `json:"userInfoFields,omitempty"`
 	Scopes                Scopes                 `json:"scopes,omitempty"`

internal/resources/resource_custom_provider.go

@@ -256,7 +256,7 @@ var customProviderSchema = schema.Schema{
 			Optional: true,
 		},
 		"scope_display_label": schema.StringAttribute{
-			Required:            true,
+			Optional:            true,
 			MarkdownDescription: "Display label for the scope of the provider.",
 		},
 		"userinfo_fields": schema.SingleNestedAttribute{

internal/resources/resource_custom_provider_test.go

@@ -195,7 +195,7 @@ func TestAccCustomProviderResource_InvalidStandardType(t *testing.T) {
 func TestAccCustomProviderResource_MissingRequired(t *testing.T) {
 	requiredParams := []string{
 		"provider_name", "display_name", "client_id", "client_secret",
-		"authorization_endpoint", "token_endpoint", "userinfo_endpoint", "scope_display_label",
+		"authorization_endpoint", "token_endpoint", "userinfo_endpoint",
 	}
 	for _, param := range requiredParams {
 		resource.Test(t, resource.TestCase{