Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ func NewRootCommand(
cmd.AddCommand(logincmd.NewLoginCmd(resources.NewClient(version)))
cmd.AddCommand(resourcecmd.NewResourcesCmd())
cmd.AddCommand(devcmd.NewDevServerCmd(resources.NewClient(version), analyticsTrackerFn, dev_server.NewClient(version)))
cmd.AddCommand(sourcemapscmd.NewSourcemapsCmd())
cmd.AddCommand(sourcemapscmd.NewSourcemapsCmd(resources.NewClient(version), analyticsTrackerFn))
resourcecmd.AddAllResourceCmds(cmd, clients.ResourcesClient, analyticsTrackerFn)

// add non-generated commands
Expand Down
11 changes: 6 additions & 5 deletions cmd/sourcemaps/sourcemaps.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,21 @@ package sourcemaps
import (
"github.com/spf13/cobra"

resourcescmd "github.com/launchdarkly/ldcli/cmd/resources"
"github.com/launchdarkly/ldcli/internal/analytics"
"github.com/launchdarkly/ldcli/internal/resources"
)

func NewSourcemapsCmd() *cobra.Command {
func NewSourcemapsCmd(client resources.Client, analyticsTrackerFn analytics.TrackerFn) *cobra.Command {
cmd := &cobra.Command{
Use: "sourcemaps",
Short: "Manage sourcemaps",
Long: "Manage sourcemaps for LaunchDarkly error monitoring",
Run: func(cmd *cobra.Command, args []string) {
_ = cmd.Help()
},
Args: cobra.MinimumNArgs(1),
}

cmd.AddCommand(NewUploadCmd(resources.NewClient("")))
cmd.AddCommand(NewUploadCmd(client, analyticsTrackerFn))
cmd.SetUsageTemplate(resourcescmd.SubcommandUsageTemplate())

return cmd
}
17 changes: 16 additions & 1 deletion cmd/sourcemaps/upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

cmdAnalytics "github.com/launchdarkly/ldcli/cmd/analytics"
"github.com/launchdarkly/ldcli/cmd/cliflags"
resourcescmd "github.com/launchdarkly/ldcli/cmd/resources"
"github.com/launchdarkly/ldcli/cmd/validators"
"github.com/launchdarkly/ldcli/internal/analytics"
"github.com/launchdarkly/ldcli/internal/output"
"github.com/launchdarkly/ldcli/internal/resources"
)
Expand Down Expand Up @@ -66,13 +68,26 @@ type SourceMapFile struct {
Name string
}

func NewUploadCmd(client resources.Client) *cobra.Command {
func NewUploadCmd(client resources.Client, analyticsTrackerFn analytics.TrackerFn) *cobra.Command {
cmd := &cobra.Command{
Args: validators.Validate(),
Use: "upload",
Short: "Upload sourcemaps",
Long: "Upload JavaScript sourcemaps to LaunchDarkly for error monitoring",
RunE: runE(client),
PersistentPreRun: func(cmd *cobra.Command, args []string) {
tracker := analyticsTrackerFn(
viper.GetString(cliflags.AccessTokenFlag),
viper.GetString(cliflags.BaseURIFlag),
viper.GetBool(cliflags.AnalyticsOptOut),
)
tracker.SendCommandRunEvent(cmdAnalytics.CmdRunEventProperties(
cmd,
"sourcemaps",
map[string]interface{}{
"action": cmd.Name(),
}))
},
}

cmd.SetUsageTemplate(resourcescmd.SubcommandUsageTemplate())
Expand Down
18 changes: 10 additions & 8 deletions cmd/sourcemaps/upload_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ import (

"github.com/stretchr/testify/assert"

"github.com/launchdarkly/ldcli/internal/analytics"
"github.com/launchdarkly/ldcli/internal/resources"
)

// Mock resources.Client implementation for testing
type mockResourcesClient struct {
responses map[string][]byte
Expand All @@ -35,9 +37,6 @@ func (m *mockResourcesClient) GetVersion() string {
return "test-version"
}




func TestGetSourceMapUploadUrls(t *testing.T) {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
assert.Equal(t, http.MethodPost, r.Method)
Expand Down Expand Up @@ -131,7 +130,9 @@ func TestUploadFile(t *testing.T) {

func TestNewUploadCmd(t *testing.T) {
client := resources.NewClient("")
cmd := NewUploadCmd(client)
cmd := NewUploadCmd(client, func(accessToken, baseURI string, analyticsOptOut bool) analytics.Tracker {
return &analytics.MockTracker{}
})

assert.Equal(t, "upload", cmd.Use)
assert.Equal(t, "Upload sourcemaps", cmd.Short)
Expand Down Expand Up @@ -200,7 +201,6 @@ func TestGetAllSourceMapFiles(t *testing.T) {
assert.Contains(t, err.Error(), "no .js.map files found")
}


func TestGetSourceMapUploadUrlsErrors(t *testing.T) {
_, err := getSourceMapUploadUrls("test-key", "project123", []string{"path"}, "://invalid-url")
assert.Error(t, err)
Expand All @@ -227,7 +227,9 @@ func TestRunE(t *testing.T) {
},
}

cmd := NewUploadCmd(mockClient)
cmd := NewUploadCmd(mockClient, func(accessToken, baseURI string, analyticsOptOut bool) analytics.Tracker {
return &analytics.MockTracker{}
})
args := []string{}

tempDir, err := os.MkdirTemp("", "sourcemap-test")
Expand All @@ -254,14 +256,14 @@ func TestRunE(t *testing.T) {
runFunc := runE(mockClient)
err = runFunc(cmd, args)
assert.Error(t, err)

err = cmd.Flags().Set("project", "test-project")
assert.NoError(t, err)
err = cmd.Flags().Set(pathFlag, testMapFile)
assert.NoError(t, err)
err = cmd.Flags().Set(backendUrlFlag, urlsServer.URL)
assert.NoError(t, err)

err = runFunc(cmd, args)
assert.Error(t, err)
}