feat(entity_tags): add an entity tag resource

build/deps.mk

@@ -8,7 +8,7 @@ deps: tools deps-only
 
 deps-only:
 	@echo "=== $(PROJECT_NAME) === [ deps             ]: Installing package dependencies required by the project..."
-	@$(GO) mod tidy
+	#@$(GO) mod tidy
 	@$(GO) mod download
 
 tools: check-version

build/lint.mk

@@ -11,7 +11,7 @@ MISSPELL         ?= misspell
 
 COMMIT_LINT_CMD   ?= go-gitlint
 COMMIT_LINT_REGEX ?= "(chore|docs|feat|fix|refactor|tests?)(\([^\)]+\))?: .*"
-COMMIT_LINT_START ?= "2020-05-01"
+COMMIT_LINT_START ?= "2020-06-17"
 
 
 EXCLUDEDIR      ?= .git

go.mod

@@ -3,9 +3,12 @@ module github.com/terraform-providers/terraform-provider-newrelic
 go 1.13
 
 require (
+	github.com/Azure/go-autorest v14.0.1+incompatible // indirect
+	github.com/Azure/go-autorest/autorest/azure/auth v0.4.2 // indirect
 	github.com/bflad/tfproviderlint v0.14.0
 	github.com/client9/misspell v0.3.4
 	github.com/golangci/golangci-lint v1.27.0
+	github.com/hashicorp/terraform v0.12.26 // indirect
 	github.com/hashicorp/terraform-plugin-sdk v1.10.0
 	github.com/newrelic/go-agent/v3 v3.6.0
 	github.com/newrelic/go-insights v1.0.3

newrelic/data_source_newrelic_entity_test.go

@@ -3,7 +3,6 @@ package newrelic
 import (
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
@@ -15,9 +14,6 @@ func TestAccNewRelicEntityData_Basic(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
-
-			// We need to give the entity search engine time to index the app
-			time.Sleep(5 * time.Second)
 		},
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{

newrelic/helpers.go

@@ -98,3 +98,13 @@ func envAccountID() (interface{}, error) {
 
 	return nil, nil
 }
+
+func stringInSlice(slice []string, str string) bool {
+	for _, s := range slice {
+		if str == s {
+			return true
+		}
+	}
+
+	return false
+}

newrelic/provider.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
-	"github.com/hashicorp/terraform-plugin-sdk/httpclient"
+	"github.com/hashicorp/terraform-plugin-sdk/meta"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 
 	"github.com/terraform-providers/terraform-provider-newrelic/version"
@@ -129,18 +129,19 @@ func Provider() terraform.ResourceProvider {
 		ResourcesMap: map[string]*schema.Resource{
 			"newrelic_alert_channel":                resourceNewRelicAlertChannel(),
 			"newrelic_alert_condition":              resourceNewRelicAlertCondition(),
-			"newrelic_alert_policy_channel":         resourceNewRelicAlertPolicyChannel(),
 			"newrelic_alert_policy":                 resourceNewRelicAlertPolicy(),
+			"newrelic_alert_policy_channel":         resourceNewRelicAlertPolicyChannel(),
 			"newrelic_application_settings":         resourceNewRelicApplicationSettings(),
-			"newrelic_plugins_alert_condition":      resourceNewRelicPluginsAlertCondition(),
 			"newrelic_dashboard":                    resourceNewRelicDashboard(),
+			"newrelic_entity_tags":                  resourceNewRelicEntityTags(),
 			"newrelic_infra_alert_condition":        resourceNewRelicInfraAlertCondition(),
 			"newrelic_insights_event":               resourceNewRelicInsightsEvent(),
 			"newrelic_nrql_alert_condition":         resourceNewRelicNrqlAlertCondition(),
+			"newrelic_plugins_alert_condition":      resourceNewRelicPluginsAlertCondition(),
 			"newrelic_synthetics_alert_condition":   resourceNewRelicSyntheticsAlertCondition(),
+			"newrelic_synthetics_label":             resourceNewRelicSyntheticsLabel(),
 			"newrelic_synthetics_monitor":           resourceNewRelicSyntheticsMonitor(),
 			"newrelic_synthetics_monitor_script":    resourceNewRelicSyntheticsMonitorScript(),
-			"newrelic_synthetics_label":             resourceNewRelicSyntheticsLabel(),
 			"newrelic_synthetics_secure_credential": resourceNewRelicSyntheticsSecureCredential(),
 			"newrelic_workload":                     resourceNewRelicWorkload(),
 		},
@@ -161,8 +162,8 @@ func Provider() terraform.ResourceProvider {
 func providerConfigure(data *schema.ResourceData, terraformVersion string) (interface{}, error) {
 	adminAPIKey := data.Get("admin_api_key").(string)
 	personalAPIKey := data.Get("api_key").(string)
-	userAgent := fmt.Sprintf("%s %s/%s", httpclient.TerraformUserAgent(terraformVersion), TerraformProviderProductUserAgent, version.ProviderVersion)
-
+	terraformUA := fmt.Sprintf("HashiCorp Terraform/%s (+https://www.terraform.io) Terraform Plugin SDK/%s", terraformVersion, meta.SDKVersionString())
+	userAgent := fmt.Sprintf("%s %s/%s", terraformUA, TerraformProviderProductUserAgent, version.ProviderVersion)
 	accountID := data.Get("account_id").(int)
 
 	cfg := Config{

newrelic/provider_test.go

@@ -88,7 +88,8 @@ func TestAccNewRelicProvider_Region(t *testing.T) {
 	rName := acctest.RandString(5)
 
 	resource.ParallelTest(t, resource.TestCase{
-		Providers: testAccProviders,
+		Providers:    testAccProviders,
+		CheckDestroy: func(*terraform.State) error { return nil },
 		Steps: []resource.TestStep{
 			// Test: Region "US"
 			{
@@ -131,6 +132,9 @@ func testAccPreCheck(t *testing.T) {
 
 	//testAccApplicationsCleanup(t)
 	testAccCreateApplication(t)
+
+	// We need to give the entity search engine time to index the app
+	time.Sleep(5 * time.Second)
 }
 
 func testAccCreateApplication(t *testing.T) {
@@ -148,6 +152,7 @@ func testAccCreateApplication(t *testing.T) {
 	}
 
 	app.RecordCustomEvent("terraform test", nil)
+
 	app.Shutdown(30 * time.Second)
 }