iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6430 from hashicorp/update_go_oracle_terraform_library 

fix vendor commit for go-oracle-terraform
This commit is contained in:
M. Marsh 2018-06-26 16:27:44 -07:00 committed by GitHub
parent ce40e9cc86 e21981e581
commit 2ef4210a98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/github.com/hashicorp/go-oracle-terraform/compute/image_list.go generated vendored
View File

@ -89,7 +89,7 @@ func (c *ImageListClient) CreateImageList(createInput *CreateImageListInput) (*I
// DeleteKeyInput describes the image list to delete // DeleteKeyInput describes the image list to delete
type DeleteImageListInput struct { type DeleteImageListInput struct {
// The name of the Image List // The name of the Image List
Name string `json:name` Name string `json:"name"`
} }
// DeleteImageList deletes the Image List with the given 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 // GetImageListInput describes the image list to get
type GetImageListInput struct { type GetImageListInput struct {
// The name of the Image List // The name of the Image List
Name string `json:name` Name string `json:"name"`
} }
// GetImageList retrieves the Image List with the given name. // GetImageList retrieves the Image List with the given name.

4
vendor/github.com/hashicorp/go-oracle-terraform/compute/machine_images.go generated vendored
View File

@ -109,7 +109,7 @@ func (c *MachineImagesClient) CreateMachineImage(createInput *CreateMachineImage
// DeleteMachineImageInput describes the MachineImage to delete // DeleteMachineImageInput describes the MachineImage to delete
type DeleteMachineImageInput struct { type DeleteMachineImageInput struct {
// The name of the MachineImage // The name of the MachineImage
Name string `json:name` Name string `json:"name"`
} }
// DeleteMachineImage deletes the MachineImage with the given 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 of the associated Object Storage Classic instance
Account string `json:"account"` Account string `json:"account"`
// The name of the Machine Image // The name of the Machine Image
Name string `json:name` Name string `json:"name"`
} }
// GetMachineImage retrieves the MachineImage with the given name. // GetMachineImage retrieves the MachineImage with the given name.

23
vendor/github.com/hashicorp/go-oracle-terraform/compute/orchestration.go generated vendored
View File

@ -60,6 +60,12 @@ const (
OrchestrationTypeInstance OrchestrationType = "Instance" OrchestrationTypeInstance OrchestrationType = "Instance"
) )
type OrchestrationRelationshipType string
const (
OrchestrationRelationshipTypeDepends OrchestrationRelationshipType = "depends"
)
// OrchestrationInfo describes an existing Orchestration. // OrchestrationInfo describes an existing Orchestration.
type Orchestration struct { type Orchestration struct {
// The default Oracle Compute Cloud Service account, such as /Compute-acme/default. // 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. // 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 // Orchestrations v2 use object references to recover interdependent objects to a healthy state. SeeObject
// References and Relationships in Using Oracle Compute Cloud Service (IaaS). // 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 // 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. // 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 // 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"` 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. // CreateOrchestration creates a new Orchestration with the given name, key and enabled flag.
func (c *OrchestrationsClient) CreateOrchestration(input *CreateOrchestrationInput) (*Orchestration, error) { func (c *OrchestrationsClient) CreateOrchestration(input *CreateOrchestrationInput) (*Orchestration, error) {
var createdOrchestration Orchestration var createdOrchestration Orchestration
@ -222,6 +238,7 @@ func (c *OrchestrationsClient) CreateOrchestration(input *CreateOrchestrationInp
instanceInput.Storage = qualifiedStorageAttachments instanceInput.Storage = qualifiedStorageAttachments
instanceInput.Networking = instanceClient.qualifyNetworking(instanceInput.Networking) instanceInput.Networking = instanceClient.qualifyNetworking(instanceInput.Networking)
} }
} }
@ -258,7 +275,7 @@ func (c *OrchestrationsClient) CreateOrchestration(input *CreateOrchestrationInp
// GetOrchestrationInput describes the Orchestration to get // GetOrchestrationInput describes the Orchestration to get
type GetOrchestrationInput struct { type GetOrchestrationInput struct {
// The three-part name of the Orchestration (/Compute-identity_domain/user/object). // 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. // GetOrchestration retrieves the Orchestration with the given name.
@ -341,7 +358,7 @@ func (c *OrchestrationsClient) UpdateOrchestration(input *UpdateOrchestrationInp
type DeleteOrchestrationInput struct { type DeleteOrchestrationInput struct {
// The three-part name of the Orchestration (/Compute-identity_domain/user/object). // The three-part name of the Orchestration (/Compute-identity_domain/user/object).
// Required // Required
Name string `json:name` Name string `json:"name"`
// Timeout for delete request // Timeout for delete request
Timeout time.Duration `json:"-"` Timeout time.Duration `json:"-"`
} }

8
vendor/github.com/hashicorp/go-oracle-terraform/compute/security_lists.go generated vendored
View File

@ -30,7 +30,7 @@ type SecurityListInfo struct {
// Shows the default account for your identity domain. // Shows the default account for your identity domain.
Account string `json:"account"` Account string `json:"account"`
// A description of the security list. // 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). // The three-part name of the security list (/Compute-identity_domain/user/object).
Name string `json:"name"` Name string `json:"name"`
// The policy for outbound traffic from the security list. // The policy for outbound traffic from the security list.
@ -73,7 +73,7 @@ func (c *SecurityListsClient) CreateSecurityList(createInput *CreateSecurityList
type GetSecurityListInput struct { type GetSecurityListInput struct {
// The three-part name of the Security List (/Compute-identity_domain/user/object). // The three-part name of the Security List (/Compute-identity_domain/user/object).
// Required // Required
Name string `json:name` Name string `json:"name"`
} }
// GetSecurityList retrieves the security list with the given name. // GetSecurityList retrieves the security list with the given name.
@ -90,7 +90,7 @@ func (c *SecurityListsClient) GetSecurityList(getInput *GetSecurityListInput) (*
type UpdateSecurityListInput struct { type UpdateSecurityListInput struct {
// A description of the security list. // A description of the security list.
// Optional // Optional
Description string `json:description` Description string `json:"description"`
// The three-part name of the Security List (/Compute-identity_domain/user/object). // The three-part name of the Security List (/Compute-identity_domain/user/object).
// Required // Required
Name string `json:"name"` Name string `json:"name"`
@ -117,7 +117,7 @@ func (c *SecurityListsClient) UpdateSecurityList(updateInput *UpdateSecurityList
type DeleteSecurityListInput struct { type DeleteSecurityListInput struct {
// The three-part name of the Security List (/Compute-identity_domain/user/object). // The three-part name of the Security List (/Compute-identity_domain/user/object).
// Required // Required
Name string `json:name` Name string `json:"name"`
} }
// DeleteSecurityList deletes the security list with the given name. // DeleteSecurityList deletes the security list with the given name.

8
vendor/github.com/hashicorp/go-oracle-terraform/compute/snapshots.go generated vendored
View File

@ -120,7 +120,7 @@ func (c *SnapshotsClient) CreateSnapshot(input *CreateSnapshotInput) (*Snapshot,
type GetSnapshotInput struct { type GetSnapshotInput struct {
// The name of the Snapshot // The name of the Snapshot
// Required // Required
Name string `json:name` Name string `json:"name"`
} }
// GetSnapshot retrieves the Snapshot with the given name. // GetSnapshot retrieves the Snapshot with the given name.
@ -176,9 +176,9 @@ func (c *SnapshotsClient) DeleteSnapshot(machineImagesClient *MachineImagesClien
return nil return nil
} }
// DeleteSnapshot deletes the Snapshot with the given name. // DeleteSnapshotResourceOnly deletes the Snapshot with the given name.
// A machine image gets created with the associated snapshot is not deleted // The machine image that gets created with the associated snapshot is not
// by this method. // deleted by this method.
func (c *SnapshotsClient) DeleteSnapshotResourceOnly(input *DeleteSnapshotInput) error { func (c *SnapshotsClient) DeleteSnapshotResourceOnly(input *DeleteSnapshotInput) error {
// Wait for snapshot complete in case delay is active and the corresponding // Wait for snapshot complete in case delay is active and the corresponding
// instance needs to be deleted first // instance needs to be deleted first

4
vendor/github.com/hashicorp/go-oracle-terraform/compute/ssh_keys.go generated vendored
View File

@ -70,7 +70,7 @@ func (c *SSHKeysClient) CreateSSHKey(createInput *CreateSSHKeyInput) (*SSHKey, e
// GetSSHKeyInput describes the ssh key to get // GetSSHKeyInput describes the ssh key to get
type GetSSHKeyInput struct { type GetSSHKeyInput struct {
// The three-part name of the SSH Key (/Compute-identity_domain/user/object). // 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. // 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 // DeleteKeyInput describes the ssh key to delete
type DeleteSSHKeyInput struct { type DeleteSSHKeyInput struct {
// The three-part name of the SSH Key (/Compute-identity_domain/user/object). // 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. // DeleteSSHKey deletes the SSH key with the given name.

1
vendor/github.com/hashicorp/go-oracle-terraform/compute/storage_volume_attachments.go generated vendored
View File

@ -81,6 +81,7 @@ type CreateStorageAttachmentInput struct {
// CreateStorageAttachment creates a storage attachment attaching the given volume to the given instance at the given index. // 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) { func (c *StorageAttachmentsClient) CreateStorageAttachment(input *CreateStorageAttachmentInput) (*StorageAttachmentInfo, error) {
input.InstanceName = c.getQualifiedName(input.InstanceName) input.InstanceName = c.getQualifiedName(input.InstanceName)
input.StorageVolumeName = c.getQualifiedName(input.StorageVolumeName)
var attachmentInfo *StorageAttachmentInfo var attachmentInfo *StorageAttachmentInfo
if err := c.createResource(&input, &attachmentInfo); err != nil { if err := c.createResource(&input, &attachmentInfo); err != nil {

20
vendor/vendor.json vendored
View File

@ -836,29 +836,23 @@
"path": "github.com/hashicorp/go-multierror", "path": "github.com/hashicorp/go-multierror",
"revision": "d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5" "revision": "d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5"
}, },
{
"checksumSHA1": "Nf2Gdn9M1KlUS3sovKfymO1VJF4=",
"path": "github.com/hashicorp/go-oracle-terraform",
"revision": "5a9a298c54339d2296d2f1135eae55a3a8f5e8c2",
"revisionTime": "2018-01-11T20:31:13Z"
},
{ {
"checksumSHA1": "hjQfXn32Tvuu6IJACOTsMzm+AbA=", "checksumSHA1": "hjQfXn32Tvuu6IJACOTsMzm+AbA=",
"path": "github.com/hashicorp/go-oracle-terraform/client", "path": "github.com/hashicorp/go-oracle-terraform/client",
"revision": "5a9a298c54339d2296d2f1135eae55a3a8f5e8c2", "revision": "62e2241f9c4154d5603a3678adc912991a47a468",
"revisionTime": "2018-01-11T20:31:13Z" "revisionTime": "2018-01-31T23:42:02Z"
}, },
{ {
"checksumSHA1": "wce86V0j11J6xRSvJEanprjK7so=", "checksumSHA1": "yoA7SyeQNJ8XxwC7IcXdJ2kOTqg=",
"path": "github.com/hashicorp/go-oracle-terraform/compute", "path": "github.com/hashicorp/go-oracle-terraform/compute",
"revision": "5a9a298c54339d2296d2f1135eae55a3a8f5e8c2", "revision": "62e2241f9c4154d5603a3678adc912991a47a468",
"revisionTime": "2018-01-11T20:31:13Z" "revisionTime": "2018-01-31T23:42:02Z"
}, },
{ {
"checksumSHA1": "NuObCk0/ybL3w++EnltgrB1GQRc=", "checksumSHA1": "NuObCk0/ybL3w++EnltgrB1GQRc=",
"path": "github.com/hashicorp/go-oracle-terraform/opc", "path": "github.com/hashicorp/go-oracle-terraform/opc",
"revision": "5a9a298c54339d2296d2f1135eae55a3a8f5e8c2", "revision": "62e2241f9c4154d5603a3678adc912991a47a468",
"revisionTime": "2018-01-11T20:31:13Z" "revisionTime": "2018-01-31T23:42:02Z"
}, },
{ {
"checksumSHA1": "ErJHGU6AVPZM9yoY/xV11TwSjQs=", "checksumSHA1": "ErJHGU6AVPZM9yoY/xV11TwSjQs=",