ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hashicorp/terraform 

* 'master' of github.com:hashicorp/terraform:
  Update vendored opc sdk
This commit is contained in:
clint shryock 2017-05-10 09:00:22 -05:00
parent 3063fa9947 1c98b17023
commit 966e4d275f
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,11 +47,23 @@ type CreateSSHKeyInput struct {
// CreateSSHKey creates a new SSH key with the given name, key and enabled flag.
func (c *SSHKeysClient) CreateSSHKey(createInput *CreateSSHKeyInput) (*SSHKey, error) {
var keyInfo SSHKey
// We have to update after create to get the full ssh key into opc
updateSSHKeyInput := UpdateSSHKeyInput{
Name: createInput.Name,
Key: createInput.Key,
Enabled: createInput.Enabled,
}
createInput.Name = c.getQualifiedName(createInput.Name)
if err := c.createResource(&createInput, &keyInfo); err != nil {
return nil, err
}
_, err := c.UpdateSSHKey(&updateSSHKeyInput)
if err != nil {
return nil, err
}
return c.success(&keyInfo)
}

14
vendor/vendor.json vendored
View File

@ -2007,22 +2007,22 @@
"revision": "d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5"
},
{
"checksumSHA1": "fOs3GlAj3fAMTlz+6OyllpZV6ow=",
"checksumSHA1": "gyD43l5lH8orGQl7TiqLHRNFtFU=",
"path": "github.com/hashicorp/go-oracle-terraform/compute",
"revision": "c96a23ea6900a1bbf65698abbd1b9a0010576cb5",
"revisionTime": "2017-04-20T21:25:45Z"
"revision": "cf979675cc5074d460720f7b97626687bcb1e203",
"revisionTime": "2017-05-09T16:19:50Z"
},
{
"checksumSHA1": "DzK7lYwHt5Isq5Zf73cnQqBO2LI=",
"path": "github.com/hashicorp/go-oracle-terraform/helper",
"revision": "c96a23ea6900a1bbf65698abbd1b9a0010576cb5",
"revisionTime": "2017-04-20T21:25:45Z"
"revision": "cf979675cc5074d460720f7b97626687bcb1e203",
"revisionTime": "2017-05-09T16:19:50Z"
},
{
"checksumSHA1": "AyNRs19Es9pDw2VMxVKWuLx3Afg=",
"path": "github.com/hashicorp/go-oracle-terraform/opc",
"revision": "c96a23ea6900a1bbf65698abbd1b9a0010576cb5",
"revisionTime": "2017-04-20T21:25:45Z"
"revision": "cf979675cc5074d460720f7b97626687bcb1e203",
"revisionTime": "2017-05-09T16:19:50Z"
},
{
"checksumSHA1": "b0nQutPMJHeUmz4SjpreotAo6Yk=",