Merge master

Author: Chris Gilmer

cmd/setup.go

@@ -549,16 +549,6 @@ func openQrCode(tempFile *os.File) error {
 	return nil
 }
 
-func checkExistingAWSProfile(profileName string, config *vault.ConfigFile, logger *log.Logger) error {
-	logger.Printf("Checking whether profile %q exists in AWS config file\n", profileName)
-	_, exists := config.ProfileSection(profileName)
-	if exists {
-		return fmt.Errorf("Profile already exists in AWS config file: %s", profileName)
-	}
-
-	return nil
-}
-
 func getPartition(region string) (string, error) {
 	partition, ok := endpoints.PartitionForRegion(endpoints.DefaultPartitions(), region)
 	if !ok {
@@ -677,14 +667,6 @@ func setupUserFunction(cmd *cobra.Command, args []string) error {
 		Keyring:     keyring,
 		NoMFA:       noMFA,
 	}
-	err = checkExistingAWSProfile(baseProfile.Name, config, logger)
-	if err != nil {
-		logger.Fatal(err)
-	}
-	err = checkExistingAWSProfile(roleProfile.Name, config, logger)
-	if err != nil {
-		logger.Fatal(err)
-	}
 	setupConfig.Setup()
 
 	// If we got this far, we win

cmd/setup_test.go

@@ -13,11 +13,6 @@ import (
 // Test logger
 var logger = log.New(os.Stdout, "", log.LstdFlags)
 
-var defaultConfig = []byte(`[profile test]
-region=us-west-2
-output=json
-`)
-
 func newConfigFile(t *testing.T, b []byte) string {
 	f, err := ioutil.TempFile("", "aws-config")
 	if err != nil {
@@ -29,36 +24,12 @@ func newConfigFile(t *testing.T, b []byte) string {
 	return f.Name()
 }
 
-func TestExistingAWSProfile(t *testing.T) {
-	f := newConfigFile(t, defaultConfig)
-	defer func() {
-		errRemove := os.Remove(f)
-		assert.NoError(t, errRemove)
-	}()
-	config, _ := vault.LoadConfig(f)
-	baseProfile := vault.ProfileSection{
-		Name:   "test",
-		Region: "us-west-2",
-	}
-	keyring, err := getKeyring("test")
-	assert.NoError(t, err)
-	setupConfig := SetupConfig{
-		Logger:      logger,
-		Name:        "test",
-		BaseProfile: &baseProfile,
-		Output:      "json",
-		Config:      config,
-		QrTempFile:  nil,
-		Keyring:     keyring,
-	}
-
-	err = checkExistingAWSProfile(baseProfile.Name, setupConfig.Config, logger)
-	assert.Error(t, err)
-	err = checkExistingAWSProfile("missing", setupConfig.Config, logger)
-	assert.NoError(t, err)
-}
-
 func TestUpdateAWSConfigFile(t *testing.T) {
+
+	var defaultConfig = []byte(`[profile test]
+region=us-west-2
+output=json
+`)
 	f := newConfigFile(t, defaultConfig)
 	defer func() {
 		errRemove := os.Remove(f)