Add logging options to AWS MQ

[elbuo8]

Changes proposed in this pull request:

• Add enable_logging flag to aws_mq_broker resource.
• Add enable_auditing flag to aws_mq_broker resource.
• Add missing property in instances to the aws_mq_broker data resource.

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccAWSMq'
=== RUN   TestAccDataSourceAWSMqBroker_basic
--- PASS: TestAccDataSourceAWSMqBroker_basic (1320.48s)
=== RUN   TestResourceAWSMqBrokerPasswordValidation
--- PASS: TestResourceAWSMqBrokerPasswordValidation (0.00s)
=== RUN   TestAccAWSMqBroker_basic
--- PASS: TestAccAWSMqBroker_basic (965.95s)
=== RUN   TestAccAWSMqBroker_allFieldsDefaultVpc
--- PASS: TestAccAWSMqBroker_allFieldsDefaultVpc (1976.66s)
=== RUN   TestAccAWSMqBroker_allFieldsCustomVpc
--- PASS: TestAccAWSMqBroker_allFieldsCustomVpc (2081.69s)
=== RUN   TestAccAWSMqBroker_updateUsers
--- PASS: TestAccAWSMqBroker_updateUsers (1425.87s)

[joestump]

Nit on the exposed HCL. My non-maintainer opinion can be taken with a grain of salt. 😄

[bflad]

Hi @elbuo8 👋 Are you still planning on changing the implementation to match the API? Here's some example code that might help:

Schema attribute declaration (swap Optional: true for Computed: true everywhere in the data source):

"logs": {
	Type:     schema.TypeList,
	Optional: true,
	MaxItems: 1,
	// Ignore missing configuration block
	DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
		if old == "1" && new == "0" {
			return true
		}
		return false
	},
	Elem: &schema.Resource{
	Schema: map[string]*schema.Schema{
		"audit": {
			Type:     schema.TypeBool,
			Optional: true,
		},
		"general": {
			Type:     schema.TypeBool,
			Optional: true,
		},
	},
},

Creating/updating:

func expandMqLogs(l []interface{}) *mq.Logs {
	if len(l) == 0 || l[0] == nil {
		return nil
	}

	m := l[0].(map[string]interface{})

	logs := &mq.Logs{
		Audit: aws.Bool(m["audit"].(bool)),
		General: aws.Bool(m["general"].(bool)),
	}

	return logs
}

// In Create func
Logs: expandMqLogs(d.Get("logs").([]interface{}))

Reading:

func flattenMqLogs(logs *mq.Logs) []interface{} {
	if logs == nil {
		return []interface{}{}
	}

	m := map[string]interface{}{
		"audit": aws.BoolValue(logs.Audit),
		"general": aws.BoolValue(logs.General),
	}

	return []interface{}{m}
}

// In Read func
if err := d.Set("logs", flattenMqLogs(out.Logs)); err != nil {
	return fmt.Errorf("error setting logs: %s", err)
}

Testing:

resource.TestCheckResourceAttr(resourceName, "logs.#", "1"),
resource.TestCheckResourceAttr(resourceName, "logs.audit", "false"),
resource.TestCheckResourceAttr(resourceName, "logs.general", "false"),

[elbuo8]

@bflad 🙇 updated with your changes.

[bflad]

Thanks so much for this, @elbuo8! LGTM with a few minor fixes, which I will put in a commit after yours. 🚀

--- PASS: TestAccAWSMqBroker_basic (1079.21s)
--- PASS: TestAccDataSourceAWSMqBroker_basic (1462.77s)
--- PASS: TestAccAWSMqBroker_updateUsers (1543.49s)
--- PASS: TestAccAWSMqBroker_allFieldsDefaultVpc (2039.54s)
--- PASS: TestAccAWSMqBroker_allFieldsCustomVpc (2091.40s)

[bflad]

These can be removed 😉

[bflad]

If there are multiple updates that call the same update API call, we generally combine the requests 👍

[bflad]

This was named logs in the last code update. 😄

[bflad]

This has been released in version 1.43.0 of the AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

[ghost]

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!