Skip to content

Commit 602acad

Browse files
lwanderlwander
committed
Implemented GCS bucket objects
1 parent 455ba7b commit 602acad

6 files changed

Lines changed: 282 additions & 0 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ FEATURES:
66
* **New resource: `cloudstack_loadbalancer_rule`** [GH-2934]
77
* **New resource: `google_compute_project_metadata`** [GH-3065]
88
* **New resources: `aws_ami`, `aws_ami_copy`, `aws_ami_from_instance`** [GH-2874]
9+
* **New resource: `google_storage_bucket_object`** [GH-3192]
910

1011
IMPROVEMENTS:
1112

‎builtin/providers/google/provider.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ func Provider() terraform.ResourceProvider {
5252
"google_dns_record_set": resourceDnsRecordSet(),
5353
"google_compute_instance_group_manager": resourceComputeInstanceGroupManager(),
5454
"google_storage_bucket": resourceStorageBucket(),
55+
"google_storage_bucket_object": resourceStorageBucketObject(),
5556
},
5657

5758
ConfigureFunc: providerConfigure,

‎builtin/providers/google/resource_storage_bucket_object.go‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
package google
2+
3+
import (
4+
"os"
5+
"fmt"
6+
7+
"github.com/hashicorp/terraform/helper/schema"
8+
9+
"google.golang.org/api/storage/v1"
10+
)
11+
12+
func resourceStorageBucketObject() *schema.Resource {
13+
return &schema.Resource{
14+
Create: resourceStorageBucketObjectCreate,
15+
Read: resourceStorageBucketObjectRead,
16+
Update: resourceStorageBucketObjectUpdate,
17+
Delete: resourceStorageBucketObjectDelete,
18+
19+
Schema: map[string]*schema.Schema{
20+
"bucket": &schema.Schema{
21+
Type: schema.TypeString,
22+
Required: true,
23+
ForceNew: true,
24+
},
25+
"name": &schema.Schema{
26+
Type: schema.TypeString,
27+
Required: true,
28+
ForceNew: true,
29+
},
30+
"source": &schema.Schema{
31+
Type: schema.TypeString,
32+
Required: true,
33+
ForceNew: true,
34+
},
35+
"predefined_acl": &schema.Schema{
36+
Type: schema.TypeString,
37+
Default: "projectPrivate",
38+
Optional: true,
39+
ForceNew: true,
40+
},
41+
"md5hash": &schema.Schema{
42+
Type: schema.TypeString,
43+
Computed: true,
44+
},
45+
"crc32c": &schema.Schema{
46+
Type: schema.TypeString,
47+
Computed: true,
48+
},
49+
},
50+
}
51+
}
52+
53+
func objectGetId(object *storage.Object) string {
54+
return object.Bucket + "-" + object.Name
55+
}
56+
57+
func resourceStorageBucketObjectCreate(d *schema.ResourceData, meta interface{}) error {
58+
config := meta.(*Config)
59+
60+
bucket := d.Get("bucket").(string)
61+
name := d.Get("name").(string)
62+
source := d.Get("source").(string)
63+
acl := d.Get("predefined_acl").(string)
64+
65+
file, err := os.Open(source)
66+
if err != nil {
67+
return fmt.Errorf("Error opening %s: %s", source, err)
68+
}
69+
70+
objectsService := storage.NewObjectsService(config.clientStorage)
71+
object := &storage.Object{Bucket: bucket}
72+
73+
insertCall := objectsService.Insert(bucket, object)
74+
insertCall.Name(name)
75+
insertCall.Media(file)
76+
insertCall.PredefinedAcl(acl)
77+
78+
_, err = insertCall.Do()
79+
80+
if err != nil {
81+
return fmt.Errorf("Error uploading contents of object %s from %s: %s", name, source, err)
82+
}
83+
84+
return resourceStorageBucketObjectRead(d, meta)
85+
}
86+
87+
func resourceStorageBucketObjectRead(d *schema.ResourceData, meta interface{}) error {
88+
config := meta.(*Config)
89+
90+
bucket := d.Get("bucket").(string)
91+
name := d.Get("name").(string)
92+
93+
objectsService := storage.NewObjectsService(config.clientStorage)
94+
getCall := objectsService.Get(bucket, name)
95+
96+
res, err := getCall.Do()
97+
98+
if err != nil {
99+
return fmt.Errorf("Error retrieving contents of object %s: %s", name, err)
100+
}
101+
102+
d.Set("md5hash", res.Md5Hash)
103+
d.Set("crc32c", res.Crc32c)
104+
105+
d.SetId(objectGetId(res))
106+
107+
return nil
108+
}
109+
110+
func resourceStorageBucketObjectUpdate(d *schema.ResourceData, meta interface{}) error {
111+
// The Cloud storage API doesn't support updating object data contents,
112+
// only metadata. So once we implement metadata we'll have work to do here
113+
return nil
114+
}
115+
116+
func resourceStorageBucketObjectDelete(d *schema.ResourceData, meta interface{}) error {
117+
config := meta.(*Config)
118+
119+
bucket := d.Get("bucket").(string)
120+
name := d.Get("name").(string)
121+
122+
objectsService := storage.NewObjectsService(config.clientStorage)
123+
124+
DeleteCall := objectsService.Delete(bucket, name)
125+
err := DeleteCall.Do()
126+
127+
if err != nil {
128+
return fmt.Errorf("Error deleting contents of object %s: %s", name, err)
129+
}
130+
131+
return nil
132+
}

‎builtin/providers/google/resource_storage_bucket_object_test.go‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
package google
2+
3+
import (
4+
"fmt"
5+
"testing"
6+
"io/ioutil"
7+
"crypto/md5"
8+
"encoding/base64"
9+
10+
"github.com/hashicorp/terraform/helper/resource"
11+
"github.com/hashicorp/terraform/terraform"
12+
13+
"google.golang.org/api/storage/v1"
14+
)
15+
16+
var tf, err = ioutil.TempFile("", "tf-gce-test")
17+
var bucketName = "tf-gce-bucket-test"
18+
var objectName = "tf-gce-test"
19+
20+
func TestAccGoogleStorageObject_basic(t *testing.T) {
21+
data := []byte("data data data")
22+
h := md5.New()
23+
h.Write(data)
24+
data_md5 := base64.StdEncoding.EncodeToString(h.Sum(nil))
25+
26+
ioutil.WriteFile(tf.Name(), data, 0644)
27+
resource.Test(t, resource.TestCase{
28+
PreCheck: func() {
29+
if err != nil {
30+
panic(err)
31+
}
32+
testAccPreCheck(t)
33+
},
34+
Providers: testAccProviders,
35+
CheckDestroy: testAccGoogleStorageObjectDestroy,
36+
Steps: []resource.TestStep{
37+
resource.TestStep{
38+
Config: testGoogleStorageBucketsObjectBasic,
39+
Check: testAccCheckGoogleStorageObject(bucketName, objectName, data_md5),
40+
},
41+
},
42+
})
43+
}
44+
45+
func testAccCheckGoogleStorageObject(bucket, object, md5 string) resource.TestCheckFunc {
46+
return func(s *terraform.State) error {
47+
config := testAccProvider.Meta().(*Config)
48+
49+
objectsService := storage.NewObjectsService(config.clientStorage)
50+
51+
52+
getCall := objectsService.Get(bucket, object)
53+
res, err := getCall.Do()
54+
55+
if err != nil {
56+
return fmt.Errorf("Error retrieving contents of object %s: %s", object, err)
57+
}
58+
59+
if (md5 != res.Md5Hash) {
60+
return fmt.Errorf("Error contents of %s garbled, md5 hashes don't match (%s, %s)", object, md5, res.Md5Hash)
61+
}
62+
63+
return nil
64+
}
65+
}
66+
67+
func testAccGoogleStorageObjectDestroy(s *terraform.State) error {
68+
config := testAccProvider.Meta().(*Config)
69+
70+
for _, rs := range s.RootModule().Resources {
71+
if rs.Type != "google_storage_bucket_object" {
72+
continue
73+
}
74+
75+
bucket := rs.Primary.Attributes["bucket"]
76+
name := rs.Primary.Attributes["name"]
77+
78+
objectsService := storage.NewObjectsService(config.clientStorage)
79+
80+
getCall := objectsService.Get(bucket, name)
81+
_, err := getCall.Do()
82+
83+
if err == nil {
84+
return fmt.Errorf("Object %s still exists", name)
85+
}
86+
}
87+
88+
return nil
89+
}
90+
91+
var testGoogleStorageBucketsObjectBasic = fmt.Sprintf(`
92+
resource "google_storage_bucket" "bucket" {
93+
name = "%s"
94+
}
95+
96+
resource "google_storage_bucket_object" "object" {
97+
name = "%s"
98+
bucket = "${google_storage_bucket.bucket.name}"
99+
source = "%s"
100+
predefined_acl = "projectPrivate"
101+
}
102+
`, bucketName, objectName, tf.Name())

‎website/source/docs/providers/google/r/storage_bucket_object.html.markdown‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
layout: "google"
3+
page_title: "Google: google_storage_bucket_object"
4+
sidebar_current: "docs-google-resource-storage-object"
5+
description: |-
6+
Creates a new object inside a specified bucket
7+
---
8+
9+
# google\_storage\_bucket\_object
10+
11+
Creates a new object inside an exisiting bucket in Google cloud storage service (GCS). Currently, it does not support creating custom ACLs. For more information see [the official documentation](https://cloud.google.com/storage/docs/overview) and [API](https://cloud.google.com/storage/docs/json_api).
12+
13+
14+
## Example Usage
15+
16+
Example creating a public object in an existing `image-store` bucket.
17+
18+
```
19+
resource "google_storage_bucket_object" "picture" {
20+
name = "butterfly01"
21+
source = "/images/nature/garden-tiger-moth.jpg"
22+
bucket = "image-store"
23+
predefined_acl = "publicRead"
24+
}
25+
26+
```
27+
28+
## Argument Reference
29+
30+
The following arguments are supported:
31+
32+
* `name` - (Required) The name of the object.
33+
* `bucket` - (Required) The name of the containing bucket.
34+
* `source` - (Required) A path to the data you want to upload.
35+
* `predefined_acl` - (Optional, Default: 'projectPrivate') The [canned GCS ACL](https://cloud.google.com/storage/docs/access-control#predefined-acl) apply.
36+
37+
## Attributes Reference
38+
39+
The following attributes are exported:
40+
41+
* `md5hash` - (Computed) Base 64 MD5 hash of the uploaded data.
42+
* `crc32c` - (Computed) Base 64 CRC32 hash of the uploaded data.

‎website/source/layouts/google.erb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@
8484
<li<%= sidebar_current("docs-google-resource-storage-bucket") %>>
8585
<a href="/docs/providers/google/r/storage_bucket.html">google_storage_bucket</a>
8686
</li>
87+
88+
<li<%= sidebar_current("docs-google-resource-storage-bucket-object") %>>
89+
<a href="/docs/providers/google/r/storage_bucket_object.html">google_storage_bucket_object</a>
90+
</li>
8791
</ul>
8892
</li>
8993
</ul>

0 commit comments

Comments
 (0)