From 0f6131820a39bd906f2bd99d42ab45b2af46d9b2 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 11 Nov 2020 09:05:47 -0800 Subject: [PATCH 1/2] docs: include note about API key access --- website/docs/guides/migration_guide_v2.html.markdown | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/website/docs/guides/migration_guide_v2.html.markdown b/website/docs/guides/migration_guide_v2.html.markdown index 730f32a5f..e5b3ce1e9 100644 --- a/website/docs/guides/migration_guide_v2.html.markdown +++ b/website/docs/guides/migration_guide_v2.html.markdown @@ -20,6 +20,11 @@ As of version 2.10.2, New Relic [**Admin API keys**](https://docs.newrelic.com/d -> **Please note the following formatting for the provider's API key.**
Your **Personal API Key** has a prefix of `NRAK-` +**IMPORTANT** Please make sure that the Personal API Key has access to the +account and resources you expect to be manipulating. If the Personal API Key +does not have access, Terraform may not be able to detect existing resources +correctly and may behave strangely. + ### Environment Variable Updates If you have been using environment variables to configure the provider, you will need to take note of the following updates and make the necessary changes to your environment variables. From 04b541035bd6c1192d443427a46e8dd48d0fe365 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Tue, 10 Nov 2020 11:18:41 -0800 Subject: [PATCH 2/2] fix(newrelic_entity): include additional ID attr for browser apps --- newrelic/data_source_newrelic_entity.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/newrelic/data_source_newrelic_entity.go b/newrelic/data_source_newrelic_entity.go index bcf754520..d1b43fad6 100644 --- a/newrelic/data_source_newrelic_entity.go +++ b/newrelic/data_source_newrelic_entity.go @@ -67,7 +67,12 @@ func dataSourceNewRelicEntity() *schema.Resource { "application_id": { Type: schema.TypeInt, Computed: true, - Description: "The domain-specific ID of the entity (only returned for APM and Browser applications)", + Description: "The domain-specific ID of the entity (only returned for APM and Browser applications).", + }, + "serving_apm_application_id": { + Type: schema.TypeInt, + Computed: true, + Description: "The browser-specific ID of the backing APM entity. (only returned for Browser applications)", }, "guid": { Type: schema.TypeString, @@ -149,6 +154,13 @@ func flattenEntityData(e *entities.Entity, d *schema.ResourceData) error { return err } + if e.ServingApmApplicationID != nil { + err = d.Set("serving_apm_application_id", *e.ServingApmApplicationID) + if err != nil { + return err + } + } + return nil }