Skip to content

Commit

Permalink
fix(Global Search/Tagging): regen services with latest API definitions (
Browse files Browse the repository at this point in the history 
#279)

Signed-off-by: francescadecicco <francescadecicco@it.ibm.com>
  • Loading branch information
@francescadecicco
francescadecicco committed Sep 19, 2023
1 parent 2e3bb37 commit 87e0507
Show file tree
Hide file tree
Showing 4 changed files with 451 additions and 24 deletions.
39 changes: 37 additions & 2 deletions globalsearchv2/global_search_v2.go
View file
Expand Up @@ -15,7 +15,7 @@
*/

/*
* IBM OpenAPI SDK Code Generator Version: 3.70.0-7df966bf-20230419-195904
* IBM OpenAPI SDK Code Generator Version: 3.79.0-2eb6af3d-20230905-174838
*/

// Package globalsearchv2 : Operations and models for the GlobalSearchV2 service
Expand All @@ -38,7 +38,7 @@ import (
// the IBM Cloud platform. The search repository stores and searches cloud resources attributes, which categorize or
// classify resources. A resource is a physical or logical component that can be created or reserved for an application
// or service instance. They are owned by resource providers, such as Cloud Foundry, IBM Kubernetes Service, or resource
// controller in IBM Cloud. Resources are uniquely identified by a Cloud Resource Name (CRN) or by an IMS ID. The
// controller in IBM Cloud. Resources are uniquely identified by a Cloud Resource Name (CRN) or by an IMS ID. The
// properties of a resource include tags and system properties. Both properties are defined in an IBM Cloud billing
// account, and span across many regions.
//
Expand Down Expand Up @@ -213,6 +213,12 @@ func (globalSearch *GlobalSearchV2) SearchWithContext(ctx context.Context, searc
}
builder.AddHeader("Accept", "application/json")
builder.AddHeader("Content-Type", "application/json")
if searchOptions.XRequestID != nil {
builder.AddHeader("x-request-id", fmt.Sprint(*searchOptions.XRequestID))
}
if searchOptions.XCorrelationID != nil {
builder.AddHeader("x-correlation-id", fmt.Sprint(*searchOptions.XCorrelationID))
}
if searchOptions.TransactionID != nil {
builder.AddHeader("transaction-id", fmt.Sprint(*searchOptions.TransactionID))
}
Expand Down Expand Up @@ -398,8 +404,24 @@ type SearchOptions struct {
// items. If the search returns no items, then the search_cursor is not present in the response.
SearchCursor *string `json:"search_cursor,omitempty"`

// An alphanumeric string that is used to trace the request. The value may include ASCII alphanumerics and any of
// following segment separators: space ( ), comma (,), hyphen, (-), and underscore (_) and may have a length up to 1024
// bytes. The value is considered invalid and must be ignored if that value includes any other character or is longer
// than 1024 bytes or is fewer than 8 characters. If not specified or invalid, it is automatically replaced by a random
// (version 4) UUID.
XRequestID *string `json:"x-request-id,omitempty"`

// An alphanumeric string that is used to trace the request as a part of a larger context: the same value is used for
// downstream requests and retries of those requests. The value may include ASCII alphanumerics and any of following
// segment separators: space ( ), comma (,), hyphen, (-), and underscore (_) and may have a length up to 1024 bytes.
// The value is considered invalid and must be ignored if that value includes any other character or is longer than
// 1024 bytes or is fewer than 8 characters. If not specified or invalid, it is automatically replaced by a random
// (version 4) UUID.
XCorrelationID *string `json:"x-correlation-id,omitempty"`

// An alphanumeric string that can be used to trace a request across services. If not specified, it automatically
// generated with the prefix "gst-".
// Deprecated: this field is deprecated and may be removed in a future release.
TransactionID *string `json:"transaction-id,omitempty"`

// The account ID to filter resources.
Expand Down Expand Up @@ -505,7 +527,20 @@ func (_options *SearchOptions) SetSearchCursor(searchCursor string) *SearchOptio
return _options
}

// SetXRequestID : Allow user to set XRequestID
func (_options *SearchOptions) SetXRequestID(xRequestID string) *SearchOptions {
_options.XRequestID = core.StringPtr(xRequestID)
return _options
}

// SetXCorrelationID : Allow user to set XCorrelationID
func (_options *SearchOptions) SetXCorrelationID(xCorrelationID string) *SearchOptions {
_options.XCorrelationID = core.StringPtr(xCorrelationID)
return _options
}

// SetTransactionID : Allow user to set TransactionID
// Deprecated: this method is deprecated and may be removed in a future release.
func (_options *SearchOptions) SetTransactionID(transactionID string) *SearchOptions {
_options.TransactionID = core.StringPtr(transactionID)
return _options
Expand Down
46 changes: 36 additions & 10 deletions globalsearchv2/global_search_v2_test.go
View file
Expand Up @@ -173,10 +173,14 @@ var _ = Describe(`GlobalSearchV2`, func() {
// Verify the contents of the request
Expect(req.URL.EscapedPath()).To(Equal(searchPath))
Expect(req.Method).To(Equal("POST"))
Expect(req.Header["X-Request-Id"]).ToNot(BeNil())
Expect(req.Header["X-Request-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
Expect(req.Header["X-Correlation-Id"]).ToNot(BeNil())
Expect(req.Header["X-Correlation-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
Expect(req.URL.Query()["limit"]).To(Equal([]string{fmt.Sprint(int64(1))}))
Expect(req.URL.Query()["limit"]).To(Equal([]string{fmt.Sprint(int64(10))}))
Expect(req.URL.Query()["timeout"]).To(Equal([]string{fmt.Sprint(int64(0))}))
Expect(req.URL.Query()["is_deleted"]).To(Equal([]string{"false"}))
Expect(req.URL.Query()["is_reclaimed"]).To(Equal([]string{"false"}))
Expand All @@ -201,9 +205,11 @@ var _ = Describe(`GlobalSearchV2`, func() {
searchOptionsModel.Query = core.StringPtr("testString")
searchOptionsModel.Fields = []string{"testString"}
searchOptionsModel.SearchCursor = core.StringPtr("testString")
searchOptionsModel.XRequestID = core.StringPtr("testString")
searchOptionsModel.XCorrelationID = core.StringPtr("testString")
searchOptionsModel.TransactionID = core.StringPtr("testString")
searchOptionsModel.AccountID = core.StringPtr("testString")
searchOptionsModel.Limit = core.Int64Ptr(int64(1))
searchOptionsModel.Limit = core.Int64Ptr(int64(10))
searchOptionsModel.Timeout = core.Int64Ptr(int64(0))
searchOptionsModel.Sort = []string{"testString"}
searchOptionsModel.IsDeleted = core.StringPtr("false")
Expand Down Expand Up @@ -257,10 +263,14 @@ var _ = Describe(`GlobalSearchV2`, func() {
}
fmt.Fprintf(GinkgoWriter, " Request body: %s", bodyBuf.String())

Expect(req.Header["X-Request-Id"]).ToNot(BeNil())
Expect(req.Header["X-Request-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
Expect(req.Header["X-Correlation-Id"]).ToNot(BeNil())
Expect(req.Header["X-Correlation-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
Expect(req.URL.Query()["limit"]).To(Equal([]string{fmt.Sprint(int64(1))}))
Expect(req.URL.Query()["limit"]).To(Equal([]string{fmt.Sprint(int64(10))}))
Expect(req.URL.Query()["timeout"]).To(Equal([]string{fmt.Sprint(int64(0))}))
Expect(req.URL.Query()["is_deleted"]).To(Equal([]string{"false"}))
Expect(req.URL.Query()["is_reclaimed"]).To(Equal([]string{"false"}))
Expand Down Expand Up @@ -290,9 +300,11 @@ var _ = Describe(`GlobalSearchV2`, func() {
searchOptionsModel.Query = core.StringPtr("testString")
searchOptionsModel.Fields = []string{"testString"}
searchOptionsModel.SearchCursor = core.StringPtr("testString")
searchOptionsModel.XRequestID = core.StringPtr("testString")
searchOptionsModel.XCorrelationID = core.StringPtr("testString")
searchOptionsModel.TransactionID = core.StringPtr("testString")
searchOptionsModel.AccountID = core.StringPtr("testString")
searchOptionsModel.Limit = core.Int64Ptr(int64(1))
searchOptionsModel.Limit = core.Int64Ptr(int64(10))
searchOptionsModel.Timeout = core.Int64Ptr(int64(0))
searchOptionsModel.Sort = []string{"testString"}
searchOptionsModel.IsDeleted = core.StringPtr("false")
Expand Down Expand Up @@ -352,10 +364,14 @@ var _ = Describe(`GlobalSearchV2`, func() {
}
fmt.Fprintf(GinkgoWriter, " Request body: %s", bodyBuf.String())

Expect(req.Header["X-Request-Id"]).ToNot(BeNil())
Expect(req.Header["X-Request-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
Expect(req.Header["X-Correlation-Id"]).ToNot(BeNil())
Expect(req.Header["X-Correlation-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
Expect(req.URL.Query()["limit"]).To(Equal([]string{fmt.Sprint(int64(1))}))
Expect(req.URL.Query()["limit"]).To(Equal([]string{fmt.Sprint(int64(10))}))
Expect(req.URL.Query()["timeout"]).To(Equal([]string{fmt.Sprint(int64(0))}))
Expect(req.URL.Query()["is_deleted"]).To(Equal([]string{"false"}))
Expect(req.URL.Query()["is_reclaimed"]).To(Equal([]string{"false"}))
Expand Down Expand Up @@ -387,9 +403,11 @@ var _ = Describe(`GlobalSearchV2`, func() {
searchOptionsModel.Query = core.StringPtr("testString")
searchOptionsModel.Fields = []string{"testString"}
searchOptionsModel.SearchCursor = core.StringPtr("testString")
searchOptionsModel.XRequestID = core.StringPtr("testString")
searchOptionsModel.XCorrelationID = core.StringPtr("testString")
searchOptionsModel.TransactionID = core.StringPtr("testString")
searchOptionsModel.AccountID = core.StringPtr("testString")
searchOptionsModel.Limit = core.Int64Ptr(int64(1))
searchOptionsModel.Limit = core.Int64Ptr(int64(10))
searchOptionsModel.Timeout = core.Int64Ptr(int64(0))
searchOptionsModel.Sort = []string{"testString"}
searchOptionsModel.IsDeleted = core.StringPtr("false")
Expand Down Expand Up @@ -419,9 +437,11 @@ var _ = Describe(`GlobalSearchV2`, func() {
searchOptionsModel.Query = core.StringPtr("testString")
searchOptionsModel.Fields = []string{"testString"}
searchOptionsModel.SearchCursor = core.StringPtr("testString")
searchOptionsModel.XRequestID = core.StringPtr("testString")
searchOptionsModel.XCorrelationID = core.StringPtr("testString")
searchOptionsModel.TransactionID = core.StringPtr("testString")
searchOptionsModel.AccountID = core.StringPtr("testString")
searchOptionsModel.Limit = core.Int64Ptr(int64(1))
searchOptionsModel.Limit = core.Int64Ptr(int64(10))
searchOptionsModel.Timeout = core.Int64Ptr(int64(0))
searchOptionsModel.Sort = []string{"testString"}
searchOptionsModel.IsDeleted = core.StringPtr("false")
Expand Down Expand Up @@ -465,9 +485,11 @@ var _ = Describe(`GlobalSearchV2`, func() {
searchOptionsModel.Query = core.StringPtr("testString")
searchOptionsModel.Fields = []string{"testString"}
searchOptionsModel.SearchCursor = core.StringPtr("testString")
searchOptionsModel.XRequestID = core.StringPtr("testString")
searchOptionsModel.XCorrelationID = core.StringPtr("testString")
searchOptionsModel.TransactionID = core.StringPtr("testString")
searchOptionsModel.AccountID = core.StringPtr("testString")
searchOptionsModel.Limit = core.Int64Ptr(int64(1))
searchOptionsModel.Limit = core.Int64Ptr(int64(10))
searchOptionsModel.Timeout = core.Int64Ptr(int64(0))
searchOptionsModel.Sort = []string{"testString"}
searchOptionsModel.IsDeleted = core.StringPtr("false")
Expand Down Expand Up @@ -502,9 +524,11 @@ var _ = Describe(`GlobalSearchV2`, func() {
searchOptionsModel.SetQuery("testString")
searchOptionsModel.SetFields([]string{"testString"})
searchOptionsModel.SetSearchCursor("testString")
searchOptionsModel.SetXRequestID("testString")
searchOptionsModel.SetXCorrelationID("testString")
searchOptionsModel.SetTransactionID("testString")
searchOptionsModel.SetAccountID("testString")
searchOptionsModel.SetLimit(int64(1))
searchOptionsModel.SetLimit(int64(10))
searchOptionsModel.SetTimeout(int64(0))
searchOptionsModel.SetSort([]string{"testString"})
searchOptionsModel.SetIsDeleted("false")
Expand All @@ -517,9 +541,11 @@ var _ = Describe(`GlobalSearchV2`, func() {
Expect(searchOptionsModel.Query).To(Equal(core.StringPtr("testString")))
Expect(searchOptionsModel.Fields).To(Equal([]string{"testString"}))
Expect(searchOptionsModel.SearchCursor).To(Equal(core.StringPtr("testString")))
Expect(searchOptionsModel.XRequestID).To(Equal(core.StringPtr("testString")))
Expect(searchOptionsModel.XCorrelationID).To(Equal(core.StringPtr("testString")))
Expect(searchOptionsModel.TransactionID).To(Equal(core.StringPtr("testString")))
Expect(searchOptionsModel.AccountID).To(Equal(core.StringPtr("testString")))
Expect(searchOptionsModel.Limit).To(Equal(core.Int64Ptr(int64(1))))
Expect(searchOptionsModel.Limit).To(Equal(core.Int64Ptr(int64(10))))
Expect(searchOptionsModel.Timeout).To(Equal(core.Int64Ptr(int64(0))))
Expect(searchOptionsModel.Sort).To(Equal([]string{"testString"}))
Expect(searchOptionsModel.IsDeleted).To(Equal(core.StringPtr("false")))
Expand Down

0 comments on commit 87e0507

Please sign in to comment.