diff --git a/README.md b/README.md index 8f3bdc28..13d85e2b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,26 @@ # ybm-cli A CLI implementation for YB Managed. +# Global configuration +This CLI support 3 possibles configurations: +* Passing values as flags + ```shell + ybm --apikey AWERDFSSS --host cloud.yugabyte.com get cluster + ``` +* Using a configuration file called `.ybm-cli.yaml` under your `$HOME` directory. + You can use the command `ybm configure` to help to setup the file + +* Using environment variables (all need to start with `YBM_`) + ```shell + export YBM_APIKEY=AWERDFSSS + export YBM_HOST=cloud.yugabyte.com + ybm get cluster + ``` + +By default, `https` will be added to the host if no scheme are provided if you want to use `http` +just add it to the host `http://cloud.yugabyte.com` + + ## Sample Create Commands: ### Cluster diff --git a/cmd/backup.go b/cmd/backup.go index 7887581b..881a1534 100644 --- a/cmd/backup.go +++ b/cmd/backup.go @@ -15,7 +15,7 @@ var getBackupCmd = &cobra.Command{ Long: "Get backups in YugabyteDB Managed", Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) listBackupRequest := apiClient.BackupApi.ListBackups(context.Background(), accountID, projectID) @@ -44,7 +44,7 @@ var restoreBackupCmd = &cobra.Command{ Long: "Restore backups in YugabyteDB Managed", Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) @@ -75,7 +75,7 @@ var createBackupCmd = &cobra.Command{ Short: "Create backup in YugabyteDB Managed", Long: "Create backup in YugabyteDB Managed", Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) clusterName, _ := cmd.Flags().GetString("cluster-name") @@ -119,7 +119,7 @@ var deleteBackupCmd = &cobra.Command{ Run: func(cmd *cobra.Command, args []string) { backupID, _ := cmd.Flags().GetString("backup-id") - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) diff --git a/cmd/cdc_sink.go b/cmd/cdc_sink.go index 9b6859dc..ae7a47b4 100644 --- a/cmd/cdc_sink.go +++ b/cmd/cdc_sink.go @@ -17,7 +17,7 @@ var getCdcSinkCmd = &cobra.Command{ Short: "Get CDC Sink in YugabyteDB Managed", Long: `Get CDC Sink in YugabyteDB Managed`, Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) cdcSinkName, _ := cmd.Flags().GetString("name") @@ -44,7 +44,7 @@ var createCdcSinkCmd = &cobra.Command{ Short: "Create CDC Sink in YugabyteDB Managed", Long: `Create CDC Sink in YugabyteDB Managed`, Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) cdcSinkName, _ := cmd.Flags().GetString("name") @@ -86,7 +86,7 @@ var editCdcSinkCmd = &cobra.Command{ Short: "Edit CDC Sink in YugabyteDB Managed", Long: `Edit CDC Sink in YugabyteDB Managed`, Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) cdcSinkName, _ := cmd.Flags().GetString("name") @@ -135,7 +135,7 @@ var deleteCdcSinkCmd = &cobra.Command{ Short: "Delete CDC Sink in YugabyteDB Managed", Long: `Delete CDC Sink in YugabyteDB Managed`, Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) cdcSinkName, _ := cmd.Flags().GetString("name") diff --git a/cmd/cdc_stream.go b/cmd/cdc_stream.go index a5d0b2cb..eaf954ef 100644 --- a/cmd/cdc_stream.go +++ b/cmd/cdc_stream.go @@ -17,7 +17,7 @@ var getCdcStreamCmd = &cobra.Command{ Short: "Get CDC Stream in YugabyteDB Managed", Long: `Get CDC Stream in YugabyteDB Managed`, Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) @@ -48,30 +48,33 @@ var createCdcStreamCmd = &cobra.Command{ Short: "Create CDC Stream in YugabyteDB Managed", Long: `Create CDC Stream in YugabyteDB Managed`, Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) clusterName, _ := cmd.Flags().GetString("cluster") clusterID, _, _ := getClusterID(context.Background(), apiClient, accountID, projectID, clusterName) + // TODO: handle failures in the above + fmt.Fprintf(os.Stderr, "accountID: %v, projectID: %v, clusterID: %v", accountID, projectID, clusterID) + cdcStreamName, _ := cmd.Flags().GetString("name") cdcSinkName, _ := cmd.Flags().GetString("sink") sinkId, _, _ := getCdcSinkID(context.Background(), apiClient, accountID, cdcSinkName) - namespace, _ := cmd.Flags().GetString("namespace") dbName, _ := cmd.Flags().GetString("db-name") tables, _ := cmd.Flags().GetStringArray("tables") + snapshotExistingData, _ := cmd.Flags().GetBool("snapshot-existing-data") + kafkaPrefix, _ := cmd.Flags().GetString("kafka-prefix") cdcStreamSpec := ybmclient.CdcStreamSpec{ - Name: cdcStreamName, - CdcSinkId: sinkId, - Namespace: namespace, - DbName: dbName, - Tables: tables, + Name: cdcStreamName, + CdcSinkId: sinkId, + DbName: dbName, + Tables: tables, + SnapshotExistingData: &snapshotExistingData, + KafkaPrefix: &kafkaPrefix, } - createClusterRequest := ybmclient.NewCreateCdcStreamRequest(cdcStreamSpec, true) - - resp, r, err := apiClient.CdcApi.CreateCdcStream(context.Background(), accountID, projectID, clusterID).CreateCdcStreamRequest(*createClusterRequest).Execute() + resp, r, err := apiClient.CdcApi.CreateCdcStream(context.Background(), accountID, projectID, clusterID).CdcStreamSpec(cdcStreamSpec).Execute() if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `CdcApi.CreateCdcStream``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) @@ -87,7 +90,7 @@ var editCdcStreamCmd = &cobra.Command{ Short: "Edit CDC Stream in YugabyteDB Managed", Long: `Edit CDC Stream in YugabyteDB Managed`, Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) @@ -128,7 +131,7 @@ var deleteCdcStreamCmd = &cobra.Command{ Short: "Delete CDC Stream in YugabyteDB Managed", Long: `Delete CDC Stream in YugabyteDB Managed`, Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) @@ -163,8 +166,9 @@ func init() { createCdcStreamCmd.Flags().String("cluster", "", "Name of the Cluster") createCdcStreamCmd.Flags().StringArray("tables", []string{}, "Database tables the Cdc Stream will listen to") createCdcStreamCmd.Flags().String("sink", "", "Destination sink for the CDC Stream") - createCdcStreamCmd.Flags().String("namespace", "", "Namespace that the Cdc Stream will listen to") createCdcStreamCmd.Flags().String("db-name", "", "Database that the Cdc Stream will listen to") + createCdcStreamCmd.Flags().String("snapshot-existing-data", "", "Whether to snapshot the existing data in the database") + createCdcStreamCmd.Flags().String("kafka-prefix", "", "A prefix for the Kafka topics") updateCmd.AddCommand(editCdcStreamCmd) editCdcStreamCmd.Flags().String("name", "", "Name of the CDC Stream") diff --git a/cmd/configure.go b/cmd/configure.go index 3aa5848f..686cab4e 100644 --- a/cmd/configure.go +++ b/cmd/configure.go @@ -8,6 +8,7 @@ import ( "os" "github.com/spf13/cobra" + "github.com/spf13/viper" ) // configureCmd represents the configure command @@ -18,8 +19,28 @@ var configureCmd = &cobra.Command{ Run: func(cmd *cobra.Command, args []string) { fmt.Print("Enter API Key: ") var apiKey string + var host string fmt.Scanln(&apiKey) - os.WriteFile("credentials", []byte(apiKey), 0644) + viper.GetViper().Set("apikey", &apiKey) + fmt.Print("Enter Host: ") + fmt.Scanln(&host) + viper.GetViper().Set("host", &host) + err := viper.WriteConfig() + if err != nil { + if _, ok := err.(viper.ConfigFileNotFoundError); ok { + fmt.Fprintln(os.Stdout, "No config was found a new one will be created.") + //Try to create the file + err = viper.SafeWriteConfig() + if err != nil { + fmt.Fprintf(os.Stderr, "Error when writing new config file: %v\n", err) + + } + } else { + fmt.Fprintf(os.Stderr, "Error when writing config file: %v\n", err) + return + } + } + fmt.Println("Configuration file sucessfully updated.") }, } diff --git a/cmd/create_cluster.go b/cmd/create_cluster.go index 68c613d3..0bf04517 100644 --- a/cmd/create_cluster.go +++ b/cmd/create_cluster.go @@ -19,7 +19,7 @@ var createClusterCmd = &cobra.Command{ Long: "Create a cluster in YB Managed", Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) diff --git a/cmd/delete_cluster.go b/cmd/delete_cluster.go index b631916f..c942f046 100644 --- a/cmd/delete_cluster.go +++ b/cmd/delete_cluster.go @@ -17,7 +17,7 @@ var deleteClusterCmd = &cobra.Command{ Short: "Delete cluster in YugabyteDB Managed", Long: "Delete cluster in YugabyteDB Managed", Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) clusterName, _ := cmd.Flags().GetString("cluster-name") diff --git a/cmd/get_cluster.go b/cmd/get_cluster.go index ac3e66ee..4df1710a 100644 --- a/cmd/get_cluster.go +++ b/cmd/get_cluster.go @@ -17,7 +17,7 @@ var getClusterCmd = &cobra.Command{ Short: "Get clusters in YugabyteDB Managed", Long: "Get clusters in YugabyteDB Managed", Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) clusterListRequest := apiClient.ClusterApi.ListClusters(context.Background(), accountID, projectID) diff --git a/cmd/network_allow_list.go b/cmd/network_allow_list.go index 26a72b3c..47f1559e 100644 --- a/cmd/network_allow_list.go +++ b/cmd/network_allow_list.go @@ -31,7 +31,7 @@ var getNetworkAllowListCmd = &cobra.Command{ Short: "Get network allow list in YugabyteDB Managed", Long: `Get network allow list in YugabyteDB Managed`, Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) @@ -63,7 +63,7 @@ var createNetworkAllowListCmd = &cobra.Command{ Short: "Create network allow lists in YugabyteDB Managed", Long: `Create network allow lists in YugabyteDB Managed`, Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) @@ -88,7 +88,7 @@ var deleteNetworkAllowListCmd = &cobra.Command{ Short: "Delete network allow list from YugabyteDB Managed", Long: `Delete network allow list from YugabyteDB Managed`, Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) diff --git a/cmd/pause_cluster.go b/cmd/pause_cluster.go index 237a5cf9..e680eda4 100644 --- a/cmd/pause_cluster.go +++ b/cmd/pause_cluster.go @@ -17,7 +17,7 @@ var pauseClusterCmd = &cobra.Command{ Short: "Pause clusters in YugabyteDB Managed", Long: "Pause clusters in YugabyteDB Managed", Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) clusterName, _ := cmd.Flags().GetString("cluster-name") diff --git a/cmd/read_replica.go b/cmd/read_replica.go index 1eaf156c..2a522ab4 100644 --- a/cmd/read_replica.go +++ b/cmd/read_replica.go @@ -78,7 +78,7 @@ var getReadReplicaCmd = &cobra.Command{ Short: "Get read replica in YugabyteDB Managed", Long: "Get read replica in YugabyteDB Managed", Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) clusterID, _, _ := getClusterID(context.Background(), apiClient, accountID, projectID, clusterName) @@ -98,7 +98,7 @@ var createReadReplicaCmd = &cobra.Command{ Short: "Create read replica in YugabyteDB Managed", Long: "Create read replica in YugabyteDB Managed", Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) clusterID, _, _ := getClusterID(context.Background(), apiClient, accountID, projectID, clusterName) @@ -120,7 +120,7 @@ var updateReadReplicaCmd = &cobra.Command{ Short: "Edit read replica in YugabyteDB Managed", Long: "Edit read replica in YugabyteDB Managed", Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) clusterID, _, _ := getClusterID(context.Background(), apiClient, accountID, projectID, clusterName) @@ -142,7 +142,7 @@ var deleteReadReplicaCmd = &cobra.Command{ Short: "Delete read replica from YugabyteDB Managed", Long: "Delete read replica from YugabyteDB Managed", Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) clusterID, _, _ := getClusterID(context.Background(), apiClient, accountID, projectID, clusterName) diff --git a/cmd/resume_cluster.go b/cmd/resume_cluster.go index e216fddc..3364a9eb 100644 --- a/cmd/resume_cluster.go +++ b/cmd/resume_cluster.go @@ -17,7 +17,7 @@ var resumeClusterCmd = &cobra.Command{ Short: "Pause clusters in YugabyteDB Managed", Long: "Pause clusters in YugabyteDB Managed", Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) clusterName, _ := cmd.Flags().GetString("cluster-name") diff --git a/cmd/root.go b/cmd/root.go index 1e5d919c..28d8f9e8 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -4,9 +4,17 @@ Copyright © 2022 NAME HERE package cmd import ( + "fmt" "os" "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +var ( + cfgFile string + // host string + // apiKey string ) // rootCmd represents the base command when called without any subcommands @@ -29,14 +37,53 @@ func Execute() { } } +func setDefaults() { + viper.SetDefault("host", "devcloud.yugabyte.com") + +} + func init() { + cobra.OnInitialize(initConfig) // Here you will define your flags and configuration settings. // Cobra supports persistent flags, which, if defined here, // will be global for your application. + setDefaults() + rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.ybm-cli.yaml)") + rootCmd.PersistentFlags().StringP("host", "", "", "YBM Api hostname") + rootCmd.PersistentFlags().StringP("apiKey", "a", "", "YBM Api Key") - // rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.ybm-cli.yaml)") + //Bind peristents flags to viper + viper.BindPFlag("host", rootCmd.PersistentFlags().Lookup("host")) + viper.BindPFlag("apiKey", rootCmd.PersistentFlags().Lookup("apiKey")) // Cobra also supports local flags, which will only run // when this action is called directly. rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") } + +// initConfig reads in config file and ENV variables if set. +func initConfig() { + if cfgFile != "" { + // Use config file from the flag. + viper.SetConfigFile(cfgFile) + } else { + // Find home directory. + home, err := os.UserHomeDir() + cobra.CheckErr(err) + + // Search config in home directory with name ".ybm-cli" (without extension). + viper.AddConfigPath(home) + viper.SetConfigType("yaml") + viper.SetConfigName(".ybm-cli") + } + + //Will check every environment variable starting with YBM_ + viper.SetEnvPrefix("ybm") + //Read all enviromnent variable that match YBM_ENVNAME + viper.AutomaticEnv() // read in environment variables that match + + // If a config file is found, read it in. + if err := viper.ReadInConfig(); err == nil { + fmt.Fprintln(os.Stderr, "Using config file:", viper.ConfigFileUsed()) + } +} diff --git a/cmd/update_cluster.go b/cmd/update_cluster.go index e58a3c06..1b3e0336 100644 --- a/cmd/update_cluster.go +++ b/cmd/update_cluster.go @@ -22,7 +22,7 @@ var updateClusterCmd = &cobra.Command{ ctx := context.Background() - apiClient, _ := getApiClient(ctx) + apiClient, _ := getApiClient(ctx, cmd) accountID, _, _ := getAccountID(ctx, apiClient) projectID, _, _ := getProjectID(ctx, apiClient, accountID) diff --git a/cmd/util.go b/cmd/util.go index 6c6d731d..cc307bf1 100644 --- a/cmd/util.go +++ b/cmd/util.go @@ -3,12 +3,17 @@ package cmd import ( "context" "fmt" + "net/http" "net/http/httputil" + "net/url" "os" + "regexp" "strconv" + "strings" "github.com/hokaccha/go-prettyjson" "github.com/spf13/cobra" + "github.com/spf13/viper" ybmclient "github.com/yugabyte/yugabytedb-managed-go-client-internal" ) @@ -17,29 +22,49 @@ func prettyPrintJson(data interface{}) { b, _ := prettyjson.Marshal(data) fmt.Println(string(b)) } +func getErrorMessage(response *http.Response, err error) string { + errMsg := err.Error() + if response != nil { + request, dumpErr := httputil.DumpRequest(response.Request, true) + if dumpErr != nil { + additional := "Error while dumping request: " + dumpErr.Error() + errMsg = errMsg + "\n\n\nDump error:" + additional + } else { + reqString := string(request) + // Replace the Authorization Bearer header with obfuscated value + re := regexp.MustCompile(`eyJ(.*)`) + reqString = re.ReplaceAllString(reqString, `***`) + errMsg = errMsg + "\n\nAPI Request:\n" + reqString + } -func getHostOrDefault(ctx context.Context) string { - host := os.Getenv("YBM_HOST") - if host == "" { - host = "devcloud.yugabyte.com" + response, dumpErr := httputil.DumpResponse(response, true) + if dumpErr != nil { + additional := "Error while dumping response: " + dumpErr.Error() + errMsg = errMsg + "\n\n\nDump error:" + additional + } else { + errMsg = errMsg + "\n\nAPI Response:\n" + string(response) + } } - return host + return errMsg } -func getApiClient(ctx context.Context) (*ybmclient.APIClient, error) { +func getApiClient(ctx context.Context, cmd *cobra.Command) (*ybmclient.APIClient, error) { configuration := ybmclient.NewConfiguration() //Configure the client - configuration.Host = getHostOrDefault(ctx) - configuration.Scheme = "https" + url, err := parseURL(viper.GetString("host")) + if err != nil { + fmt.Fprintln(os.Stdout, err.Error()) + os.Exit(1) + } + + configuration.Host = url.Host + configuration.Scheme = url.Scheme apiClient := ybmclient.NewAPIClient(configuration) - // authorize user with api key - apiKeyBytes, _ := os.ReadFile("credentials") - apiKey := string(apiKeyBytes) + apiKey := viper.GetString("apiKey") apiClient.GetConfig().AddDefaultHeader("Authorization", "Bearer "+apiKey) return apiClient, nil } - func getClusterID(ctx context.Context, apiClient *ybmclient.APIClient, accountId string, projectId string, clusterName string) (clusterId string, clusterIdOk bool, errorMessage string) { clusterResp, resp, err := apiClient.ClusterApi.ListClusters(ctx, accountId, projectId).Name(clusterName).Execute() if err != nil { @@ -58,8 +83,14 @@ func getClusterID(ctx context.Context, apiClient *ybmclient.APIClient, accountId func getAccountID(ctx context.Context, apiClient *ybmclient.APIClient) (accountId string, accountIdOK bool, errorMessage string) { accountResp, resp, err := apiClient.AccountApi.ListAccounts(ctx).Execute() if err != nil { - b, _ := httputil.DumpResponse(resp, true) - return "", false, string(b) + errMsg := getErrorMessage(resp, err) + if strings.Contains(err.Error(), "is not a valid") { + fmt.Print("The deserialization of the response failed due to following error. "+ + "Skipping as this should not impact the functionality of the provider.", + map[string]interface{}{"errMsg": err.Error()}) + } else { + return "", false, errMsg + } } accountData := accountResp.GetData() if len(accountData) == 0 { @@ -75,8 +106,14 @@ func getAccountID(ctx context.Context, apiClient *ybmclient.APIClient) (accountI func getProjectID(ctx context.Context, apiClient *ybmclient.APIClient, accountId string) (projectId string, projectIdOK bool, errorMessage string) { projectResp, resp, err := apiClient.ProjectApi.ListProjects(ctx, accountId).Execute() if err != nil { - b, _ := httputil.DumpResponse(resp, true) - return "", false, string(b) + errMsg := getErrorMessage(resp, err) + if strings.Contains(err.Error(), "is not a valid") { + fmt.Print("The deserialization of the response failed due to following error. "+ + "Skipping as this should not impact the functionality of the provider.", + map[string]interface{}{"errMsg": err.Error()}) + } else { + return "", false, errMsg + } } projectData := projectResp.GetData() if len(projectData) == 0 { @@ -241,7 +278,6 @@ func createClusterSpec(ctx context.Context, apiClient *ybmclient.APIClient, cmd clusterType, _ := cmd.Flags().GetString("cluster-type") clusterInfo.SetClusterType(ybmclient.ClusterType(clusterType)) } - networking := *ybmclient.NewNetworkingWithDefaults() // Compute track ID for database version softwareInfo := *ybmclient.NewSoftwareInfoWithDefaults() @@ -256,9 +292,7 @@ func createClusterSpec(ctx context.Context, apiClient *ybmclient.APIClient, cmd clusterSpec = ybmclient.NewClusterSpec( clusterName, - cloudInfo, clusterInfo, - networking, softwareInfo) if regionInfoProvided { clusterSpec.SetClusterRegionInfo(clusterRegionInfo) @@ -338,3 +372,13 @@ func getTrackName(ctx context.Context, apiClient *ybmclient.APIClient, accountId return trackName, true, "" } +func parseURL(host string) (*url.URL, error) { + endpoint, err := url.Parse(host) + if err != nil { + return nil, fmt.Errorf("Could not parse ybm server url (%s): %w", host, err) + } + if endpoint.Scheme == "" { + endpoint.Scheme = "https" + } + return endpoint, err +} diff --git a/cmd/vpc.go b/cmd/vpc.go index 899238cb..f4a824bd 100644 --- a/cmd/vpc.go +++ b/cmd/vpc.go @@ -29,7 +29,7 @@ var getVpcCmd = &cobra.Command{ Run: func(cmd *cobra.Command, args []string) { vpcName, _ := cmd.Flags().GetString("name") - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) vpcListRequest := getVpcByName(*apiClient, accountID, projectID, vpcName) @@ -97,7 +97,7 @@ var createVpcCmd = &cobra.Command{ } vpcRequest := *ybmclient.NewSingleTenantVpcRequest(vpcSpec) - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) resp, response, err := apiClient.NetworkApi.CreateVpc(context.Background(), accountID, projectID).SingleTenantVpcRequest(vpcRequest).Execute() @@ -117,7 +117,7 @@ var deleteVpcCmd = &cobra.Command{ Long: "Delete a VPC in YugabyteDB Managed", Run: func(cmd *cobra.Command, args []string) { vpcName, _ := cmd.Flags().GetString("name") - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) diff --git a/cmd/vpc_peering.go b/cmd/vpc_peering.go index ded9c7ca..51fccfea 100644 --- a/cmd/vpc_peering.go +++ b/cmd/vpc_peering.go @@ -28,7 +28,7 @@ var getVpcPeeringCmd = &cobra.Command{ Long: "Get VPC peerings in YugabyteDB Managed", Run: func(cmd *cobra.Command, args []string) { - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) resp, r, err := apiClient.NetworkApi.ListVpcPeerings(context.Background(), accountID, projectID).Execute() @@ -85,7 +85,7 @@ var createVpcPeeringCmd = &cobra.Command{ applicationVPCSpec.SetCidr(cidr) } - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) @@ -121,7 +121,7 @@ var deleteVpcPeeringCmd = &cobra.Command{ Run: func(cmd *cobra.Command, args []string) { vpcPeeringName, _ := cmd.Flags().GetString("name") - apiClient, _ := getApiClient(context.Background()) + apiClient, _ := getApiClient(context.Background(), cmd) accountID, _, _ := getAccountID(context.Background(), apiClient) projectID, _, _ := getProjectID(context.Background(), apiClient, accountID) diff --git a/go.mod b/go.mod index 99d6f1de..e31ef3ad 100644 --- a/go.mod +++ b/go.mod @@ -5,19 +5,34 @@ go 1.19 require ( github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f github.com/spf13/cobra v1.5.0 - github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20221124000615-6ac41b801bac + github.com/spf13/viper v1.14.0 + github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20221221120552-fec10f75497e ) require ( github.com/fatih/color v1.13.0 // indirect - github.com/golang/protobuf v1.4.2 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/magiconair/properties v1.8.6 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.5 // indirect + github.com/spf13/afero v1.9.2 // indirect + github.com/spf13/cast v1.5.0 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect - golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99 // indirect - golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect - google.golang.org/appengine v1.6.6 // indirect - google.golang.org/protobuf v1.25.0 // indirect + github.com/subosito/gotenv v1.4.1 // indirect + golang.org/x/net v0.5.0 // indirect + golang.org/x/oauth2 v0.4.0 // indirect + golang.org/x/sys v0.4.0 // indirect + golang.org/x/text v0.6.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.28.1 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 949ff1bc..77e9e774 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -13,6 +14,9 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -30,6 +34,7 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -39,14 +44,23 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -73,8 +87,11 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -83,10 +100,14 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -94,22 +115,35 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f h1:7LYC+Yfkj3CTRcShK0KOL/w6iTiKyqqBA9a41Wnggw8= github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f/go.mod h1:pFlLw2CfqZiIBOx6BuCeRLCrfxBJipTY0nIOF/VbGcI= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= @@ -117,33 +151,62 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= +github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= +github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= +github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= +github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20221123192635-e31a4eda7543 h1:O4UszfsSOQmzrZgfJAfHj7+H0jN1TIxoI8BFRCIsFpI= -github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20221123192635-e31a4eda7543/go.mod h1:5vW0xIzIZw+1djkiWKx0qqNmqbRBSf4mjc4qw8lIMik= -github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20221124000615-6ac41b801bac h1:7t30r2EMmi70K5AUQKkVGGDxSt1mYGV9XIX4zffbmOg= -github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20221124000615-6ac41b801bac/go.mod h1:5vW0xIzIZw+1djkiWKx0qqNmqbRBSf4mjc4qw8lIMik= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= +github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20221221120552-fec10f75497e h1:uxw7IYj9SoWmi9g/FiLYjsW0wiDcpJX1POromXAKSO8= +github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20221221120552-fec10f75497e/go.mod h1:5vW0xIzIZw+1djkiWKx0qqNmqbRBSf4mjc4qw8lIMik= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -166,6 +229,7 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -174,6 +238,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -199,15 +265,25 @@ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99 h1:5vD4XjIc0X5+kHZjx4UecYdjA6mJo+XXNoaW0EjU5Os= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M= +golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -216,6 +292,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -242,15 +320,29 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc= -golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -294,10 +386,16 @@ golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -315,13 +413,17 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -351,6 +453,13 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -363,6 +472,10 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -372,13 +485,23 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=