Port over API bits from #962 (#965)

pull/962/head^2
Jeff Mitchell 5 years ago committed by GitHub
parent 3ab8bb03de
commit ea23737258
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -2,7 +2,6 @@
package accounts
import (
"bytes"
"context"
"errors"
"fmt"
@ -29,18 +28,6 @@ type Account struct {
response *api.Response
}
func (n Account) ResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n Account) ResponseMap() map[string]interface{} {
return n.response.Map
}
func (n Account) ResponseStatus() int {
return n.response.HttpResponse().StatusCode
}
type AccountReadResult struct {
Item *Account
response *api.Response
@ -50,12 +37,8 @@ func (n AccountReadResult) GetItem() interface{} {
return n.Item
}
func (n AccountReadResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n AccountReadResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n AccountReadResult) GetResponse() *api.Response {
return n.response
}
type (
@ -67,12 +50,8 @@ type AccountDeleteResult struct {
response *api.Response
}
func (n AccountDeleteResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n AccountDeleteResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n AccountDeleteResult) GetResponse() *api.Response {
return n.response
}
type AccountListResult struct {
@ -84,12 +63,8 @@ func (n AccountListResult) GetItems() interface{} {
return n.Items
}
func (n AccountListResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n AccountListResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n AccountListResult) GetResponse() *api.Response {
return n.response
}
// Client is a client for this collection

@ -32,5 +32,10 @@ func (e *Error) Error() string {
// Errors are considered the same iff they are both api.Errors and their statuses are the same.
func (e *Error) Is(target error) bool {
tApiErr := AsServerError(target)
return tApiErr != nil && tApiErr.Kind == e.Kind && e.ResponseStatus() == tApiErr.ResponseStatus()
return tApiErr != nil && tApiErr.Kind == e.Kind && e.Response().StatusCode() == tApiErr.Response().StatusCode()
}
// Response returns the API response associated with the error
func (e *Error) Response() *Response {
return e.response
}

@ -2,7 +2,6 @@
package authmethods
import (
"bytes"
"context"
"errors"
"fmt"
@ -30,18 +29,6 @@ type AuthMethod struct {
response *api.Response
}
func (n AuthMethod) ResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n AuthMethod) ResponseMap() map[string]interface{} {
return n.response.Map
}
func (n AuthMethod) ResponseStatus() int {
return n.response.HttpResponse().StatusCode
}
type AuthMethodReadResult struct {
Item *AuthMethod
response *api.Response
@ -51,12 +38,8 @@ func (n AuthMethodReadResult) GetItem() interface{} {
return n.Item
}
func (n AuthMethodReadResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n AuthMethodReadResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n AuthMethodReadResult) GetResponse() *api.Response {
return n.response
}
type (
@ -68,12 +51,8 @@ type AuthMethodDeleteResult struct {
response *api.Response
}
func (n AuthMethodDeleteResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n AuthMethodDeleteResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n AuthMethodDeleteResult) GetResponse() *api.Response {
return n.response
}
type AuthMethodListResult struct {
@ -85,12 +64,8 @@ func (n AuthMethodListResult) GetItems() interface{} {
return n.Items
}
func (n AuthMethodListResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n AuthMethodListResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n AuthMethodListResult) GetResponse() *api.Response {
return n.response
}
// Client is a client for this collection

@ -2,7 +2,6 @@
package authtokens
import (
"bytes"
"context"
"fmt"
"net/url"
@ -29,18 +28,6 @@ type AuthToken struct {
response *api.Response
}
func (n AuthToken) ResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n AuthToken) ResponseMap() map[string]interface{} {
return n.response.Map
}
func (n AuthToken) ResponseStatus() int {
return n.response.HttpResponse().StatusCode
}
type AuthTokenReadResult struct {
Item *AuthToken
response *api.Response
@ -50,12 +37,8 @@ func (n AuthTokenReadResult) GetItem() interface{} {
return n.Item
}
func (n AuthTokenReadResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n AuthTokenReadResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n AuthTokenReadResult) GetResponse() *api.Response {
return n.response
}
type (
@ -67,12 +50,8 @@ type AuthTokenDeleteResult struct {
response *api.Response
}
func (n AuthTokenDeleteResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n AuthTokenDeleteResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n AuthTokenDeleteResult) GetResponse() *api.Response {
return n.response
}
type AuthTokenListResult struct {
@ -84,12 +63,8 @@ func (n AuthTokenListResult) GetItems() interface{} {
return n.Items
}
func (n AuthTokenListResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n AuthTokenListResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n AuthTokenListResult) GetResponse() *api.Response {
return n.response
}
// Client is a client for this collection

@ -1,8 +1,6 @@
// Code generated by "make api"; DO NOT EDIT.
package api
import "bytes"
type Error struct {
Kind string `json:"kind,omitempty"`
Op string `json:"op,omitempty"`
@ -11,15 +9,3 @@ type Error struct {
response *Response
}
func (n Error) ResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n Error) ResponseMap() map[string]interface{} {
return n.response.Map
}
func (n Error) ResponseStatus() int {
return n.response.HttpResponse().StatusCode
}

@ -188,6 +188,7 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@ -243,6 +244,7 @@ github.com/hashicorp/go-kms-wrapping v0.5.16/go.mod h1:lxD7e9q7ZyCtDEP+tnMevsEvw
github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod h1:d1g9WGtAunDNpek8jUIEJnBlbgKS1N2Q61QkHiZyR1g=
github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI=
github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY=
github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
@ -268,6 +270,7 @@ github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
@ -276,12 +279,14 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J
github.com/hashicorp/shared-secure-libs v0.0.2/go.mod h1:xhtA0FH6AYYFOy0sir7u0O0zzdLi7ofU6oWxy+gjnuc=
github.com/hashicorp/vault/api v1.0.5-0.20200514164214-89b1987e38c2/go.mod h1:P8A7gn1a6j/7qQ4zOaWI6FC/Q9jQWEBRTOwZH33tC9o=
github.com/hashicorp/vault/api v1.0.5-0.20200519221902-385fac77e20f/go.mod h1:euTFbi2YJgwcju3imEt919lhJKF68nN1cQPq3aA+kBE=
github.com/hashicorp/vault/api v1.0.5-0.20200805123347-1ef507638af6 h1:ChHpobQse3kjVX7GmbpUFVqaMTf4lb1gcLrJltsUmS4=
github.com/hashicorp/vault/api v1.0.5-0.20200805123347-1ef507638af6/go.mod h1:R3Umvhlxi2TN7Ex2hzOowyeNb+SfbVWI973N+ctaFMk=
github.com/hashicorp/vault/sdk v0.1.14-0.20200514144402-4bfac290c352/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10=
github.com/hashicorp/vault/sdk v0.1.14-0.20200514164214-89b1987e38c2/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10=
github.com/hashicorp/vault/sdk v0.1.14-0.20200519221530-14615acda45f/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10=
github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10=
github.com/hashicorp/vault/sdk v0.1.14-0.20200805123347-1ef507638af6/go.mod h1:+S2qzS1Tex9JgbHxb/Jv7CdZyKydxqg09G/qVvyVmUc=
github.com/hashicorp/vault/sdk v0.1.14-0.20200916184745-5576096032f8 h1:oin8pbTJ+5OTk9JLzcCF1To0A/5Xsq5xJXQYhBTaOS8=
github.com/hashicorp/vault/sdk v0.1.14-0.20200916184745-5576096032f8/go.mod h1:7GBJyKruotYxJlye8yHyGICV7kN7dQCNsCMTrb+v5J0=
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
@ -401,6 +406,7 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP
github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@ -573,6 +579,7 @@ golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@ -630,6 +637,7 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@ -768,6 +776,7 @@ gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKW
gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=

@ -2,7 +2,6 @@
package groups
import (
"bytes"
"context"
"errors"
"fmt"
@ -29,18 +28,6 @@ type Group struct {
response *api.Response
}
func (n Group) ResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n Group) ResponseMap() map[string]interface{} {
return n.response.Map
}
func (n Group) ResponseStatus() int {
return n.response.HttpResponse().StatusCode
}
type GroupReadResult struct {
Item *Group
response *api.Response
@ -50,12 +37,8 @@ func (n GroupReadResult) GetItem() interface{} {
return n.Item
}
func (n GroupReadResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n GroupReadResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n GroupReadResult) GetResponse() *api.Response {
return n.response
}
type (
@ -67,12 +50,8 @@ type GroupDeleteResult struct {
response *api.Response
}
func (n GroupDeleteResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n GroupDeleteResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n GroupDeleteResult) GetResponse() *api.Response {
return n.response
}
type GroupListResult struct {
@ -84,12 +63,8 @@ func (n GroupListResult) GetItems() interface{} {
return n.Items
}
func (n GroupListResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n GroupListResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n GroupListResult) GetResponse() *api.Response {
return n.response
}
// Client is a client for this collection

@ -2,7 +2,6 @@
package hostcatalogs
import (
"bytes"
"context"
"errors"
"fmt"
@ -30,18 +29,6 @@ type HostCatalog struct {
response *api.Response
}
func (n HostCatalog) ResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n HostCatalog) ResponseMap() map[string]interface{} {
return n.response.Map
}
func (n HostCatalog) ResponseStatus() int {
return n.response.HttpResponse().StatusCode
}
type HostCatalogReadResult struct {
Item *HostCatalog
response *api.Response
@ -51,12 +38,8 @@ func (n HostCatalogReadResult) GetItem() interface{} {
return n.Item
}
func (n HostCatalogReadResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n HostCatalogReadResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n HostCatalogReadResult) GetResponse() *api.Response {
return n.response
}
type (
@ -68,12 +51,8 @@ type HostCatalogDeleteResult struct {
response *api.Response
}
func (n HostCatalogDeleteResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n HostCatalogDeleteResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n HostCatalogDeleteResult) GetResponse() *api.Response {
return n.response
}
type HostCatalogListResult struct {
@ -85,12 +64,8 @@ func (n HostCatalogListResult) GetItems() interface{} {
return n.Items
}
func (n HostCatalogListResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n HostCatalogListResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n HostCatalogListResult) GetResponse() *api.Response {
return n.response
}
// Client is a client for this collection

@ -2,7 +2,6 @@
package hosts
import (
"bytes"
"context"
"errors"
"fmt"
@ -30,18 +29,6 @@ type Host struct {
response *api.Response
}
func (n Host) ResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n Host) ResponseMap() map[string]interface{} {
return n.response.Map
}
func (n Host) ResponseStatus() int {
return n.response.HttpResponse().StatusCode
}
type HostReadResult struct {
Item *Host
response *api.Response
@ -51,12 +38,8 @@ func (n HostReadResult) GetItem() interface{} {
return n.Item
}
func (n HostReadResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n HostReadResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n HostReadResult) GetResponse() *api.Response {
return n.response
}
type (
@ -68,12 +51,8 @@ type HostDeleteResult struct {
response *api.Response
}
func (n HostDeleteResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n HostDeleteResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n HostDeleteResult) GetResponse() *api.Response {
return n.response
}
type HostListResult struct {
@ -85,12 +64,8 @@ func (n HostListResult) GetItems() interface{} {
return n.Items
}
func (n HostListResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n HostListResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n HostListResult) GetResponse() *api.Response {
return n.response
}
// Client is a client for this collection

@ -2,7 +2,6 @@
package hostsets
import (
"bytes"
"context"
"errors"
"fmt"
@ -30,18 +29,6 @@ type HostSet struct {
response *api.Response
}
func (n HostSet) ResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n HostSet) ResponseMap() map[string]interface{} {
return n.response.Map
}
func (n HostSet) ResponseStatus() int {
return n.response.HttpResponse().StatusCode
}
type HostSetReadResult struct {
Item *HostSet
response *api.Response
@ -51,12 +38,8 @@ func (n HostSetReadResult) GetItem() interface{} {
return n.Item
}
func (n HostSetReadResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n HostSetReadResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n HostSetReadResult) GetResponse() *api.Response {
return n.response
}
type (
@ -68,12 +51,8 @@ type HostSetDeleteResult struct {
response *api.Response
}
func (n HostSetDeleteResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n HostSetDeleteResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n HostSetDeleteResult) GetResponse() *api.Response {
return n.response
}
type HostSetListResult struct {
@ -85,12 +64,8 @@ func (n HostSetListResult) GetItems() interface{} {
return n.Items
}
func (n HostSetListResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n HostSetListResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n HostSetListResult) GetResponse() *api.Response {
return n.response
}
// Client is a client for this collection

@ -22,6 +22,11 @@ func (r *Response) HttpResponse() *http.Response {
return r.resp
}
// StatusCode returns the underlying HTTP status code
func (r *Response) StatusCode() int {
return r.resp.StatusCode
}
func (r *Response) Decode(inStruct interface{}) (*Error, error) {
if r == nil || r.resp == nil {
return nil, fmt.Errorf("nil response, cannot decode")

@ -2,7 +2,6 @@
package roles
import (
"bytes"
"context"
"errors"
"fmt"
@ -32,18 +31,6 @@ type Role struct {
response *api.Response
}
func (n Role) ResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n Role) ResponseMap() map[string]interface{} {
return n.response.Map
}
func (n Role) ResponseStatus() int {
return n.response.HttpResponse().StatusCode
}
type RoleReadResult struct {
Item *Role
response *api.Response
@ -53,12 +40,8 @@ func (n RoleReadResult) GetItem() interface{} {
return n.Item
}
func (n RoleReadResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n RoleReadResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n RoleReadResult) GetResponse() *api.Response {
return n.response
}
type (
@ -70,12 +53,8 @@ type RoleDeleteResult struct {
response *api.Response
}
func (n RoleDeleteResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n RoleDeleteResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n RoleDeleteResult) GetResponse() *api.Response {
return n.response
}
type RoleListResult struct {
@ -87,12 +66,8 @@ func (n RoleListResult) GetItems() interface{} {
return n.Items
}
func (n RoleListResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n RoleListResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n RoleListResult) GetResponse() *api.Response {
return n.response
}
// Client is a client for this collection

@ -2,7 +2,6 @@
package scopes
import (
"bytes"
"context"
"errors"
"fmt"
@ -28,18 +27,6 @@ type Scope struct {
response *api.Response
}
func (n Scope) ResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n Scope) ResponseMap() map[string]interface{} {
return n.response.Map
}
func (n Scope) ResponseStatus() int {
return n.response.HttpResponse().StatusCode
}
type ScopeReadResult struct {
Item *Scope
response *api.Response
@ -49,12 +36,8 @@ func (n ScopeReadResult) GetItem() interface{} {
return n.Item
}
func (n ScopeReadResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n ScopeReadResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n ScopeReadResult) GetResponse() *api.Response {
return n.response
}
type (
@ -66,12 +49,8 @@ type ScopeDeleteResult struct {
response *api.Response
}
func (n ScopeDeleteResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n ScopeDeleteResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n ScopeDeleteResult) GetResponse() *api.Response {
return n.response
}
type ScopeListResult struct {
@ -83,12 +62,8 @@ func (n ScopeListResult) GetItems() interface{} {
return n.Items
}
func (n ScopeListResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n ScopeListResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n ScopeListResult) GetResponse() *api.Response {
return n.response
}
// Client is a client for this collection

@ -2,7 +2,6 @@
package sessions
import (
"bytes"
"context"
"fmt"
"net/url"
@ -37,18 +36,6 @@ type Session struct {
response *api.Response
}
func (n Session) ResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n Session) ResponseMap() map[string]interface{} {
return n.response.Map
}
func (n Session) ResponseStatus() int {
return n.response.HttpResponse().StatusCode
}
type SessionReadResult struct {
Item *Session
response *api.Response
@ -58,12 +45,8 @@ func (n SessionReadResult) GetItem() interface{} {
return n.Item
}
func (n SessionReadResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n SessionReadResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n SessionReadResult) GetResponse() *api.Response {
return n.response
}
type (
@ -75,12 +58,8 @@ type SessionDeleteResult struct {
response *api.Response
}
func (n SessionDeleteResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n SessionDeleteResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n SessionDeleteResult) GetResponse() *api.Response {
return n.response
}
type SessionListResult struct {
@ -92,12 +71,8 @@ func (n SessionListResult) GetItems() interface{} {
return n.Items
}
func (n SessionListResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n SessionListResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n SessionListResult) GetResponse() *api.Response {
return n.response
}
// Client is a client for this collection

@ -1,28 +1,24 @@
package targets
import (
"bytes"
"context"
"fmt"
"net/url"
"github.com/hashicorp/boundary/api"
)
type SessionAuthorizationResult struct {
Item *SessionAuthorization
responseBody *bytes.Buffer
responseMap map[string]interface{}
Item *SessionAuthorization
response *api.Response
}
func (n SessionAuthorizationResult) GetItem() interface{} {
return n.Item
}
func (n SessionAuthorizationResult) GetResponseBody() *bytes.Buffer {
return n.responseBody
}
func (n SessionAuthorizationResult) GetResponseMap() map[string]interface{} {
return n.responseMap
func (n SessionAuthorizationResult) GetResponse() *api.Response {
return n.response
}
func (c *Client) AuthorizeSession(ctx context.Context, targetId string, opt ...Option) (*SessionAuthorizationResult, error) {
@ -76,7 +72,5 @@ func (c *Client) AuthorizeSession(ctx context.Context, targetId string, opt ...O
if apiErr != nil {
return nil, apiErr
}
sar.responseBody = resp.Body
sar.responseMap = resp.Map
return sar, nil
}

@ -2,7 +2,6 @@
package targets
import (
"bytes"
"context"
"errors"
"fmt"
@ -34,18 +33,6 @@ type Target struct {
response *api.Response
}
func (n Target) ResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n Target) ResponseMap() map[string]interface{} {
return n.response.Map
}
func (n Target) ResponseStatus() int {
return n.response.HttpResponse().StatusCode
}
type TargetReadResult struct {
Item *Target
response *api.Response
@ -55,12 +42,8 @@ func (n TargetReadResult) GetItem() interface{} {
return n.Item
}
func (n TargetReadResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n TargetReadResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n TargetReadResult) GetResponse() *api.Response {
return n.response
}
type (
@ -72,12 +55,8 @@ type TargetDeleteResult struct {
response *api.Response
}
func (n TargetDeleteResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n TargetDeleteResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n TargetDeleteResult) GetResponse() *api.Response {
return n.response
}
type TargetListResult struct {
@ -89,12 +68,8 @@ func (n TargetListResult) GetItems() interface{} {
return n.Items
}
func (n TargetListResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n TargetListResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n TargetListResult) GetResponse() *api.Response {
return n.response
}
// Client is a client for this collection

@ -2,7 +2,6 @@
package users
import (
"bytes"
"context"
"errors"
"fmt"
@ -29,18 +28,6 @@ type User struct {
response *api.Response
}
func (n User) ResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n User) ResponseMap() map[string]interface{} {
return n.response.Map
}
func (n User) ResponseStatus() int {
return n.response.HttpResponse().StatusCode
}
type UserReadResult struct {
Item *User
response *api.Response
@ -50,12 +37,8 @@ func (n UserReadResult) GetItem() interface{} {
return n.Item
}
func (n UserReadResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n UserReadResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n UserReadResult) GetResponse() *api.Response {
return n.response
}
type (
@ -67,12 +50,8 @@ type UserDeleteResult struct {
response *api.Response
}
func (n UserDeleteResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n UserDeleteResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n UserDeleteResult) GetResponse() *api.Response {
return n.response
}
type UserListResult struct {
@ -84,12 +63,8 @@ func (n UserListResult) GetItems() interface{} {
return n.Items
}
func (n UserListResult) GetResponseBody() *bytes.Buffer {
return n.response.Body
}
func (n UserListResult) GetResponseMap() map[string]interface{} {
return n.response.Map
func (n UserListResult) GetResponse() *api.Response {
return n.response
}
// Client is a client for this collection

@ -1,8 +1,6 @@
package api
import (
"bytes"
"github.com/fatih/structs"
)
@ -12,17 +10,14 @@ func init() {
type GenericResult interface {
GetItem() interface{}
GetResponseBody() *bytes.Buffer
GetResponseMap() map[string]interface{}
GetResponse() *Response
}
type GenericDeleteResult interface {
GetResponseBody() *bytes.Buffer
GetResponseMap() map[string]interface{}
GetResponse() *Response
}
type GenericListResult interface {
GetItems() interface{}
GetResponseBody() *bytes.Buffer
GetResponseMap() map[string]interface{}
GetResponse() *Response
}

Loading…
Cancel
Save