@@ -15,9 +15,7 @@ import (
1515 "github.com/spf13/cobra"
1616 "github.com/spf13/viper"
1717
18- cmdAnalytics "github.com/launchdarkly/ldcli/cmd/analytics"
19- "github.com/launchdarkly/ldcli/cmd/cliflags"
20- "github.com/launchdarkly/ldcli/internal/analytics"
18+ resourcescmd "github.com/launchdarkly/ldcli/cmd/resources"
2119 "github.com/launchdarkly/ldcli/internal/resources"
2220)
2321
@@ -29,7 +27,7 @@ const (
2927 backendUrlFlag = "backend-url"
3028
3129 defaultPath = "."
32- defaultBackendUrl = "https://app.launchdarkly.com"
30+ defaultBackendUrl = "https://pri.observability. app.launchdarkly.com"
3331
3432 verifyApiKeyQuery = `
3533 query ApiKeyToOrgID($api_key: String!) {
@@ -69,51 +67,14 @@ func NewUploadCmd(client resources.Client) *cobra.Command {
6967 RunE : runE (client ),
7068 }
7169
72- cmd .Flags ().String (apiKeyFlag , "" , "The LaunchDarkly API key" )
73- _ = cmd .MarkFlagRequired (apiKeyFlag )
74- _ = cmd .Flags ().SetAnnotation (apiKeyFlag , "required" , []string {"true" })
75- _ = viper .BindPFlag (apiKeyFlag , cmd .Flags ().Lookup (apiKeyFlag ))
76-
77- cmd .Flags ().String (appVersionFlag , "" , "The current version of your deploy" )
78- _ = viper .BindPFlag (appVersionFlag , cmd .Flags ().Lookup (appVersionFlag ))
79-
80- cmd .Flags ().String (pathFlag , defaultPath , "Sets the directory of where the sourcemaps are" )
81- _ = viper .BindPFlag (pathFlag , cmd .Flags ().Lookup (pathFlag ))
82-
83- cmd .Flags ().String (basePathFlag , "" , "An optional base path for the uploaded sourcemaps" )
84- _ = viper .BindPFlag (basePathFlag , cmd .Flags ().Lookup (basePathFlag ))
85-
86- cmd .Flags ().String (backendUrlFlag , defaultBackendUrl , "An optional backend url for self-hosted deployments" )
87- _ = viper .BindPFlag (backendUrlFlag , cmd .Flags ().Lookup (backendUrlFlag ))
70+ cmd .SetUsageTemplate (resourcescmd .SubcommandUsageTemplate ())
71+ initFlags (cmd )
8872
8973 return cmd
9074}
9175
9276func runE (client resources.Client ) func (cmd * cobra.Command , args []string ) error {
9377 return func (cmd * cobra.Command , args []string ) error {
94- var tracker analytics.Tracker = & analytics.NoopClient {}
95- if analyticsTrackerFn , ok := cmd .Root ().Annotations ["analytics_tracker_fn" ]; ok {
96- trackerFn := analytics.NoopClientFn {}.Tracker ()
97- if analyticsTrackerFn == "client" {
98- trackerFn = analytics.ClientFn {
99- ID : "ldcli" ,
100- Version : "dev" ,
101- }.Tracker
102- }
103- tracker = trackerFn (
104- viper .GetString (cliflags .AccessTokenFlag ),
105- viper .GetString (cliflags .BaseURIFlag ),
106- viper .GetBool (cliflags .AnalyticsOptOut ),
107- )
108- }
109-
110- tracker .SendCommandRunEvent (cmdAnalytics .CmdRunEventProperties (
111- cmd ,
112- "sourcemaps" ,
113- map [string ]interface {}{
114- "action" : "upload" ,
115- }))
116-
11778 apiKey := viper .GetString (apiKeyFlag )
11879 appVersion := viper .GetString (appVersionFlag )
11980 path := viper .GetString (pathFlag )
@@ -277,11 +238,11 @@ func getS3Key(organizationID, version, basePath, fileName string) string {
277238 if version == "" {
278239 version = "unversioned"
279240 }
280-
241+
281242 if basePath != "" && ! strings .HasSuffix (basePath , "/" ) {
282243 basePath = basePath + "/"
283244 }
284-
245+
285246 return fmt .Sprintf ("%s/%s/%s%s" , organizationID , version , basePath , fileName )
286247}
287248
@@ -355,3 +316,22 @@ func uploadFile(filePath, uploadUrl, name string) error {
355316 fmt .Printf ("[LaunchDarkly] Uploaded %s to %s\n " , filePath , name )
356317 return nil
357318}
319+
320+ func initFlags (cmd * cobra.Command ) {
321+ cmd .Flags ().String (apiKeyFlag , "" , "The LaunchDarkly Observability API key" )
322+ _ = cmd .MarkFlagRequired (apiKeyFlag )
323+ _ = cmd .Flags ().SetAnnotation (apiKeyFlag , "required" , []string {"true" })
324+ _ = viper .BindPFlag (apiKeyFlag , cmd .Flags ().Lookup (apiKeyFlag ))
325+
326+ cmd .Flags ().String (appVersionFlag , "" , "The current version of your deploy" )
327+ _ = viper .BindPFlag (appVersionFlag , cmd .Flags ().Lookup (appVersionFlag ))
328+
329+ cmd .Flags ().String (pathFlag , defaultPath , "Sets the directory of where the sourcemaps are" )
330+ _ = viper .BindPFlag (pathFlag , cmd .Flags ().Lookup (pathFlag ))
331+
332+ cmd .Flags ().String (basePathFlag , "" , "An optional base path for the uploaded sourcemaps" )
333+ _ = viper .BindPFlag (basePathFlag , cmd .Flags ().Lookup (basePathFlag ))
334+
335+ cmd .Flags ().String (backendUrlFlag , defaultBackendUrl , "An optional backend url for self-hosted deployments" )
336+ _ = viper .BindPFlag (backendUrlFlag , cmd .Flags ().Lookup (backendUrlFlag ))
337+ }
0 commit comments