Properly encode paths for google_storage_object_access_control (#4946) (#3407)

* Added slashes into testAclObjectName

This gives a failing test that reproduces the issue

* Added % to the places that need it

* Run update tests with and without slashes

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/4946.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+storage: fixed handling of object paths that contain slashes for `google_storage_object_access_control`
+```

google-beta/resource_storage_object_access_control.go

@@ -158,7 +158,7 @@ func resourceStorageObjectAccessControlCreate(d *schema.ResourceData, meta inter
 	mutexKV.Lock(lockName)
 	defer mutexKV.Unlock(lockName)
 
-	url, err := replaceVars(d, config, "{{StorageBasePath}}b/{{bucket}}/o/{{object}}/acl")
+	url, err := replaceVars(d, config, "{{StorageBasePath}}b/{{bucket}}/o/{{%object}}/acl")
 	if err != nil {
 		return err
 	}
@@ -195,7 +195,7 @@ func resourceStorageObjectAccessControlRead(d *schema.ResourceData, meta interfa
 		return err
 	}
 
-	url, err := replaceVars(d, config, "{{StorageBasePath}}b/{{bucket}}/o/{{object}}/acl/{{entity}}")
+	url, err := replaceVars(d, config, "{{StorageBasePath}}b/{{bucket}}/o/{{%object}}/acl/{{entity}}")
 	if err != nil {
 		return err
 	}
@@ -285,7 +285,7 @@ func resourceStorageObjectAccessControlUpdate(d *schema.ResourceData, meta inter
 	mutexKV.Lock(lockName)
 	defer mutexKV.Unlock(lockName)
 
-	url, err := replaceVars(d, config, "{{StorageBasePath}}b/{{bucket}}/o/{{object}}/acl/{{entity}}")
+	url, err := replaceVars(d, config, "{{StorageBasePath}}b/{{bucket}}/o/{{%object}}/acl/{{entity}}")
 	if err != nil {
 		return err
 	}
@@ -324,7 +324,7 @@ func resourceStorageObjectAccessControlDelete(d *schema.ResourceData, meta inter
 	mutexKV.Lock(lockName)
 	defer mutexKV.Unlock(lockName)
 
-	url, err := replaceVars(d, config, "{{StorageBasePath}}b/{{bucket}}/o/{{object}}/acl/{{entity}}")
+	url, err := replaceVars(d, config, "{{StorageBasePath}}b/{{bucket}}/o/{{%object}}/acl/{{entity}}")
 	if err != nil {
 		return err
 	}
@@ -349,7 +349,7 @@ func resourceStorageObjectAccessControlDelete(d *schema.ResourceData, meta inter
 func resourceStorageObjectAccessControlImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*Config)
 	if err := parseImportId([]string{
-		"(?P<bucket>[^/]+)/(?P<object>[^/]+)/(?P<entity>[^/]+)",
+		"(?P<bucket>[^/]+)/(?P<object>.+)/(?P<entity>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}

google-beta/resource_storage_object_access_control_generated_test.go

@@ -81,7 +81,7 @@ func testAccCheckStorageObjectAccessControlDestroyProducer(t *testing.T) func(s
 
 			config := googleProviderConfig(t)
 
-			url, err := replaceVarsForTest(config, rs, "{{StorageBasePath}}b/{{bucket}}/o/{{object}}/acl/{{entity}}")
+			url, err := replaceVarsForTest(config, rs, "{{StorageBasePath}}b/{{bucket}}/o/{{%object}}/acl/{{entity}}")
 			if err != nil {
 				return err
 			}

google-beta/resource_storage_object_access_control_test.go

@@ -12,7 +12,46 @@ func TestAccStorageObjectAccessControl_update(t *testing.T) {
 	t.Parallel()
 
 	bucketName := testBucketName(t)
-	objectName := testAclObjectName(t)
+	objectName := fmt.Sprintf("%s-%d", "tf-test-acl-object", randInt(t))
+	objectData := []byte("data data data")
+	if err := ioutil.WriteFile(tfObjectAcl.Name(), objectData, 0644); err != nil {
+		t.Errorf("error writing file: %v", err)
+	}
+	vcrTest(t, resource.TestCase{
+		PreCheck: func() {
+			if errObjectAcl != nil {
+				panic(errObjectAcl)
+			}
+			testAccPreCheck(t)
+		},
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckStorageObjectAccessControlDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testGoogleStorageObjectAccessControlBasic(bucketName, objectName, "READER", "allUsers"),
+			},
+			{
+				ResourceName:      "google_storage_object_access_control.default",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testGoogleStorageObjectAccessControlBasic(bucketName, objectName, "OWNER", "allUsers"),
+			},
+			{
+				ResourceName:      "google_storage_object_access_control.default",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func TestAccStorageObjectAccessControl_updateWithSlashes(t *testing.T) {
+	t.Parallel()
+
+	bucketName := testBucketName(t)
+	objectName := fmt.Sprintf("%s-%d", "tf-test/acl/object", randInt(t))
 	objectData := []byte("data data data")
 	if err := ioutil.WriteFile(tfObjectAcl.Name(), objectData, 0644); err != nil {
 		t.Errorf("error writing file: %v", err)