Merge pull request #131 from newrelic/jthurman/deps

Update newrelic-client-go 0.16.0

Author: Jonathan Thurman

go.mod

@@ -14,11 +14,11 @@ require (
 	github.com/jedib0t/go-pretty v4.3.0+incompatible
 	github.com/llorllale/go-gitlint v0.0.0-20190914155841-58c0b8cef0e5
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/newrelic/newrelic-client-go v0.15.0
+	github.com/newrelic/newrelic-client-go v0.16.0
 	github.com/psampaz/go-mod-outdated v0.5.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.6
 	github.com/spf13/viper v1.6.2
 	github.com/stretchr/testify v1.5.1
-	golang.org/x/tools v0.0.0-20200309202150-20ab64c0d93f
+	golang.org/x/tools v0.0.0-20200311090712-aafaee8bce8c
 )

go.sum

@@ -389,8 +389,8 @@ github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E=
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
-github.com/newrelic/newrelic-client-go v0.15.0 h1:FuGsI4gpI/uT7BQ/Q5MTKOQ+S307xejGBR3odvwxvx8=
-github.com/newrelic/newrelic-client-go v0.15.0/go.mod h1:t5cDNddE1yqC6ph7VdeRbFoVMZrxY06d0+xseKQozfY=
+github.com/newrelic/newrelic-client-go v0.16.0 h1:gNc2rAGIyZ3Nk/MpEGuXfKSaPQ1w7tLhAM9f6IFx8Mw=
+github.com/newrelic/newrelic-client-go v0.16.0/go.mod h1:t5cDNddE1yqC6ph7VdeRbFoVMZrxY06d0+xseKQozfY=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88=
 github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
@@ -682,8 +682,8 @@ golang.org/x/tools v0.0.0-20200102140908-9497f49d5709/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200204192400-7124308813f3/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200305224536-de023d59a5d1 h1:A6Mu2vcvuNXbBiGKuVHG74fmEPmzsZ5dzG0WhV2GcqI=
 golang.org/x/tools v0.0.0-20200305224536-de023d59a5d1/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200309202150-20ab64c0d93f h1:NbrfHxef+IfdI86qCgO/1Siq1BuMH2xG0NqgvCguRhQ=
-golang.org/x/tools v0.0.0-20200309202150-20ab64c0d93f/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200311090712-aafaee8bce8c h1:9WR4YuzLDuQMqEmLQrG0DiMmE2/HvX1dlrujzjmNVFg=
+golang.org/x/tools v0.0.0-20200311090712-aafaee8bce8c/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/apm/command.go

@@ -4,8 +4,19 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var (
+	apmAccountID string
+	apmAppID     int
+)
+
 // Command represents the apm command
 var Command = &cobra.Command{
 	Use:   "apm",
 	Short: "Interact with New Relic APM",
 }
+
+func init() {
+	// Flags for all things APM
+	Command.PersistentFlags().StringVarP(&apmAccountID, "accountId", "a", "", "A New Relic account ID")
+	Command.PersistentFlags().IntVarP(&apmAppID, "applicationId", "", 0, "A New Relic APM application ID")
+}

internal/apm/command_application.go

@@ -15,10 +15,8 @@ import (
 )
 
 var (
-	appAccountID string
-	appID        int
-	appName      string
-	appGUID      string
+	appName string
+	appGUID string
 )
 
 // Command represents the apm command
@@ -39,30 +37,45 @@ The search command performs a query for an APM application name and/or account I
 	Example: "newrelic apm application search --name <appName>",
 	Run: func(cmd *cobra.Command, args []string) {
 
-		if appName == "" && appAccountID == "" {
+		if appGUID == "" && appName == "" && apmAccountID == "" {
 			utils.LogIfError(cmd.Help())
-			log.Fatal("one of --name or --accountId are required")
+			log.Fatal("one of --accountId, --guid, --name are required")
 		}
 
 		client.WithClient(func(nrClient *newrelic.NewRelic) {
 			var results []*entities.Entity
 			var err error
 
-			params := entities.SearchEntitiesParams{
-				Domain: entities.EntityDomainType("APM"),
-				Type:   entities.EntityType("APPLICATION"),
-			}
+			// Look for just the GUID if passed in
+			if appGUID != "" {
+				if appName != "" || apmAccountID != "" {
+					log.Warnf("Searching for --guid only, ignoring --accountId and --name")
+				}
 
-			if appName != "" {
-				params.Name = appName
-			}
+				var singleResult *entities.Entity
+				singleResult, err = nrClient.Entities.GetEntity(appGUID)
+				utils.LogIfFatal(err)
 
-			if appAccountID != "" {
-				params.Tags = &entities.TagValue{Key: "accountId", Value: appAccountID}
-			}
+				if singleResult != nil {
+					results = append(results, singleResult)
+				}
+			} else {
+				params := entities.SearchEntitiesParams{
+					Domain: entities.EntityDomainType("APM"),
+					Type:   entities.EntityType("APPLICATION"),
+				}
 
-			results, err = nrClient.Entities.SearchEntities(params)
-			utils.LogIfFatal(err)
+				if appName != "" {
+					params.Name = appName
+				}
+
+				if apmAccountID != "" {
+					params.Tags = &entities.TagValue{Key: "accountId", Value: apmAccountID}
+				}
+
+				results, err = nrClient.Entities.SearchEntities(params)
+				utils.LogIfFatal(err)
+			}
 
 			json, err := prettyjson.Marshal(results)
 			utils.LogIfFatal(err)
@@ -105,12 +118,10 @@ The get command performs a query for an APM application by GUID.
 func init() {
 	Command.AddCommand(cmdApp)
 
-	cmdApp.PersistentFlags().IntVarP(&appID, "applicationId", "a", 0, "search for results matching the given APM application ID")
 	cmdApp.PersistentFlags().StringVarP(&appGUID, "guid", "g", "", "search for results matching the given APM application GUID")
 
 	cmdApp.AddCommand(cmdAppGet)
 
 	cmdApp.AddCommand(cmdAppSearch)
 	cmdAppSearch.Flags().StringVarP(&appName, "name", "n", "", "search for results matching the given APM application name")
-	cmdAppGet.Flags().StringVarP(&appAccountID, "accountId", "", "", "search for results matching the given APM application account ID")
 }

internal/apm/command_deployment.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/hokaccha/go-prettyjson"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
 	"github.com/newrelic/newrelic-client-go/newrelic"
@@ -39,8 +40,13 @@ The list command returns deployments for a New Relic APM application.
 `,
 	Example: "newrelic apm deployment list --applicationId <appID>",
 	Run: func(cmd *cobra.Command, args []string) {
+		if apmAppID == 0 {
+			utils.LogIfError(cmd.Help())
+			log.Fatal("--applicationId is required")
+		}
+
 		client.WithClient(func(nrClient *newrelic.NewRelic) {
-			deployments, err := nrClient.APM.ListDeployments(appID)
+			deployments, err := nrClient.APM.ListDeployments(apmAppID)
 			utils.LogIfFatal(err)
 
 			json, err := prettyjson.Marshal(deployments)
@@ -61,8 +67,13 @@ application.
 `,
 	Example: "newrelic apm deployment create --applicationId <appID> --revision <deploymentRevision>",
 	Run: func(cmd *cobra.Command, args []string) {
+		if apmAppID == 0 {
+			utils.LogIfError(cmd.Help())
+			log.Fatal("--applicationId and --revision are required")
+		}
+
 		client.WithClient(func(nrClient *newrelic.NewRelic) {
-			d, err := nrClient.APM.CreateDeployment(appID, deployment)
+			d, err := nrClient.APM.CreateDeployment(apmAppID, deployment)
 			utils.LogIfFatal(err)
 
 			json, err := prettyjson.Marshal(d)
@@ -82,8 +93,13 @@ The delete command performs a delete operation for an APM deployment.
 `,
 	Example: "newrelic apm deployment delete --applicationId <appID> --deploymentID <deploymentID>",
 	Run: func(cmd *cobra.Command, args []string) {
+		if apmAppID == 0 {
+			utils.LogIfError(cmd.Help())
+			log.Fatal("--applicationId is required")
+		}
+
 		client.WithClient(func(nrClient *newrelic.NewRelic) {
-			d, err := nrClient.APM.DeleteDeployment(appID, deployment.ID)
+			d, err := nrClient.APM.DeleteDeployment(apmAppID, deployment.ID)
 			utils.LogIfFatal(err)
 
 			json, err := prettyjson.Marshal(d)
@@ -98,24 +114,16 @@ func init() {
 	Command.AddCommand(cmdDeployment)
 
 	cmdDeployment.AddCommand(cmdDeploymentList)
-	cmdDeploymentList.Flags().IntVarP(&appID, "applicationId", "a", 0, "the application ID to list deployments for")
-	utils.LogIfError(cmdDeploymentList.MarkFlagRequired("applicationId"))
 
 	cmdDeployment.AddCommand(cmdDeploymentCreate)
 	cmdDeploymentCreate.Flags().StringVarP(&deployment.Description, "description", "", "", "the description stored with the deployment")
 	cmdDeploymentCreate.Flags().StringVarP(&deployment.User, "user", "", "", "the user creating with the deployment")
 	cmdDeploymentCreate.Flags().StringVarP(&deployment.Changelog, "change-log", "", "", "the change log stored with the deployment")
 
-	cmdDeploymentCreate.Flags().IntVarP(&appID, "applicationId", "a", 0, "the application ID the deployment will be created for")
-	utils.LogIfError(cmdDeploymentCreate.MarkFlagRequired("applicationId"))
-
 	cmdDeploymentCreate.Flags().StringVarP(&deployment.Revision, "revision", "r", "", "a freeform string representing the revision of the deployment")
 	utils.LogIfError(cmdDeploymentCreate.MarkFlagRequired("revision"))
 
 	cmdDeployment.AddCommand(cmdDeploymentDelete)
-	cmdDeploymentDelete.Flags().IntVarP(&appID, "applicationId", "a", 0, "the application ID the deployment belongs to")
-	utils.LogIfError(cmdDeploymentDelete.MarkFlagRequired("applicationId"))
-
 	cmdDeploymentDelete.Flags().IntVarP(&deployment.ID, "deploymentID", "d", 0, "the ID of the deployment to be deleted")
 	utils.LogIfError(cmdDeploymentDelete.MarkFlagRequired("deploymentID"))
 }

internal/apm/command_deployment_test.go

@@ -20,15 +20,15 @@ func TestApmDeploymentList(t *testing.T) {
 	assert.Equal(t, "list", cmdDeploymentList.Name())
 
 	testcobra.CheckCobraMetadata(t, cmdDeploymentList)
-	testcobra.CheckCobraRequiredFlags(t, cmdDeploymentList, []string{"applicationId"})
+	testcobra.CheckCobraRequiredFlags(t, cmdDeploymentList, []string{})
 }
 
 func TestApmDeploymentCreate(t *testing.T) {
 	assert.Equal(t, "create", cmdDeploymentCreate.Name())
 
 	testcobra.CheckCobraMetadata(t, cmdDeploymentCreate)
 	testcobra.CheckCobraRequiredFlags(t, cmdDeploymentCreate,
-		[]string{"applicationId", "revision"})
+		[]string{"revision"})
 
 }
 
@@ -37,5 +37,5 @@ func TestApmDeleteDeployment(t *testing.T) {
 
 	testcobra.CheckCobraMetadata(t, cmdDeploymentDelete)
 	testcobra.CheckCobraRequiredFlags(t, cmdDeploymentDelete,
-		[]string{"applicationId", "deploymentID"})
+		[]string{"deploymentID"})
 }