fix: handling of default azure tenant_type

zitadel · Sep 6, 2023 · 1f6c5a8 · 1f6c5a8
2 parents 28d61ea + 51fd727
commit 1f6c5a8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/zitadel/idp_azure_ad/funcs.go b/zitadel/idp_azure_ad/funcs.go
@@ -92,6 +92,7 @@ func read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagn
 	cfg := respIdp.GetConfig()
 	specificCfg := cfg.GetAzureAd()
 	generalCfg := cfg.GetOptions()
+	tenantID := specificCfg.GetTenant().GetTenantId()
 	set := map[string]interface{}{
 		idp_utils.NameVar:              respIdp.GetName(),
 		idp_utils.ClientIDVar:          specificCfg.GetClientId(),
@@ -102,9 +103,15 @@ func read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagn
 		idp_utils.IsAutoCreationVar:    generalCfg.GetIsAutoCreation(),
 		idp_utils.IsAutoUpdateVar:      generalCfg.GetIsAutoUpdate(),
 		EmailVerifiedVar:               specificCfg.GetEmailVerified(),
-		TenantTypeVar:                  idp.AzureADTenantType_name[int32(specificCfg.GetTenant().GetTenantType())],
-		TenantIDVar:                    specificCfg.GetTenant().GetTenantId(),
+		TenantIDVar:                    tenantID,
 	}
+
+	if tenantID == "" {
+		set[TenantTypeVar] = idp.AzureADTenantType_name[int32(specificCfg.GetTenant().GetTenantType())]
+	} else {
+		set[TenantTypeVar] = ""
+	}
+
 	for k, v := range set {
 		if err := d.Set(k, v); err != nil {
 			return diag.Errorf("failed to set %s of oidc idp: %v", k, err)
@@ -118,6 +125,9 @@ func ConstructTenant(d *schema.ResourceData) (*idp.AzureADTenant, error) {
 	tenant := &idp.AzureADTenant{}
 	tenantId := idp_utils.StringValue(d, TenantIDVar)
 	tenantType := idp_utils.StringValue(d, TenantTypeVar)
+	if tenantId == "" && tenantType == "" {
+		return nil, fmt.Errorf("tenant_id or tenant_type are required, but both were empty")
+	}
 	if tenantId != "" && tenantType != "" {
 		return nil, fmt.Errorf("tenant_id and tenant_type are mutually exclusive, but got id %s and type %s", tenantId, tenantType)
 	}

diff --git a/zitadel/idp_azure_ad/schema.go b/zitadel/idp_azure_ad/schema.go
@@ -21,7 +21,6 @@ var (
 	TenantTypeResourceField = &schema.Schema{
 		Type:        schema.TypeString,
 		Optional:    true,
-		Default:     idp.AzureADTenantType_name[0],
 		Description: "the azure ad tenant type",
 		ValidateDiagFunc: func(value interface{}, path cty.Path) diag.Diagnostics {
 			return helper.EnumValueValidation(TenantTypeVar, value, idp.AzureADTenantType_value)

diff --git a/zitadel/org_idp_azure_ad/funcs.go b/zitadel/org_idp_azure_ad/funcs.go
@@ -92,6 +92,7 @@ func read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagn
 	cfg := respIdp.GetConfig()
 	specificCfg := cfg.GetAzureAd()
 	generalCfg := cfg.GetOptions()
+	tenantID := specificCfg.GetTenant().GetTenantId()
 	set := map[string]interface{}{
 		helper.OrgIDVar:                respIdp.GetDetails().GetResourceOwner(),
 		idp_utils.NameVar:              respIdp.GetName(),
@@ -103,8 +104,13 @@ func read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagn
 		idp_utils.IsAutoCreationVar:    generalCfg.GetIsAutoCreation(),
 		idp_utils.IsAutoUpdateVar:      generalCfg.GetIsAutoUpdate(),
 		idp_azure_ad.EmailVerifiedVar:  specificCfg.GetEmailVerified(),
-		idp_azure_ad.TenantTypeVar:     idp.AzureADTenantType_name[int32(specificCfg.GetTenant().GetTenantType())],
-		idp_azure_ad.TenantIDVar:       specificCfg.GetTenant().GetTenantId(),
+		idp_azure_ad.TenantIDVar:       tenantID,
+	}
+
+	if tenantID == "" {
+		set[idp_azure_ad.TenantTypeVar] = idp.AzureADTenantType_name[int32(specificCfg.GetTenant().GetTenantType())]
+	} else {
+		set[idp_azure_ad.TenantTypeVar] = ""
 	}
 	for k, v := range set {
 		if err := d.Set(k, v); err != nil {