Fix incorrect client URL when parsing arguments incorrectly

rootlyhq · Oct 18, 2024 · 0737148 · 0737148
1 parent 86d885e
commit 0737148
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/cmd/provider_cmd_rootly.go b/cmd/provider_cmd_rootly.go
@@ -8,14 +8,15 @@ import (
 )
 
 func newCmdRootlyImporter(options ImportOptions) *cobra.Command {
+	url := ""
 	token := ""
 	cmd := &cobra.Command{
 		Use:   "rootly",
 		Short: "Import current state to Terraform configuration from Rootly",
 		Long:  "Import current state to Terraform configuration from Rootly",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			provider := newRootlyProvider()
-			err := Import(provider, options, []string{token})
+			err := Import(provider, options, []string{url, token})
 			if err != nil {
 				return err
 			}
@@ -25,6 +26,7 @@ func newCmdRootlyImporter(options ImportOptions) *cobra.Command {
 
 	cmd.AddCommand(listCmd(newRootlyProvider()))
 	baseProviderFlags(cmd.PersistentFlags(), &options, "environment", "")
+	cmd.PersistentFlags().StringVarP(&url, "url", "u", "https://api.rootly.com", "env param ROOTLY_API_URL")
 	cmd.PersistentFlags().StringVarP(&token, "token", "t", "", "env param ROOTLY_API_TOKEN")
 	return cmd
 }

diff --git a/cmd/version.go b/cmd/version.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const version = "v2.1.0"
+const version = "v2.1.1"
 
 var versionCmd = &cobra.Command{
 	Use:   "version",

diff --git a/providers/rootly/rootly_provider.go b/providers/rootly/rootly_provider.go
@@ -10,8 +10,8 @@ import (
 
 type RootlyProvider struct { //nolint
 	terraformutils.Provider
-	apiKey        string
 	apiUrl        string
+	apiKey        string
 }
 
 func (p *RootlyProvider) Init(args []string) error {
@@ -28,8 +28,8 @@ func (p *RootlyProvider) Init(args []string) error {
 	if apiKey := os.Getenv("ROOTLY_API_TOKEN"); apiKey != "" {
 		p.apiKey = os.Getenv("ROOTLY_API_TOKEN")
 	}
-	if args[0] != "" {
-		p.apiKey = args[0]
+	if args[1] != "" {
+		p.apiKey = args[1]
 	}
 	if p.apiKey == "" {
 		return errors.New("required API key missing")
@@ -3018,4 +3018,4 @@ func (p *RootlyProvider) GetSupportedService() map[string]terraformutils.Service
 		"team": &TeamGenerator{},
 		"webhooks_endpoint": &WebhooksEndpointGenerator{},
 	}
-}
+}