fix(object): handles nested id (#1690)

Author: quantumsheep

scaleway/helpers.go

@@ -104,10 +104,10 @@ func parseLocalizedID(localizedID string) (locality, id string, err error) {
 // parseLocalizedNestedID parses a localizedNestedID and extracts the resource locality, the inner and outer id.
 func parseLocalizedNestedID(localizedID string) (locality string, innerID, outerID string, err error) {
 	tab := strings.Split(localizedID, "/")
-	if len(tab) != 3 {
+	if len(tab) < 3 {
 		return "", "", localizedID, fmt.Errorf("cant parse localized id: %s", localizedID)
 	}
-	return tab[0], tab[1], tab[2], nil
+	return tab[0], tab[1], strings.Join(tab[2:], "/"), nil
 }
 
 // parseLocalizedNestedID parses a localizedNestedOwnerID and extracts the resource locality, the inner and outer id and owner.

scaleway/helpers_test.go

@@ -61,6 +61,61 @@ func TestParseLocalizedID(t *testing.T) {
 	}
 }
 
+func TestParseLocalizedNestedID(t *testing.T) {
+	testCases := []struct {
+		name       string
+		localityID string
+		innerID    string
+		outerID    string
+		locality   string
+		err        string
+	}{
+		{
+			name:       "id with a sub directory",
+			localityID: "fr-par/my-id/subdir",
+			innerID:    "my-id",
+			outerID:    "subdir",
+			locality:   "fr-par",
+		},
+		{
+			name:       "id with multiple sub directories",
+			localityID: "fr-par/my-id/subdir/foo/bar",
+			innerID:    "my-id",
+			outerID:    "subdir/foo/bar",
+			locality:   "fr-par",
+		},
+		{
+			name:       "simple",
+			localityID: "fr-par-1/my-id",
+			err:        "cant parse localized id: fr-par-1/my-id",
+		},
+		{
+			name:       "empty",
+			localityID: "",
+			err:        "cant parse localized id: ",
+		},
+		{
+			name:       "without locality",
+			localityID: "my-id",
+			err:        "cant parse localized id: my-id",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			locality, innerID, outerID, err := parseLocalizedNestedID(tc.localityID)
+			if tc.err != "" {
+				require.EqualError(t, err, tc.err)
+			} else {
+				require.NoError(t, err)
+				assert.Equal(t, tc.locality, locality)
+				assert.Equal(t, tc.innerID, innerID)
+				assert.Equal(t, tc.outerID, outerID)
+			}
+		})
+	}
+}
+
 func TestParseZonedID(t *testing.T) {
 	testCases := []struct {
 		name       string

scaleway/resource_object_test.go

@@ -42,6 +42,42 @@ func TestAccScalewayObject_Basic(t *testing.T) {
 					testAccCheckScalewayObjectExists(tt, "scaleway_object.file"),
 				),
 			},
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_object_bucket" "base-01" {
+						name = "%s"
+						tags = {
+							foo = "bar"
+						}
+					}
+					
+					resource scaleway_object "file" {
+						bucket = scaleway_object_bucket.base-01.name
+						key = "myfile/foo"
+					}
+				`, bucketName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayObjectExists(tt, "scaleway_object.file"),
+				),
+			},
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_object_bucket" "base-01" {
+						name = "%s"
+						tags = {
+							foo = "bar"
+						}
+					}
+					
+					resource scaleway_object "file" {
+						bucket = scaleway_object_bucket.base-01.name
+						key = "myfile/foo/bar"
+					}
+				`, bucketName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayObjectExists(tt, "scaleway_object.file"),
+				),
+			},
 		},
 	})
 }