backend/manta: Update manta dependencies

Internally, triton-go has changed how it handles errors. We can now get rid of checking strings for errors, and we have introduced an errors library that wraps some of the major errors we encounter and test for
hashicorp · Jan 17, 2018 · e9476c6 · e9476c6
1 parent 0e93e0c
commit e9476c6
Show file tree

Hide file tree

Showing 27 changed files with 632 additions and 369 deletions.
diff --git a/backend/remote-state/manta/backend_state.go b/backend/remote-state/manta/backend_state.go
@@ -12,6 12,7 @@ import (
  "github.com/hashicorp/terraform/state"
  "github.com/hashicorp/terraform/state/remote"
  "github.com/hashicorp/terraform/terraform"
  tritonErrors "github.com/joyent/triton-go/errors"
  "github.com/joyent/triton-go/storage"
 )
 
@@ -22,7 23,7 @@ func (b *Backend) States() ([]string, error) {
  DirectoryName: path.Join(mantaDefaultRootStore, b.path),
  })
  if err != nil {
- if strings.Contains(err.Error(), "ResourceNotFound") {
  if tritonErrors.IsResourceNotFound(err) {
  return result, nil
  }
  return nil, err

diff --git a/backend/remote-state/manta/client.go b/backend/remote-state/manta/client.go
@@ -9,11 9,10 @@ import (
  "log"
  "path"
 
- "strings"
-
  uuid "github.com/hashicorp/go-uuid"
  "github.com/hashicorp/terraform/state"
  "github.com/hashicorp/terraform/state/remote"
  tritonErrors "github.com/joyent/triton-go/errors"
  "github.com/joyent/triton-go/storage"
 )
 
@@ -34,7 33,7 @@ func (c *RemoteClient) Get() (*remote.Payload, error) {
  ObjectPath: path.Join(mantaDefaultRootStore, c.directoryName, c.keyName),
  })
  if err != nil {
- if strings.Contains(err.Error(), "ResourceNotFound") {
  if tritonErrors.IsResourceNotFound(err) {
  return nil, nil
  }
  return nil, err
@@ -107,7 106,7 @@ func (c *RemoteClient) Lock(info *state.LockInfo) (string, error) {
  lockErr := &state.LockError{}
  lockInfo, err := c.getLockInfo()
  if err != nil {
- if !strings.Contains(err.Error(), "ResourceNotFound") {
  if tritonErrors.IsResourceNotFound(err) {
  lockErr.Err = fmt.Errorf("failed to retrieve lock info: %s", err)
  return "", lockErr
  }

diff --git a/vendor/github.com/joyent/triton-go/CHANGELOG.md b/vendor/github.com/joyent/triton-go/CHANGELOG.md
diff --git a/vendor/github.com/joyent/triton-go/GNUmakefile b/vendor/github.com/joyent/triton-go/GNUmakefile
diff --git a/vendor/github.com/joyent/triton-go/Gopkg.lock b/vendor/github.com/joyent/triton-go/Gopkg.lock
diff --git a/vendor/github.com/joyent/triton-go/Gopkg.toml b/vendor/github.com/joyent/triton-go/Gopkg.toml
diff --git a/vendor/github.com/joyent/triton-go/authentication/dummy.go b/vendor/github.com/joyent/triton-go/authentication/dummy.go
diff --git a/vendor/github.com/joyent/triton-go/authentication/ecdsa_signature.go b/vendor/github.com/joyent/triton-go/authentication/ecdsa_signature.go
diff --git a/vendor/github.com/joyent/triton-go/authentication/private_key_signer.go b/vendor/github.com/joyent/triton-go/authentication/private_key_signer.go
diff --git a/vendor/github.com/joyent/triton-go/authentication/rsa_signature.go b/vendor/github.com/joyent/triton-go/authentication/rsa_signature.go
diff --git a/vendor/github.com/joyent/triton-go/authentication/signature.go b/vendor/github.com/joyent/triton-go/authentication/signature.go
diff --git a/vendor/github.com/joyent/triton-go/authentication/signer.go b/vendor/github.com/joyent/triton-go/authentication/signer.go
diff --git a/vendor/github.com/joyent/triton-go/authentication/ssh_agent_signer.go b/vendor/github.com/joyent/triton-go/authentication/ssh_agent_signer.go
diff --git a/vendor/github.com/joyent/triton-go/authentication/test_signer.go b/vendor/github.com/joyent/triton-go/authentication/test_signer.go