From e21981e58190641cf62fae5cbcb395a9bd710a22 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Tue, 26 Jun 2018 15:17:59 -0700 Subject: [PATCH] fix vendor commit for go-oracle-terraform --- .../go-oracle-terraform/compute/image_list.go | 4 ++-- .../compute/machine_images.go | 4 ++-- .../compute/orchestration.go | 23 ++++++++++++++++--- .../compute/security_lists.go | 8 +++---- .../go-oracle-terraform/compute/snapshots.go | 8 +++---- .../go-oracle-terraform/compute/ssh_keys.go | 4 ++-- .../compute/storage_volume_attachments.go | 1 + vendor/vendor.json | 20 ++++++---------- 8 files changed, 42 insertions(+), 30 deletions(-) diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/image_list.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/image_list.go index 0d4ca06ba..1d908987c 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/compute/image_list.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/image_list.go @@ -89,7 +89,7 @@ func (c *ImageListClient) CreateImageList(createInput *CreateImageListInput) (*I // DeleteKeyInput describes the image list to delete type DeleteImageListInput struct { // The name of the Image List - Name string `json:name` + Name string `json:"name"` } // DeleteImageList deletes the Image List with the given name. @@ -101,7 +101,7 @@ func (c *ImageListClient) DeleteImageList(deleteInput *DeleteImageListInput) err // GetImageListInput describes the image list to get type GetImageListInput struct { // The name of the Image List - Name string `json:name` + Name string `json:"name"` } // GetImageList retrieves the Image List with the given name. diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/machine_images.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/machine_images.go index bf7736a63..f2c4b4a15 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/compute/machine_images.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/machine_images.go @@ -109,7 +109,7 @@ func (c *MachineImagesClient) CreateMachineImage(createInput *CreateMachineImage // DeleteMachineImageInput describes the MachineImage to delete type DeleteMachineImageInput struct { // The name of the MachineImage - Name string `json:name` + Name string `json:"name"` } // DeleteMachineImage deletes the MachineImage with the given name. @@ -122,7 +122,7 @@ type GetMachineImageInput struct { // account of the associated Object Storage Classic instance Account string `json:"account"` // The name of the Machine Image - Name string `json:name` + Name string `json:"name"` } // GetMachineImage retrieves the MachineImage with the given name. diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/orchestration.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/orchestration.go index 684e0d45f..93d9e2342 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/compute/orchestration.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/orchestration.go @@ -60,6 +60,12 @@ const ( OrchestrationTypeInstance OrchestrationType = "Instance" ) +type OrchestrationRelationshipType string + +const ( + OrchestrationRelationshipTypeDepends OrchestrationRelationshipType = "depends" +) + // OrchestrationInfo describes an existing Orchestration. type Orchestration struct { // The default Oracle Compute Cloud Service account, such as /Compute-acme/default. @@ -162,7 +168,7 @@ type Object struct { // 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"` + Relationships []Relationship `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 @@ -193,6 +199,16 @@ type Health struct { Error string `json:"error,omitempty"` } +type Relationship struct { + // The type of Relationship + // The only type is depends + // Required + Type OrchestrationRelationshipType `json:"type"` + // What objects the relationship depends on + // Required + Targets []string `json:"targets"` +} + // CreateOrchestration creates a new Orchestration with the given name, key and enabled flag. func (c *OrchestrationsClient) CreateOrchestration(input *CreateOrchestrationInput) (*Orchestration, error) { var createdOrchestration Orchestration @@ -222,6 +238,7 @@ func (c *OrchestrationsClient) CreateOrchestration(input *CreateOrchestrationInp instanceInput.Storage = qualifiedStorageAttachments instanceInput.Networking = instanceClient.qualifyNetworking(instanceInput.Networking) + } } @@ -258,7 +275,7 @@ func (c *OrchestrationsClient) CreateOrchestration(input *CreateOrchestrationInp // 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` + Name string `json:"name"` } // GetOrchestration retrieves the Orchestration with the given name. @@ -341,7 +358,7 @@ func (c *OrchestrationsClient) UpdateOrchestration(input *UpdateOrchestrationInp type DeleteOrchestrationInput struct { // The three-part name of the Orchestration (/Compute-identity_domain/user/object). // Required - Name string `json:name` + Name string `json:"name"` // Timeout for delete request Timeout time.Duration `json:"-"` } diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/security_lists.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/security_lists.go index 3c6d87364..dec906e8c 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/compute/security_lists.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/security_lists.go @@ -30,7 +30,7 @@ type SecurityListInfo struct { // Shows the default account for your identity domain. Account string `json:"account"` // A description of the security list. - Description string `json:description` + Description string `json:"description"` // The three-part name of the security list (/Compute-identity_domain/user/object). Name string `json:"name"` // The policy for outbound traffic from the security list. @@ -73,7 +73,7 @@ func (c *SecurityListsClient) CreateSecurityList(createInput *CreateSecurityList type GetSecurityListInput struct { // The three-part name of the Security List (/Compute-identity_domain/user/object). // Required - Name string `json:name` + Name string `json:"name"` } // GetSecurityList retrieves the security list with the given name. @@ -90,7 +90,7 @@ func (c *SecurityListsClient) GetSecurityList(getInput *GetSecurityListInput) (* type UpdateSecurityListInput struct { // A description of the security list. // Optional - Description string `json:description` + Description string `json:"description"` // The three-part name of the Security List (/Compute-identity_domain/user/object). // Required Name string `json:"name"` @@ -117,7 +117,7 @@ func (c *SecurityListsClient) UpdateSecurityList(updateInput *UpdateSecurityList type DeleteSecurityListInput struct { // The three-part name of the Security List (/Compute-identity_domain/user/object). // Required - Name string `json:name` + Name string `json:"name"` } // DeleteSecurityList deletes the security list with the given name. diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/snapshots.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/snapshots.go index 370fd0c97..98a24ac9d 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/compute/snapshots.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/snapshots.go @@ -120,7 +120,7 @@ func (c *SnapshotsClient) CreateSnapshot(input *CreateSnapshotInput) (*Snapshot, type GetSnapshotInput struct { // The name of the Snapshot // Required - Name string `json:name` + Name string `json:"name"` } // GetSnapshot retrieves the Snapshot with the given name. @@ -176,9 +176,9 @@ func (c *SnapshotsClient) DeleteSnapshot(machineImagesClient *MachineImagesClien return nil } -// DeleteSnapshot deletes the Snapshot with the given name. -// A machine image gets created with the associated snapshot is not deleted -// by this method. +// DeleteSnapshotResourceOnly deletes the Snapshot with the given name. +// The machine image that gets created with the associated snapshot is not +// deleted by this method. func (c *SnapshotsClient) DeleteSnapshotResourceOnly(input *DeleteSnapshotInput) error { // Wait for snapshot complete in case delay is active and the corresponding // instance needs to be deleted first diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/ssh_keys.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/ssh_keys.go index 7e8be20ed..821fd2216 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/compute/ssh_keys.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/ssh_keys.go @@ -70,7 +70,7 @@ func (c *SSHKeysClient) CreateSSHKey(createInput *CreateSSHKeyInput) (*SSHKey, e // GetSSHKeyInput describes the ssh key to get type GetSSHKeyInput struct { // The three-part name of the SSH Key (/Compute-identity_domain/user/object). - Name string `json:name` + Name string `json:"name"` } // GetSSHKey retrieves the SSH key with the given name. @@ -110,7 +110,7 @@ func (c *SSHKeysClient) UpdateSSHKey(updateInput *UpdateSSHKeyInput) (*SSHKey, e // DeleteKeyInput describes the ssh key to delete type DeleteSSHKeyInput struct { // The three-part name of the SSH Key (/Compute-identity_domain/user/object). - Name string `json:name` + Name string `json:"name"` } // DeleteSSHKey deletes the SSH key with the given name. diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/storage_volume_attachments.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/storage_volume_attachments.go index 51e18af47..7fe9a13ef 100644 --- a/vendor/github.com/hashicorp/go-oracle-terraform/compute/storage_volume_attachments.go +++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/storage_volume_attachments.go @@ -81,6 +81,7 @@ type CreateStorageAttachmentInput struct { // CreateStorageAttachment creates a storage attachment attaching the given volume to the given instance at the given index. func (c *StorageAttachmentsClient) CreateStorageAttachment(input *CreateStorageAttachmentInput) (*StorageAttachmentInfo, error) { input.InstanceName = c.getQualifiedName(input.InstanceName) + input.StorageVolumeName = c.getQualifiedName(input.StorageVolumeName) var attachmentInfo *StorageAttachmentInfo if err := c.createResource(&input, &attachmentInfo); err != nil { diff --git a/vendor/vendor.json b/vendor/vendor.json index 3f2ba9413..7f7d5ae68 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -836,29 +836,23 @@ "path": "github.com/hashicorp/go-multierror", "revision": "d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5" }, - { - "checksumSHA1": "Nf2Gdn9M1KlUS3sovKfymO1VJF4=", - "path": "github.com/hashicorp/go-oracle-terraform", - "revision": "5a9a298c54339d2296d2f1135eae55a3a8f5e8c2", - "revisionTime": "2018-01-11T20:31:13Z" - }, { "checksumSHA1": "hjQfXn32Tvuu6IJACOTsMzm+AbA=", "path": "github.com/hashicorp/go-oracle-terraform/client", - "revision": "5a9a298c54339d2296d2f1135eae55a3a8f5e8c2", - "revisionTime": "2018-01-11T20:31:13Z" + "revision": "62e2241f9c4154d5603a3678adc912991a47a468", + "revisionTime": "2018-01-31T23:42:02Z" }, { - "checksumSHA1": "wce86V0j11J6xRSvJEanprjK7so=", + "checksumSHA1": "yoA7SyeQNJ8XxwC7IcXdJ2kOTqg=", "path": "github.com/hashicorp/go-oracle-terraform/compute", - "revision": "5a9a298c54339d2296d2f1135eae55a3a8f5e8c2", - "revisionTime": "2018-01-11T20:31:13Z" + "revision": "62e2241f9c4154d5603a3678adc912991a47a468", + "revisionTime": "2018-01-31T23:42:02Z" }, { "checksumSHA1": "NuObCk0/ybL3w++EnltgrB1GQRc=", "path": "github.com/hashicorp/go-oracle-terraform/opc", - "revision": "5a9a298c54339d2296d2f1135eae55a3a8f5e8c2", - "revisionTime": "2018-01-11T20:31:13Z" + "revision": "62e2241f9c4154d5603a3678adc912991a47a468", + "revisionTime": "2018-01-31T23:42:02Z" }, { "checksumSHA1": "ErJHGU6AVPZM9yoY/xV11TwSjQs=",