From d53c5ce9c932c4dfec5613d389984c4341bcff7a Mon Sep 17 00:00:00 2001 From: Stephen Cross Date: Mon, 20 Nov 2017 14:44:10 -0500 Subject: [PATCH 01/10] fix delete_at description --- opc/resource_storage_object.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opc/resource_storage_object.go b/opc/resource_storage_object.go index 51a57e1..a00f046 100644 --- a/opc/resource_storage_object.go +++ b/opc/resource_storage_object.go @@ -86,7 +86,7 @@ func resourceOPCStorageObject() *schema.Resource { Optional: true, Computed: true, ForceNew: true, - Description: "Specify the number of seconds after which the system deletes the object", + Description: "The date and time in UNIX Epoch time stamp format when the system removes the object", }, "etag": { Type: schema.TypeString, From 59635fb0ca7469c6ea0477eeeab64d57d8235654 Mon Sep 17 00:00:00 2001 From: Stephen Cross Date: Mon, 20 Nov 2017 23:06:41 -0500 Subject: [PATCH 02/10] storage object update & tests WIP --- opc/resource_storage_object.go | 16 ++++++++++ opc/resource_storage_object_test.go | 45 +++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/opc/resource_storage_object.go b/opc/resource_storage_object.go index a00f046..08566f0 100644 --- a/opc/resource_storage_object.go +++ b/opc/resource_storage_object.go @@ -95,6 +95,13 @@ func resourceOPCStorageObject() *schema.Resource { ForceNew: true, Description: "MD5 checksum value of the request body. Unquoted. Strongly Recommended", }, + "metadata": { + Type: schema.TypeMap, + Optional: true, + Computed: true, + ForceNew: true, + Description: "The object metadata", + }, "transfer_encoding": { Type: schema.TypeString, Optional: true, @@ -201,6 +208,14 @@ func resourceOPCStorageObjectCreate(d *schema.ResourceData, meta interface{}) er input.ETag = v.(string) } + if v, ok := d.GetOk("metadata"); ok { + metadata := make(map[string]string) + for name, value := range v.(map[string]interface{}) { + metadata[name] = value.(string) + } + input.ObjectMetadata = metadata + } + if v, ok := d.GetOk("transfer_encoding"); ok { input.TransferEncoding = v.(string) } @@ -245,6 +260,7 @@ func resourceOPCStorageObjectRead(d *schema.ResourceData, meta interface{}) erro d.Set("last_modified", result.LastModified) d.Set("delete_at", result.DeleteAt) d.Set("object_manifest", result.ObjectManifest) + d.Set("metadata", result.ObjectMetadata) d.Set("timestamp", result.Timestamp) d.Set("transaction_id", result.TransactionID) diff --git a/opc/resource_storage_object_test.go b/opc/resource_storage_object_test.go index d121c97..03165e9 100644 --- a/opc/resource_storage_object_test.go +++ b/opc/resource_storage_object_test.go @@ -99,6 +99,30 @@ func TestAccOPCStorageObject_fileSource(t *testing.T) { }) } +func TestAccOPCStorageObject_objectMetadata(t *testing.T) { + resName := "opc_storage_object.test" + rInt := acctest.RandInt() + + body := _SourceInput + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckStorageObjectDestroy, + Steps: []resource.TestStep{ + { + Config: testAccOPCStorageObject_objectMetadata(rInt, body), + Check: resource.ComposeTestCheckFunc( + testAccCheckStorageObjectExists, + resource.TestCheckResourceAttr(resName, "name", fmt.Sprintf("test-acc-%d", rInt)), + resource.TestCheckResourceAttr(resName, "container", fmt.Sprintf("acc-test-%d", rInt)), + resource.TestCheckResourceAttrSet(resName, "metadata"), + ), + }, + }, + }) +} + func testAccCheckStorageObjectExists(s *terraform.State) error { client := testAccProvider.Meta().(*OPCClient).storageClient.Objects() @@ -146,6 +170,27 @@ resource "opc_storage_container" "foo" { }`, rInt) } +func testAccOPCStorageObject_objectMetadata(rInt int, body string) string { + return fmt.Sprintf(` +%s + +resource "opc_storage_object" "test" { + name = "test-acc-%d" + container = "${opc_storage_container.foo.name}" + content_type = "text/plain;charset=UTF-8" + metadata { + "Foo": "bar", + "Abc-Def": "XYZ" + } + content = < Date: Mon, 20 Nov 2017 23:07:46 -0500 Subject: [PATCH 03/10] Add additional attributed to sotrage container --- opc/resource_storage_container.go | 50 ++++++++++++++++++++++++++ opc/resource_storage_container_test.go | 12 +++++++ 2 files changed, 62 insertions(+) diff --git a/opc/resource_storage_container.go b/opc/resource_storage_container.go index afaecc9..b6f69e4 100644 --- a/opc/resource_storage_container.go +++ b/opc/resource_storage_container.go @@ -59,6 +59,24 @@ func resourceOPCStorageContainer() *schema.Resource { Type: schema.TypeInt, Optional: true, }, + "quota_bytes": { + Type: schema.TypeInt, + Optional: true, + }, + "quota_count": { + Type: schema.TypeInt, + Optional: true, + }, + "metadata": { + Type: schema.TypeMap, + Optional: true, + }, + // "georeplication_policy": { + // Type: schema.TypeList, + // Optional: true, + // Computed: true, + // Elem: &schema.Schema{Type: schema.TypeString}, + // }, }, } } @@ -93,6 +111,20 @@ func resourceOPCStorageContainerCreate(d *schema.ResourceData, meta interface{}) if maxAge, ok := d.GetOk("max_age"); ok { input.MaxAge = maxAge.(int) } + if quotaBytes, ok := d.GetOk("quota_bytes"); ok { + input.QuotaBytes = quotaBytes.(int) + } + if quotaCount, ok := d.GetOk("quota_count"); ok { + input.QuotaCount = quotaCount.(int) + } + + if v, ok := d.GetOk("metadata"); ok { + metadata := make(map[string]string) + for name, value := range v.(map[string]interface{}) { + metadata[name] = value.(string) + } + input.CustomMetadata = metadata + } info, err := client.CreateContainer(&input) if err != nil { @@ -134,6 +166,10 @@ func resourceOPCStorageContainerRead(d *schema.ResourceData, meta interface{}) e d.Set("primary_key", result.PrimaryKey) d.Set("secondary_key", result.SecondaryKey) d.Set("max_age", result.MaxAge) + d.Set("quota_bytes", result.QuotaBytes) + d.Set("quota_count", result.QuotaCount) + d.Set("metadata", result.CustomMetadata) + if err := setStringList(d, "read_acls", result.ReadACLs); err != nil { return err } @@ -197,6 +233,20 @@ func resourceOPCStorageContainerUpdate(d *schema.ResourceData, meta interface{}) if maxAge, ok := d.GetOk("max_age"); ok { input.MaxAge = maxAge.(int) } + if quotaBytes, ok := d.GetOk("quota_bytes"); ok { + input.QuotaBytes = quotaBytes.(int) + } + if quotaCount, ok := d.GetOk("quota_count"); ok { + input.QuotaCount = quotaCount.(int) + } + + if v, ok := d.GetOk("metadata"); ok { + metadata := make(map[string]string) + for name, value := range v.(map[string]interface{}) { + metadata[name] = value.(string) + } + input.CustomMetadata = metadata + } info, err := client.UpdateContainer(&input) if err != nil { diff --git a/opc/resource_storage_container_test.go b/opc/resource_storage_container_test.go index 1219284..b32246b 100644 --- a/opc/resource_storage_container_test.go +++ b/opc/resource_storage_container_test.go @@ -114,9 +114,14 @@ const testAccOPCStorageContainerBasic = ` resource "opc_storage_container" "test" { name = "acc-storage-container-%d" max_age = 50 + quota_bytes = 1000000000 + quota_count = 1000 primary_key = "test-key" allowed_origins = ["origin-1"] exposed_headers = ["exposed-header-1"] + metadate { + "Foo": "bar" + } } ` @@ -124,9 +129,16 @@ const testAccOPCStorageContainerUpdated = ` resource "opc_storage_container" "test" { name = "acc-storage-container-%d" max_age = 60 + quota_bytes = 2000000000 + quota_count = 2000 primary_key = "test-key-updated" secondary_key = "test-key" allowed_origins = ["origin-1", "origin-2"] exposed_headers = ["exposed-header-1", "exposed-header-2"] + metadate { + "Foo": "bar", + "Abc-Def": "xyz" + } + } ` From 6bef74d031b78a48e6ead52a069dea56fd1c75b7 Mon Sep 17 00:00:00 2001 From: Stephen Cross Date: Thu, 23 Nov 2017 17:18:34 -0500 Subject: [PATCH 04/10] update docs --- .../r/opc_storage_container.html.markdown | 5 ++ .../docs/r/opc_storage_object.html.markdown | 84 +++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 website/docs/r/opc_storage_object.html.markdown diff --git a/website/docs/r/opc_storage_container.html.markdown b/website/docs/r/opc_storage_container.html.markdown index c2a750f..12c34a4 100644 --- a/website/docs/r/opc_storage_container.html.markdown +++ b/website/docs/r/opc_storage_container.html.markdown @@ -41,6 +41,11 @@ The following arguments are supported: * `max_age` - (Optional) Maximum age in seconds for the origin to hold the preflight results. +* `quota_bytes` - (Optional) Maximum size of the container, in bytes + +* `quota_count` - (Optional) Maximum object count of the container + + ## Import Container's can be imported using the `resource name`, e.g. diff --git a/website/docs/r/opc_storage_object.html.markdown b/website/docs/r/opc_storage_object.html.markdown new file mode 100644 index 0000000..b6abe31 --- /dev/null +++ b/website/docs/r/opc_storage_object.html.markdown @@ -0,0 +1,84 @@ +--- +layout: "opc" +page_title: "Oracle: opc_storage_opject" +sidebar_current: "docs-opc-resource-storage-object" +description: |- + Creates and manages a Object in the OPC Storage Container. `storage_endpoint` must be set in the provider or environment to manage these resources. +--- + +# opc\_storage\_object + +Creates and manages a Object in the OPC Storage Container. `storage_endpoint` must be set in the provider or environment to manage these resources. + +## Example Usage + +```hcl +resource "opc_storage_object" "default" { + name = "storage-object-1" + container = "${opc_storage_container.container.name}" + file = "${"./source_file.txt"}" + etag = "${md5(file("./source_file.txt"))}" + content_type = "text/plain;charset=utf-8" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the Storage Object. + +* `container` - (Required) The name of Storage Container the store the object in. + +* `content` - (Optional) Raw content in string-form of the data. + +* `file` - (Optional) File path for the content to use for data. + +* `copy_from` - (Optional) name of an existing object used to create the new object as a copy. The value is in form `container/object`. You must UTF-8-encode and then URL-encode the names of the container and object. + +* `content_disposition` - (Optional) Set the HTTP `Content-Disposition` header to specify the override behaviour for the browser, e.g. `inline` or `attachment`. + +* `content_encoding` - (Optional) set the HTTP `Content-Encoding` for the object. + +* `content_type` - (Optional) set the MIME type for the object. + +* `delete_at` - (Optional) The date and time in UNIX Epoch time stamp format when the system removes the object. + +* `etag` - (Optional) MD5 checksum value of the request body. Strongly Recommended. + +* `transfer_encoding` - (Optional) Set to `chunked` to enable chunked transfer encoding. + +* `metadata` - (Optional) Additional object metadata headers. See [Object Metadata ](#object-metadata) below for more information. + +## Attributes + +In addition to the attributes listed above, the following attributes are exported: + +* `id` - The combined container and object name path of the object. +* `accept_ranges` - Type of ranges that the object accepts. +* `content_length` - Length of the object in bytes. +* `last_modified` - Date and Time that the object was created/modified in ISO 8601. +* `object_manifest` - The dynamic large-object manifest object. +* `timestamp` - Date and Time in UNIX EPOCH when the account, container, or object was initially created at the current version. +* `transaction_id` - Transaction ID of the request. + +## Object Metadata + +The `metadata` config defines a map of additional meta data header name value pairs. + +```hcl +metadata { + "Foo-Bar" = "barfoo", + "Sha256" = "e91ed4f93637379a7539cb5d8d0b5bca3972755de4f9371ab2e123e7b4c53680" +} +``` + +The additional meta data items set on the object in the form `X-Object-Meta-{name}: {value}`, where `{name}` is the name of the metadata item `{value}` is the header content. + +## Import + +Object's can be imported using the `resource id`, e.g. + +```shell +$ terraform import opc_storage_object.default container/example +``` From e56e064a96ec065231ae06b879c4783f3283dd19 Mon Sep 17 00:00:00 2001 From: Stephen Cross Date: Thu, 23 Nov 2017 17:41:55 -0500 Subject: [PATCH 05/10] update service names --- website/opc.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/opc.erb b/website/opc.erb index fddd98e..3d9186b 100644 --- a/website/opc.erb +++ b/website/opc.erb @@ -26,7 +26,7 @@ > - Compute Resources + Compute Classic Resources - > - Storage PAAS Resources + > + Object Storage Classic Resources
    > opc_storage_container From 8cc6bb9827f487919b000ec4b6d75d4aadb047d7 Mon Sep 17 00:00:00 2001 From: Stephen Cross Date: Thu, 23 Nov 2017 19:37:34 -0500 Subject: [PATCH 06/10] update docs --- .../r/opc_storage_container.html.markdown | 43 ++++++++++++++++--- .../docs/r/opc_storage_object.html.markdown | 12 +++--- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/website/docs/r/opc_storage_container.html.markdown b/website/docs/r/opc_storage_container.html.markdown index 12c34a4..623c41b 100644 --- a/website/docs/r/opc_storage_container.html.markdown +++ b/website/docs/r/opc_storage_container.html.markdown @@ -16,10 +16,8 @@ provider or environment to manage these resources. ```hcl resource "opc_storage_container" "default" { - name = "storage-container-1" - read_acls = ["read_acl_1", "read_acl_2"] - max_age = 60 - primary_key = "primary-key-name" + name = "storage-container-1" + read_acls = [ ".r:example.com", ".rlistings" ] } ``` @@ -29,9 +27,9 @@ The following arguments are supported: * `name` - (Required) The name of the Storage Container. -* `read_acls` - (Optional) The list of ACLs that grant read access. +* `read_acls` - (Optional) The list of ACLs that grant read access. See [Setting Container ACLs](setting-container-acls). -* `write_acls` - (Optional) The list of ACLs that grant write access. +* `write_acls` - (Optional) The list of ACLs that grant write access. See [Setting Container ACLs](setting-container-acls). * `primary_key` - (Optional) The primary secret key value for temporary URLs. @@ -39,12 +37,45 @@ The following arguments are supported: * `allowed_origins` - (Optional) List of origins that are allowed to make cross-origin requests. +* `exposed_headers` - (Optional) List of headers exposed to the user agent (e.g. browser) in the actual request response + * `max_age` - (Optional) Maximum age in seconds for the origin to hold the preflight results. * `quota_bytes` - (Optional) Maximum size of the container, in bytes * `quota_count` - (Optional) Maximum object count of the container +* `metadata` - (Optional) Additional object metadata headers. See [Container Metadata ](#container-metadata) below for more information. + +## Setting Container ACLs + +The `read_acl` consists of a list of **roles** or **referrer designations**. The `write_acls` consists of a list of **roles**. + +- **roles** can be built-in roles or custom roles. Custom roles are defined in the Users tab in the Oracle Cloud My Services console. For a role that was provisioned as part of another service instance, the format is `domainName.serviceName.roleName`. For a custom role, the format is `domainName.roleName`. Default Storage roles include: + + - `${var.domain}.Storage.Storage_ReadOnlyGroup` + - `${var.domain}.Storage.Storage_ReadWriteGroup` + - `${var.domain}.Storage.Storage_Administrator` + +- **referrer designation** indicates the host (or hosts) for which read access to the container should be allowed or denied. When the server receives a request for the container, it compares the referrer designations specified in the Read ACL with the value of the Referer header in the request, and determines whether access should be allowed or denied. The syntax of the referrer designation is: `.r:value` + + `value` indicates the host for which access to the container should be allowed. It can be a specific host name (example: `.r:www.example.com`), a domain (example: `.r:.example.com`), or an asterisk (`.r:*`) to indicate all hosts. Note that if `.r:*` is specified, objects in the container will be publicly readable without authentication. + + A minus sign (-) before value (example: `.r:-temp.example.com`) indicates that the host specified in the value field must be denied access to the container. + +By default, read access to a container does not include permission to list the objects in the container. To allow listing of objects as well, include the `.rlistings` directive in the ACL. + + +## Container Metadata + +The `metadata` config defines a map of additional meta data header name value pairs. The additional meta data items are set as HTTP Headers on the container in the form `X-Container-Meta-{name}: {value}`, where `{name}` is the name of the metadata item `{value}` is the header content. For example: + +```hcl +metadata { + "Foo-Bar" = "barfoo" + "Tags" = "abc 123 xyz" +} +``` ## Import diff --git a/website/docs/r/opc_storage_object.html.markdown b/website/docs/r/opc_storage_object.html.markdown index b6abe31..d608693 100644 --- a/website/docs/r/opc_storage_object.html.markdown +++ b/website/docs/r/opc_storage_object.html.markdown @@ -14,10 +14,10 @@ Creates and manages a Object in the OPC Storage Container. `storage_endpoint` mu ```hcl resource "opc_storage_object" "default" { - name = "storage-object-1" - container = "${opc_storage_container.container.name}" - file = "${"./source_file.txt"}" - etag = "${md5(file("./source_file.txt"))}" + name = "storage-object-1" + container = "${opc_storage_container.container.name}" + file = "${"./source_file.txt"}" + etag = "${md5(file("./source_file.txt"))}" content_type = "text/plain;charset=utf-8" } ``` @@ -64,7 +64,7 @@ In addition to the attributes listed above, the following attributes are exporte ## Object Metadata -The `metadata` config defines a map of additional meta data header name value pairs. +The `metadata` config defines a map of additional meta data header name value pairs. The additional meta data items are set HTTP Headers on the object in the form `X-Object-Meta-{name}: {value}`, where `{name}` is the name of the metadata item `{value}` is the header content. For example: ```hcl metadata { @@ -73,8 +73,6 @@ metadata { } ``` -The additional meta data items set on the object in the form `X-Object-Meta-{name}: {value}`, where `{name}` is the name of the metadata item `{value}` is the header content. - ## Import Object's can be imported using the `resource id`, e.g. From c9d9359b7f3abfe2e3b0f02e3c01266a9203bd7d Mon Sep 17 00:00:00 2001 From: Stephen Cross Date: Mon, 4 Dec 2017 12:22:17 -0500 Subject: [PATCH 07/10] Fixed removing custom headers --- opc/resource_storage_container.go | 32 ++++++++++++++++++++++++++ opc/resource_storage_container_test.go | 12 +++++----- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/opc/resource_storage_container.go b/opc/resource_storage_container.go index b6f69e4..9fa921f 100644 --- a/opc/resource_storage_container.go +++ b/opc/resource_storage_container.go @@ -240,6 +240,19 @@ func resourceOPCStorageContainerUpdate(d *schema.ResourceData, meta interface{}) input.QuotaCount = quotaCount.(int) } + // Create list of metadata headers to be removed + old, new := d.GetChange("metadata") + newHeaders := getKeys(new.(map[string]interface{})) + oldHeaders := getKeys(old.(map[string]interface{})) + removeHeaders := []string{} + for i := range oldHeaders { + if !contains(newHeaders, oldHeaders[i]) { + removeHeaders = append(removeHeaders, oldHeaders[i]) + } + } + input.RemoveCustomMetadata = removeHeaders + + // metadata headers to add or update if v, ok := d.GetOk("metadata"); ok { metadata := make(map[string]string) for name, value := range v.(map[string]interface{}) { @@ -257,3 +270,22 @@ func resourceOPCStorageContainerUpdate(d *schema.ResourceData, meta interface{}) return resourceOPCStorageContainerRead(d, meta) } + +// get keys from a map +func getKeys(m map[string]interface{}) []string { + keys := []string{} + for k, _ := range m { + keys = append(keys, k) + } + return keys +} + +// check if value is in slice +func contains(s []string, e string) bool { + for _, a := range s { + if a == e { + return true + } + } + return false +} diff --git a/opc/resource_storage_container_test.go b/opc/resource_storage_container_test.go index b32246b..74ccdc5 100644 --- a/opc/resource_storage_container_test.go +++ b/opc/resource_storage_container_test.go @@ -119,8 +119,9 @@ resource "opc_storage_container" "test" { primary_key = "test-key" allowed_origins = ["origin-1"] exposed_headers = ["exposed-header-1"] - metadate { - "Foo": "bar" + metadata { + "Foo" = "bar", + "Abc-Def" = "xyz" } } ` @@ -135,10 +136,9 @@ resource "opc_storage_container" "test" { secondary_key = "test-key" allowed_origins = ["origin-1", "origin-2"] exposed_headers = ["exposed-header-1", "exposed-header-2"] - metadate { - "Foo": "bar", - "Abc-Def": "xyz" + metadata { + "Bar" = "foo", + "Abc-Def" = "xyz" } - } ` From 34ab68e7f089171acb1f5c4084f66f43da1ea598 Mon Sep 17 00:00:00 2001 From: Stephen Cross Date: Tue, 5 Dec 2017 11:02:39 -0500 Subject: [PATCH 08/10] removed old doc file, updated import info --- .../opc_compute_storage_object.html.markdown | 88 ------------------- .../docs/r/opc_storage_object.html.markdown | 4 + 2 files changed, 4 insertions(+), 88 deletions(-) delete mode 100644 website/docs/r/opc_compute_storage_object.html.markdown diff --git a/website/docs/r/opc_compute_storage_object.html.markdown b/website/docs/r/opc_compute_storage_object.html.markdown deleted file mode 100644 index 91f2094..0000000 --- a/website/docs/r/opc_compute_storage_object.html.markdown +++ /dev/null @@ -1,88 +0,0 @@ ---- -layout: "opc" -page_title: "Oracle: opc_storage_object" -sidebar_current: "docs-opc-resource-storage-object" -description: |- - Creates and manages a Container Object in the OPC Storage Domain. `storage_endpoint` must be set in the - provider or environment to manage these resources. ---- - -# opc\_storage\_object - -Creates and manages a Container in the OPC Storage Domain. `storage_endpoint` must be set in the -provider or environment to manage these resources. - -## Example Usage - -```hcl -resource "opc_storage_container" "foo" { - name = "my-storage-container" - max_age = 50 - primary_key = "test-key" - allowed_origins = ["origin-1"] -} - -resource "opc_storage_object" "default" { - name = "my-storage-object" - container = "${opc_storage_container.foo.name}" - content = < Date: Wed, 13 Dec 2017 10:31:36 -0700 Subject: [PATCH 09/10] Updating vendored go sdk --- .../go-oracle-terraform/client/client.go | 54 +-- .../go-oracle-terraform/client/version.go | 35 ++ .../compute/compute_resource_client.go | 19 + .../go-oracle-terraform/compute/instances.go | 54 +++ .../compute/orchestration.go | 423 ++++++++++++++++++ .../go-oracle-terraform/opc/config.go | 1 + .../go-oracle-terraform/storage/container.go | 203 ++++++++- .../go-oracle-terraform/storage/object.go | 32 +- vendor/vendor.json | 48 +- 9 files changed, 785 insertions(+), 84 deletions(-) create mode 100644 vendor/github.com/hashicorp/go-oracle-terraform/client/version.go create mode 100644 vendor/github.com/hashicorp/go-oracle-terraform/compute/orchestration.go diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/client/client.go b/vendor/github.com/hashicorp/go-oracle-terraform/client/client.go index 44e92e8..4188d11 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/client/client.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/client/client.go @@ -7,12 +7,25 @@ import ( "io" "net/http" "net/url" + "runtime" "time" "github.com/hashicorp/go-oracle-terraform/opc" ) const DEFAULT_MAX_RETRIES = 1 +const USER_AGENT_HEADER = "User-Agent" + +var ( + // defaultUserAgent builds a string containing the Go version, system archityecture and OS, + // and the go-autorest version. + defaultUserAgent = fmt.Sprintf("Go/%s (%s-%s) go-oracle-terraform/%s", + runtime.Version(), + runtime.GOARCH, + runtime.GOOS, + Version(), + ) +) // Client represents an authenticated compute client, with compute credentials and an api client. type Client struct { @@ -22,6 +35,7 @@ type Client struct { APIEndpoint *url.URL httpClient *http.Client MaxRetries *int + UserAgent *string logger opc.Logger loglevel opc.LogLevelType } @@ -33,10 +47,14 @@ func NewClient(c *opc.Config) (*Client, error) { UserName: c.Username, Password: c.Password, APIEndpoint: c.APIEndpoint, + UserAgent: &defaultUserAgent, httpClient: c.HTTPClient, MaxRetries: c.MaxRetries, loglevel: c.LogLevel, } + if c.UserAgent != nil { + client.UserAgent = c.UserAgent + } // Setup logger; defaults to stdout if c.Logger == nil { @@ -64,38 +82,6 @@ func NewClient(c *opc.Config) (*Client, error) { return client, nil } -// This builds an http request. -// After calling this you need to add the authentication. Header/Cookie/etc -// Then call ExecuteRequest and pass in the return value of this method -// It is split up to add additional authentication that is Oracle API dependent. -// DEPRECATED -func (c *Client) BuildRequest(method, path string, body interface{}) (*http.Request, error) { - // Parse URL Path - urlPath, err := url.Parse(path) - if err != nil { - return nil, err - } - - // Marshall request body - var requestBody io.ReadSeeker - var marshaled []byte - if body != nil { - marshaled, err = json.Marshal(body) - if err != nil { - return nil, err - } - requestBody = bytes.NewReader(marshaled) - } - - // Create request - req, err := http.NewRequest(method, c.formatURL(urlPath), requestBody) - if err != nil { - return nil, err - } - - return req, nil -} - // Marshalls the request body and returns the resulting byte slice // This is split out of the BuildRequestBody method so as to allow // the developer to print a debug string of the request body if they @@ -128,6 +114,8 @@ func (c *Client) BuildRequestBody(method, path string, body []byte) (*http.Reque if err != nil { return nil, err } + // Adding UserAgent Header + req.Header.Add(USER_AGENT_HEADER, *c.UserAgent) return req, nil } @@ -145,6 +133,8 @@ func (c *Client) BuildNonJSONRequest(method, path string, body io.ReadSeeker) (* if err != nil { return nil, err } + // Adding UserAgentHeader + req.Header.Add(USER_AGENT_HEADER, *c.UserAgent) return req, nil } diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/client/version.go b/vendor/github.com/hashicorp/go-oracle-terraform/client/version.go new file mode 100644 index 0000000..3538fd1 --- /dev/null +++ b/vendor/github.com/hashicorp/go-oracle-terraform/client/version.go @@ -0,0 +1,35 @@ +package client + +import ( + "bytes" + "fmt" + "strings" + "sync" +) + +const ( + major = 0 + minor = 6 + patch = 2 + tag = "" +) + +var once sync.Once +var version string + +// Version returns the semantic version (see http://semver.org). +func Version() string { + once.Do(func() { + semver := fmt.Sprintf("%d.%d.%d", major, minor, patch) + verBuilder := bytes.NewBufferString(semver) + if tag != "" && tag != "-" { + updated := strings.TrimPrefix(tag, "-") + _, err := verBuilder.WriteString("-" + updated) + if err == nil { + verBuilder = bytes.NewBufferString(semver) + } + } + version = verBuilder.String() + }) + return version +} diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/compute_resource_client.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/compute_resource_client.go index 89fbe73..2c3e1dc 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/compute/compute_resource_client.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/compute_resource_client.go @@ -66,6 +66,25 @@ func (c *ResourceClient) deleteResource(name string) error { return nil } +func (c *ResourceClient) deleteOrchestration(name string) error { + var objectPath string + if name != "" { + objectPath = c.getObjectPath(c.ResourceRootPath, name) + } else { + objectPath = c.ResourceRootPath + } + // Set terminate to true as we always want to delete an orchestration + objectPath = fmt.Sprintf("%s?terminate=True", objectPath) + + _, err := c.executeRequest("DELETE", objectPath, nil) + if err != nil { + return err + } + + // No errors and no response body to write + return nil +} + func (c *ResourceClient) unmarshalResponseBody(resp *http.Response, iface interface{}) error { buf := new(bytes.Buffer) buf.ReadFrom(resp.Body) diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/instances.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/instances.go index 688060f..ddfa8d6 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/compute/instances.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/instances.go @@ -440,6 +440,60 @@ func (c *InstancesClient) GetInstance(input *GetInstanceInput) (*InstanceInfo, e return &responseBody, nil } +type InstancesInfo struct { + Instances []InstanceInfo `json:"result"` +} + +type GetInstanceIdInput struct { + // Name of the instance you want to get + Name string +} + +// GetInstanceFromName loops through all the instances and finds the instance for the given name +// This is needed for orchestration since it doesn't return the id for the instance it creates. +func (c *InstancesClient) GetInstanceFromName(input *GetInstanceIdInput) (*InstanceInfo, error) { + input.Name = c.getQualifiedName(input.Name) + + var instancesInfo InstancesInfo + if err := c.getResource(fmt.Sprintf("%s/", c.getUserName()), &instancesInfo); err != nil { + return nil, err + } + + for _, i := range instancesInfo.Instances { + if strings.Contains(i.Name, input.Name) { + if i.Name == "" { + return nil, fmt.Errorf("Empty response body when requesting instance %s", input.Name) + } + + // The returned 'Name' attribute is the fully qualified instance name + "/" + ID + // Split these out to accurately populate the fields + nID := strings.Split(c.getUnqualifiedName(i.Name), "/") + i.Name = nID[0] + i.ID = nID[1] + + c.unqualify(&i.VCableID) + + // Unqualify SSH Key names + sshKeyNames := []string{} + for _, sshKeyRef := range i.SSHKeys { + sshKeyNames = append(sshKeyNames, c.getUnqualifiedName(sshKeyRef)) + } + i.SSHKeys = sshKeyNames + + var networkingErr error + i.Networking, networkingErr = c.unqualifyNetworking(i.Networking) + if networkingErr != nil { + return nil, networkingErr + } + i.Storage = c.unqualifyStorage(i.Storage) + + return &i, nil + } + } + + return nil, fmt.Errorf("Unable to find instance: %q", input.Name) +} + type UpdateInstanceInput struct { // Name of this instance, generated by the server. // Required diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/orchestration.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/orchestration.go new file mode 100644 index 0000000..a20e34c --- /dev/null +++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/orchestration.go @@ -0,0 +1,423 @@ +package compute + +import ( + "fmt" + "time" + + "github.com/hashicorp/go-oracle-terraform/client" +) + +const WaitForOrchestrationActiveTimeout = time.Duration(3600 * time.Second) +const WaitForOrchestrationDeleteTimeout = time.Duration(3600 * time.Second) + +// OrchestrationsClient is a client for the Orchestration functions of the Compute API. +type OrchestrationsClient struct { + ResourceClient +} + +// Orchestrations obtains an OrchestrationsClient which can be used to access to the +// Orchestration functions of the Compute API +func (c *ComputeClient) Orchestrations() *OrchestrationsClient { + return &OrchestrationsClient{ + ResourceClient: ResourceClient{ + ComputeClient: c, + ResourceDescription: "Orchestration", + ContainerPath: "/platform/v1/orchestration/", + ResourceRootPath: "/platform/v1/orchestration", + }} +} + +type OrchestrationDesiredState string + +const ( + // * active: Creates all the orchestration objects defined in the orchestration. + OrchestrationDesiredStateActive OrchestrationDesiredState = "active" + // * inactive: Adds the orchestration to Oracle Compute Cloud Service, but does not create any of the orchestration + OrchestrationDesiredStateInactive OrchestrationDesiredState = "inactive" + // * suspended: Suspends all orchestration objects defined in the orchestration + OrchestrationDesiredStateSuspend OrchestrationDesiredState = "suspend" +) + +type OrchestrationStatus string + +const ( + OrchestrationStatusActive OrchestrationStatus = "active" + OrchestrationStatusInactive OrchestrationStatus = "inactive" + OrchestrationStatusSuspend OrchestrationStatus = "suspend" + OrchestrationStatusActivating OrchestrationStatus = "activating" + OrchestrationStatusDeleting OrchestrationStatus = "deleting" + OrchestrationStatusError OrchestrationStatus = "terminal_error" + OrchestrationStatusStopping OrchestrationStatus = "stopping" + OrchestrationStatusSuspending OrchestrationStatus = "suspending" + OrchestrationStatusStarting OrchestrationStatus = "starting" + OrchestrationStatusDeactivating OrchestrationStatus = "deactivating" +) + +type OrchestrationType string + +const ( + OrchestrationTypeInstance OrchestrationType = "Instance" +) + +// OrchestrationInfo describes an existing Orchestration. +type Orchestration struct { + // The default Oracle Compute Cloud Service account, such as /Compute-acme/default. + Account string `json:"account"` + // Description of this orchestration + Description string `json:"description"` + // The desired_state specified in the orchestration JSON file. A unique identifier for this orchestration. + DesiredState OrchestrationDesiredState `json:"desired_state"` + // Unique identifier of this orchestration + ID string `json:"id"` + // The three-part name of the Orchestration (/Compute-identity_domain/user/object). + Name string `json:"name"` + // List of orchestration objects + Objects []Object `json:"objects"` + // Current status of this orchestration + Status OrchestrationStatus `json:"status"` + // Strings that describe the orchestration and help you identify it. + Tags []string `json:"tags"` + // Time the orchestration was last audited + TimeAudited string `json:"time_audited"` + // The time when the orchestration was added to Oracle Compute Cloud Service. + TimeCreated string `json:"time_created"` + // The time when the orchestration was last updated in Oracle Compute Cloud Service. + TimeUpdated string `json:"time_updated"` + // Unique Resource Identifier + URI string `json:"uri"` + // Name of the user who added this orchestration or made the most recent update to this orchestration. + User string `json:"user"` + // Version of this orchestration. It is automatically generated by the server. + Version int `json:"version"` +} + +// CreateOrchestrationInput defines an Orchestration to be created. +type CreateOrchestrationInput struct { + // The default Oracle Compute Cloud Service account, such as /Compute-acme/default. + // Optional + Account string `json:"account,omitempty"` + // Description of this orchestration + // Optional + Description string `json:"description,omitempty"` + // Specify the desired state of this orchestration: active, inactive, or suspend. + // You can manage the state of the orchestration objects by changing the desired state of the orchestration. + // * active: Creates all the orchestration objects defined in the orchestration. + // * inactive: Adds the orchestration to Oracle Compute Cloud Service, but does not create any of the orchestration + // objects defined in the orchestration. + // Required + DesiredState OrchestrationDesiredState `json:"desired_state"` + // The three-part name of the Orchestration (/Compute-identity_domain/user/object). + // Object names can contain only alphanumeric characters, hyphens, underscores, and periods. Object names are case-sensitive. + // Required + Name string `json:"name"` + // The list of objects in the orchestration. An object is the primary building block of an orchestration. + // An orchestration can contain up to 100 objects. + // Required + Objects []Object `json:"objects"` + // Strings that describe the orchestration and help you identify it. + Tags []string `json:"tags,omitempty"` + // Version of this orchestration. It is automatically generated by the server. + Version int `json:"version,omitempty"` + // Time to wait for an orchestration to be ready + Timeout time.Duration `json:"-"` +} + +type Object struct { + // The default Oracle Compute Cloud Service account, such as /Compute-acme/default. + // Optional + Account string `json:"account,omitempty"` + // Description of this orchestration + // Optional + Description string `json:"description,omitempty"` + // The desired state of the object + // Optional + DesiredState OrchestrationDesiredState `json:"desired_state,omitempty"` + // A text string describing the object. Labels can't include spaces. In an orchestration, the label for + // each object must be unique. Maximum length is 256 characters. + // Required + Label string `json:"label"` + // The four-part name of the object (/Compute-identity_domain/user/orchestration/object). If you don't specify a name + // for this object, the name is generated automatically. Object names can contain only alphanumeric characters, hyphens, + // underscores, and periods. Object names are case-sensitive. When you specify the object name, ensure that an object of + // the same type and with the same name doesn't already exist. If such a object already exists, then another + // object of the same type and with the same name won't be created and the existing object won't be updated. + // Optional + Name string `json:"name,omitempty"` + // The three-part name (/Compute-identity_domain/user/object) of the orchestration to which the object belongs. + // Required + Orchestration string `json:"orchestration"` + // Specifies whether the object should persist when the orchestration is suspended. Specify one of the following: + // * true: The object persists when the orchestration is suspended. + // * false: The object is deleted when the orchestration is suspended. + // By default, persistent is set to false. It is recommended that you specify true for storage + // volumes and other critical objects. Persistence applies only when you're suspending an orchestration. + // When you terminate an orchestration, all the objects defined in it are deleted. + // Optional + Persistent bool `json:"persistent,omitempty"` + // The relationship between the objects that are created by this orchestration. The + // only supported relationship is depends, indicating that the specified target objects must be created first. + // Note that when recovering from a failure, the orchestration doesn't consider object relationships. + // Orchestrations v2 use object references to recover interdependent objects to a healthy state. SeeObject + // References and Relationships in Using Oracle Compute Cloud Service (IaaS). + Relationship []Object `json:"relationships,omitempty"` + // The template attribute defines the properties or characteristics of the Oracle Compute Cloud Service object + // that you want to create, as specified by the type attribute. + // The fields in the template section vary depending on the specified type. See Orchestration v2 Attributes + // Specific to Each Object Type in Using Oracle Compute Cloud Service (IaaS) to determine the parameters that are + // specific to each object type that you want to create. + // For example, if you want to create a storage volume, the type would be StorageVolume, and the template would include + // size and bootable. If you want to create an instance, the type would be Instance, and the template would include + // instance-specific attributes, such as imagelist and shape. + // Required + Template interface{} `json:"template"` + // Specify one of the following object types that you want to create. + // The only allowed type is Instance + // Required + Type OrchestrationType `json:"type"` + // Version of this object, generated by the server + // Optional + Version int `json:"version,omitempty"` +} + +// CreateOrchestration creates a new Orchestration with the given name, key and enabled flag. +func (c *OrchestrationsClient) CreateOrchestration(input *CreateOrchestrationInput) (*Orchestration, error) { + var createdOrchestration Orchestration + + input.Name = c.getQualifiedName(input.Name) + for _, i := range input.Objects { + i.Orchestration = c.getQualifiedName(i.Orchestration) + if i.Type == OrchestrationTypeInstance { + instanceClient := c.ComputeClient.Instances() + instanceInput := i.Template.(*CreateInstanceInput) + instanceInput.Name = c.getQualifiedName(instanceInput.Name) + + qualifiedSSHKeys := []string{} + for _, key := range instanceInput.SSHKeys { + qualifiedSSHKeys = append(qualifiedSSHKeys, c.getQualifiedName(key)) + } + + instanceInput.SSHKeys = qualifiedSSHKeys + + qualifiedStorageAttachments := []StorageAttachmentInput{} + for _, attachment := range instanceInput.Storage { + qualifiedStorageAttachments = append(qualifiedStorageAttachments, StorageAttachmentInput{ + Index: attachment.Index, + Volume: c.getQualifiedName(attachment.Volume), + }) + } + instanceInput.Storage = qualifiedStorageAttachments + + instanceInput.Networking = instanceClient.qualifyNetworking(instanceInput.Networking) + } + } + + if err := c.createResource(&input, &createdOrchestration); err != nil { + return nil, err + } + + // Call wait for orchestration ready now, as creating the orchestration is an eventually consistent operation + getInput := &GetOrchestrationInput{ + Name: createdOrchestration.Name, + } + + if input.Timeout == 0 { + input.Timeout = WaitForOrchestrationActiveTimeout + } + + // Wait for orchestration to be ready and return the result + // Don't have to unqualify any objects, as the GetOrchestration method will handle that + orchestrationInfo, orchestrationError := c.WaitForOrchestrationState(getInput, input.Timeout) + if orchestrationError != nil { + deleteInput := &DeleteOrchestrationInput{ + Name: createdOrchestration.Name, + } + err := c.DeleteOrchestration(deleteInput) + if err != nil { + return nil, fmt.Errorf("Error deleting orchestration %s: %s", getInput.Name, err) + } + } + + return &orchestrationInfo, nil +} + +// GetOrchestrationInput describes the Orchestration to get +type GetOrchestrationInput struct { + // The three-part name of the Orchestration (/Compute-identity_domain/user/object). + Name string `json:name` +} + +// GetOrchestration retrieves the Orchestration with the given name. +func (c *OrchestrationsClient) GetOrchestration(input *GetOrchestrationInput) (*Orchestration, error) { + var orchestrationInfo Orchestration + if err := c.getResource(input.Name, &orchestrationInfo); err != nil { + return nil, err + } + + return c.success(&orchestrationInfo) +} + +// UpdateOrchestrationInput defines an Orchestration to be updated +type UpdateOrchestrationInput struct { + // The default Oracle Compute Cloud Service account, such as /Compute-acme/default. + // Optional + Account string `json:"account,omitempty"` + // Description of this orchestration + // Optional + Description string `json:"description,omitempty"` + // Specify the desired state of this orchestration: active, inactive, or suspend. + // You can manage the state of the orchestration objects by changing the desired state of the orchestration. + // * active: Creates all the orchestration objects defined in the orchestration. + // * inactive: Adds the orchestration to Oracle Compute Cloud Service, but does not create any of the orchestration + // objects defined in the orchestration. + // Required + DesiredState OrchestrationDesiredState `json:"desired_state"` + // The three-part name of the Orchestration (/Compute-identity_domain/user/object). + // Object names can contain only alphanumeric characters, hyphens, underscores, and periods. Object names are case-sensitive. + // Required + Name string `json:"name"` + // The list of objects in the orchestration. An object is the primary building block of an orchestration. + // An orchestration can contain up to 100 objects. + // Required + Objects []Object `json:"objects"` + // Strings that describe the orchestration and help you identify it. + Tags []string `json:"tags,omitempty"` + // Version of this orchestration. It is automatically generated by the server. + Version int `json:"version,omitempty"` + // Time to wait for an orchestration to be ready + Timeout time.Duration `json:"-"` +} + +// UpdateOrchestration updates the orchestration. +func (c *OrchestrationsClient) UpdateOrchestration(input *UpdateOrchestrationInput) (*Orchestration, error) { + var updatedOrchestration Orchestration + input.Name = c.getQualifiedName(input.Name) + for _, i := range input.Objects { + i.Orchestration = c.getQualifiedName(i.Orchestration) + if i.Type == OrchestrationTypeInstance { + instanceInput := i.Template.(map[string]interface{}) + instanceInput["name"] = c.getQualifiedName(instanceInput["name"].(string)) + } + } + + if err := c.updateResource(input.Name, input, &updatedOrchestration); err != nil { + return nil, err + } + + // Call wait for orchestration ready now, as creating the orchestration is an eventually consistent operation + getInput := &GetOrchestrationInput{ + Name: updatedOrchestration.Name, + } + + if input.Timeout == 0 { + input.Timeout = WaitForOrchestrationActiveTimeout + } + + // Wait for orchestration to be ready and return the result + // Don't have to unqualify any objects, as the GetOrchestration method will handle that + orchestrationInfo, orchestrationError := c.WaitForOrchestrationState(getInput, input.Timeout) + if orchestrationError != nil { + return nil, orchestrationError + } + + return &orchestrationInfo, nil +} + +// DeleteOrchestrationInput describes the Orchestration to delete +type DeleteOrchestrationInput struct { + // The three-part name of the Orchestration (/Compute-identity_domain/user/object). + // Required + Name string `json:name` + // Timeout for delete request + Timeout time.Duration `json:"-"` +} + +// DeleteOrchestration deletes the Orchestration with the given name. +func (c *OrchestrationsClient) DeleteOrchestration(input *DeleteOrchestrationInput) error { + if err := c.deleteOrchestration(input.Name); err != nil { + return err + } + + if input.Timeout == 0 { + input.Timeout = WaitForOrchestrationDeleteTimeout + } + + return c.WaitForOrchestrationDeleted(input, input.Timeout) +} + +func (c *OrchestrationsClient) success(info *Orchestration) (*Orchestration, error) { + c.unqualify(&info.Name) + for _, i := range info.Objects { + c.unqualify(&i.Orchestration) + if OrchestrationType(i.Type) == OrchestrationTypeInstance { + instanceInput := i.Template.(map[string]interface{}) + instanceInput["name"] = c.getUnqualifiedName(instanceInput["name"].(string)) + } + } + + return info, nil +} + +// WaitForOrchestrationActive waits for an orchestration to be completely initialized and available. +func (c *OrchestrationsClient) WaitForOrchestrationState(input *GetOrchestrationInput, timeout time.Duration) (Orchestration, error) { + var info *Orchestration + var getErr error + err := c.client.WaitFor("orchestration to be ready", timeout, func() (bool, error) { + info, getErr = c.GetOrchestration(input) + if getErr != nil { + return false, getErr + } + c.client.DebugLogString(fmt.Sprintf("Orchestration name is %v, Orchestration info is %+v", info.Name, info)) + switch s := info.Status; s { + case OrchestrationStatusError: + return false, fmt.Errorf("Error initializing orchestration: %+v", info) + case OrchestrationStatus(info.DesiredState): + c.client.DebugLogString(fmt.Sprintf("Orchestration %s", info.DesiredState)) + return true, nil + case OrchestrationStatusActivating: + c.client.DebugLogString("Orchestration activating") + return false, nil + case OrchestrationStatusStopping: + c.client.DebugLogString("Orchestration stopping") + return false, nil + case OrchestrationStatusSuspending: + c.client.DebugLogString("Orchestration suspending") + return false, nil + case OrchestrationStatusDeactivating: + c.client.DebugLogString("Orchestration deactivating") + return false, nil + default: + return false, fmt.Errorf("Unknown orchestration state: %s, erroring", s) + } + }) + return *info, err +} + +// WaitForOrchestrationDeleted waits for an orchestration to be fully deleted. +func (c *OrchestrationsClient) WaitForOrchestrationDeleted(input *DeleteOrchestrationInput, timeout time.Duration) error { + return c.client.WaitFor("orchestration to be deleted", timeout, func() (bool, error) { + var info Orchestration + if err := c.getResource(input.Name, &info); err != nil { + if client.WasNotFoundError(err) { + // Orchestration could not be found, thus deleted + return true, nil + } + // Some other error occurred trying to get Orchestration, exit + return false, err + } + switch s := info.Status; s { + case OrchestrationStatusError: + return false, fmt.Errorf("Error stopping orchestration: %+v", info) + case OrchestrationStatusStopping: + c.client.DebugLogString("Orchestration stopping") + return false, nil + case OrchestrationStatusDeleting: + c.client.DebugLogString("Orchestration deleting") + return false, nil + case OrchestrationStatusActive: + c.client.DebugLogString("Orchestration active") + return false, nil + default: + return false, fmt.Errorf("Unknown orchestration state: %s, erroring", s) + } + }) +} diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/opc/config.go b/vendor/github.com/hashicorp/go-oracle-terraform/opc/config.go index 0ac83ec..5c144a6 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/opc/config.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/opc/config.go @@ -14,6 +14,7 @@ type Config struct { LogLevel LogLevelType Logger Logger HTTPClient *http.Client + UserAgent *string } func NewConfig() *Config { diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/storage/container.go b/vendor/github.com/hashicorp/go-oracle-terraform/storage/container.go index 9dc2cf9..0a1f01a 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/storage/container.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/storage/container.go @@ -1,11 +1,52 @@ package storage import ( + "fmt" "net/http" "strconv" "strings" ) +// Header Constants +const ( + hContainerRead = "X-Container-Read" + hContainerWrite = "X-Container-Write" + hTempURLKey = "X-Container-Meta-Temp-Url-Key" + hTempURLKey2 = "X-Container-Meta-Temp-Url-Key-2" + hAccessControlAllowOrigin = "X-Container-Meta-Access-Control-Allow-Origin" + hAccessControlExposeHeaders = "X-Container-Meta-Access-Control-Expose-Headers" + hAccessControlMaxAge = "X-Container-Meta-Access-Control-Max-Age" + hQuotaBytes = "X-Container-Meta-Quota-Bytes" + hQuotaCount = "X-Container-Meta-Quota-Count" + hPolicyGeoreplication = "X-Container-Meta-Policy-Georeplication" + + hMetaPrefix = "X-Container-Meta-" + hRemoveMetaPrefix = "X-Remove-Container-Meta-" +) + +// All X-Container-Meta-* attributes that are explictly declared in the +// Container data types. Use to distigush standard from customer attributes +var explicitMetaHeaders = []string{ + hTempURLKey, + hTempURLKey2, + hAccessControlAllowOrigin, + hAccessControlExposeHeaders, + hAccessControlMaxAge, + hQuotaBytes, + hQuotaCount, + hPolicyGeoreplication, +} + +// Determine if a given header is a standard attribute or custom header +func (c *StorageClient) isCustomHeader(header string) bool { + for _, v := range explicitMetaHeaders { + if v == header { + return false + } + } + return true +} + // Container describes an existing Container. type Container struct { // The name of the Container @@ -24,6 +65,14 @@ type Container struct { ExposedHeaders []string // Maximum age in seconds for the origin to hold the preflight results. MaxAge int + // Maximum size of the container, in bytes + QuotaBytes int + // Maximum object count of the container + QuotaCount int + // Map of custom Container X-Container-Meta-{name} name value pairs + CustomMetadata map[string]string + // Georeplication Policy (undocumented) + GeoreplicationPolicy []string } // CreateContainerInput defines an Container to be created. @@ -55,6 +104,17 @@ type CreateContainerInput struct { // Sets the maximum age in seconds for the origin to hold the preflight results. // Optional MaxAge int + // Sets the Maximum size of the container, in bytes + // Optional + QuotaBytes int + // Sets the Maximum object count of the container + // Optional + QuotaCount int + // Map of custom Container X-Container-Meta-{name} name value pairs + // Optional + CustomMetadata map[string]string + // Georeplication Policy (undocumented) + // GeoreplicationPolicy []string } // CreateContainer creates a new Container with the given name, key and enabled flag. @@ -65,17 +125,38 @@ func (c *StorageClient) CreateContainer(input *CreateContainerInput) (*Container // There are default values for these that we don't want to zero out if Read and Write ACLs are not set. if len(input.ReadACLs) > 0 { - headers["X-Container-Read"] = strings.Join(input.ReadACLs, ",") + headers[hContainerRead] = strings.Join(input.ReadACLs, ",") } if len(input.WriteACLs) > 0 { - headers["X-Container-Write"] = strings.Join(input.WriteACLs, ",") + headers[hContainerWrite] = strings.Join(input.WriteACLs, ",") } - headers["X-Container-Meta-Temp-URL-Key"] = input.PrimaryKey - headers["X-Container-Meta-Temp-URL-Key-2"] = input.SecondaryKey - headers["X-Container-Meta-Access-Control-Allow-Origin"] = strings.Join(input.AllowedOrigins, " ") - headers["X-Container-Meta-Access-Control-Expose-Headers"] = strings.Join(input.ExposedHeaders, " ") - headers["X-Container-Meta-Access-Control-Max-Age"] = strconv.Itoa(input.MaxAge) + headers[hTempURLKey] = input.PrimaryKey + headers[hTempURLKey2] = input.SecondaryKey + headers[hAccessControlAllowOrigin] = strings.Join(input.AllowedOrigins, " ") + headers[hAccessControlExposeHeaders] = strings.Join(input.ExposedHeaders, " ") + // headers[hPolicyGeoreplication] = strings.Join(input.GeoreplicationPolicy, " ") + + if input.MaxAge != 0 { + headers[hAccessControlMaxAge] = strconv.Itoa(input.MaxAge) + } + if input.QuotaBytes != 0 { + headers[hQuotaBytes] = strconv.Itoa(input.QuotaBytes) + } + if input.QuotaCount != 0 { + headers[hQuotaCount] = strconv.Itoa(input.QuotaCount) + } + + if len(input.CustomMetadata) > 0 { + // add a header entry for each custom metadata item + // X-Container-Meta-{name}: value + for name, value := range input.CustomMetadata { + header := fmt.Sprintf("%s%s", hMetaPrefix, name) + if c.isCustomHeader(header) { + headers[header] = fmt.Sprintf("%s", value) + } + } + } if err := c.createResource(input.Name, headers); err != nil { return nil, err @@ -148,6 +229,40 @@ type UpdateContainerInput struct { // Updates the maximum age in seconds for the origin to hold the preflight results. // Optional MaxAge int + // Updates the Maximum size of the container, in bytes + // Optional + QuotaBytes int + // Updates the Maximum object count of the container + // Optional + QuotaCount int + // Updates custom Container X-Container-Meta-{name} name value pairs + // Optional + CustomMetadata map[string]string + // Remove custom Container X-Container-Meta-{name} headers + // Optional + RemoveCustomMetadata []string + // Georeplication Policy (undocumented) + // GeoreplicationPolicy []string +} + +// Set an X-Container-Meta-{name} header with the value provided +// or if the value is empty set the X-Remove-Container-Meta-{name} header +func (c *StorageClient) updateOrRemoveStringValue(headers map[string]string, header, value string) { + if value == "" { + headers[strings.Replace(header, hMetaPrefix, hRemoveMetaPrefix, 1)] = "" + } else { + headers[header] = value + } +} + +// Set an X-Container-Meta-{name} header with the value provided +// or if the value is 0 set the X-Remove-Container-Meta-{name} header +func (c *StorageClient) updateOrRemoveIntValue(headers map[string]string, header string, value int) { + if value == 0 { + headers[strings.Replace(header, hMetaPrefix, hRemoveMetaPrefix, 1)] = "" + } else { + headers[header] = strconv.Itoa(value) + } } // UpdateContainer updates the key and enabled flag of the Container with the given name. @@ -156,17 +271,44 @@ func (c *StorageClient) UpdateContainer(input *UpdateContainerInput) (*Container // There are default values for these that we don't want to zero out if Read and Write ACLs are not set. if len(input.ReadACLs) > 0 { - headers["X-Container-Read"] = strings.Join(input.ReadACLs, ",") + headers[hContainerRead] = strings.Join(input.ReadACLs, ",") } if len(input.WriteACLs) > 0 { - headers["X-Container-Write"] = strings.Join(input.WriteACLs, ",") + headers[hContainerWrite] = strings.Join(input.WriteACLs, ",") } - headers["X-Container-Meta-Temp-URL-Key"] = input.PrimaryKey - headers["X-Container-Meta-Temp-URL-Key-2"] = input.SecondaryKey - headers["X-Container-Meta-Access-Control-Allow-Origin"] = strings.Join(input.AllowedOrigins, " ") - headers["X-Container-Meta-Access-Control-Expose-Headers"] = strings.Join(input.ExposedHeaders, " ") - headers["X-Container-Meta-Access-Control-Max-Age"] = strconv.Itoa(input.MaxAge) + c.updateOrRemoveStringValue(headers, hTempURLKey, input.PrimaryKey) + c.updateOrRemoveStringValue(headers, hTempURLKey2, input.SecondaryKey) + c.updateOrRemoveStringValue(headers, hAccessControlAllowOrigin, strings.Join(input.AllowedOrigins, " ")) + c.updateOrRemoveStringValue(headers, hAccessControlExposeHeaders, strings.Join(input.ExposedHeaders, " ")) + c.updateOrRemoveIntValue(headers, hAccessControlMaxAge, input.MaxAge) + c.updateOrRemoveIntValue(headers, hQuotaBytes, input.QuotaBytes) + c.updateOrRemoveIntValue(headers, hQuotaCount, input.QuotaCount) + // c.updateOrRemove(headers, hPolicyGeoreplication, strings.Join(input.GeoreplicationPolicy, " ")) + + if len(input.CustomMetadata) > 0 { + // add a header entry for each custom metadata item + // X-Container-Meta-{name}: value + for name, value := range input.CustomMetadata { + header := fmt.Sprintf("%s%s", hMetaPrefix, name) + if c.isCustomHeader(header) { + headers[header] = fmt.Sprintf("%s", value) + } + } + } + + if len(input.RemoveCustomMetadata) > 0 { + // add a special header entry for each custom metadata item to be removed + // X-Remove-Container-Meta-{name}: value + for _, name := range input.RemoveCustomMetadata { + header := fmt.Sprintf("%s%s", hMetaPrefix, name) + if c.isCustomHeader(header) { + // change to remove header + header = fmt.Sprintf("%s%s", hRemoveMetaPrefix, name) + headers[header] = "" + } + } + } input.Name = c.getQualifiedName(input.Name) if err := c.updateResource(input.Name, headers); err != nil { @@ -181,13 +323,32 @@ func (c *StorageClient) UpdateContainer(input *UpdateContainerInput) (*Container func (c *StorageClient) success(rsp *http.Response, container *Container) (*Container, error) { var err error - container.ReadACLs = strings.Split(rsp.Header.Get("X-Container-Read"), ",") - container.WriteACLs = strings.Split(rsp.Header.Get("X-Container-Write"), ",") - container.PrimaryKey = rsp.Header.Get("X-Container-Meta-Temp-URL-Key") - container.SecondaryKey = rsp.Header.Get("X-Container-Meta-Temp-URL-Key-2") - container.AllowedOrigins = strings.Split(rsp.Header.Get("X-Container-Meta-Access-Control-Allow-Origin"), " ") - container.ExposedHeaders = strings.Split(rsp.Header.Get("X-Container-Meta-Access-Control-Expose-Headers"), " ") - container.MaxAge, err = strconv.Atoi(rsp.Header.Get("X-Container-Meta-Access-Control-Max-Age")) + container.ReadACLs = strings.Split(rsp.Header.Get(hContainerRead), ",") + container.WriteACLs = strings.Split(rsp.Header.Get(hContainerWrite), ",") + container.PrimaryKey = rsp.Header.Get(hTempURLKey) + container.SecondaryKey = rsp.Header.Get(hTempURLKey2) + container.AllowedOrigins = strings.Split(rsp.Header.Get(hAccessControlAllowOrigin), " ") + container.ExposedHeaders = strings.Split(rsp.Header.Get(hAccessControlExposeHeaders), " ") + container.GeoreplicationPolicy = strings.Split(rsp.Header.Get(hPolicyGeoreplication), " ") + + if value, err := strconv.Atoi(rsp.Header.Get(hAccessControlMaxAge)); err == nil { + container.MaxAge = value + } + if value, err := strconv.Atoi(rsp.Header.Get(hQuotaBytes)); err == nil { + container.QuotaBytes = value + } + if value, err := strconv.Atoi(rsp.Header.Get(hQuotaCount)); err == nil { + container.QuotaCount = value + } + + container.CustomMetadata = make(map[string]string) + for header, value := range rsp.Header { + if strings.HasPrefix(header, hMetaPrefix) && c.isCustomHeader(header) { + name := strings.TrimPrefix(header, hMetaPrefix) + container.CustomMetadata[name] = strings.Join(value, " ") + } + } + if err != nil { return nil, err } diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/storage/object.go b/vendor/github.com/hashicorp/go-oracle-terraform/storage/object.go index c8e6366..3638320 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/storage/object.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/storage/object.go @@ -46,6 +46,8 @@ const ( h_Timestamp = "X-Timestamp" h_TransactionID = "X-Trans-Id" h_TransferEncoding = "Transfer-Encoding" + + h_MetadataPrefix = "X-Object-Meta-" ) // ObjectInfo describes an existing object @@ -81,9 +83,8 @@ type ObjectInfo struct { DeleteAt int // Optional: The dynamic large object manifest object. ObjectManifest string - - // TODO: X-Object-Meta-{name} - + // Optional: The map of object metadata name values pairs for X-Object-Meta-{name} + ObjectMetadata map[string]string // Date and time in UNIX EPOCH when the account, container, _or_ object // was initially created as a current version. Timestamp string @@ -117,10 +118,11 @@ type CreateObjectInput struct { // and the name of the container and object must be URL-encoded // Optional CopyFrom string - // Specify the number of seconds after which the system deletes the object. - // Optional + // Specify the date and time in UNIX Epoch time stamp format when the system + // removes the object DeleteAt int - + // Specify the map of object metadata name values pairs for X-Object-Meta-{name} + ObjectMetadata map[string]string // MD5 checksum value of the request body. Unquoted // Strongly recommended, not required. ETag string @@ -160,8 +162,16 @@ func (c *ObjectClient) CreateObject(input *CreateObjectInput) (*ObjectInfo, erro if input.DeleteAt != 0 { headers[h_DeleteAt] = fmt.Sprintf("%d", input.DeleteAt) } + if len(input.ObjectMetadata) > 0 { + // add a header entry for each metadata item + // X-Object-Meta-{name}: value + for name, value := range input.ObjectMetadata { + header := fmt.Sprintf("%s%s", h_MetadataPrefix, name) + headers[header] = fmt.Sprintf("%s", value) + } + } - if input.Body == nil { + if input.Body == nil && input.CopyFrom == "" { return nil, fmt.Errorf("Body cannot be nil") } @@ -296,6 +306,14 @@ func (c *ObjectClient) success(resp *http.Response, object *ObjectInfo) (*Object } } + object.ObjectMetadata = make(map[string]string) + for header, value := range resp.Header { + if strings.HasPrefix(header, h_MetadataPrefix) { + name := strings.TrimPrefix(header, h_MetadataPrefix) + object.ObjectMetadata[name] = strings.Join(value, " ") + } + } + return object, nil } diff --git a/vendor/vendor.json b/vendor/vendor.json index 34bae3b..160c6c7 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -254,44 +254,44 @@ "revision": "d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5" }, { - "checksumSHA1": "hc/EkPH26GzST0jazlZk0rOsty4=", + "checksumSHA1": "hjQfXn32Tvuu6IJACOTsMzm+AbA=", "path": "github.com/hashicorp/go-oracle-terraform/client", - "revision": "d1b0e9affb138d06c32c582d4882ffbfc6497ea2", - "revisionTime": "2017-09-14T16:37:18Z", - "version": "=v0.4.0", - "versionExact": "v0.4.0" + "revision": "e0d598bfeb66f747ec57c4338dbaf851155629fc", + "revisionTime": "2017-12-13T17:12:11Z", + "version": "v0.6.3", + "versionExact": "v0.6.3" }, { - "checksumSHA1": "iAw1fXm+NCtzcfjwoH9kqG7g0jU=", + "checksumSHA1": "p9U7+yTMji0K9wsMVDFJNWp+9F8=", "path": "github.com/hashicorp/go-oracle-terraform/compute", - "revision": "83d5e12ef842b566a21b0a92753b69bf8fe9b9ca", - "revisionTime": "2017-10-23T14:49:57Z", - "version": "v0.5.2", - "versionExact": "v0.5.2" + "revision": "e0d598bfeb66f747ec57c4338dbaf851155629fc", + "revisionTime": "2017-12-13T17:12:11Z", + "version": "v0.6.3", + "versionExact": "v0.6.3" }, { "checksumSHA1": "E7dGmtLqjJnfc+Wz3paDimFVI8I=", "path": "github.com/hashicorp/go-oracle-terraform/database", - "revision": "83d5e12ef842b566a21b0a92753b69bf8fe9b9ca", - "revisionTime": "2017-10-23T14:49:57Z", - "version": "v0.5.2", - "versionExact": "v0.5.2" + "revision": "e0d598bfeb66f747ec57c4338dbaf851155629fc", + "revisionTime": "2017-12-13T17:12:11Z", + "version": "v0.6.3", + "versionExact": "v0.6.3" }, { - "checksumSHA1": "JbuYtbJkx3r1BLuCMymkri0Q1BI=", + "checksumSHA1": "NuObCk0/ybL3w++EnltgrB1GQRc=", "path": "github.com/hashicorp/go-oracle-terraform/opc", - "revision": "d1b0e9affb138d06c32c582d4882ffbfc6497ea2", - "revisionTime": "2017-09-14T16:37:18Z", - "version": "=v0.4.0", - "versionExact": "v0.4.0" + "revision": "e0d598bfeb66f747ec57c4338dbaf851155629fc", + "revisionTime": "2017-12-13T17:12:11Z", + "version": "v0.6.3", + "versionExact": "v0.6.3" }, { - "checksumSHA1": "H8V9Z6p2ezWTQmDkKrcnlIYg8q4=", + "checksumSHA1": "WKErIOzVwmPBcOC0lDp2RUEtSJs=", "path": "github.com/hashicorp/go-oracle-terraform/storage", - "revision": "83d5e12ef842b566a21b0a92753b69bf8fe9b9ca", - "revisionTime": "2017-10-23T14:49:57Z", - "version": "v0.5.2", - "versionExact": "v0.5.2" + "revision": "e0d598bfeb66f747ec57c4338dbaf851155629fc", + "revisionTime": "2017-12-13T17:12:11Z", + "version": "v0.6.3", + "versionExact": "v0.6.3" }, { "checksumSHA1": "b0nQutPMJHeUmz4SjpreotAo6Yk=", From 982762507a0462f754b668deed2eafee49b57017 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 11 Jan 2018 13:06:00 -0700 Subject: [PATCH 10/10] Adding more checks to tests --- opc/import_storage_container_test.go | 3 +-- opc/resource_storage_container_test.go | 28 +++++++++++++++++++------- opc/resource_storage_object_test.go | 10 +++++---- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/opc/import_storage_container_test.go b/opc/import_storage_container_test.go index ff9baa9..d826986 100644 --- a/opc/import_storage_container_test.go +++ b/opc/import_storage_container_test.go @@ -1,7 +1,6 @@ package opc import ( - "fmt" "testing" "github.com/hashicorp/terraform/helper/acctest" @@ -12,7 +11,7 @@ func TestAccOPCStorageContainer_importBasic(t *testing.T) { resourceName := "opc_storage_container.test" rInt := acctest.RandInt() - config := fmt.Sprintf(testAccOPCStorageContainerBasic, rInt) + config := testAccOPCStorageContainerBasic(rInt) resource.Test(t, resource.TestCase{ PreCheck: func() { diff --git a/opc/resource_storage_container_test.go b/opc/resource_storage_container_test.go index 74ccdc5..e55fdcc 100644 --- a/opc/resource_storage_container_test.go +++ b/opc/resource_storage_container_test.go @@ -13,7 +13,7 @@ import ( func TestAccOPCStorageContainer_Basic(t *testing.T) { containerResourceName := "opc_storage_container.test" ri := acctest.RandInt() - config := fmt.Sprintf(testAccOPCStorageContainerBasic, ri) + config := testAccOPCStorageContainerBasic(ri) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -35,8 +35,8 @@ func TestAccOPCStorageContainer_Basic(t *testing.T) { func TestAccOPCStorageContainer_Updated(t *testing.T) { containerResourceName := "opc_storage_container.test" ri := acctest.RandInt() - config := fmt.Sprintf(testAccOPCStorageContainerBasic, ri) - config2 := fmt.Sprintf(testAccOPCStorageContainerUpdated, ri) + config := testAccOPCStorageContainerBasic(ri) + config2 := testAccOPCStorageContainerUpdated(ri) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -53,6 +53,11 @@ func TestAccOPCStorageContainer_Updated(t *testing.T) { resource.TestCheckResourceAttr(containerResourceName, "allowed_origins.0", "origin-1"), resource.TestCheckResourceAttr(containerResourceName, "exposed_headers.#", "1"), resource.TestCheckResourceAttr(containerResourceName, "exposed_headers.0", "exposed-header-1"), + resource.TestCheckResourceAttr(containerResourceName, "quota_bytes", "1000000000"), + resource.TestCheckResourceAttr(containerResourceName, "quota_count", "1000"), + resource.TestCheckResourceAttr(containerResourceName, "metadata.%", "2"), + resource.TestCheckResourceAttr(containerResourceName, "metadata.Foo", "bar"), + resource.TestCheckResourceAttr(containerResourceName, "metadata.Abc-Def", "xyz"), ), }, { @@ -66,6 +71,11 @@ func TestAccOPCStorageContainer_Updated(t *testing.T) { resource.TestCheckResourceAttr(containerResourceName, "allowed_origins.1", "origin-2"), resource.TestCheckResourceAttr(containerResourceName, "exposed_headers.#", "2"), resource.TestCheckResourceAttr(containerResourceName, "exposed_headers.1", "exposed-header-2"), + resource.TestCheckResourceAttr(containerResourceName, "quota_bytes", "2000000000"), + resource.TestCheckResourceAttr(containerResourceName, "quota_count", "2000"), + resource.TestCheckResourceAttr(containerResourceName, "metadata.%", "2"), + resource.TestCheckResourceAttr(containerResourceName, "metadata.Bar", "foo"), + resource.TestCheckResourceAttr(containerResourceName, "metadata.Abc-Def", "xyz"), ), }, }, @@ -110,7 +120,8 @@ func testAccCheckStorageContainerDestroy(s *terraform.State) error { return nil } -const testAccOPCStorageContainerBasic = ` +func testAccOPCStorageContainerBasic(rInt int) string { + return fmt.Sprintf(` resource "opc_storage_container" "test" { name = "acc-storage-container-%d" max_age = 50 @@ -124,9 +135,11 @@ resource "opc_storage_container" "test" { "Abc-Def" = "xyz" } } -` +`, rInt) +} -const testAccOPCStorageContainerUpdated = ` +func testAccOPCStorageContainerUpdated(rInt int) string { + return fmt.Sprintf(` resource "opc_storage_container" "test" { name = "acc-storage-container-%d" max_age = 60 @@ -141,4 +154,5 @@ resource "opc_storage_container" "test" { "Abc-Def" = "xyz" } } -` +`, rInt) +} diff --git a/opc/resource_storage_object_test.go b/opc/resource_storage_object_test.go index 03165e9..0c0bd3b 100644 --- a/opc/resource_storage_object_test.go +++ b/opc/resource_storage_object_test.go @@ -116,7 +116,9 @@ func TestAccOPCStorageObject_objectMetadata(t *testing.T) { testAccCheckStorageObjectExists, resource.TestCheckResourceAttr(resName, "name", fmt.Sprintf("test-acc-%d", rInt)), resource.TestCheckResourceAttr(resName, "container", fmt.Sprintf("acc-test-%d", rInt)), - resource.TestCheckResourceAttrSet(resName, "metadata"), + resource.TestCheckResourceAttr(resName, "metadata.%", "2"), + resource.TestCheckResourceAttr(resName, "metadata.Foo", "bar"), + resource.TestCheckResourceAttr(resName, "metadata.Abc-Def", "xyz"), ), }, }, @@ -177,11 +179,11 @@ func testAccOPCStorageObject_objectMetadata(rInt int, body string) string { resource "opc_storage_object" "test" { name = "test-acc-%d" container = "${opc_storage_container.foo.name}" - content_type = "text/plain;charset=UTF-8" metadata { - "Foo": "bar", - "Abc-Def": "XYZ" + "Foo" = "bar", + "Abc-Def" = "xyz" } + content_type = "text/plain;charset=UTF-8" content = <