chore(core): remove v1 config (#1484)

Author: Codelax

scw/README.md

@@ -23,11 +23,6 @@ The function [`GetConfigPath`](https://godoc.org/github.com/scaleway/scaleway-sd
 3. Unix home directory: `$HOME/.config/scw/config.yaml`
 4. Windows home directory: `%USERPROFILE%/.config/scw/config.yaml`
 
-## V1 config (DEPRECATED)
-
-The V1 config (AKA legacy config) `.scwrc` is deprecated.
-To migrate the V1 config to the new format use the function [`MigrateLegacyConfig`](https://godoc.org/github.com/scaleway/scaleway-sdk-go/scw#MigrateLegacyConfig), this will create a [proper config file](#tl-dr) the new [config file path](#config-file-path).
-
 ## Reading config order
 
 [ClientOption](https://godoc.org/github.com/scaleway/scaleway-sdk-go/scw#ClientOption) ordering will decide the order in which the config should apply:

scw/config.go

@@ -223,12 +223,6 @@ func LoadConfigFromPath(path string) (*Config, error) {
 		return nil, errors.Wrap(err, "cannot read config file")
 	}
 
-	_, err = unmarshalConfV1(file)
-	if err == nil {
-		// reject V1 config
-		return nil, errors.New("found legacy config in %s: legacy config is not allowed, please switch to the new config file format: %s", path, documentationLink)
-	}
-
 	confV2, err := unmarshalConfV2(file)
 	if err != nil {
 		return nil, errors.Wrap(err, "content of config file %s is invalid", path)

scw/config_legacy.go

@@ -126,11 +126,6 @@ default_region: ` + v2ValidDefaultRegion + `
 
 	v2SimpleInvalidConfigFile            = `insecure: "bool""`
 	v2SimpleConfigFileWithInvalidProfile = `active_profile: flantier`
-
-	v2FromV1ConfigFile = `secret_key: ` + v1ValidToken + `
-default_organization_id: ` + v1ValidOrganizationID + `
-default_project_id: ` + v1ValidOrganizationID + `
-`
 )
 
 // TestSaveConfig tests config write the correct values in the config file
@@ -261,10 +256,9 @@ func TestSaveConfig(t *testing.T) {
 // TestLoadConfig tests config getters return correct values
 func TestLoadProfileAndActiveProfile(t *testing.T) {
 	tests := []struct {
-		name       string
-		env        map[string]string
-		files      map[string]string
-		isMigrated bool
+		name  string
+		env   map[string]string
+		files map[string]string
 
 		expectedError                 string
 		expectedAccessKey             *string
@@ -326,34 +320,6 @@ func TestLoadProfileAndActiveProfile(t *testing.T) {
 			expectedDefaultProjectID:      s(v2ValidDefaultProjectID),
 			expectedDefaultRegion:         s(v2ValidDefaultRegion),
 		},
-		{
-			name: "Simple config with valid V1",
-			env: map[string]string{
-				"HOME": "{HOME}",
-			},
-			files: map[string]string{
-				".scwrc": v1ValidConfigFile,
-			},
-			isMigrated:                    true,
-			expectedSecretKey:             s(v1ValidToken),
-			expectedDefaultOrganizationID: s(v1ValidOrganizationID),
-			expectedDefaultProjectID:      s(v1ValidOrganizationID),
-		},
-		{
-			name: "Simple config with valid V2 and valid V1",
-			env: map[string]string{
-				"HOME": "{HOME}",
-			},
-			files: map[string]string{
-				".config/scw/config.yaml": v2SimpleValidConfigFile,
-				".scwrc":                  v1ValidConfigFile,
-			},
-			expectedAccessKey:             s(v2ValidAccessKey),
-			expectedSecretKey:             s(v2ValidSecretKey),
-			expectedDefaultOrganizationID: s(v2ValidDefaultOrganizationID),
-			expectedDefaultProjectID:      s(v2ValidDefaultProjectID),
-			expectedDefaultRegion:         s(v2ValidDefaultRegion),
-		},
 		{
 			name: "Complete config",
 			env: map[string]string{
@@ -426,28 +392,6 @@ func TestLoadProfileAndActiveProfile(t *testing.T) {
 			expectedDefaultZone:           s(v2ValidDefaultZone2),
 		},
 
-		// Valid V1 is not allowed
-		{
-			name: "Err: custom-path config with valid V1",
-			env: map[string]string{
-				ScwConfigPathEnv: "{HOME}/valid2/test.conf",
-			},
-			files: map[string]string{
-				"valid2/test.conf": v1ValidConfigFile,
-			},
-			expectedError: "scaleway-sdk-go: found legacy config in {HOME}/valid2/test.conf: legacy config is not allowed, please switch to the new config file format: " + documentationLink,
-		},
-		{
-			name: "Err: default config with invalid V1",
-			env: map[string]string{
-				"HOME": "{HOME}",
-			},
-			files: map[string]string{
-				".scwrc": v1InvalidConfigFile,
-			},
-			expectedError: "scaleway-sdk-go: content of config file {HOME}/.scwrc is invalid json: invalid character ':' after top-level value",
-		},
-
 		// Config file config.yaml and config.yml
 		{
 			name: "Read config.yml",
@@ -480,16 +424,6 @@ func TestLoadProfileAndActiveProfile(t *testing.T) {
 			// remove config file(s)
 			defer cleanEnv(t, test.files, dir)
 
-			// load config
-			isMigrated, err := MigrateLegacyConfig()
-
-			if test.expectedError != "" && err != nil {
-				testhelpers.Equals(t, test.expectedError, err.Error())
-				return
-			}
-			testhelpers.AssertNoError(t, err)
-
-			testhelpers.Equals(t, test.isMigrated, isMigrated)
 			config, err := LoadConfig()
 			if test.expectedError == "" {
 				testhelpers.AssertNoError(t, err)

scw/config_legacy_test.go

@@ -12,9 +12,7 @@ import (
 
 // TestLoad tests all valid configuration files:
 // - v2 config
-// - v1 to v2 config migration
 // - custom-path with v2 config
-// - custom-path with v1 config
 // - XDG config path with v2 config
 func TestLoad(t *testing.T) {
 	tests := []struct {
@@ -59,20 +57,6 @@ func TestLoad(t *testing.T) {
 				".config/scw/config.yaml": v2SimpleValidConfigFile,
 			},
 		},
-		{
-			name: "Default config with valid V2 and valid V1",
-			env: map[string]string{
-				"HOME": "{HOME}",
-			},
-			files: map[string]string{
-				".config/scw/config.yaml": v2SimpleValidConfigFile,
-				".scwrc":                  v1ValidConfigFile,
-			},
-			expected: v2SimpleValidConfig,
-			expectedFiles: map[string]string{
-				".config/scw/config.yaml": v2SimpleValidConfigFile,
-			},
-		},
 		{
 			name: "XDG config with valid V2",
 			env: map[string]string{

scw/config_test.go

@@ -70,15 +70,6 @@ func getConfigV2FilePath() (string, bool) {
 	return filepath.Clean(filepath.Join(configDir, defaultConfigFileName)), true
 }
 
-// getConfigV1FilePath returns the path to the v1 config file
-func getConfigV1FilePath() (string, bool) {
-	path, err := os.UserHomeDir()
-	if err != nil {
-		return "", false
-	}
-	return filepath.Clean(filepath.Join(path, ".scwrc")), true
-}
-
 // GetScwConfigDir returns the path to scw config folder
 func GetScwConfigDir() (string, error) {
 	if xdgPath := os.Getenv(xdgConfigDirEnv); xdgPath != "" {