Merge branch 'master' into OAS-7161

Author: Robert-Stam

internal/resource_organization.go

@@ -36,6 +36,12 @@ const (
 	organizationNameFieldName        = "name"
 	organizationDescriptionFieldName = "description"
 	organizationLockFieldName        = "locked"
+	authenticationProvidersFieldName = "authentication_providers"
+	enableGithubFieldName            = "enable_github"
+	enableGoogleFieldName            = "enable_google"
+	enableUsernamePasswordFieldName  = "enable_username_password"
+	enableMicrosoftFieldName         = "enable_microsoft"
+	enableSso                        = "enable_sso"
 )
 
 // resourceOrganization defines an Organization Oasis resource.
@@ -63,6 +69,47 @@ func resourceOrganization() *schema.Resource {
 				Description: "Organization Resource Organization Lock field",
 				Optional:    true,
 			},
+			authenticationProvidersFieldName: {
+				Type:        schema.TypeList,
+				Description: "Authentication Provider field",
+				Computed:    true,
+				Optional:    true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+
+						enableGithubFieldName: {
+							Type:        schema.TypeBool,
+							Description: "Organization Resource Enable Github Login field",
+							Optional:    true,
+							Default:     false,
+						},
+						enableGoogleFieldName: {
+							Type:        schema.TypeBool,
+							Description: "Organization Resource Enable Google Login field",
+							Optional:    true,
+							Default:     false,
+						},
+						enableUsernamePasswordFieldName: {
+							Type:        schema.TypeBool,
+							Description: "Organization Resource Enable Username Password Login field",
+							Optional:    true,
+							Default:     false,
+						},
+						enableMicrosoftFieldName: {
+							Type:        schema.TypeBool,
+							Description: "Organization Resource Enable Microsoft Login field",
+							Optional:    true,
+							Default:     false,
+						},
+						enableSso: {
+							Type:        schema.TypeBool,
+							Description: "Organization Resource Enable Single Sign On(SSO) Login field",
+							Optional:    true,
+							Default:     false,
+						},
+					},
+				},
+			},
 		},
 	}
 }
@@ -132,7 +179,9 @@ func expandOrganizationResource(d *schema.ResourceData) (*rm.Organization, error
 	if v, ok := d.GetOk(organizationLockFieldName); ok {
 		ret.Locked = v.(bool)
 	}
-
+	if v, ok := d.GetOk(authenticationProvidersFieldName); ok {
+		ret.AuthenticationProviders = expandAuthenticationProviders(v.([]interface{}))
+	}
 	return ret, nil
 }
 
@@ -178,7 +227,9 @@ func resourceOrganizationUpdate(ctx context.Context, d *schema.ResourceData, m i
 	if d.HasChange(organizationLockFieldName) {
 		organization.Locked = d.Get(organizationLockFieldName).(bool)
 	}
-
+	if v, ok := d.GetOk(authenticationProvidersFieldName); ok {
+		organization.AuthenticationProviders = expandAuthenticationProviders(v.([]interface{}))
+	}
 	res, err := rmc.UpdateOrganization(client.ctxWithToken, organization)
 	if err != nil {
 		client.log.Error().Err(err).Msg("Failed to update Organization")
@@ -191,9 +242,50 @@ func resourceOrganizationUpdate(ctx context.Context, d *schema.ResourceData, m i
 
 // flattenOrganizationResource will take an Organization object and turn it into a flat map for terraform digestion.
 func flattenOrganizationResource(organization *rm.Organization) map[string]interface{} {
-	return map[string]interface{}{
+	result := map[string]interface{}{
 		organizationNameFieldName:        organization.GetName(),
 		organizationDescriptionFieldName: organization.GetDescription(),
 		organizationLockFieldName:        organization.GetLocked(),
 	}
+	if organization.GetAuthenticationProviders() != nil {
+		result[authenticationProvidersFieldName] = flattenAuthenticationProviders(organization.GetAuthenticationProviders())
+	}
+	return result
+}
+
+// flattenAuthenticationProviders will take a AuthenticationProviders Spec object and turn it into a flat map for terraform digestion.
+func flattenAuthenticationProviders(p *rm.AuthenticationProviders) []interface{} {
+	providers := make(map[string]interface{})
+	providers[enableGithubFieldName] = p.GetEnableGithub()
+	providers[enableGoogleFieldName] = p.GetEnableGoogle()
+	providers[enableMicrosoftFieldName] = p.GetEnableMicrosoft()
+	providers[enableUsernamePasswordFieldName] = p.GetEnableUsernamePassword()
+	providers[enableSso] = p.GetEnableSso()
+	return []interface{}{
+		providers,
+	}
+}
+
+// expandAuthenticationProviders will take a terraform flat map schema data and turn it into an ArangoGraph AuthenticationProviders.
+func expandAuthenticationProviders(p []interface{}) *rm.AuthenticationProviders {
+	result := &rm.AuthenticationProviders{}
+	for _, v := range p {
+		item := v.(map[string]interface{})
+		if i, ok := item[enableGithubFieldName]; ok {
+			result.EnableGithub = i.(bool)
+		}
+		if i, ok := item[enableGoogleFieldName]; ok {
+			result.EnableGoogle = i.(bool)
+		}
+		if i, ok := item[enableMicrosoftFieldName]; ok {
+			result.EnableMicrosoft = i.(bool)
+		}
+		if i, ok := item[enableUsernamePasswordFieldName]; ok {
+			result.EnableUsernamePassword = i.(bool)
+		}
+		if i, ok := item[enableSso]; ok {
+			result.EnableSso = i.(bool)
+		}
+	}
+	return result
 }

internal/resource_organization_test.go

@@ -139,6 +139,30 @@ func TestFlattenOrganization(t *testing.T) {
 		flattened := flattenOrganizationResource(organization)
 		assert.Equal(tt, expected, flattened)
 	})
+
+	t.Run("with auth providers enabled", func(tt *testing.T) {
+		authProviderData := []interface{}{
+			map[string]interface{}{
+				enableGithubFieldName:           true,
+				enableGoogleFieldName:           true,
+				enableMicrosoftFieldName:        true,
+				enableUsernamePasswordFieldName: true,
+				enableSso:                       true,
+			},
+		}
+		organization.AuthenticationProviders = expandAuthenticationProviders(authProviderData)
+		expected[authenticationProvidersFieldName] = []interface{}{
+			map[string]interface{}{
+				enableGithubFieldName:           true,
+				enableGoogleFieldName:           true,
+				enableMicrosoftFieldName:        true,
+				enableUsernamePasswordFieldName: true,
+				enableSso:                       true,
+			},
+		}
+		flattened := flattenOrganizationResource(organization)
+		assert.Equal(tt, expected, flattened)
+	})
 }
 
 // TestExpandOrganization tests the Oasis Organization expansion for Terraform schema compatibility.