Skip to content

Commit

Permalink
go.mod: Update cloud-sdk-go to version v1.0.0-bc4 (#48)
Browse files Browse the repository at this point in the history 
Updates cloud-sdk-go to version v1.0.0-bc4 in th go.mod file and updates
the required Golang source files. Since a change was merged that is now
able to obtain the underlying response message from the http.Body,
updates all of our tests which relied on the unknown error (status xxx).

Signed-off-by: Marc Lopez <[email protected]>
  • Loading branch information
@marclop
marclop authored Nov 15, 2019
1 parent 7ba34cc commit 78dd825
Show file tree
Hide file tree
Showing 51 changed files with 175 additions and 342 deletions.
4 changes: 2 additions & 2 deletions cmd/deployment/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,15 @@ $ cat deployment_example.json
"ref_id": "my-kibana-instance",
"elasticsearch_cluster_ref_id": "my-es-cluster",
"plan": {
"zone_count": 1,
"kibana": {
"version": "6.8.4"
},
"cluster_topology": [
{
"instance_configuration_id": "kibana",
"memory_per_node": 1024,
"node_count_per_zone": 1
"node_count_per_zone": 1,
"zone_count": 1
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions docs/ecctl_deployment_create.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ $ cat deployment_example.json
"ref_id": "my-kibana-instance",
"elasticsearch_cluster_ref_id": "my-es-cluster",
"plan": {
"zone_count": 1,
"kibana": {
"version": "6.8.4"
},
"cluster_topology": [
{
"instance_configuration_id": "kibana",
"memory_per_node": 1024,
"node_count_per_zone": 1
"node_count_per_zone": 1,
"zone_count": 1
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/chzyer/logex v1.1.10 // indirect
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
github.com/davecgh/go-spew v1.1.1
github.com/elastic/cloud-sdk-go v1.0.0-bc3
github.com/elastic/cloud-sdk-go v1.0.0-bc4
github.com/elastic/uptd v1.0.0
github.com/ghodss/yaml v1.0.0
github.com/go-openapi/runtime v0.19.8
Expand Down
25 changes: 17 additions & 8 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tN
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 h1:G1bPvciwNyF7IUmKXNt9Ak3m6u9DE1rF+RmtIkBpVdA=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/asaskevich/govalidator v0.0.0-20170425121227-4918b99a7cb9/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
Expand Down Expand Up @@ -49,8 +51,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/elastic/cloud-sdk-go v1.0.0-bc3 h1:giV/eTC5ZpovZr124o6/2uB/OP4CcmISTSSsd4+Rgd0=
github.com/elastic/cloud-sdk-go v1.0.0-bc3/go.mod h1:zhBhuQcIJKsXh24Rf+LNkJdgRvaIJo7Gn9h/TWL0Kks=
github.com/elastic/cloud-sdk-go v1.0.0-bc4 h1:8Gc/gFos+dJv992c8FQ06X9Mx080p2ceuiB1dUPWeUA=
github.com/elastic/cloud-sdk-go v1.0.0-bc4/go.mod h1:19tuRaJglGTECDJfiWEDMOVj23ZL+9+YYoIV1fZIGzc=
github.com/elastic/uptd v1.0.0 h1:oUhbbTK6hjFYB5w5dwjo1HtbqrWyLiqj+6Sb05oawU8=
github.com/elastic/uptd v1.0.0/go.mod h1:2Pm07gLal/a/gTPq3el2QgOjoxu97pB2I17AprXxa48=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
Expand Down Expand Up @@ -89,19 +91,21 @@ github.com/go-openapi/jsonreference v0.18.0 h1:oP2OUNdG1l2r5kYhrfVMXO54gWmzcfAwP
github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
github.com/go-openapi/loads v0.18.0 h1:2A3goxrC4KuN8ZrMKHCqAAugtq6A6WfXVfOIKUbZ4n0=
github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
github.com/go-openapi/loads v0.19.3 h1:jwIoahqCmaA5OBoc/B+1+Mu2L0Gr8xYQnbeyQEo/7b0=
github.com/go-openapi/loads v0.19.3/go.mod h1:YVfqhUCdahYwR3f3iiwQLhicVRvLlU/WO5WPaZvcvSI=
github.com/go-openapi/loads v0.19.4 h1:5I4CCSqoWzT+82bBkNIvmLc0UOsoKKQ4Fz+3VxOB7SY=
github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk=
github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
github.com/go-openapi/runtime v0.19.0 h1:sU6pp4dSV2sGlNKKyHxZzi1m1kG4WnYtWcJ+HYbygjE=
github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4=
github.com/go-openapi/runtime v0.19.7 h1:b2zcE9GCjDVtguugU7+S95vkHjwQEjz/lB+8LOuA9Nw=
github.com/go-openapi/runtime v0.19.7/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo=
github.com/go-openapi/runtime v0.19.8 h1:la3rOpJ+UnJSCgsgMv/xKHCMCpKJtFVa7ai4mPnV2ts=
github.com/go-openapi/runtime v0.19.8/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo=
github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
Expand Down Expand Up @@ -130,8 +134,8 @@ github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+
github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
github.com/go-openapi/validate v0.19.3 h1:PAH/2DylwWcIU1s0Y7k3yNmeAgWOcKrNE2Q7Ww/kCg4=
github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo=
github.com/go-openapi/validate v0.19.4 h1:LGjO87VyXY3bIKjlYpXSFuLRG2mTeuYlZyeNwFFWpyM=
github.com/go-openapi/validate v0.19.4/go.mod h1:BkJ0ZmXui7yB0bJXWSXgLPNTmbLVeX/3D1xn/N9mMUM=
github.com/go-openapi/validate v0.19.5 h1:QhCBKRYqZR+SKo4gl1lPhPahope8/RLt6EVgY8X80w0=
github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
Expand Down Expand Up @@ -191,6 +195,8 @@ github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
github.com/marclop/elasticsearch-cli v0.0.0-20190212132418-ee09f7ae57f1 h1:AjKJSp3BJvuT8IZI0qmK4UtST/Gl+W+ohf7QO87Xfd4=
github.com/marclop/elasticsearch-cli v0.0.0-20190212132418-ee09f7ae57f1/go.mod h1:5IsNi9k3pZY5PtppCpl0QRBsmmtUOb4vJMoky6DXjy8=
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
Expand Down Expand Up @@ -227,6 +233,7 @@ github.com/russross/blackfriday v0.0.0-20170728175326-4048872b16cc h1:Ng688TEbTG
github.com/russross/blackfriday v0.0.0-20170728175326-4048872b16cc/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
Expand All @@ -248,8 +255,6 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
github.com/spf13/viper v1.0.0/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
github.com/spf13/viper v1.5.0 h1:GpsTwfsQ27oS/Aha/6d1oD7tpKIqWnOA6tgOX9HHkt4=
github.com/spf13/viper v1.5.0/go.mod h1:AkYRkVJF8TkSG/xet6PzXX+l39KhhXa2pdqVSxnTcn4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand All @@ -268,13 +273,16 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 h1:3SVOIvH7Ae1KRYyQWRjXWJEA9sS/c/pjvH++55Gr648=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
go.mongodb.org/mongo-driver v1.1.1 h1:Sq1fR+0c58RME5EoqKdjkiQAmPjmfHlZOoRI6fTUOcs=
go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
go.mongodb.org/mongo-driver v1.1.2 h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA=
go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
Expand Down Expand Up @@ -336,6 +344,7 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190211224914-44bee7e801e4/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
Expand Down
2 changes: 1 addition & 1 deletion pkg/deployment/apm/resync_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func TestResync(t *testing.T) {
Body: mock.NewStringBody(`{}`),
}}),
}},
wantErr: errors.New("unknown error (status 403)"),
wantErr: errors.New("{}"),
},
{
name: "Fails due to API error",
Expand Down
6 changes: 3 additions & 3 deletions pkg/deployment/create_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ func TestCreate(t *testing.T) {
API: api.NewMock(mock.New500Response(mock.NewStringBody("error"))),
Request: &models.DeploymentCreateRequest{},
}},
err: errors.New("unknown error (status 500)"),
err: errors.New("error"),
},
{
name: "succeeds",
args: args{params: CreateParams{
API: api.NewMock(mock.New200Response(mock.NewStringBody(basicESCluster))),
API: api.NewMock(mock.New201Response(mock.NewStringBody(basicESCluster))),
Request: &models.DeploymentCreateRequest{
Name: "my example cluster",
Resources: &models.DeploymentCreateResources{
Expand Down Expand Up @@ -129,7 +129,7 @@ func TestCreate(t *testing.T) {
name: "succeeds with idempotency ID",
args: args{params: CreateParams{
RequestID: "1232131231",
API: api.NewMock(mock.New200Response(mock.NewStringBody(basicESCluster))),
API: api.NewMock(mock.New201Response(mock.NewStringBody(basicESCluster))),
Request: &models.DeploymentCreateRequest{
Name: "my example cluster",
Resources: &models.DeploymentCreateResources{
Expand Down
2 changes: 1 addition & 1 deletion pkg/deployment/delete_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func TestDelete(t *testing.T) {
API: api.NewMock(mock.New500Response(mock.NewStringBody("error"))),
DeploymentID: util.ValidClusterID,
}},
err: errors.New("unknown error (status 500)"),
err: errors.New("error"),
},
{
name: "Succeeds",
Expand Down
9 changes: 2 additions & 7 deletions pkg/deployment/elasticsearch/create_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,9 @@ func TestCreate(t *testing.T) {
{
name: "fails when the API returns an error",
args: args{params: CreateParams{
API: api.NewMock(mock.Response{
Response: http.Response{
StatusCode: 500,
Body: mock.NewStringBody(`{}`),
},
}),
API: api.NewMock(mock.New500Response(mock.NewStringBody(`{}`))),
}},
err: errors.New("unknown error (status 500)"),
err: errors.New("{}"),
},
{
name: "succeeds with tracking",
Expand Down
11 changes: 3 additions & 8 deletions pkg/deployment/elasticsearch/delete_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func TestDeleteCluster(t *testing.T) {
}),
},
}},
err: errors.New("unknown error (status 500)"),
err: errors.New("{}"),
},
{
name: "fails due to cluster not being stopped",
Expand All @@ -104,15 +104,10 @@ func TestDeleteCluster(t *testing.T) {
args: args{params: DeleteClusterParams{
ClusterParams: util.ClusterParams{
ClusterID: util.ValidClusterID,
API: api.NewMock(mock.Response{
Response: http.Response{
StatusCode: 500,
Body: mock.NewStringBody(`{}`),
},
}),
API: api.NewMock(mock.New500Response(mock.NewStringBody(`{}`))),
},
}},
err: errors.New("unknown error (status 500)"),
err: errors.New("{}"),
},
{
name: "fails due to missing cluster ID",
Expand Down
4 changes: 2 additions & 2 deletions pkg/deployment/elasticsearch/diagnose_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,14 @@ func TestDiagnose(t *testing.T) {
"Content-Type": []string{"application/zip"},
},
StatusCode: 500,
Body: mock.NewStringBody("something diagnosed"),
Body: mock.NewStringBody("something not diagnosed"),
},
}),
},
},
buf: new(bytes.Buffer),
},
err: errors.New("unknown error (status 500)"),
err: errors.New("something not diagnosed"),
},
{
name: "empty params return error",
Expand Down
18 changes: 4 additions & 14 deletions pkg/deployment/elasticsearch/instances/lifecycle_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,10 @@ func TestResume(t *testing.T) {
args: args{params: Params{
ClusterParams: util.ClusterParams{
ClusterID: util.ValidClusterID,
API: api.NewMock(mock.Response{
Response: http.Response{
StatusCode: 500,
Body: mock.NewStringBody(`{}`),
},
}),
API: api.NewMock(mock.New500Response(mock.NewStringBody(`{}`))),
},
}},
err: errors.New("unknown error (status 500)"),
err: errors.New("{}"),
},
}
for _, tt := range tests {
Expand Down Expand Up @@ -127,15 +122,10 @@ func TestPause(t *testing.T) {
args: args{params: Params{
ClusterParams: util.ClusterParams{
ClusterID: util.ValidClusterID,
API: api.NewMock(mock.Response{
Response: http.Response{
StatusCode: 500,
Body: mock.NewStringBody(`{}`),
},
}),
API: api.NewMock(mock.New500Response(mock.NewStringBody(`{}`))),
},
}},
err: errors.New("unknown error (status 500)"),
err: errors.New("{}"),
},
}
for _, tt := range tests {
Expand Down
7 changes: 2 additions & 5 deletions pkg/deployment/elasticsearch/instances/reducer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,9 @@ func TestList(t *testing.T) {
name: "fails due to API error",
args: args{params: util.ClusterParams{
ClusterID: util.ValidClusterID,
API: api.NewMock(mock.Response{Response: http.Response{
StatusCode: 500,
Body: mock.NewStructBody(models.ElasticsearchClusterInfo{}),
}}),
API: api.NewMock(mock.New500Response(mock.NewStringBody(`{"error": "some error"}`))),
}},
err: errors.New("unknown error (status 500)"),
err: errors.New(`{"error": "some error"}`),
},
{
name: "fails due parameter validation",
Expand Down
20 changes: 4 additions & 16 deletions pkg/deployment/elasticsearch/instances/routing_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,10 @@ func TestStartRouting(t *testing.T) {
args: args{params: Params{
ClusterParams: util.ClusterParams{
ClusterID: util.ValidClusterID,
API: api.NewMock(mock.Response{
Response: http.Response{
Status: http.StatusText(http.StatusInternalServerError),
StatusCode: http.StatusInternalServerError,
Body: mock.NewStringBody(`{}`),
},
}),
API: api.NewMock(mock.New500Response(mock.NewStringBody(`{"error": "some error"}`))),
},
}},
err: errors.New(`unknown error (status 500)`),
err: errors.New(`{"error": "some error"}`),
},
{
name: "fails due to parameter validation",
Expand Down Expand Up @@ -128,16 +122,10 @@ func TestStopRouting(t *testing.T) {
args: args{params: Params{
ClusterParams: util.ClusterParams{
ClusterID: util.ValidClusterID,
API: api.NewMock(mock.Response{
Response: http.Response{
Status: http.StatusText(http.StatusInternalServerError),
StatusCode: http.StatusInternalServerError,
Body: mock.NewStringBody(`{}`),
},
}),
API: api.NewMock(mock.New500Response(mock.NewStringBody(`{"error": "some error"}`))),
},
}},
err: errors.New(`unknown error (status 500)`),
err: errors.New(`{"error": "some error"}`),
},
{
name: "fails due to parameter validation",
Expand Down
9 changes: 2 additions & 7 deletions pkg/deployment/elasticsearch/list_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,9 @@ func TestList(t *testing.T) {
{
name: "fails due to api error",
args: args{params: ListParams{
API: api.NewMock(mock.Response{
Response: http.Response{
StatusCode: 500,
Body: mock.NewStringBody(`{}`),
},
}),
API: api.NewMock(mock.New500Response(mock.NewStringBody(`{"error": "some error"}`))),
}},
err: errors.New("unknown error (status 500)"),
err: errors.New(`{"error": "some error"}`),
},
{
name: "fails due to parameter validation",
Expand Down
Loading

0 comments on commit 78dd825

Please sign in to comment.