Fix ListGrafanaCloudLogs pluralization

fastly · Nov 4, 2024 · 7b0b929 · 7b0b929
1 parent 2d496bd
commit 7b0b929
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/go.mod b/go.mod
@@ -25,7 +25,7 @@ require (
 )
 
 require (
-	github.com/fastly/go-fastly/v9 v9.11.1-0.20241029182158-4574980e2a68
+	github.com/fastly/go-fastly/v9 v9.11.1-0.20241104135557-460b99554827
 	github.com/hashicorp/cap v0.7.0
 	github.com/kennygrant/sanitize v1.2.4
 	github.com/otiai10/copy v1.14.0

diff --git a/go.sum b/go.sum
@@ -24,8 +24,8 @@ github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj6
 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
 github.com/dustinkirkland/golang-petname v0.0.0-20240428194347-eebcea082ee0 h1:aYo8nnk3ojoQkP5iErif5Xxv0Mo0Ga/FR5+ffl/7+Nk=
 github.com/dustinkirkland/golang-petname v0.0.0-20240428194347-eebcea082ee0/go.mod h1:8AuBTZBRSFqEYBPYULd+NN474/zZBLP+6WeT5S9xlAc=
-github.com/fastly/go-fastly/v9 v9.11.1-0.20241029182158-4574980e2a68 h1:DuO+agAMmkVY462eS5xoyGAoG9Na1ATBGlCO10HHHGk=
-github.com/fastly/go-fastly/v9 v9.11.1-0.20241029182158-4574980e2a68/go.mod h1:5w2jgJBZqQEebOwM/rRg7wutAcpDTziiMYWb/6qdM7U=
+github.com/fastly/go-fastly/v9 v9.11.1-0.20241104135557-460b99554827 h1:3/1g7YyuyHZbKu0lYVmXnJtb/rU43e6PyvHrNapJjMs=
+github.com/fastly/go-fastly/v9 v9.11.1-0.20241104135557-460b99554827/go.mod h1:5w2jgJBZqQEebOwM/rRg7wutAcpDTziiMYWb/6qdM7U=
 github.com/fastly/kingpin v2.1.12-0.20191105091915-95d230a53780+incompatible h1:FhrXlfhgGCS+uc6YwyiFUt04alnjpoX7vgDKJxS6Qbk=
 github.com/fastly/kingpin v2.1.12-0.20191105091915-95d230a53780+incompatible/go.mod h1:U8UynVoU1SQaqD2I4ZqgYd5lx3A1ipQYn4aSt2Y5h6c=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=

diff --git a/pkg/api/interface.go b/pkg/api/interface.go
@@ -127,7 +127,7 @@ type Interface interface {
 	DeleteGCS(*fastly.DeleteGCSInput) error
 
 	CreateGrafanaCloudLogs(*fastly.CreateGrafanaCloudLogsInput) (*fastly.GrafanaCloudLogs, error)
-	ListGrafanaCloudLogss(*fastly.ListGrafanaCloudLogssInput) ([]*fastly.GrafanaCloudLogs, error)
+	ListGrafanaCloudLogs(*fastly.ListGrafanaCloudLogsInput) ([]*fastly.GrafanaCloudLogs, error)
 	GetGrafanaCloudLogs(*fastly.GetGrafanaCloudLogsInput) (*fastly.GrafanaCloudLogs, error)
 	UpdateGrafanaCloudLogs(*fastly.UpdateGrafanaCloudLogsInput) (*fastly.GrafanaCloudLogs, error)
 	DeleteGrafanaCloudLogs(*fastly.DeleteGrafanaCloudLogsInput) error

diff --git a/pkg/commands/logging/grafanacloudlogs/grafanacloud_logs_integration_test.go b/pkg/commands/logging/grafanacloudlogs/grafanacloud_logs_integration_test.go
@@ -68,48 +68,48 @@ func TestGrafanaCloudLogsList(t *testing.T) {
 		{
 			args: args("logging grafanacloudlogs list --service-id 123 --version 1"),
 			api: mock.API{
-				ListVersionsFn:          testutil.ListVersions,
-				ListGrafanaCloudLogssFn: listGrafanaCloudLogsOK,
+				ListVersionsFn:         testutil.ListVersions,
+				ListGrafanaCloudLogsFn: listGrafanaCloudLogsOK,
 			},
-			wantOutput: listGrafanaCloudLogssShortOutput,
+			wantOutput: listGrafanaCloudLogsShortOutput,
 		},
 		{
 			args: args("logging grafanacloudlogs list --service-id 123 --version 1 --verbose"),
 			api: mock.API{
-				ListVersionsFn:          testutil.ListVersions,
-				ListGrafanaCloudLogssFn: listGrafanaCloudLogsOK,
+				ListVersionsFn:         testutil.ListVersions,
+				ListGrafanaCloudLogsFn: listGrafanaCloudLogsOK,
 			},
-			wantOutput: listGrafanaCloudLogssVerboseOutput,
+			wantOutput: listGrafanaCloudLogsVerboseOutput,
 		},
 		{
 			args: args("logging grafanacloudlogs list --service-id 123 --version 1 -v"),
 			api: mock.API{
-				ListVersionsFn:          testutil.ListVersions,
-				ListGrafanaCloudLogssFn: listGrafanaCloudLogsOK,
+				ListVersionsFn:         testutil.ListVersions,
+				ListGrafanaCloudLogsFn: listGrafanaCloudLogsOK,
 			},
-			wantOutput: listGrafanaCloudLogssVerboseOutput,
+			wantOutput: listGrafanaCloudLogsVerboseOutput,
 		},
 		{
 			args: args("logging grafanacloudlogs --verbose list --service-id 123 --version 1"),
 			api: mock.API{
-				ListVersionsFn:          testutil.ListVersions,
-				ListGrafanaCloudLogssFn: listGrafanaCloudLogsOK,
+				ListVersionsFn:         testutil.ListVersions,
+				ListGrafanaCloudLogsFn: listGrafanaCloudLogsOK,
 			},
-			wantOutput: listGrafanaCloudLogssVerboseOutput,
+			wantOutput: listGrafanaCloudLogsVerboseOutput,
 		},
 		{
 			args: args("logging -v grafanacloudlogs list --service-id 123 --version 1"),
 			api: mock.API{
-				ListVersionsFn:          testutil.ListVersions,
-				ListGrafanaCloudLogssFn: listGrafanaCloudLogsOK,
+				ListVersionsFn:         testutil.ListVersions,
+				ListGrafanaCloudLogsFn: listGrafanaCloudLogsOK,
 			},
-			wantOutput: listGrafanaCloudLogssVerboseOutput,
+			wantOutput: listGrafanaCloudLogsVerboseOutput,
 		},
 		{
 			args: args("logging grafanacloudlogs list --service-id 123 --version 1"),
 			api: mock.API{
-				ListVersionsFn:          testutil.ListVersions,
-				ListGrafanaCloudLogssFn: listGrafanaCloudLogssError,
+				ListVersionsFn:         testutil.ListVersions,
+				ListGrafanaCloudLogsFn: listGrafanaCloudLogsError,
 			},
 			wantError: errTest.Error(),
 		},
@@ -283,7 +283,7 @@ func createGrafanaCloudLogsError(_ *fastly.CreateGrafanaCloudLogsInput) (*fastly
 	return nil, errTest
 }
 
-func listGrafanaCloudLogsOK(i *fastly.ListGrafanaCloudLogssInput) ([]*fastly.GrafanaCloudLogs, error) {
+func listGrafanaCloudLogsOK(i *fastly.ListGrafanaCloudLogsInput) ([]*fastly.GrafanaCloudLogs, error) {
 	return []*fastly.GrafanaCloudLogs{
 		{
 			ServiceID:         fastly.ToPointer(i.ServiceID),
@@ -316,17 +316,17 @@ func listGrafanaCloudLogsOK(i *fastly.ListGrafanaCloudLogssInput) ([]*fastly.Gra
 	}, nil
 }
 
-func listGrafanaCloudLogssError(_ *fastly.ListGrafanaCloudLogssInput) ([]*fastly.GrafanaCloudLogs, error) {
+func listGrafanaCloudLogsError(_ *fastly.ListGrafanaCloudLogsInput) ([]*fastly.GrafanaCloudLogs, error) {
 	return nil, errTest
 }
 
-var listGrafanaCloudLogssShortOutput = strings.TrimSpace(`
+var listGrafanaCloudLogsShortOutput = strings.TrimSpace(`
 SERVICE  VERSION  NAME
 123      1        logs
 123      1        analytics
 `) + "\n"
 
-var listGrafanaCloudLogssVerboseOutput = strings.TrimSpace(`
+var listGrafanaCloudLogsVerboseOutput = strings.TrimSpace(`
 Fastly API endpoint: https://api.fastly.com
 Fastly API token provided via config file (profile: user)
 

diff --git a/pkg/commands/logging/grafanacloudlogs/list.go b/pkg/commands/logging/grafanacloudlogs/list.go
@@ -17,7 +17,7 @@ type ListCommand struct {
 	argparser.Base
 	argparser.JSONOutput
 
-	Input          fastly.ListGrafanaCloudLogssInput
+	Input          fastly.ListGrafanaCloudLogsInput
 	serviceName    argparser.OptionalServiceNameID
 	serviceVersion argparser.OptionalServiceVersion
 }
@@ -81,7 +81,7 @@ func (c *ListCommand) Exec(_ io.Reader, out io.Writer) error {
 	c.Input.ServiceID = serviceID
 	c.Input.ServiceVersion = fastly.ToValue(serviceVersion.Number)
 
-	o, err := c.Globals.APIClient.ListGrafanaCloudLogss(&c.Input)
+	o, err := c.Globals.APIClient.ListGrafanaCloudLogs(&c.Input)
 	if err != nil {
 		c.Globals.ErrLog.Add(err)
 		return err

diff --git a/pkg/mock/api.go b/pkg/mock/api.go
@@ -119,7 +119,7 @@ type API struct {
 	DeleteGCSFn func(*fastly.DeleteGCSInput) error
 
 	CreateGrafanaCloudLogsFn func(*fastly.CreateGrafanaCloudLogsInput) (*fastly.GrafanaCloudLogs, error)
-	ListGrafanaCloudLogssFn  func(*fastly.ListGrafanaCloudLogssInput) ([]*fastly.GrafanaCloudLogs, error)
+	ListGrafanaCloudLogsFn   func(*fastly.ListGrafanaCloudLogsInput) ([]*fastly.GrafanaCloudLogs, error)
 	GetGrafanaCloudLogsFn    func(*fastly.GetGrafanaCloudLogsInput) (*fastly.GrafanaCloudLogs, error)
 	UpdateGrafanaCloudLogsFn func(*fastly.UpdateGrafanaCloudLogsInput) (*fastly.GrafanaCloudLogs, error)
 	DeleteGrafanaCloudLogsFn func(*fastly.DeleteGrafanaCloudLogsInput) error
@@ -855,9 +855,9 @@ func (m API) CreateGrafanaCloudLogs(i *fastly.CreateGrafanaCloudLogsInput) (*fas
 	return m.CreateGrafanaCloudLogsFn(i)
 }
 
-// ListGrafanaCloudLogss implements Interface.
-func (m API) ListGrafanaCloudLogss(i *fastly.ListGrafanaCloudLogssInput) ([]*fastly.GrafanaCloudLogs, error) {
-	return m.ListGrafanaCloudLogssFn(i)
+// ListGrafanaCloudLogs implements Interface.
+func (m API) ListGrafanaCloudLogs(i *fastly.ListGrafanaCloudLogsInput) ([]*fastly.GrafanaCloudLogs, error) {
+	return m.ListGrafanaCloudLogsFn(i)
 }
 
 // GetGrafanaCloudLogs implements Interface.