Skip to content

Commit

Permalink
Merge pull request #28940 from lvthillo/f-add-remove-to-aws_cloudfron…
Browse files Browse the repository at this point in the history 
…t_response_headers_policy-28694

Add remove_headers_config to aws_cloudfront_response_headers_policy
  • Loading branch information
@ewbankkit
ewbankkit authored Apr 18, 2023
2 parents 1bfe5a9 + 8b406b8 commit 59e9e2e
Show file tree
Hide file tree
Showing 7 changed files with 302 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .changelog/28940.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:enhancement
resource/aws_cloudfront_response_headers_policy: Add `remove_headers_config` argument
```

```release-note:enhancement
data-source/aws_cloudfront_response_headers_policy: Add `remove_headers_config` attribute
```
157 changes: 151 additions & 6 deletions internal/service/cloudfront/response_headers_policy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ func ResourceResponseHeadersPolicy() *schema.Resource {
ReadWithoutTimeout: resourceResponseHeadersPolicyRead,
UpdateWithoutTimeout: resourceResponseHeadersPolicyUpdate,
DeleteWithoutTimeout: resourceResponseHeadersPolicyDelete,

Importer: &schema.ResourceImporter{
StateContext: schema.ImportStatePassthroughContext,
},

Schema: map[string]*schema.Schema{
"comment": {
Type: schema.TypeString,
Expand Down Expand Up @@ -107,7 +109,7 @@ func ResourceResponseHeadersPolicy() *schema.Resource {
},
},
},
AtLeastOneOf: []string{"cors_config", "custom_headers_config", "security_headers_config", "server_timing_headers_config"},
AtLeastOneOf: []string{"cors_config", "custom_headers_config", "remove_headers_config", "security_headers_config", "server_timing_headers_config"},
},
"custom_headers_config": {
Type: schema.TypeList,
Expand Down Expand Up @@ -137,7 +139,7 @@ func ResourceResponseHeadersPolicy() *schema.Resource {
},
},
},
AtLeastOneOf: []string{"cors_config", "custom_headers_config", "security_headers_config", "server_timing_headers_config"},
AtLeastOneOf: []string{"cors_config", "custom_headers_config", "remove_headers_config", "security_headers_config", "server_timing_headers_config"},
},
"etag": {
Type: schema.TypeString,
Expand All @@ -148,6 +150,28 @@ func ResourceResponseHeadersPolicy() *schema.Resource {
Type: schema.TypeString,
Required: true,
},
"remove_headers_config": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"items": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"header": {
Type: schema.TypeString,
Required: true,
},
},
},
},
},
},
AtLeastOneOf: []string{"cors_config", "custom_headers_config", "remove_headers_config", "security_headers_config", "server_timing_headers_config"},
},
"security_headers_config": {
Type: schema.TypeList,
MaxItems: 1,
Expand Down Expand Up @@ -272,7 +296,7 @@ func ResourceResponseHeadersPolicy() *schema.Resource {
},
},
},
AtLeastOneOf: []string{"cors_config", "custom_headers_config", "security_headers_config", "server_timing_headers_config"},
AtLeastOneOf: []string{"cors_config", "custom_headers_config", "remove_headers_config", "security_headers_config", "server_timing_headers_config"},
},
"server_timing_headers_config": {
Type: schema.TypeList,
Expand All @@ -291,7 +315,7 @@ func ResourceResponseHeadersPolicy() *schema.Resource {
},
},
},
AtLeastOneOf: []string{"cors_config", "custom_headers_config", "security_headers_config", "server_timing_headers_config"},
AtLeastOneOf: []string{"cors_config", "custom_headers_config", "remove_headers_config", "security_headers_config", "server_timing_headers_config"},
},
},
}
Expand All @@ -318,6 +342,10 @@ func resourceResponseHeadersPolicyCreate(ctx context.Context, d *schema.Resource
apiObject.CustomHeadersConfig = expandResponseHeadersPolicyCustomHeadersConfig(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("remove_headers_config"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
apiObject.RemoveHeadersConfig = expandResponseHeadersPolicyRemoveHeadersConfig(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("security_headers_config"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
apiObject.SecurityHeadersConfig = expandResponseHeadersPolicySecurityHeadersConfig(v.([]interface{})[0].(map[string]interface{}))
}
Expand All @@ -330,7 +358,6 @@ func resourceResponseHeadersPolicyCreate(ctx context.Context, d *schema.Resource
ResponseHeadersPolicyConfig: apiObject,
}

log.Printf("[DEBUG] Creating CloudFront Response Headers Policy: (%s)", input)
output, err := conn.CreateResponseHeadersPolicyWithContext(ctx, input)

if err != nil {
Expand Down Expand Up @@ -376,6 +403,13 @@ func resourceResponseHeadersPolicyRead(ctx context.Context, d *schema.ResourceDa
}
d.Set("etag", output.ETag)
d.Set("name", apiObject.Name)
if apiObject.RemoveHeadersConfig != nil {
if err := d.Set("remove_headers_config", []interface{}{flattenResponseHeadersPolicyRemoveHeadersConfig(apiObject.RemoveHeadersConfig)}); err != nil {
return sdkdiag.AppendErrorf(diags, "setting remove_headers_config: %s", err)
}
} else {
d.Set("remove_headers_config", nil)
}
if apiObject.SecurityHeadersConfig != nil {
if err := d.Set("security_headers_config", []interface{}{flattenResponseHeadersPolicySecurityHeadersConfig(apiObject.SecurityHeadersConfig)}); err != nil {
return sdkdiag.AppendErrorf(diags, "setting security_headers_config: %s", err)
Expand Down Expand Up @@ -419,6 +453,10 @@ func resourceResponseHeadersPolicyUpdate(ctx context.Context, d *schema.Resource
apiObject.CustomHeadersConfig = expandResponseHeadersPolicyCustomHeadersConfig(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("remove_headers_config"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
apiObject.RemoveHeadersConfig = expandResponseHeadersPolicyRemoveHeadersConfig(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("security_headers_config"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
apiObject.SecurityHeadersConfig = expandResponseHeadersPolicySecurityHeadersConfig(v.([]interface{})[0].(map[string]interface{}))
}
Expand All @@ -433,7 +471,6 @@ func resourceResponseHeadersPolicyUpdate(ctx context.Context, d *schema.Resource
ResponseHeadersPolicyConfig: apiObject,
}

log.Printf("[DEBUG] Updating CloudFront Response Headers Policy: (%s)", input)
_, err := conn.UpdateResponseHeadersPolicyWithContext(ctx, input)

if err != nil {
Expand Down Expand Up @@ -788,6 +825,114 @@ func flattenResponseHeadersPolicyCustomHeaders(apiObjects []*cloudfront.Response
return tfList
}

//
// remove_headers_config:
//

func expandResponseHeadersPolicyRemoveHeadersConfig(tfMap map[string]interface{}) *cloudfront.ResponseHeadersPolicyRemoveHeadersConfig {
if tfMap == nil {
return nil
}

apiObject := &cloudfront.ResponseHeadersPolicyRemoveHeadersConfig{}

if v, ok := tfMap["items"].(*schema.Set); ok && v.Len() > 0 {
items := expandResponseHeadersPolicyRemoveHeaders(v.List())
apiObject.Items = items
apiObject.Quantity = aws.Int64(int64(len(items)))
}

return apiObject
}

func expandResponseHeadersPolicyRemoveHeader(tfMap map[string]interface{}) *cloudfront.ResponseHeadersPolicyRemoveHeader {
if tfMap == nil {
return nil
}

apiObject := &cloudfront.ResponseHeadersPolicyRemoveHeader{}

if v, ok := tfMap["header"].(string); ok && v != "" {
apiObject.Header = aws.String(v)
}

return apiObject
}

func expandResponseHeadersPolicyRemoveHeaders(tfList []interface{}) []*cloudfront.ResponseHeadersPolicyRemoveHeader {
if len(tfList) == 0 {
return nil
}

var apiObjects []*cloudfront.ResponseHeadersPolicyRemoveHeader

for _, tfMapRaw := range tfList {
tfMap, ok := tfMapRaw.(map[string]interface{})

if !ok {
continue
}

apiObject := expandResponseHeadersPolicyRemoveHeader(tfMap)

if apiObject == nil {
continue
}

apiObjects = append(apiObjects, apiObject)
}

return apiObjects
}

func flattenResponseHeadersPolicyRemoveHeadersConfig(apiObject *cloudfront.ResponseHeadersPolicyRemoveHeadersConfig) map[string]interface{} {
if apiObject == nil {
return nil
}

tfMap := map[string]interface{}{}

if v := apiObject.Items; len(v) > 0 {
tfMap["items"] = flattenResponseHeadersPolicyRemoveHeaders(v)
}

return tfMap
}

func flattenResponseHeadersPolicyRemoveHeader(apiObject *cloudfront.ResponseHeadersPolicyRemoveHeader) map[string]interface{} {
if apiObject == nil {
return nil
}

tfMap := map[string]interface{}{}

if v := apiObject.Header; v != nil {
tfMap["header"] = aws.StringValue(v)
}

return tfMap
}

func flattenResponseHeadersPolicyRemoveHeaders(apiObjects []*cloudfront.ResponseHeadersPolicyRemoveHeader) []interface{} {
if len(apiObjects) == 0 {
return nil
}

var tfList []interface{}

for _, apiObject := range apiObjects {
if apiObject == nil {
continue
}

if v := flattenResponseHeadersPolicyRemoveHeader(apiObject); len(v) > 0 {
tfList = append(tfList, v)
}
}

return tfList
}

//
// security_headers_config:
//
Expand Down
27 changes: 27 additions & 0 deletions internal/service/cloudfront/response_headers_policy_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,26 @@ func DataSourceResponseHeadersPolicy() *schema.Resource {
Computed: true,
ExactlyOneOf: []string{"id", "name"},
},
"remove_headers_config": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"items": {
Type: schema.TypeSet,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"header": {
Type: schema.TypeString,
Computed: true,
},
},
},
},
},
},
},
"security_headers_config": {
Type: schema.TypeList,
Computed: true,
Expand Down Expand Up @@ -335,6 +355,13 @@ func dataSourceResponseHeadersPolicyRead(ctx context.Context, d *schema.Resource
}
d.Set("etag", output.ETag)
d.Set("name", apiObject.Name)
if apiObject.RemoveHeadersConfig != nil {
if err := d.Set("remove_headers_config", []interface{}{flattenResponseHeadersPolicyRemoveHeadersConfig(apiObject.RemoveHeadersConfig)}); err != nil {
return sdkdiag.AppendErrorf(diags, "setting remove_headers_config: %s", err)
}
} else {
d.Set("remove_headers_config", nil)
}
if apiObject.SecurityHeadersConfig != nil {
if err := d.Set("security_headers_config", []interface{}{flattenResponseHeadersPolicySecurityHeadersConfig(apiObject.SecurityHeadersConfig)}); err != nil {
return sdkdiag.AppendErrorf(diags, "setting security_headers_config: %s", err)
Expand Down
14 changes: 14 additions & 0 deletions internal/service/cloudfront/response_headers_policy_data_source_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ func TestAccCloudFrontResponseHeadersPolicyDataSource_basic(t *testing.T) {
resource.TestCheckResourceAttrPair(dataSource1Name, "etag", resourceName, "etag"),
resource.TestCheckResourceAttrPair(dataSource1Name, "id", resourceName, "id"),
resource.TestCheckResourceAttrPair(dataSource1Name, "name", resourceName, "name"),
resource.TestCheckResourceAttrPair(dataSource1Name, "remove_headers_config.#", resourceName, "remove_headers_config.#"),
resource.TestCheckResourceAttrPair(dataSource1Name, "remove_headers_config.0.items.#", resourceName, "remove_headers_config.0.items.#"),
resource.TestCheckResourceAttrPair(dataSource1Name, "security_headers_config.#", resourceName, "security_headers_config.#"),
resource.TestCheckResourceAttrPair(dataSource1Name, "security_headers_config.0.content_security_policy.#", resourceName, "security_headers_config.0.content_security_policy.#"),
resource.TestCheckResourceAttrPair(dataSource1Name, "security_headers_config.0.frame_options.#", resourceName, "security_headers_config.0.frame_options.#"),
Expand Down Expand Up @@ -72,6 +74,8 @@ func TestAccCloudFrontResponseHeadersPolicyDataSource_basic(t *testing.T) {
resource.TestCheckResourceAttrPair(dataSource2Name, "etag", resourceName, "etag"),
resource.TestCheckResourceAttrPair(dataSource2Name, "id", resourceName, "id"),
resource.TestCheckResourceAttrPair(dataSource2Name, "name", resourceName, "name"),
resource.TestCheckResourceAttrPair(dataSource2Name, "remove_headers_config.#", resourceName, "remove_headers_config.#"),
resource.TestCheckResourceAttrPair(dataSource2Name, "remove_headers_config.0.items.#", resourceName, "remove_headers_config.0.items.#"),
resource.TestCheckResourceAttrPair(dataSource2Name, "security_headers_config.#", resourceName, "security_headers_config.#"),
resource.TestCheckResourceAttrPair(dataSource2Name, "security_headers_config.0.content_security_policy.#", resourceName, "security_headers_config.0.content_security_policy.#"),
resource.TestCheckResourceAttrPair(dataSource2Name, "security_headers_config.0.frame_options.#", resourceName, "security_headers_config.0.frame_options.#"),
Expand Down Expand Up @@ -133,6 +137,16 @@ resource "aws_cloudfront_response_headers_policy" "test" {
}
}
remove_headers_config {
items {
header = "X-Header3"
}
items {
header = "X-Header4"
}
}
security_headers_config {
content_security_policy {
content_security_policy = "policy1"
Expand Down
Loading

0 comments on commit 59e9e2e

Please sign in to comment.