-
Notifications
You must be signed in to change notification settings - Fork 9.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #19497 from philof/r/elasticsearch_domain_saml_opt…
…ions r/aws_elasticsearch_domain_saml_options: New resource
- Loading branch information
Showing
6 changed files
with
794 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ```release-note:new-resource | ||
| aws_elasticsearch_domain_saml_options | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,233 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
| "time" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/aws/awserr" | ||
| elasticsearch "github.com/aws/aws-sdk-go/service/elasticsearchservice" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" | ||
| ) | ||
|
|
||
| func resourceAwsElasticSearchDomainSAMLOptions() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Create: resourceAwsElasticSearchDomainSAMLOptionsPut, | ||
| Read: resourceAwsElasticSearchDomainSAMLOptionsRead, | ||
| Update: resourceAwsElasticSearchDomainSAMLOptionsPut, | ||
| Delete: resourceAwsElasticSearchDomainSAMLOptionsDelete, | ||
| Importer: &schema.ResourceImporter{ | ||
| State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { | ||
| d.Set("domain_name", d.Id()) | ||
| return []*schema.ResourceData{d}, nil | ||
| }, | ||
| }, | ||
|
|
||
| Schema: map[string]*schema.Schema{ | ||
| "domain_name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
| "saml_options": { | ||
| Type: schema.TypeList, | ||
| Optional: true, | ||
| MaxItems: 1, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "enabled": { | ||
| Type: schema.TypeBool, | ||
| Optional: true, | ||
| Default: true, | ||
| }, | ||
| "idp": { | ||
| Type: schema.TypeList, | ||
| Optional: true, | ||
| MaxItems: 1, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "entity_id": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| }, | ||
| "metadata_content": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ValidateFunc: validation.StringIsNotEmpty, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "master_backend_role": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| ValidateFunc: validation.StringIsNotEmpty, | ||
| }, | ||
| "master_user_name": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| Sensitive: true, | ||
| ValidateFunc: validation.StringIsNotEmpty, | ||
| }, | ||
| "roles_key": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| }, | ||
| "session_timeout_minutes": { | ||
| Type: schema.TypeInt, | ||
| Optional: true, | ||
| Default: 60, | ||
| ValidateFunc: validation.IntBetween(1, 1440), | ||
| DiffSuppressFunc: elasticsearchDomainSamlOptionsDiffSupress, | ||
| }, | ||
| "subject_key": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| Default: "NameID", | ||
| DiffSuppressFunc: elasticsearchDomainSamlOptionsDiffSupress, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
| func elasticsearchDomainSamlOptionsDiffSupress(k, old, new string, d *schema.ResourceData) bool { | ||
| if v, ok := d.Get("saml_options").([]interface{}); ok && len(v) > 0 { | ||
| if enabled, ok := v[0].(map[string]interface{})["enabled"].(bool); ok && !enabled { | ||
| return true | ||
| } | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func resourceAwsElasticSearchDomainSAMLOptionsRead(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).esconn | ||
|
|
||
| input := &elasticsearch.DescribeElasticsearchDomainInput{ | ||
| DomainName: aws.String(d.Get("domain_name").(string)), | ||
| } | ||
|
|
||
| domain, err := conn.DescribeElasticsearchDomain(input) | ||
|
|
||
| if err != nil { | ||
| if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "ResourceNotFoundException" { | ||
| log.Printf("[WARN] ElasticSearch Domain %q not found, removing from state", d.Id()) | ||
| d.SetId("") | ||
| return nil | ||
| } | ||
| return err | ||
| } | ||
|
|
||
| log.Printf("[DEBUG] Received ElasticSearch domain: %s", domain) | ||
|
|
||
| ds := domain.DomainStatus | ||
| options := ds.AdvancedSecurityOptions.SAMLOptions | ||
|
|
||
| if err := d.Set("saml_options", flattenESSAMLOptions(d, options)); err != nil { | ||
| return fmt.Errorf("error setting saml_options for ElasticSearch Configuration: %w", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func resourceAwsElasticSearchDomainSAMLOptionsPut(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).esconn | ||
|
|
||
| domainName := d.Get("domain_name").(string) | ||
| config := elasticsearch.AdvancedSecurityOptionsInput{} | ||
| config.SetSAMLOptions(expandESSAMLOptions(d.Get("saml_options").([]interface{}))) | ||
|
|
||
| log.Printf("[DEBUG] Updating ElasticSearch domain SAML Options %s", config) | ||
|
|
||
| _, err := conn.UpdateElasticsearchDomainConfig(&elasticsearch.UpdateElasticsearchDomainConfigInput{ | ||
| DomainName: aws.String(domainName), | ||
| AdvancedSecurityOptions: &config, | ||
| }) | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| d.SetId(domainName) | ||
|
|
||
| input := &elasticsearch.DescribeElasticsearchDomainInput{ | ||
| DomainName: aws.String(d.Get("domain_name").(string)), | ||
| } | ||
| var out *elasticsearch.DescribeElasticsearchDomainOutput | ||
| err = resource.Retry(50*time.Minute, func() *resource.RetryError { | ||
| var err error | ||
| out, err = conn.DescribeElasticsearchDomain(input) | ||
| if err != nil { | ||
| return resource.NonRetryableError(err) | ||
| } | ||
|
|
||
| if !*out.DomainStatus.Processing { | ||
| return nil | ||
| } | ||
|
|
||
| return resource.RetryableError( | ||
| fmt.Errorf("%q: Timeout while waiting for changes to be processed", d.Id())) | ||
| }) | ||
| if isResourceTimeoutError(err) { | ||
| out, err = conn.DescribeElasticsearchDomain(input) | ||
| if err == nil && !*out.DomainStatus.Processing { | ||
| return nil | ||
| } | ||
| } | ||
| if err != nil { | ||
| return fmt.Errorf("Error updating Elasticsearch domain SAML Options: %s", err) | ||
| } | ||
|
|
||
| return resourceAwsElasticSearchDomainSAMLOptionsRead(d, meta) | ||
| } | ||
|
|
||
| func resourceAwsElasticSearchDomainSAMLOptionsDelete(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).esconn | ||
|
|
||
| domainName := d.Get("domain_name").(string) | ||
| config := elasticsearch.AdvancedSecurityOptionsInput{} | ||
| config.SetSAMLOptions(nil) | ||
|
|
||
| _, err := conn.UpdateElasticsearchDomainConfig(&elasticsearch.UpdateElasticsearchDomainConfigInput{ | ||
| DomainName: aws.String(domainName), | ||
| AdvancedSecurityOptions: &config, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| log.Printf("[DEBUG] Waiting for ElasticSearch domain SAML Options %q to be deleted", d.Get("domain_name").(string)) | ||
|
|
||
| input := &elasticsearch.DescribeElasticsearchDomainInput{ | ||
| DomainName: aws.String(d.Get("domain_name").(string)), | ||
| } | ||
| var out *elasticsearch.DescribeElasticsearchDomainOutput | ||
| err = resource.Retry(60*time.Minute, func() *resource.RetryError { | ||
| var err error | ||
| out, err = conn.DescribeElasticsearchDomain(input) | ||
| if err != nil { | ||
| return resource.NonRetryableError(err) | ||
| } | ||
|
|
||
| if !*out.DomainStatus.Processing { | ||
| return nil | ||
| } | ||
|
|
||
| return resource.RetryableError( | ||
| fmt.Errorf("%q: Timeout while waiting for SAML Options to be deleted", d.Id())) | ||
| }) | ||
| if isResourceTimeoutError(err) { | ||
| out, err := conn.DescribeElasticsearchDomain(input) | ||
| if err == nil && !*out.DomainStatus.Processing { | ||
| return nil | ||
| } | ||
| } | ||
| if err != nil { | ||
| return fmt.Errorf("Error deleting Elasticsearch domain SAML Options: %s", err) | ||
| } | ||
| return nil | ||
| } |
Oops, something went wrong.