Add bucket and region to federation_token.go

[#161256726]

Signed-off-by: Vitaliy Krasylovets <[email protected]>

federation_token.go

@@ -1,27 +1,28 @@
 package pivnet
 
 import (
+ "bytes"
+ "encoding/json"
  "fmt"
  "net/http"
- "encoding/json"
- "bytes"
 )
 
 type FederationTokenService struct {
  client Client
 }
 
 type FederationToken struct {
- AccessKeyID string `json:"access_key_id,omitempty" yaml:"access_key_id,omitempty"`
- SecretAccessKey string `json:"secret_access_key,omitempty" yaml:"secret_access_key,omitempty"`
- SessionToken string `json:"session_token,omitempty" yaml:"session_token,omitempty"`
+ AccessKeyID string `json:"access_key_id,omitempty" yaml:"access_key_id,omitempty"`
+ SecretAccessKey string `json:"secret_access_key,omitempty" yaml:"secret_access_key,omitempty"`
+ SessionToken string `json:"session_token,omitempty" yaml:"session_token,omitempty"`
+ Bucket string `json:"bucket,omitempty" yaml:"bucket,omitempty"`
+ Region string `json:"region,omitempty" yaml:"region,omitempty"`
 }
 
 type createFederationTokenBody struct {
-  ProductID string `json:"product_id"`
+ ProductID string `json:"product_id"`
 }
 
-
 func (f FederationTokenService) GenerateFederationToken(productSlug string) (FederationToken, error) {
  url := fmt.Sprintf("/federation_token")
 
@@ -55,4 +56,4 @@ func (f FederationTokenService) GenerateFederationToken(productSlug string) (Fed
  }
 
  return token, nil
-}
+}

federation_token_test.go

@@ -25,13 +25,14 @@ var _ = Describe("PivnetClient - federation token", func() {
  apiAddress string
  userAgent string
 
- response  interface{}
- responseStatusCode int
+ mockedResponse interface{}
+ responseStatusCode  int
  expectedRequestBody requestBody
- newClientConfig pivnet.ClientConfig
- fakeLogger logger.Logger
+ newClientConfig  pivnet.ClientConfig
+ fakeLogger  logger.Logger
 
  productSlug string
+ expectedFederationToken pivnet.FederationToken
  )
 
  BeforeEach(func() {
@@ -61,7 +62,7 @@ var _ = Describe("PivnetClient - federation token", func() {
  fmt.Sprintf("%s/federation_token", apiPrefix),
  ),
  ghttp.VerifyJSONRepresenting(&expectedRequestBody),
- ghttp.RespondWithJSONEncoded(responseStatusCode, response),
+ ghttp.RespondWithJSONEncoded(responseStatusCode, mockedResponse),
  ),
  )
  })
@@ -74,13 +75,22 @@ var _ = Describe("PivnetClient - federation token", func() {
  BeforeEach(func() {
  productSlug = "banana"
 
- response = pivnet.FederationToken{
- AccessKeyID: "some-AccessKeyID",
+ mockedResponse = pivnet.FederationToken{
+ AccessKeyID:  "some-AccessKeyID",
  SecretAccessKey: "some-SecretAccessKey",
- SessionToken: "some-SessionToken",
+ SessionToken: "some-SessionToken",
+ Bucket: "some-bucket",
+ Region: "some-region",
  }
 
  responseStatusCode = http.StatusOK
+ expectedFederationToken = pivnet.FederationToken{
+ AccessKeyID: "some-AccessKeyID",
+ SecretAccessKey: "some-SecretAccessKey",
+ SessionToken: "some-SessionToken",
+ Bucket: "some-bucket",
+ Region: "some-region",
+ }
  })
 
  It("returns the federated token without error", func() {
@@ -90,17 +100,15 @@ var _ = Describe("PivnetClient - federation token", func() {
  Expect(err).NotTo(HaveOccurred())
 
  Expect(federationToken).ToNot(Equal(nil))
- Expect(federationToken.AccessKeyID).To(Equal("some-AccessKeyID"))
- Expect(federationToken.SecretAccessKey).To(Equal("some-SecretAccessKey"))
- Expect(federationToken.SessionToken).To(Equal("some-SessionToken"))
+ Expect(federationToken).To(Equal(expectedFederationToken))
  })
  })
 
  Describe("Err when trying to generate token for restricted product", func() {
  BeforeEach(func() {
  productSlug = "something-i-dont-manage"
 
- response = pivnetErr{Message: "only available for product admins and partner product admins"}
+ mockedResponse = pivnetErr{Message: "only available for product admins and partner product admins"}
 
  responseStatusCode = http.StatusForbidden
  })
@@ -115,4 +123,4 @@ var _ = Describe("PivnetClient - federation token", func() {
  Expect(err.Error()).To(ContainSubstring("403 - only available for product admins and partner product admins"))
  })
  })
-})
+})