addressed PR comments - Part 2

Author: andreaangiolillo

tools/cli/internal/cli/sunset/list.go

@@ -20,9 +20,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/mongodb/openapi/tools/cli/internal/openapi"
+
 	"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
 	"github.com/mongodb/openapi/tools/cli/internal/cli/usage"
-	"github.com/mongodb/openapi/tools/cli/internal/openapi"
+	"github.com/mongodb/openapi/tools/cli/internal/openapi/sunset"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
@@ -46,7 +48,7 @@ func (o *ListOpts) Run() error {
 		return err
 	}
 
-	sunsets, err := o.newSunsetInRange(openapi.NewSunsetListFromSpec(specInfo))
+	sunsets, err := o.newSunsetInRange(sunset.NewSunsetListFromSpec(specInfo))
 	if err != nil {
 		return err
 	}
@@ -63,8 +65,8 @@ func (o *ListOpts) Run() error {
 	return nil
 }
 
-func (o *ListOpts) newSunsetInRange(sunsets []*openapi.Sunset) ([]*openapi.Sunset, error) {
-	var out []*openapi.Sunset
+func (o *ListOpts) newSunsetInRange(sunsets []*sunset.Sunset) ([]*sunset.Sunset, error) {
+	var out []*sunset.Sunset
 	if o.from == "" && o.to == "" {
 		return sunsets, nil
 	}
@@ -99,7 +101,7 @@ func isDateInRange(date, from, to *time.Time) bool {
 	return true
 }
 
-func (o *ListOpts) newSunsetListBytes(versions []*openapi.Sunset) ([]byte, error) {
+func (o *ListOpts) newSunsetListBytes(versions []*sunset.Sunset) ([]byte, error) {
 	data, err := json.MarshalIndent(versions, "", "  ")
 	if err != nil {
 		return nil, err

tools/cli/internal/cli/sunset/list_test.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestList_Run(t *testing.T) {
@@ -29,13 +30,8 @@ func TestList_Run(t *testing.T) {
 		fs:         fs,
 	}
 
-	if err := opts.Run(); err != nil {
-		t.Fatalf("Run() unexpected error: %v", err)
-	}
-
+	require.NoError(t, opts.Run())
 	b, err := afero.ReadFile(fs, opts.outputPath)
-	if err != nil {
-		t.Fatalf("ReadFile() unexpected error: %v", err)
-	}
+	require.NoError(t, err)
 	assert.NotEmpty(t, b)
 }

tools/cli/internal/openapi/sunset.go renamed to tools/cli/internal/openapi/sunset/sunset.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package openapi
+package sunset
 
 import (
 	"github.com/getkin/kin-openapi/openapi3"
@@ -39,8 +39,8 @@ func NewSunsetListFromSpec(spec *load.SpecInfo) []*Sunset {
 
 	for path, pathBody := range paths.Map() {
 		for operationName, operationBody := range pathBody.Operations() {
-			teamName := newTeamNameFromOperation(operationBody)
-			extensions := newExtensionsFrom2xxResponse(operationBody.Responses.Map())
+			teamName := teamName(operationBody)
+			extensions := successResponseExtensions(operationBody.Responses.Map())
 			if extensions == nil {
 				continue
 			}
@@ -70,31 +70,31 @@ func NewSunsetListFromSpec(spec *load.SpecInfo) []*Sunset {
 	return sunsets
 }
 
-func newTeamNameFromOperation(op *openapi3.Operation) string {
+func teamName(op *openapi3.Operation) string {
 	if value, ok := op.Extensions[teamExtensionName]; ok {
 		return value.(string)
 	}
 	return ""
 }
 
-func newExtensionsFrom2xxResponse(responsesMap map[string]*openapi3.ResponseRef) map[string]any {
+func successResponseExtensions(responsesMap map[string]*openapi3.ResponseRef) map[string]any {
 	if val, ok := responsesMap["200"]; ok {
-		return newExtensionsFromContent(val.Value.Content)
+		return contentExtensions(val.Value.Content)
 	}
 	if val, ok := responsesMap["201"]; ok {
-		return newExtensionsFromContent(val.Value.Content)
+		return contentExtensions(val.Value.Content)
 	}
 	if val, ok := responsesMap["202"]; ok {
-		return newExtensionsFromContent(val.Value.Content)
+		return contentExtensions(val.Value.Content)
 	}
 	if val, ok := responsesMap["204"]; ok {
-		return newExtensionsFromContent(val.Value.Content)
+		return contentExtensions(val.Value.Content)
 	}
 
 	return nil
 }
 
-func newExtensionsFromContent(content openapi3.Content) map[string]any {
+func contentExtensions(content openapi3.Content) map[string]any {
 	for _, v := range content {
 		return v.Extensions
 	}

tools/cli/internal/openapi/sunset_test.go renamed to tools/cli/internal/openapi/sunset/sunset_test.go

@@ -1,4 +1,4 @@
-package openapi
+package sunset
 
 import (
 	"testing"
@@ -167,7 +167,7 @@ func TestNewExtensionsFrom2xxResponse(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			result := newExtensionsFrom2xxResponse(test.responsesMap)
+			result := successResponseExtensions(test.responsesMap)
 			assert.Equal(t, test.expected, result)
 		})
 	}