Merge branch 'master' into patch-1

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
 }
 

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
 
 -> <small>**Please note the following formatting for the provider's API key.** <br>Your **Personal API Key** has a prefix of `NRAK-` </small>
 
+**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.