Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor r/obs_bucket_object #781

Merged
merged 1 commit into from
Dec 23, 2020
Merged

Refactor r/obs_bucket_object #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 38 additions & 75 deletions opentelekomcloud/resource_opentelekomcloud_obs_bucket_object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ func resourceObsBucketObject() *schema.Resource {
},

"source": {
Type: schema.TypeString,
Optional: true,
Type: schema.TypeString,
Optional: true,
AtLeastOneOf: []string{"content"},
},

"content": {
Type: schema.TypeString,
Optional: true,
ConflictsWith: []string{"source"},
Type: schema.TypeString,
Optional: true,
AtLeastOneOf: []string{"source"},
},

"storage_class": {
Expand Down Expand Up @@ -93,25 +94,6 @@ func resourceObsBucketObject() *schema.Resource {
Type: schema.TypeInt,
Computed: true,
},

"credentials": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"access_key": {
Type: schema.TypeString,
Required: true,
},
"secret_key": {
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
},
},
},
},
}
}
Expand All @@ -125,18 +107,13 @@ func resourceObsBucketObjectPut(d *schema.ResourceData, meta interface{}) error
if err != nil {
return fmt.Errorf("error creating OBS client: %s", err)
}
source := d.Get("source").(string)
content := d.Get("content").(string)
if source == "" && content == "" {
return fmt.Errorf("must specify \"source\" or \"content\" field")
}

if source != "" {
if source, ok := d.GetOk("source"); ok {
// check source file whether exist
_, err := os.Stat(source)
_, err := os.Stat(source.(string))
if err != nil {
if os.IsNotExist(err) {
return fmt.Errorf("source file %s is not exist", source)
return fmt.Errorf("source file %s does not exist", source)
}
return err
}
Expand All @@ -145,7 +122,7 @@ func resourceObsBucketObjectPut(d *schema.ResourceData, meta interface{}) error
resp, err = putFileToObject(client, d)
}

if content != "" {
if _, ok := d.GetOk("content"); ok {
// put content
resp, err = putContentToObject(client, d)
}
Expand All @@ -171,33 +148,40 @@ func resourceObsBucketObjectPut(d *schema.ResourceData, meta interface{}) error
return resourceObsBucketObjectRead(d, meta)
}

func putContentToObject(obsClient *obs.ObsClient, d *schema.ResourceData) (*obs.PutObjectOutput, error) {
bucket := d.Get("bucket").(string)
key := d.Get("key").(string)
content := d.Get("content").(string)

putInput := &obs.PutObjectInput{}
putInput.Bucket = bucket
putInput.Key = key

func basicInput(d *schema.ResourceData) obs.PutObjectBasicInput {
common := obs.PutObjectBasicInput{
ObjectOperationInput: obs.ObjectOperationInput{
Bucket: d.Get("bucket").(string),
Key: d.Get("key").(string),
},
ContentType: d.Get("content_type").(string),
}
if v, ok := d.GetOk("acl"); ok {
putInput.ACL = obs.AclType(v.(string))
common.ACL = obs.AclType(v.(string))
}
if v, ok := d.GetOk("storage_class"); ok {
putInput.StorageClass = obs.StorageClassType(v.(string))
common.StorageClass = obs.StorageClassType(v.(string))
}
if v, ok := d.GetOk("content_type"); ok {
putInput.ContentType = v.(string)
common.ContentType = v.(string)
}

var sseKmsHeader = obs.SseKmsHeader{}
if d.Get("encryption").(bool) {
sseKmsHeader.Encryption = obs.DEFAULT_SSE_KMS_ENCRYPTION
sseKmsHeader.Key = d.Get("kms_key_id").(string)
putInput.SseHeader = sseKmsHeader
common.SseHeader = sseKmsHeader
}
return common
}

func putContentToObject(obsClient *obs.ObsClient, d *schema.ResourceData) (*obs.PutObjectOutput, error) {
content := d.Get("content").(string)

log.Printf("[DEBUG] putting %s to OBS Bucket %s, opts: %#v", key, bucket, putInput)
putInput := &obs.PutObjectInput{
PutObjectBasicInput: basicInput(d),
}

log.Printf("[DEBUG] putting %s to OBS Bucket %s, opts: %#v", putInput.Key, putInput.Bucket, putInput)
// do not log content
body := bytes.NewReader([]byte(content))
putInput.Body = body
Expand All @@ -206,32 +190,12 @@ func putContentToObject(obsClient *obs.ObsClient, d *schema.ResourceData) (*obs.
}

func putFileToObject(obsClient *obs.ObsClient, d *schema.ResourceData) (*obs.PutObjectOutput, error) {
bucket := d.Get("bucket").(string)
key := d.Get("key").(string)

putInput := &obs.PutFileInput{}
putInput.Bucket = bucket
putInput.Key = key
putInput.SourceFile = d.Get("source").(string)

if v, ok := d.GetOk("acl"); ok {
putInput.ACL = obs.AclType(v.(string))
}
if v, ok := d.GetOk("storage_class"); ok {
putInput.StorageClass = obs.StorageClassType(v.(string))
}
if v, ok := d.GetOk("content_type"); ok {
putInput.ContentType = v.(string)
}

var sseKmsHeader = obs.SseKmsHeader{}
if d.Get("encryption").(bool) {
sseKmsHeader.Encryption = obs.DEFAULT_SSE_KMS_ENCRYPTION
sseKmsHeader.Key = d.Get("kms_key_id").(string)
putInput.SseHeader = sseKmsHeader
putInput := &obs.PutFileInput{
PutObjectBasicInput: basicInput(d),
}
putInput.SourceFile = d.Get("source").(string)

log.Printf("[DEBUG] putting %s to OBS Bucket %s, opts: %#v", key, bucket, putInput)
log.Printf("[DEBUG] putting %s to OBS Bucket %s, opts: %#v", putInput.Key, putInput.Bucket, putInput)
return obsClient.PutFile(putInput)
}

Expand All @@ -250,7 +214,7 @@ func resourceObsBucketObjectRead(d *schema.ResourceData, meta interface{}) error

resp, err := client.ListObjects(input)
if err != nil {
return getObsError("Error listing objects of OBS bucket", bucket, err)
return getObsError("error listing objects of OBS bucket", bucket, err)
}

var exist bool
Expand All @@ -268,8 +232,7 @@ func resourceObsBucketObjectRead(d *schema.ResourceData, meta interface{}) error
}
log.Printf("[DEBUG] Reading OBS Bucket Object %s: %#v", key, object)

class := string(object.StorageClass)
if class == "" {
if class := string(object.StorageClass); class == "" {
err = d.Set("storage_class", "STANDARD")
} else {
err = d.Set("storage_class", normalizeStorageClass(class))
Expand Down
31 changes: 31 additions & 0 deletions opentelekomcloud/resource_opentelekomcloud_obs_bucket_object_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"io/ioutil"
"os"
"regexp"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
Expand Down Expand Up @@ -78,6 +79,24 @@ func TestAccObsBucketObject_content(t *testing.T) {
})
}

func TestAccObsBucketObject_nothing(t *testing.T) {
rInt := acctest.RandInt()

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckObsBucketObjectDestroy,
Steps: []resource.TestStep{
{
PreConfig: func() {},
Config: testAccObsBucketObjectConfigNothing(rInt),
PlanOnly: true,
ExpectError: regexp.MustCompile("-.+one\\sof\\s`content,source`\\smust\\sbe\\sspecified\\n"),
},
},
})
}

func testAccCheckObsBucketObjectDestroy(s *terraform.State) error {
config := testAccProvider.Meta().(*Config)
obsClient, err := config.newObjectStorageClient(OS_REGION_NAME)
Expand Down Expand Up @@ -162,6 +181,18 @@ func testAccCheckObsBucketObjectExists(n string) resource.TestCheckFunc {
}
}

func testAccObsBucketObjectConfigNothing(randInt int) string {
return fmt.Sprintf(`
resource "opentelekomcloud_obs_bucket" "object_bucket" {
bucket = "tf-object-test-bucket-%d"
}
resource "opentelekomcloud_obs_bucket_object" "object" {
bucket = opentelekomcloud_obs_bucket.object_bucket.bucket
key = "test-key"
}
`, randInt)
}

func testAccObsBucketObjectConfigSource(randInt int, source string) string {
return fmt.Sprintf(`
resource "opentelekomcloud_obs_bucket" "object_bucket" {
Expand Down